From 535d681e854469f9fe906749dcb833da54ee26ad Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Thu, 29 Mar 2007 06:46:26 +0000
Subject: [PATCH] fixes for improved download page processing
---
releng.wtpbuilder/build.xml | 57 ++
.../components/jst-sdk/customTargets.xml | 34 --
.../components/jst/customTargets.xml | 29 -
.../distribution/dali.site/publish.xml | 3 +-
.../distribution/jsf.site/publish.xml | 3 +-
.../distribution/patches.site/publish.xml | 3 +-
.../distribution/wtp.build/build.xml | 158 +++--
.../distribution/wtp.site/build.xml | 6 +-
.../distribution/wtp.site/publish.xml | 118 ++--
.../templateFiles/index.html.template | 558 +++++++++---------
.../distribution/wtp.site/testManifest.xml | 107 ----
.../distribution/wtp.tests/build.xml | 1 +
.../wtp.tests/testScripts/test.xml | 16 +-
.../wtp.tests/testScripts/wtp-junit-tests.xml | 4 +
14 files changed, 497 insertions(+), 600 deletions(-)
delete mode 100644 releng.wtpbuilder/distribution/wtp.site/testManifest.xml
diff --git a/releng.wtpbuilder/build.xml b/releng.wtpbuilder/build.xml
index af3919042..5b70472c0 100644
--- a/releng.wtpbuilder/build.xml
+++ b/releng.wtpbuilder/build.xml
@@ -33,8 +33,30 @@
<property name="build.pack-all-in-one" value="${build.pack-all-in-one}" />
<property name="eclipse.builder.fetch" value="${eclipse.builder.fetch}" />
</ant>
+
+ <antcall target="package"/>
+
+ <!-- todo: all-one's will have to be moved after 'package' now -->
+
</target>
+ <target name="package" depends="init">
+ <!-- post, post packaging, for WTP ... "manually" assemble the desired zips -->
+
+ <antcall target="combineArchives">
+ <param name="corename" value=""/>
+ </antcall>
+
+ <antcall target="combineArchives">
+ <param name="corename" value="-sdk"/>
+ </antcall>
+
+ <antcall target="combineArchives">
+ <param name="corename" value="-Automated-Tests"/>
+ </antcall>
+
+
+ </target>
<target name="site" depends="init" if="site_distro_target_exists">
<ant antfile="${distributionCoreName}.site/build.xml">
@@ -127,4 +149,39 @@
</target>
+
+
+ <target name="combineArchives">
+ <property name="archiveName" value="wtp${corename}-${buildLabel}.zip" />
+ <delete dir="${buildDirectory}/tempforrezipping" failonerror="false"/>
+
+ <exec dir="${buildDirectory}/${buildLabel}" executable="unzip" failonerror="false">
+ <arg line="-o -qq wtp-wst${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
+ </exec>
+
+ <exec dir="${buildDirectory}/${buildLabel}" executable="unzip" failonerror="false">
+ <arg line="-o -qq wtp-jst${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
+ </exec>
+
+ <exec dir="${buildDirectory}/${buildLabel}" executable="unzip" failonerror="false">
+ <arg line="-o -qq wtp-jsf${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
+ </exec>
+
+ <exec dir="${buildDirectory}/${buildLabel}" executable="unzip" failonerror="false">
+ <arg line="-o -qq wtp-jpa${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
+ </exec>
+
+
+ <zip destfile="${buildDirectory}/${buildLabel}/${archiveName}" basedir="${buildDirectory}/tempforrezipping" />
+
+ <delete dir="${buildDirectory}/tempforrezipping" failonerror="false"/>
+
+ <ant antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" target="createChecksums">
+ <property name="buildDirectory" value="${buildDirectory}" />
+ <property name="buildLabel" value="${buildLabel}" />
+ <property name="archiveName" value="${archiveName}" />
+ </ant>
+ </target>
+
+
</project>
diff --git a/releng.wtpbuilder/components/jst-sdk/customTargets.xml b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
index d038ef63f..4f8b21b7a 100644
--- a/releng.wtpbuilder/components/jst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
@@ -65,40 +65,6 @@
value="${archiveName}" />
</ant>
-
- <!-- post, post packaging, for WTP -->
-
- <property
- name="wtparchiveName"
- value="wtp-sdk-${buildLabel}.zip" />
-
- <zip
- destfile="${buildDirectory}/${buildLabel}/${wtparchiveName}"
- duplicate="preserve">
- <zipfileset
- src="${buildDirectory}/${buildLabel}/wtp-wst-sdk-${buildLabel}.zip" />
- <zipfileset
- src="${buildDirectory}/${buildLabel}/wtp-jst-sdk-${buildLabel}.zip" />
- </zip>
-
-
- <ant
- antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
- target="createChecksums">
- <property
- name="buildDirectory"
- value="${buildDirectory}" />
- <property
- name="buildLabel"
- value="${buildLabel}" />
- <property
- name="archiveName"
- value="${wtparchiveName}" />
- </ant>
-
-
-
-
</target>
<!-- ===================================================================== -->
diff --git a/releng.wtpbuilder/components/jst/customTargets.xml b/releng.wtpbuilder/components/jst/customTargets.xml
index 48e519cd2..e2d502f9e 100644
--- a/releng.wtpbuilder/components/jst/customTargets.xml
+++ b/releng.wtpbuilder/components/jst/customTargets.xml
@@ -64,35 +64,6 @@
</ant>
- <!-- post, post packaging, for WTP -->
-
- <property
- name="wtparchiveName"
- value="wtp-${buildLabel}.zip" />
-
- <zip
- destfile="${buildDirectory}/${buildLabel}/${wtparchiveName}"
- duplicate="preserve">
- <zipfileset
- src="${buildDirectory}/${buildLabel}/wtp-wst-${buildLabel}.zip" />
- <zipfileset
- src="${buildDirectory}/${buildLabel}/wtp-jst-${buildLabel}.zip" />
- </zip>
-
-
- <ant
- antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
- target="createChecksums">
- <property
- name="buildDirectory"
- value="${buildDirectory}" />
- <property
- name="buildLabel"
- value="${buildLabel}" />
- <property
- name="archiveName"
- value="${wtparchiveName}" />
- </ant>
diff --git a/releng.wtpbuilder/distribution/dali.site/publish.xml b/releng.wtpbuilder/distribution/dali.site/publish.xml
index 1addc9b68..888103102 100644
--- a/releng.wtpbuilder/distribution/dali.site/publish.xml
+++ b/releng.wtpbuilder/distribution/dali.site/publish.xml
@@ -39,7 +39,8 @@
-->
<property file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
- <indexResults isBuildTested="${isBuildTested}" dropTokenList="${dropTokenList}" xmlDirectoryName="${result}/testResults/xml" dropDirectoryName="${result}" testResultsTemplateFileName="${basedir}/templateFiles/testResults.php.template" dropTemplateFileName="${basedir}/templateFiles/${indexTemplateFilename}" testResultsHtmlFileName="testResults.php" dropHtmlFileName="${indexFileName}" hrefTestResultsTargetPath="testResults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${result}/compilelogs" testManifestFileName="${basedir}/testManifest.xml" />
+ <indexResults isBuildTested="${isBuildTested}" dropTokenList="${dropTokenList}" xmlDirectoryName="${result}/testResults/xml" dropDirectoryName="${result}" testResultsTemplateFileName="${basedir}/templateFiles/testResults.php.template"
+ testResultsHtmlFileName="testResults.php" dropHtmlFileName="${indexFileName}" hrefTestResultsTargetPath="testResults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${result}/compilelogs" testManifestFileName="${basedir}/testManifest.xml" />
<tstamp>
<format property="TODAY" pattern="MMMM d, yyyy" />
diff --git a/releng.wtpbuilder/distribution/jsf.site/publish.xml b/releng.wtpbuilder/distribution/jsf.site/publish.xml
index 5924b3c3d..d904ffd25 100644
--- a/releng.wtpbuilder/distribution/jsf.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jsf.site/publish.xml
@@ -39,7 +39,8 @@
-->
<property file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
- <indexResults isBuildTested="${isBuildTested}" dropTokenList="${dropTokenList}" xmlDirectoryName="${result}/testResults/xml" dropDirectoryName="${result}" testResultsTemplateFileName="${basedir}/templateFiles/testResults.php.template" dropTemplateFileName="${basedir}/templateFiles/${indexTemplateFilename}" testResultsHtmlFileName="testResults.php" dropHtmlFileName="${indexFileName}" hrefTestResultsTargetPath="testResults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${result}/compilelogs" testManifestFileName="${basedir}/testManifest.xml" />
+ <indexResults isBuildTested="${isBuildTested}" dropTokenList="${dropTokenList}" xmlDirectoryName="${result}/testResults/xml" dropDirectoryName="${result}" testResultsTemplateFileName="${basedir}/templateFiles/testResults.php.template"
+ testResultsHtmlFileName="testResults.php" dropHtmlFileName="${indexFileName}" hrefTestResultsTargetPath="testResults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${result}/compilelogs" testManifestFileName="${basedir}/testManifest.xml" />
<tstamp>
<format property="TODAY" pattern="MMMM d, yyyy" />
diff --git a/releng.wtpbuilder/distribution/patches.site/publish.xml b/releng.wtpbuilder/distribution/patches.site/publish.xml
index 132538c21..30fa98ca3 100644
--- a/releng.wtpbuilder/distribution/patches.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches.site/publish.xml
@@ -39,7 +39,8 @@
-->
<property file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
- <indexResults isBuildTested="${isBuildTested}" dropTokenList="${dropTokenList}" xmlDirectoryName="${result}/testResults/xml" dropDirectoryName="${result}" testResultsTemplateFileName="${basedir}/templateFiles/testResults.php.template" dropTemplateFileName="${basedir}/templateFiles/${indexTemplateFilename}" testResultsHtmlFileName="testResults.php" dropHtmlFileName="${indexFileName}" hrefTestResultsTargetPath="testResults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${result}/compilelogs" testManifestFileName="${basedir}/testManifest.xml" />
+ <indexResults isBuildTested="${isBuildTested}" dropTokenList="${dropTokenList}" xmlDirectoryName="${result}/testResults/xml" dropDirectoryName="${result}" testResultsTemplateFileName="${basedir}/templateFiles/testResults.php.template"
+ testResultsHtmlFileName="testResults.php" dropHtmlFileName="${indexFileName}" hrefTestResultsTargetPath="testResults/html" hrefCompileLogsTargetPath="compilelogs" compileLogsDirectoryName="${result}/compilelogs" testManifestFileName="${basedir}/testManifest.xml" />
<tstamp>
<format property="TODAY" pattern="MMMM d, yyyy" />
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index 81f68a857..c2dc40daa 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -2,93 +2,75 @@
- <target name="build" depends="getBaseBuilder">
- <dirname file="${ant.file}"
- property="distribution.wtp.build.dir" />
- <property file="${wtp.builder.home}/build.properties" />
- <property name="buildTargets"
- value="${wtp.builder.home}/scripts/build/runbuild.xml" />
-
-
- <ant antfile="${buildTargets}">
- <property name="component" value="wst" />
- </ant>
-
- <ant antfile="${buildTargets}">
- <property name="component" value="wst-sdk" />
- </ant>
- <ant antfile="${buildTargets}">
- <property name="component" value="wst.tests" />
- <property name="eclipseBuildFailOnError"
- value="false" />
- </ant>
-
- <ant antfile="${buildTargets}">
- <property name="component" value="jst" />
- </ant>
- <ant antfile="${buildTargets}">
- <property name="component" value="jst-sdk" />
- </ant>
- <ant antfile="${buildTargets}">
- <property name="component" value="jst.tests" />
- <property name="eclipseBuildFailOnError"
- value="false" />
- </ant>
-
- <ant antfile="${buildTargets}">
- <property name="component" value="jsf" />
- <property name="eclipseBuildFailOnError"
- value="false" />
- </ant>
-
- <ant antfile="${buildTargets}">
- <property name="component" value="jsf-sdk" />
- <property name="eclipseBuildFailOnError"
- value="false" />
- </ant>
- <ant antfile="${buildTargets}">
- <property name="component" value="jsf.tests" />
- <property name="eclipseBuildFailOnError"
- value="false" />
- </ant>
-
- <ant antfile="${buildTargets}">
- <property name="component" value="dali" />
- <property name="eclipseBuildFailOnError"
- value="false" />
- </ant>
-
- <ant antfile="${buildTargets}">
- <property name="component" value="dali-sdk" />
- <property name="eclipseBuildFailOnError"
- value="false" />
- </ant>
-
- <ant antfile="${buildTargets}">
- <property name="component" value="dali.tests" />
- <property name="eclipseBuildFailOnError"
- value="false" />
- </ant>
-
-
- <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-
- </target>
-
- <target name="getBaseBuilder"
- if="eclipse.builder.fetch">
- <dirname file="${ant.file}"
- property="wtbuilder.dir" />
- <property name="buildTargets"
- value="${wtp.builder.home}/scripts/build/runbuild.xml" />
- <ant antfile="${buildTargets}"
- target="getBaseBuilder">
- <property name="eclipse.builder.fetch"
- value="${eclipse.builder.fetch}" />
- </ant>
- </target>
-
-
-
+ <target name="build" depends="getBaseBuilder">
+ <dirname file="${ant.file}" property="distribution.wtp.build.dir" />
+ <property file="${wtp.builder.home}/build.properties" />
+ <property name="buildTargets" value="${wtp.builder.home}/scripts/build/runbuild.xml" />
+
+
+ <ant antfile="${buildTargets}">
+ <property name="component" value="wst" />
+ </ant>
+
+ <ant antfile="${buildTargets}">
+ <property name="component" value="wst-sdk" />
+ </ant>
+ <ant antfile="${buildTargets}">
+ <property name="component" value="wst.tests" />
+ <property name="eclipseBuildFailOnError" value="false" />
+ </ant>
+
+ <ant antfile="${buildTargets}">
+ <property name="component" value="jst" />
+ </ant>
+ <ant antfile="${buildTargets}">
+ <property name="component" value="jst-sdk" />
+ </ant>
+ <ant antfile="${buildTargets}">
+ <property name="component" value="jst.tests" />
+ <property name="eclipseBuildFailOnError" value="false" />
+ </ant>
+
+ <ant antfile="${buildTargets}">
+ <property name="component" value="jsf" />
+ <property name="eclipseBuildFailOnError" value="false" />
+ </ant>
+
+ <ant antfile="${buildTargets}">
+ <property name="component" value="jsf-sdk" />
+ <property name="eclipseBuildFailOnError" value="false" />
+ </ant>
+ <ant antfile="${buildTargets}">
+ <property name="component" value="jsf.tests" />
+ <property name="eclipseBuildFailOnError" value="false" />
+ </ant>
+
+ <ant antfile="${buildTargets}">
+ <property name="component" value="dali" />
+ <property name="eclipseBuildFailOnError" value="false" />
+ </ant>
+
+ <ant antfile="${buildTargets}">
+ <property name="component" value="dali-sdk" />
+ <property name="eclipseBuildFailOnError" value="false" />
+ </ant>
+
+ <ant antfile="${buildTargets}">
+ <property name="component" value="dali.tests" />
+ <property name="eclipseBuildFailOnError" value="false" />
+ </ant>
+
+
+ <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
+
+ </target>
+
+ <target name="getBaseBuilder" if="eclipse.builder.fetch">
+ <dirname file="${ant.file}" property="wtbuilder.dir" />
+ <property name="buildTargets" value="${wtp.builder.home}/scripts/build/runbuild.xml" />
+ <ant antfile="${buildTargets}" target="getBaseBuilder">
+ <property name="eclipse.builder.fetch" value="${eclipse.builder.fetch}" />
+ </ant>
+ </target>
</project>
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
index ce66c0838..e2ba36ce2 100644
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/build.xml
@@ -56,13 +56,15 @@
<property name="indexFileName" value="index.php" />
<property name="result" value="${buildDirectory}/${buildLabel}" />
<property name="indexTemplateFilename" value="index.html.template" />
-
+
+ <copy file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}" tofile="${buildDirectory}/${indexFileName}" />
+
<condition property="isBuildTested" value="true">
<available file="${buildDirectory}/${buildLabel}/testResults/html" />
</condition>
<ant antfile="${publish.xml}" dir="${component.dir}">
- <property name="dropTokenList" value="%wtpruntime%,%wtpsdk%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jsf-runtime%,%jsf-sdk%,%jsf-tests%,%jpa-runtime%,%jpa-sdk%,%jpa-tests%" />
+ <property name="dropTokenList" value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jsf-runtime%,%jsf-sdk%,%jsf-tests%,%jpa-runtime%,%jpa-sdk%,%jpa-tests%" />
<property name="webtoolsDownloadURL" value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
<property name="buildBranch" value="${buildBranch}" />
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index 2fcf03b53..6068b744d 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -11,17 +11,20 @@
<property name="resultDir"
value="${buildDirectory}/${buildLabel}" />
-
- <echo message="resultDir: ${resultDir}" />
+ <!--name of generated index page-->
+ <property name="indexFileName" value="index.php" />
<property name="templateDir" value="${wtp.builder.home}/distribution/wtp.site" />
-
+ <property name="resultingIndex" value="${resultDir}/${indexFileName}" />
+
+ <echo message="resultDir: ${resultDir}" />
<echo message="templateDir: ${templateDir}" />
+ <echo message="resultingIndex: ${resultingIndex}" />
- <!--name of generated index page-->
- <property name="indexFileName" value="index.php" />
+
<target name="default">
+ <copy overwrite="true" file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}" tofile="${resultingIndex}" />
<antcall target="countFiles" />
<antcall target="generateCompileIndex" />
<antcall target="generateJUnitTestsIndex" />
@@ -30,6 +33,7 @@
<target name="generateCompileIndex" >
+
<!--
<taskdef name="indexResults" classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator" />
-->
@@ -58,13 +62,10 @@
xmlDirectoryName=""
dropDirectoryName="${resultDir}"
testResultsTemplateFileName="${templateDir}/templateFiles/testCompileResults.php.template"
- dropTemplateFileName="${templateDir}/templateFiles/${indexTemplateFilename}"
testResultsHtmlFileName="testCompileResults.php"
- dropHtmlFileName="${indexFileName}"
hrefTestResultsTargetPath=""
hrefCompileLogsTargetPath="testcompilelogs"
- compileLogsDirectoryName="${resultDir}/testcompilelogs"
- testManifestFileName="${templateDir}/testManifest.xml" />
+ compileLogsDirectoryName="${resultDir}/testcompilelogs" />
<!-- create table of code plugins compiles -->
<summarizeResults isBuildTested="false"
@@ -73,13 +74,10 @@
xmlDirectoryName=""
dropDirectoryName="${resultDir}"
testResultsTemplateFileName="${templateDir}/templateFiles/compileResults.php.template"
- dropTemplateFileName="${templateDir}/templateFiles/${indexTemplateFilename}"
testResultsHtmlFileName="compileResults.php"
- dropHtmlFileName="${indexFileName}"
hrefTestResultsTargetPath="testResults/html"
hrefCompileLogsTargetPath="compilelogs"
- compileLogsDirectoryName="${resultDir}/compilelogs"
- testManifestFileName="${templateDir}/testManifest.xml" />
+ compileLogsDirectoryName="${resultDir}/compilelogs" />
@@ -92,47 +90,50 @@
<antcall target="${buildType}" />
<!-- Insert Build Date -->
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@date@"
value="${TODAY}" />
<!-- Insert Build Name -->
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@build@"
value="${buildLabel}" />
<!-- Insert Mirror Name -->
- <replace file="${resultDir}/${indexFileName}"
+ <!--
+ <replace file="${resultingIndex}"
token="@mirror@"
- value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" />
+ value="\${downloadprefix}" />
+ -->
+ <!-- value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" /> -->
<!-- Insert PreRequsites -->
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@eclipseFile@"
value="${eclipse.file.linux-gtk-x86}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@eclipseURL@"
value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@eclipseBuildURL@"
value="${eclipse.url}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@emfFile@"
value="${emf.file}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@emfURL@"
value="${emf.url}/${emf.file}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@gefFile@"
value="${gef.file}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@gefURL@"
value="${gef.url}/${gef.file}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@jemFile@"
value="${jem.file}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@jemURL@"
value="${jem.url}/${jem.file}" />
<!--
@@ -140,10 +141,10 @@
no harm done, so in the interests of keeping builder
streams in sync, we'll leave them here as place hold
-->
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@dtpFile@"
value="${dtp.file}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@dtpURL@"
value="${dtp.url}/${dtp.file}" />
@@ -154,7 +155,7 @@
</echo>
<!-- Update timestamp on file to permit overwrite through Ant copy task -->
- <touch file="${resultDir}/${indexFileName}" />
+ <touch file="${resultingIndex}" />
</target>
<target name="generateJUnitTestsIndex" depends="checkIfTested" if="doTests">
@@ -190,12 +191,9 @@
dropDirectoryName="${resultDir}"
xmlDirectoryName="${resultDir}/testResults/xml"
testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
- dropTemplateFileName="${templateDir}/templateFiles/${indexTemplateFilename}"
testResultsHtmlFileName="testResults.php"
- dropHtmlFileName="${indexFileName}"
hrefTestResultsTargetPath="testResults/html"
- compileLogsDirectoryName=""
- testManifestFileName="${templateDir}/testManifest.xml" />
+ compileLogsDirectoryName=""/>
<tstamp>
@@ -207,47 +205,47 @@
<antcall target="${buildType}" />
<!-- Insert Build Date -->
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@date@"
value="${TODAY}" />
<!-- Insert Build Name -->
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@build@"
value="${buildLabel}" />
<!-- Insert Mirror Name -->
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@mirror@"
value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" />
<!-- Insert PreRequsites -->
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@eclipseFile@"
value="${eclipse.file.linux-gtk-x86}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@eclipseURL@"
value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@eclipseBuildURL@"
value="${eclipse.url}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@emfFile@"
value="${emf.file}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@emfURL@"
value="${emf.url}/${emf.file}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@gefFile@"
value="${gef.file}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@gefURL@"
value="${gef.url}/${gef.file}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@jemFile@"
value="${jem.file}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@jemURL@"
value="${jem.url}/${jem.file}" />
<!--
@@ -255,10 +253,10 @@
no harm done, so in the interests of keeping builder
streams in sync, we'll leave them here as place hold
-->
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@dtpFile@"
value="${dtp.file}" />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@dtpURL@"
value="${dtp.url}/${dtp.file}" />
@@ -269,7 +267,7 @@
</echo>
<!-- Update timestamp on file to permit overwrite through Ant copy task -->
- <touch file="${resultDir}/${indexFileName}" />
+ <touch file="${resultingIndex}" />
</target>
@@ -348,56 +346,56 @@
<!--Build type descriptors-->
<target name="I">
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="%wtpandprereqs%"
value=" " />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@type@"
value="Integration" />
</target>
<target name="S">
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="%wtpandprereqs%"
value=" " />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@type@"
value="Stable" />
</target>
<target name="N">
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="%wtpandprereqs%"
value=" " />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@type@"
value="Nightly" />
</target>
<target name="M">
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="%wtpandprereqs%"
value=" " />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@type@"
value="Maintenance" />
</target>
<target name="R">
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="%wtpandprereqs%"
value=" " />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@type@"
value="Release" />
</target>
<target name="T">
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="%wtpandprereqs%"
value=" " />
- <replace file="${resultDir}/${indexFileName}"
+ <replace file="${resultingIndex}"
token="@type@"
value="Test" />
</target>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
index 23f8652e1..405a462a8 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
@@ -2,49 +2,60 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Download</title>
+<title>WTP Downloads</title>
-<?php
-//ini_set("display_errors", "true");
-//error_reporting (E_ERROR | E_WARNING | E_PARSE | E_NOTICE );
-
+<?php
+//ini_set("display_errors", "true");
+//error_reporting (E_ALL);
+
+//todo: compute downloadprefix based on host server, and stage of declaration
+$downloadprefix="./";
+
+// todo: unsure if can handle filenames that are URLs?
+function fileSizeInMegs($filename) {
+ // handy constant to compute file size in megabytes
+ $onemeg=1024*1024;
+ $zipfilesize=filesize($filename);
+ $zipfilesize=round($zipfilesize/$onemeg, 0);
+ return $zipfilesize;
+}
// expecting grandTotalErrors and grandTotalTests
- $filename = "unitTestsSummary.xml";
- if (file_exists($filename)) {
- $prefix = "unitTests_";
- $unitTestsSummary = simplexml_load_file($filename);
- foreach ($unitTestsSummary->summaryItem as $summaryItem) {
- $name = $summaryItem->name;
- $value = $summaryItem->value;
- $code= "\$" . $prefix . $name . " = " . $value . ";";
- //echo "<br />code: " . $code;
- eval($code);
- }
- }
-
- $filename = "compilelogsSummary.xml";
- $prefix = "code_";
- $compileSummary = simplexml_load_file($filename);
- foreach ($compileSummary->summaryItem as $summaryItem) {
- $name = $summaryItem->name;
- $value = $summaryItem->value;
- $code= "\$" . $prefix . $name . " = " . $value . ";";
- //echo "<br />code: " . $code;
- eval($code);
- }
-
- $filename = "testcompilelogsSummary.xml";
- $prefix = "test_";
- $compileSummary = simplexml_load_file($filename);
- foreach ($compileSummary->summaryItem as $summaryItem) {
- $name = $summaryItem->name;
- $value = $summaryItem->value;
- $code= "\$" . $prefix . $name . " = " . $value . ";";
- //echo "<br />code: " . $code;
- eval($code);
- }
+$filename = "unitTestsSummary.xml";
+if (file_exists($filename)) {
+ $prefix = "unitTests_";
+ $unitTestsSummary = simplexml_load_file($filename);
+ foreach ($unitTestsSummary->summaryItem as $summaryItem) {
+ $name = $summaryItem->name;
+ $value = $summaryItem->value;
+ $code= "\$" . $prefix . $name . " = " . $value . ";";
+ //echo "<br />code: " . $code;
+ eval($code);
+ }
+}
+
+$filename = "compilelogsSummary.xml";
+$prefix = "code_";
+$compileSummary = simplexml_load_file($filename);
+foreach ($compileSummary->summaryItem as $summaryItem) {
+ $name = $summaryItem->name;
+ $value = $summaryItem->value;
+ $code= "\$" . $prefix . $name . " = " . $value . ";";
+ //echo "<br />code: " . $code;
+ eval($code);
+}
+
+$filename = "testcompilelogsSummary.xml";
+$prefix = "test_";
+$compileSummary = simplexml_load_file($filename);
+foreach ($compileSummary->summaryItem as $summaryItem) {
+ $name = $summaryItem->name;
+ $value = $summaryItem->value;
+ $code= "\$" . $prefix . $name . " = " . $value . ";";
+ //echo "<br />code: " . $code;
+ eval($code);
+}
?>
@@ -54,256 +65,265 @@
<body>
-<table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" ><tr><td ALIGN=LEFT width="80%">
-<p><b><font face="Verdana" size="+3">@type@ Build: @build@</font></b><br />
-@date@
-</p>
-<p>These downloads are provided under the <a href="http://www.eclipse.org/legal/epl/notice.html">Eclipse Foundation
-Software User Agreement</a>.</p>
-</td></tr></table>
-
-<!-- *********** Build Status ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"> <b><font face="Arial,Helvetica" color="#FFFFFF">Build, test and performance</font></b></td></tr></table>
-<br />
-<?
-$buildmachineScript="../../../displayBuildMachine.php";
-if (file_exists($buildmachineScript))
-{
- include $buildmachineScript;
- echo displayBuildMachine();
-}
-?>
-<br /> <a href="buildNotes.php">Build notes</a>
-<br /> <a href="directory.txt">map files</a>
-<br />
-<br />
-
-<?php
-
- if (isset($unitTests_grandTotalErrors)) {
- $errorColor="green";
- if ($unitTests_grandTotalErrors > 0) {
- $errorColor="red";
- }
- echo "<br /> <a href=\"testResults.php\">Unit test results</a> ";
- echo "<img src=\"http://download.eclipse.org/webtools/downloads/junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font> Total: " . $unitTests_grandTotalTests;
- }
- else {
- echo "<font color=\"orange\">Unit tests are pending</font>";
- }
-?>
-
+<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
+ <tr>
+ <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b>@type@
+ Build: @build@</b></font></td>
+
+
+ <tr>
+ <td><font size="-1">@date@</font></td>
+ </tr>
+ <tr>
+ <td>
+ <p>The Eclipse Web Tools Platform Project provides tools for Web
+ Development, and is a platform for adopters making add-on tools for
+ Web Development.</p>
+ </td>
+ </tr>
+</table>
+<!-- *********** Required Prerequisites ************** -->
+<table border=0 cellspacing=2 cellpadding=2 width="100%">
+ <tr>
+ <td align="left" valign="top" bgcolor="#0080C0"><font
+ face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Required
+ Prerequisites</font></td>
+ </tr>
+ <tr>
+ <td>These are the prerequisites project packages to run the Web Tools
+ Platform. They must be downloaded and installed before WTP can be
+ installed or used.</td>
+ </tr>
+ <tr>
+ <table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
+ <tr valign="top">
+ <td width="10%"/>
+ <td>Eclipse Platform (Platform, JDT, PDE)</td>
+ <td align="right"><a href="@eclipseURL@">@eclipseFile@</a> or <a
+ href=@eclipseBuildURL@>other platform</a></td>
+ </tr>
+ <tr valign="top">
+ <td width="10%"/>
+ <td>Eclipse Modeling Framework (EMF, XSD InfoSet, SDO)</td>
+ <td align="right"><a href="@emfURL@">@emfFile@</a></td>
+ </tr>
+ <tr valign="top">
+ <td width="10%"/>
+ <td>Graphical Editing Framework (GEF)</td>
+ <td align="right"><a href="@gefURL@">@gefFile@</a></td>
+ </tr>
+ <tr valign="top">
+ <td width="10%"/>
+ <td>Data Tools Platform (DTP)</td>
+ <td align="right"><a href="@dtpURL@">@dtpFile@</a></td>
+ </tr>
+ </table>
+ </tr>
+</table>
-<br /> <a href="compileResults.php">Compile logs: Code Bundles</a>
-<?php
-echo " ($code_totalBundles) ";
-echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_err.gif\"/><font color=red>$code_totalErrors</font> ";
-echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_warn.gif\"/><font color=orange>$code_totalWarnings</font> ";
-?>
+<!-- *********** WTP ************** -->
+<table border=0 cellspacing=2 cellpadding=2 width="100%">
+ <tr>
+ <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
+ face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
+ Platform Complete</font></td>
+ </tr>
+
+ <tr>
+ <td align="left" valign="top" colspan="5">
+ <p>The WTP zip files includes the features and plugins from the WST,
+ JST (including JSF), and JPA projects.</p>
+ </td>
+ </tr>
+ <tr>
+ <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+
+
+ <tr>
+ <td align="left" valign="top" width="10%"><b>Web App Developers:</b></td>
+ <td align="left" valign="top">
+ <p>This non-SDK package is for most users. It includes the runnable
+ code and end-user documentation for those using the tools to develop
+ web applications.</p>
+ </td>
+ <?php
+
+ $zipfilename="wtp-@build@";
+
+ $filename=$zipfilename.".zip";
+ $zipfilesize=fileSizeInMegs($filename);
+ echo ' <td align="right" valign="top" width="10%">
+ <a href="' . ${downloadprefix} . ${filename} . '">' . "wtp" . '</a>
+ </td>
+ <td align="right" valign="top" width="5%">
+ (' . ${zipfilesize} . 'M)
+ </td>
+ <td align="right" valign="top" width="5%">
+ [<a href="checksum/' . ${filename} . '.md5">md5</a>]
+ </td>';
+
+ ?>
+ </tr>
+
+ <tr>
+
+
+ <tr>
+ <td align="left" valign="top" width="10%"><b>Tool Developers:</b></td>
+
+ <td align="left" valign="top">
+ <p>The SDK package includes source code and developer documentation
+ for those using WTP as a platform to build more tools, as well as
+ everything that is in the non-SDK version.</p>
+
+ <?php
+
+ $zipfilename="wtp-sdk-@build@";
+
+ $filename=$zipfilename.".zip";
+ $zipfilesize=fileSizeInMegs($filename);
+ echo '<td align="right" valign="top" width="10%">
+ <a href="' . ${downloadprefix} . ${filename} . '">' . "wtp-sdk" . '</a>
+ </td>
+ <td align="right" valign="top" width="5%">
+ (' . ${zipfilesize} . 'M)
+ </td>
+ <td align="right" valign="top" width="5%">
+ [<a href="checksum/' . ${filename} . '.md5">md5</a>]
+ </td>';
+ ?>
+
+ </tr>
+
+ <tr>
+
+ <td align="left" valign="top" width="10%"></td>
+ <td align="left" valign="top">
+ <p>The Automated Test zip contains the unit tests.</p>
+ <?php
+
+ $zipfilename="wtp-Automated-Tests-@build@";
+
+ $filename=$zipfilename.".zip";
+ $zipfilesize=fileSizeInMegs($filename);
+ echo '<td align="right" valign="top" width="10%">
+ <a href="' . ${downloadprefix} . ${filename} . '">' . "wtp-Automated-Tests" . '</a>
+ </td>
+ <td align="right" valign="top" width="5%">
+ (' . ${zipfilesize} . 'M)
+ </td>
+ <td align="right" valign="top" width="5%">
+ [<a href="checksum/' . ${filename} . '.md5">md5</a>]
+ </td>';
+ ?>
+
+ </tr>
+ </table>
+
+
+ <tr>
-<br /> <a href="testCompileResults.php">Compile logs: Test Bundles</a>
-<?php
-echo " ($test_totalBundles) ";
-echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_err.gif\"/><font color=red>$test_totalErrors</font> ";
-echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_warn.gif\"/><font color=orange>$test_totalWarnings</font> ";
-?>
-<br />
-<br />
+</table>
-<br /> <a href="whatisfixed/buglog.html">What is fixed</a>
-<br /> <a href="pii.php">Unused property messages</a>
-<br />
-<?php
-if (file_exists("versioningReportName.php"))
-{
- include "versioningReportName.php";
- $fname="${versionReportFilename}.html";
- if (file_exists($fname)) {
- echo "<br /> <a href='$fname'>Versioning Information</a>";
- }
+<!-- *********** Build Status ************** -->
+<table border=0 cellspacing=2 cellpadding=2 width="100%">
+ <tr>
+ <td align=left valign=top bgcolor="#0080C0"><font
+ face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
+ and other interesting details</font></td>
+ </tr>
+ <tr>
+ <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+
+ <tr>
+ <td><?php
+ $buildmachineScript="../../../displayBuildMachine.php";
+ if (file_exists($buildmachineScript))
+ {
+ include $buildmachineScript;
+ echo displayBuildMachine();
+ }
+ ?> <a href="buildNotes.php">Build notes</a> <br />
+ <a href="directory.txt">map files</a> <?php
+
+ if (isset($unitTests_grandTotalErrors)) {
+ $errorColor="green";
+ if ($unitTests_grandTotalErrors > 0) {
+ $errorColor="red";
+ }
+ echo "<br /> <a href=\"testResults.php\">Unit test results</a> ";
+ echo "<img src=\"http://download.eclipse.org/webtools/downloads/junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font> Total: " . $unitTests_grandTotalTests;
+ }
+ else {
+ echo "<font color=\"orange\">Unit tests are pending</font>";
+ }
+ ?> <br />
+ <a href="compileResults.php">Compile logs: Code Bundles</a> <?php
+ echo " ($code_totalBundles) ";
+ echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_err.gif\"/><font color=red>$code_totalErrors</font> ";
+ echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_warn.gif\"/><font color=orange>$code_totalWarnings</font> ";
+ ?> <br />
+ <a href="testCompileResults.php">Compile logs: Test Bundles</a> <?php
+ echo " ($test_totalBundles) ";
+ echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_err.gif\"/><font color=red>$test_totalErrors</font> ";
+ echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_warn.gif\"/><font color=orange>$test_totalWarnings</font> ";
+ ?> <br />
+ <a href="whatisfixed/buglog.html">What is fixed</a> <br />
+ <a href="pii.php">Unused property messages</a> <?php
+ if (file_exists("versioningReportName.php"))
+ {
+ include "versioningReportName.php";
+ $fname="${versionReportFilename}.html";
+ if (file_exists($fname)) {
+ echo "<br /> <a href='$fname'>Versioning Information</a>";
+ }
}
-?>
-
-<?php
+?> <?php
if (file_exists("./apiresults"))
{
- echo "<br />";
- echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
- echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
- echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
- echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
- echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
- echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
- echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-
- echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
+ echo "<br />";
+ echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
+ echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
+ echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
+ echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
+ echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
+ echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
+ echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
+
+ echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
}
-?>
-
-<?php
+?> <?php
if (file_exists("./perfresults"))
{
- echo "<br />";
- echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
- echo "<br />";
+ echo "<br />";
+ echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
+ echo "<br />";
}
-?>
+?></td>
+ </tr>
-<!-- *********** Requirements ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"> <b><font face="Arial,Helvetica" color="#FFFFFF">Requirements</font></b></td></tr></table>
-<P>These are the prerequisites to install WebTools Platform;. They must
-be downloaded and installed before the WTP can be installed.</P><br />
-<li>The Eclipse driver used in this build is <a href="@eclipseURL@">@eclipseFile@</a>. You can find a suitable driver for your platform at <a href=@eclipseBuildURL@>here</a><br /></li>
-<li>The EMF driver used in this build is <a href="@emfURL@">@emfFile@</a><br /></li>
-<li>The GEF driver used in this build is <a href="@gefURL@">@gefFile@</a><br /></li>
-<li>Data Tools Platform (DTP) driver used in this build is <a href="@dtpURL@">@dtpFile@</a><br /></li>
-<P></P>
-
-
-
-<!-- *********** Runtime downloads ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0">
-<b><font face="Arial,Helvetica" color="#FFFFFF">
-Web Tools Platform (WTP, JST and WST combined)
-</font></b></td></tr>
-
-<TR><TD align="LEFT" valign="TOP" colspan="3">
-The Eclipse Web Tools Platform Project provides tools for Web Development, and is a platform for adopters making add-on tools for Web Development.
-The WTP zip files includes the WST and JST builds in one package. (JST is not provided separately, as it pre-reqs WST, there is no
-need for it "by itself").
-<p>The SDK package includes source code and developer documentation for those using WTP as a platform to build more tools, as well as everything that is in the non-SDK version.
-</p>The non-SDK package includes the runnable code and end-user documentation for those using the tools to
-develop web applications.
-</TD></TR></table>
-
-%wtpandprereqs%
-
-<table border=0 cellspacing=2 cellpadding=0 width="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-%wtpruntime%
-</table>
-
-<table border=0 cellspacing=2 cellpadding=0 width="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-%wtpsdk%
+ </table>
+ </tr>
</table>
-<!-- *********** WST downloads ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td align=LEFT valign=TOP colspan="3" bgcolor="#999999">
-<b><font face="Arial,Helvetica" color="#FFFFFF">
-Web Standard Tools (WST)
-</font></b></td></tr>
+<!-- footer -->
+<center>
+<hr>
+<p>All downloads are provided under the terms and conditions of the <a
+ href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
+User Agreement</a> unless otherwise specified.</p>
-<TR><TD align="LEFT" valign="TOP" colspan="3">
-The Web Standard Tools (WST) subproject includes languages and specifications published by open-standard bodies (e.g. W3C, IETF, ECMA, OASIS, WS-I, ANSI) that are commonly used by (non-J2EE) Web-centric applications (e.g. HTML, CSS, JavaScript, XML, XSD, XSLT, SVG, SOAP, WSDL, UDDI, SQL, XQuery).
-<p>The SDK package includes source code and developer documentation for those using WST as a platform to build more tools, as well as everything that is in the non-SDK version.
-</p><p>The non-SDK package includes the runnable code and end-user documentation for those using the tools to
-develop web applications.</p>
-</TD></TR></table>
+<p>If you have problems downloading the drops, contact the <font
+ face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
+ href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-<table BORDER=0 CELLSPACING=2 CELLPADDING=0 WIDTH="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<tr><td>%wst%</td></tr>
-</table>
-
-
-<table BORDER=0 CELLSPACING=2 CELLPADDING=0 WIDTH="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<tr><td>%wst-sdk%</td></tr>
-</table>
-
-
-<!-- *********** Automated Test Downloads ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr><td align=LEFT valign=TOP colspan="3" bgcolor="#999999">
-<b><font face="Arial,Helvetica" color="#FFFFFF">
-Automated Tests
-</font></b></td></tr>
-
-<TR><TD align="LEFT" valign="TOP" colspan="3">
-This download contains the JUnit tests for the WST and JST Projects
-</TD></TR></table>
-
-
-<table BORDER=0 CELLSPACING=2 CELLPADDING=0 WIDTH="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<tr><td>%wst-tests%</td></tr>
-</table>
-
-
-<table BORDER=0 CELLSPACING=2 CELLPADDING=0 WIDTH="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<tr><td>%jst-tests%</td></tr>
-</table>
-
-
-<!-- *********** JSF downloads ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"> <b><font face="Arial,Helvetica" color="#FFFFFF">
- Java Server Faces (JSF) </font></b></td>
- </tr>
-
-<TR>
- <TD align="LEFT" valign="TOP" colspan="3"> This module includes the complete
- set of plug-in to use and develop Java Server Faces (JSF). </TD>
- </TR></table>
-
-<table border=0 cellspacing=2 cellpadding=0 width="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<tr><td>%jsf-runtime%</td></tr>
-</table>
-
-
-<table border=0 cellspacing=2 cellpadding=0 width="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<tr><td>%jsf-sdk%</td></tr>
-</table>
-
-
-
-<table border=0 cellspacing=2 cellpadding=0 width="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<tr><td>%jsf-tests%</td></tr>
-</table>
-
-
-
-
-
-
-
-<!-- *********** JPA downloads ************** -->
-<table border=0 cellspacing=5 cellpadding=2 width="100%" ><tr>
- <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"> <b><font face="Arial,Helvetica" color="#FFFFFF">
- Java Persistence API (JPA) </font></b></td>
- </tr>
-
-<TR>
- <TD align="LEFT" valign="TOP" colspan="3"> This module includes the complete
- set of plug-in to use and develop Java Persistence API (JPA). </TD>
- </TR></table>
-
-<table border=0 cellspacing=2 cellpadding=0 width="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<tr><td>%jpa-runtime%</td></tr>
-</table>
-
-
-<table border=0 cellspacing=2 cellpadding=0 width="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<tr><td>%jpa-sdk%</td></tr>
-</table>
-
-
-
-<table border=0 cellspacing=2 cellpadding=0 width="100%" bordercolor="#999999" >
-<tr><td align=RIGHT valign=TOP width="7%">
-<tr><td>%jpa-tests%</td></tr>
-</table>
+</center>
+<!-- end footer -->
</body>
diff --git a/releng.wtpbuilder/distribution/wtp.site/testManifest.xml b/releng.wtpbuilder/distribution/wtp.site/testManifest.xml
deleted file mode 100644
index 09ecab550..000000000
--- a/releng.wtpbuilder/distribution/wtp.site/testManifest.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0"?>
-<topLevel>
- <zipTypes>
- <zipType name="wtpruntime">
- <platform
- id="WTPRUN"
- name="All"
- fileName='<a href="@mirror@wtp-@build@.zip">wtp-@build@.zip</a>(<a href="checksum/wtp-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
- <zipType name="wtpsdk">
- <platform
- id="WTPSDK"
- name="All"
- fileName='<a href="@mirror@wtp-sdk-@build@.zip">wtp-sdk-@build@.zip</a>(<a href="checksum/wtp-sdk-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
- <zipType name="wst">
- <platform
- id="WST"
- name="All"
- fileName='<a href="@mirror@wtp-wst-@build@.zip">wtp-wst-@build@.zip</a> (<a href="checksum/wtp-wst-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
- <zipType name="wst-sdk">
- <platform
- id="WST-SDK"
- name="All"
- fileName='<a href="@mirror@wtp-wst-sdk-@build@.zip">wtp-wst-sdk@build@.zip</a> (<a href="checksum/wtp-wst-sdk-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
- <zipType name="wst-tests">
- <platform
- id="WST-TESTS"
- name="All"
- fileName='<a href="@mirror@wtp-wst-Automated-Tests-@build@.zip">wtp-wst-Automated-Tests-@build@.zip</a> (<a href="checksum/wtp-wst-Automated-Tests-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
- <zipType name="jst-tests">
- <platform
- id="JST-TESTS"
- name="All"
- fileName='<a href="@mirror@wtp-jst-Automated-Tests-@build@.zip">wtp-jst-Automated-Tests-@build@.zip</a> (<a href="checksum/wtp-jst-Automated-Tests-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
- <zipType name="wst-perf-tests">
- <platform
- id="WST-PERF-TESTS"
- name="All"
- fileName='<a href="@mirror@wtp-wst-perf-Tests-@build@.zip">wtp-wst-perf-Tests-@build@.zip</a> (<a href="checksum/wtp-wst-perf-Tests-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
- <zipType name="jst-perf-tests">
- <platform
- id="JST-PERF-TESTS"
- name="All"
- fileName='<a href="@mirror@wtp-jst-perf-Tests-@build@.zip">wtp-jst-perf-Tests-@build@.zip</a> (<a href="checksum/wtp-jst-perf-Tests-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
-
-
- <zipType name="jsf-runtime">
- <platform
- id="JSF-RUNTIME"
- name="All"
- fileName='<a href="@mirror@wtp-jsf-@build@.zip">wtp-jsf-@build@.zip</a> (<a href="checksum/wtp-jsf-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
- <zipType name="jsf-sdk">
- <platform
- id="JSF-SDK"
- name="All"
- fileName='<a href="@mirror@wtp-jsf-sdk-@build@.zip">wtp-jsf-sdk-@build@.zip</a> (<a href="checksum/wtp-jsf-sdk-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
- <zipType name="jsf-tests">
- <platform
- id="JSF-TESTS"
- name="All"
- fileName='<a href="@mirror@wtp-jsf-Automated-Tests-@build@.zip">wtp-jsf-Automated-Tests-@build@.zip</a> (<a href="checksum/wtp-jsf-Automated-Tests-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
-
- <zipType name="jpa-runtime">
- <platform
- id="JPA-RUNTIME"
- name="All"
- fileName='<a href="@mirror@wtp-jpa-@build@.zip">wtp-jpa-@build@.zip</a> (<a href="checksum/wtp-jpa-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
- <zipType name="jpa-sdk">
- <platform
- id="JPA-SDK"
- name="All"
- fileName='<a href="@mirror@wtp-jpa-sdk-@build@.zip">wtp-jpa-sdk-@build@.zip</a> (<a href="checksum/wtp-jpa-sdk-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
- <zipType name="jpa-tests">
- <platform
- id="JPA-TESTS"
- name="All"
- fileName='<a href="@mirror@wtp-jpa-Automated-Tests-@build@.zip">wtp-jpa-Automated-Tests-@build@.zip</a> (<a href="checksum/wtp-jpa-Automated-Tests-@build@.zip.md5">md5</a>) <font size="2"></font>'>
- </platform>
- </zipType>
- </zipTypes>
-
-</topLevel>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 8a973a263..4a6fd0e22 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -211,6 +211,7 @@
error="${testRoot}/results/fullErrorLog.txt"/>
<sysproperty key="build.home" value="${env.BUILD_HOME}" />
<sysproperty key="buildDirectory" value="${buildDirectory}" />
+ <sysproperty key="buildLabel" value="${buildLabel}" />
<sysproperty key="baseLocation" value="${baseLocation}" />
<sysproperty key="testRoot" value="${testRoot}" />
<sysproperty key="testDir" value="${testRoot}" />
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
index 65401e1b5..c01785af1 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
@@ -3,9 +3,9 @@
<echo message="starting Automated Eclipse Testing" />
<echo message="basedir: ${basedir}" />
<echo message="testRoot: ${testRoot}" />
-
+
<fail message="testRoot must be set" unless="testRoot" />
-
+
<!--properties file containing the some server name properties -->
<property file="${testRoot}/testServer.properties" />
@@ -152,7 +152,7 @@
<param name="report" value="org.eclipse.jem.tests" />
</antcall>
</target>
-
+
<target name="jst-j2ee-core-tests" description="Runs the org.eclipse.jst.j2ee.core.tests test.xml">
<antcall target="runtests">
<param name="testPlugin" value="${org.eclipse.jst.j2ee.core.tests}" />
@@ -288,9 +288,9 @@
<!-- HTML TESTS -->
<target name="wst-html-tests" description="Runs test.xml for
- org.eclipse.wst.html.core.tests
- org.eclipse.wst.html.ui.tests
- org.eclipse.wst.html.tests.encoding">
+ org.eclipse.wst.html.core.tests
+ org.eclipse.wst.html.ui.tests
+ org.eclipse.wst.html.tests.encoding">
<antcall target="runtests">
<param name="testPlugin" value="${org.eclipse.wst.html.core.tests}" />
<param name="report" value="org.eclipse.wst.html.core.tests" />
@@ -463,9 +463,9 @@
<echo message="Starting jst-server-generic-tests" />
<antcall target="jst-server-generic-tests" />
- <echo message="Starting jst-jem-tests"/>
+ <echo message="Starting jst-jem-tests" />
<antcall target="jst-jem-tests" />
-
+
<echo message="Starting jst-j2ee-core-tests" />
<antcall target="jst-j2ee-core-tests" />
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
index 899822630..50100a682 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
@@ -51,6 +51,8 @@
<echo message="plugin-path: ${plugin-path}" />
<echo message="junit-report-output: ${junit-report-output}" />
<echo message="test-output: ${test-output}" />
+ <echo message="buildDirectory: ${buildDirectory}"/>
+ <echo message="buildLabel: ${buildLabel}"/>
<echo message="jvm: ${env.JAVA_5_HOME}/bin/java" />
@@ -118,6 +120,8 @@
<jvmarg value="-Dosgi.ws=${env.BASEWS}" />
<jvmarg value="-Dosgi.os=${env.BASEOS}" />
<jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
+ <jvmarg value="-DbuildLabel=${buildLabel}"/>
+ <jvmarg value="-DbuildDirectory=${buildDirectory}"/>
<jvmarg value="-Dwtp.autotest.noninteractive=true" />
<jvmarg value="-Dosgi.clean=true" />
--
GitLab