diff --git a/releng.wtpbuilder/components/xsl_tests/customTargets.xml b/releng.wtpbuilder/components/xsl_tests/customTargets.xml
index ed5f2129abcbf37680a948287ce1bdd5035fe73b..050c1fec5c57580dd9b22c2d0e7c49786e0bd79d 100644
--- a/releng.wtpbuilder/components/xsl_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/xsl_tests/customTargets.xml
@@ -10,38 +10,39 @@
some variables, e.g. ones we set, since properties are case sensitive, even if
the environment variables on your operating system are not, e.g. it will
be ${env.Path} not ${env.PATH} on Windows -->
- <property environment="env" />
+ <property
+ environment="env" />
<!--
Let users override standard properties, if desired.
If directory, file, or some properties do not exist,
then standard properties will be used.
-->
- <property
- file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <property
+ file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
<!-- let this project specify properties, if not already set -->
- <property file="build.properties" />
-
-
- <property
- name="cvsProtocol"
- value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
- <property
- name="cvsUser"
- value="${env.BUILD_CVS_WRITE_USER}" />
- <property
- name="cvsServer"
- value="${env.BUILD_CVS_SERVER}" />
- <property
- name="cvsRoot"
- value="${env.BUILD_CVS_ROOT}" />
+ <property
+ file="build.properties" />
+ <property
+ name="cvsProtocol"
+ value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
+ <property
+ name="cvsUser"
+ value="${env.BUILD_CVS_WRITE_USER}" />
+ <property
+ name="cvsServer"
+ value="${env.BUILD_CVS_SERVER}" />
+ <property
+ name="cvsRoot"
+ value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
<!-- ===================================================================== -->
- <target name="allElements">
+ <target
+ name="allElements">
<echo
level="info"
message="Target:${target} " />
@@ -75,38 +76,26 @@
<!-- ${assembleScriptName}) but may also add pre and post processing -->
<!-- Add one target for each root element and each configuration -->
<!-- ===================================================================== -->
-
- <target name="assemble.org.eclipse.wst.xsl_tests.feature">
+ <target
+ name="assemble.org.eclipse.wst.xsl_tests.feature">
<property
name="archiveName"
- value="wtp-incubator-tests-${buildLabel}.zip" />
+ value="wtp-incubator-xsl-tests-${buildLabel}.zip" />
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}" />
</target>
-
- <target name="prePackage" />
-
-
- <target name="postPackage">
+ <target
+ name="prePackage" />
+ <target
+ name="postPackage">
<property
name="archiveName"
- value="wtp-incubator-tests-${buildLabel}.zip" />
-
+ value="wtp-incubator-xsl-tests-${buildLabel}.zip" />
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="unpackUpdateJarsAndCreateZippedPackages">
- <property
- name="buildDirectory"
- value="${buildDirectory}" />
- <property
- name="buildLabel"
- value="${buildLabel}" />
- <property
- name="archiveName"
- value="${archiveName}" />
</ant>
-
</target>
<!-- ===================================================================== -->
@@ -135,8 +124,6 @@
<property
name="mapVersionTag"
value="HEAD" />
-
-
<echo
level="info"
message="${mapCvsRoot} ${mapVersionTag} ">
@@ -159,14 +146,13 @@
reallyquiet="${env.CVS_REALLY_QUIET}" />
<!--tag the map files project-->
- <antcall target="tagMapFiles">
+ <antcall
+ target="tagMapFiles">
<param
name="mapCvsRoot"
value="${mapCvsRoot}" />
</antcall>
-
</target>
-
<target
name="tagMapFiles"
if="tagMaps">
@@ -182,12 +168,14 @@
<!-- ===================================================================== -->
<!-- Steps to do before setup -->
<!-- ===================================================================== -->
- <target name="preSetup"></target>
+ <target
+ name="preSetup"></target>
<!-- ===================================================================== -->
<!-- Steps to do after setup but before starting the build proper -->
<!-- ===================================================================== -->
- <target name="postSetup">
+ <target
+ name="postSetup">
<dirname
file="${ant.file}"
property="component.dir" />
@@ -197,7 +185,6 @@
<echo
level="debug"
message="component.dir: ${component.dir}" />
-
<ant
antfile="${component.dir}/dependency.xml"
target="get">
@@ -234,18 +221,20 @@
<!-- ===================================================================== -->
<!-- Steps to do before fetching the build elements -->
<!-- ===================================================================== -->
- <target name="preFetch"></target>
+ <target
+ name="preFetch"></target>
<!-- ===================================================================== -->
<!-- Steps to do after fetching the build elements -->
<!-- ===================================================================== -->
- <target name="postFetch"></target>
+ <target
+ name="postFetch"></target>
<!-- ===================================================================== -->
<!-- Steps to do before generating the build scripts. -->
<!-- ===================================================================== -->
- <target name="postGenerate">
-
+ <target
+ name="postGenerate">
<customizeAccessRules
bundleDirectory="${buildDirectory}/plugins"
defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
@@ -253,64 +242,75 @@
<!-- ===================================================================== -->
<!-- Steps to do after generating the build scripts. -->
<!-- ===================================================================== -->
- <target name="preGenerate"></target>
+ <target
+ name="preGenerate"></target>
<!-- ===================================================================== -->
<!-- Steps to do before running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
- <target name="preProcess"></target>
+ <target
+ name="preProcess"></target>
<!-- ===================================================================== -->
<!-- Steps to do after running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
- <target name="postProcess">
-
- <condition property="logsAvailable">
- <istrue value="${javacVerbose}" />
+ <target
+ name="postProcess">
+ <condition
+ property="logsAvailable">
+ <istrue
+ value="${javacVerbose}" />
</condition>
- <antcall target="gatherLogs" />
-
+ <antcall
+ target="gatherLogs" />
</target>
<!-- ===================================================================== -->
<!-- Steps to do before running assemble. -->
<!-- ===================================================================== -->
- <target name="preAssemble"></target>
+ <target
+ name="preAssemble"></target>
<!-- ===================================================================== -->
<!-- Steps to do after running assemble. -->
<!-- ===================================================================== -->
- <target name="postAssemble"></target>
+ <target
+ name="postAssemble"></target>
<!-- ===================================================================== -->
<!-- Steps to do after the build is done. -->
<!-- ===================================================================== -->
- <target name="postBuild"></target>
+ <target
+ name="postBuild"></target>
<!-- ===================================================================== -->
<!-- Steps to test the build results -->
<!-- ===================================================================== -->
- <target name="test"></target>
+ <target
+ name="test"></target>
<!-- ===================================================================== -->
<!-- Steps to do to publish the build results -->
<!-- ===================================================================== -->
- <target name="publish"></target>
+ <target
+ name="publish"></target>
<!-- ===================================================================== -->
<!-- Helper targets -->
<!-- ===================================================================== -->
<target
name="gatherLogs"
if="logsAvailable">
- <mkdir dir="${buildDirectory}/${buildLabel}/testcompilelogs" />
+ <mkdir
+ dir="${buildDirectory}/${buildLabel}/testcompilelogs" />
<echo
level="debug"
message="logExtension: ${logExtension}" />
- <antcall target="allElements">
+ <antcall
+ target="allElements">
<param
name="target"
value="gatherLogs" />
@@ -323,17 +323,16 @@
overwrite="true">
<fileset
dir="${buildDirectory}/features/org.eclipse.wst.xsl_tests.feature">
- <include name="**/*.log.zip" />
+ <include
+ name="**/*.log.zip" />
</fileset>
</unzip>
-
-
</target>
-
<target
name="clean"
unless="noclean">
- <antcall target="allElements">
+ <antcall
+ target="allElements">
<param
name="target"
value="cleanElement" />
@@ -342,18 +341,19 @@
<!-- ===================================================================== -->
<!-- Default target -->
<!-- ===================================================================== -->
- <target name="noDefault">
+ <target
+ name="noDefault">
<echo
level="error"
message="You must specify a target when invoking this file" />
</target>
-
- <target name="check.useLocalMaps">
- <condition property="useLocalMaps">
+ <target
+ name="check.useLocalMaps">
+ <condition
+ property="useLocalMaps">
<equals
arg1="${env.USE_LOCAL_MAPS}"
arg2="true" />
</condition>
</target>
-
-</project>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/incubator.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/incubator.site/templateFiles/index.html.template.php
index 9b76fd7e16b9bfd58ea13aa99e865f9cb8a2293c..d41504a8105686d97cd4332d7fbf38088fdf1d25 100644
--- a/releng.wtpbuilder/distribution/incubator.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/incubator.site/templateFiles/index.html.template.php
@@ -299,7 +299,7 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl
$zipfilename="wtp-incubator-xsl-${build}";
$filename=$zipfilename.".zip";
$zipfilesize=fileSizeForDisplay($filename);
- $fileShortDescription="@build@";
+ $fileShortDescription="xsl";
displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
?>
</tr>
@@ -313,7 +313,7 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl
$zipfilename="wtp-incubator-xsl_sdk-${build}";
$filename=$zipfilename.".zip";
$zipfilesize=fileSizeForDisplay($filename);
- $fileShortDescription="@build@";
+ $fileShortDescription="xsl-sdk";
displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
?>
</tr>
@@ -323,10 +323,10 @@ if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.ecl
<p>Unit tests.</p>
</td>
<?php
- $zipfilename="wtp-incubator-tests-${build}";
+ $zipfilename="wtp-incubator-xsl-tests-${build}";
$filename=$zipfilename.".zip";
$zipfilesize=fileSizeForDisplay($filename);
- $fileShortDescription="@build@";
+ $fileShortDescription="JUnit tests";
displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
?>
</tr>