improving versioning test and display
diff --git a/releng.wtpbuilder/build.xml b/releng.wtpbuilder/build.xml
index a2f0609..cce1b17 100644
--- a/releng.wtpbuilder/build.xml
+++ b/releng.wtpbuilder/build.xml
@@ -82,6 +82,12 @@
<property
name="local.cache.dir"
value="${env.LOCAL_PREREQS_CACHE}" />
+ <property
+ name="buildDirectory"
+ value="${buildDirectory}" />
+ <property
+ name="buildLabel"
+ value="${buildLabel}" />
</ant>
</target>
diff --git a/releng.wtpbuilder/components/dali.tests/customTargets.xml b/releng.wtpbuilder/components/dali.tests/customTargets.xml
index 80786eb..eb76143 100644
--- a/releng.wtpbuilder/components/dali.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/dali.tests/customTargets.xml
@@ -216,7 +216,13 @@
<!-- ===================================================================== -->
<!-- Steps to do after running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
- <target name="postProcess"></target>
+ <target name="postProcess">
+ <condition property="logsAvailable">
+ <istrue value="${javacVerbose}" />
+ </condition>
+ <antcall target="gatherLogs" />
+
+ </target>
<!-- ===================================================================== -->
@@ -279,6 +285,42 @@
<!-- ===================================================================== -->
<target name="publish"></target>
+
+
+ <!-- ===================================================================== -->
+ <!-- Helper targets -->
+ <!-- ===================================================================== -->
+ <target
+ name="gatherLogs"
+ if="logsAvailable">
+ <mkdir dir="${buildDirectory}/${buildLabel}/testcompilelogs" />
+ <antcall target="allElements">
+ <param
+ name="target"
+ value="gatherLogs" />
+ </antcall>
+
+ <unzip
+ dest="${buildDirectory}/${buildLabel}/testcompilelogs"
+ overwrite="true">
+ <fileset dir="${buildDirectory}/features/org.eclipse.jpa.tests">
+ <include name="**/*.log.zip" />
+ </fileset>
+ </unzip>
+
+
+ </target>
+
+ <target
+ name="clean"
+ unless="noclean">
+ <antcall target="allElements">
+ <param
+ name="target"
+ value="cleanElement" />
+ </antcall>
+ </target>
+
<!-- ===================================================================== -->
<!-- Default target -->
<!-- ===================================================================== -->
diff --git a/releng.wtpbuilder/components/jsf.tests/customTargets.xml b/releng.wtpbuilder/components/jsf.tests/customTargets.xml
index e21b768..41dc992 100644
--- a/releng.wtpbuilder/components/jsf.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jsf.tests/customTargets.xml
@@ -216,7 +216,14 @@
<!-- ===================================================================== -->
<!-- Steps to do after running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
- <target name="postProcess"></target>
+ <target name="postProcess">
+ <condition property="logsAvailable">
+ <istrue value="${javacVerbose}" />
+ </condition>
+ <antcall target="gatherLogs" />
+
+
+ </target>
<!-- ===================================================================== -->
@@ -248,6 +255,40 @@
<target name="publish"></target>
<!-- ===================================================================== -->
+ <!-- Helper targets -->
+ <!-- ===================================================================== -->
+ <target
+ name="gatherLogs"
+ if="logsAvailable">
+ <mkdir dir="${buildDirectory}/${buildLabel}/testcompilelogs" />
+ <antcall target="allElements">
+ <param
+ name="target"
+ value="gatherLogs" />
+ </antcall>
+
+ <unzip
+ dest="${buildDirectory}/${buildLabel}/testcompilelogs"
+ overwrite="true">
+ <fileset dir="${buildDirectory}/features/org.eclipse.jst.jsf.tests.feature">
+ <include name="**/*.log.zip" />
+ </fileset>
+ </unzip>
+
+
+ </target>
+
+ <target
+ name="clean"
+ unless="noclean">
+ <antcall target="allElements">
+ <param
+ name="target"
+ value="cleanElement" />
+ </antcall>
+ </target>
+
+ <!-- ===================================================================== -->
<!-- Default target -->
<!-- ===================================================================== -->
<target name="noDefault">
diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml
index e66fd2c..2b47fa2 100644
--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml
@@ -1,6 +1,5 @@
-<project
- name="Build specific targets and properties"
- default="noDefault">
+<project name="Build specific targets and properties"
+ default="noDefault">
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
@@ -11,15 +10,10 @@
<echo message="basedir: ${basedir}" />
<echo message="buildDirectory: ${buildDirectory}" />
<echo message="baseLocation: ${baseLocation}" />
- <ant
- antfile="${genericTargets}"
- target="${target}">
- <property
- name="type"
- value="feature" />
- <property
- name="id"
- value="org.eclipse.jst.tests" />
+ <ant antfile="${genericTargets}" target="${target}">
+ <property name="type" value="feature" />
+ <property name="id"
+ value="org.eclipse.jst.tests" />
</ant>
</target>
@@ -31,12 +25,10 @@
<!-- ===================================================================== -->
<target name="assemble.org.eclipse.jst.tests">
- <property
- name="archiveName"
- value="wtp-jst-Automated-Tests-${buildLabel}.zip" />
- <ant
- antfile="${assembleScriptName}"
- dir="${buildDirectory}" />
+ <property name="archiveName"
+ value="wtp-jst-Automated-Tests-${buildLabel}.zip" />
+ <ant antfile="${assembleScriptName}"
+ dir="${buildDirectory}" />
</target>
@@ -45,22 +37,17 @@
<target name="postPackage">
- <property
- name="archiveName"
- value="wtp-jst-Automated-Tests-${buildLabel}.zip" />
+ <property name="archiveName"
+ value="wtp-jst-Automated-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 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>
@@ -70,67 +57,55 @@
<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
<!-- ===================================================================== -->
<target name="checkLocal">
- <available
- property="mapsLocal"
- file="${buildDirectory}/maps/releng" />
+ <available property="mapsLocal"
+ file="${buildDirectory}/maps/releng" />
</target>
- <target
- name="getMapFiles"
- depends="checkLocal"
- unless="mapsLocal">
+ <target name="getMapFiles"
+ depends="checkLocal"
+ unless="mapsLocal">
<!-- *** change the repo info -->
- <property
- name="mapCvsRoot"
- value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
- <property
- name="mapVersionTag"
- value="HEAD" />
- <echo message="${mapCvsRoot} ${mapVersionTag} "></echo>
- <cvs
- cvsRoot="${mapCvsRoot}"
- package="releng"
- dest="${buildDirectory}/maps"
- tag="${mapVersionTag}" />
+ <property name="mapCvsRoot"
+ value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
+ <property name="mapVersionTag" value="HEAD" />
+ <echo message="${mapCvsRoot} ${mapVersionTag} ">
+ </echo>
+ <cvs cvsRoot="${mapCvsRoot}"
+ package="releng"
+ dest="${buildDirectory}/maps"
+ tag="${mapVersionTag}" />
<!--tag the map files project-->
<antcall target="tagMapFiles">
- <param
- name="mapCvsRoot"
- value="${mapCvsRoot}" />
+ <param name="mapCvsRoot"
+ value="${mapCvsRoot}" />
</antcall>
</target>
- <target
- name="tagMapFiles"
- if="tagMaps">
- <cvs
- cvsRoot="${mapCvsRoot}"
- dest="${buildDirectory}/maps"
- command="tag v${buildType}${timestamp}" />
+ <target name="tagMapFiles" if="tagMaps">
+ <cvs cvsRoot="${mapCvsRoot}"
+ dest="${buildDirectory}/maps"
+ command="tag v${buildType}${timestamp}" />
</target>
<!-- ===================================================================== -->
<!-- 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">
- <dirname
- file="${ant.file}"
- property="component.dir" />
- <ant
- antfile="${component.dir}/dependency.xml"
- target="get">
- <property
- name="dependency.properties"
- value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
- <property
- name="base.install.dir"
- value="${buildRoot}" />
+ <dirname file="${ant.file}"
+ property="component.dir" />
+ <ant antfile="${component.dir}/dependency.xml"
+ target="get">
+ <property name="dependency.properties"
+ value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
+ <property name="base.install.dir"
+ value="${buildRoot}" />
</ant>
</target>
@@ -138,44 +113,58 @@
<!-- ===================================================================== -->
<!-- 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="preGenerate"></target>
+ <target name="preGenerate">
+ </target>
<!-- ===================================================================== -->
<!-- Steps to do after generating the build scripts. -->
<!-- ===================================================================== -->
- <target name="postGenerate"></target>
+ <target name="postGenerate">
+ </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"></target>
+ <target name="postProcess">
+ <condition property="logsAvailable">
+ <istrue value="${javacVerbose}" />
+ </condition>
+ <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. -->
@@ -188,13 +177,40 @@
<!-- ===================================================================== -->
<!-- Steps to do 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" />
+ <antcall target="allElements">
+ <param name="target" value="gatherLogs" />
+ </antcall>
+
+ <unzip dest="${buildDirectory}/${buildLabel}/testcompilelogs"
+ overwrite="true">
+ <fileset dir="${buildDirectory}/features/org.eclipse.jst.tests">
+ <include name="**/*.log.zip" />
+ </fileset>
+ </unzip>
+
+
+ </target>
+
+ <target name="clean" unless="noclean">
+ <antcall target="allElements">
+ <param name="target" value="cleanElement" />
+ </antcall>
+ </target>
<!-- ===================================================================== -->
<!-- Default target -->
diff --git a/releng.wtpbuilder/components/wst.tests/customTargets.xml b/releng.wtpbuilder/components/wst.tests/customTargets.xml
index fe34e94..a8ac8e9 100644
--- a/releng.wtpbuilder/components/wst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wst.tests/customTargets.xml
@@ -191,7 +191,15 @@
<!-- ===================================================================== -->
<!-- Steps to do after running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
- <target name="postProcess"></target>
+ <target name="postProcess">
+
+ <condition property="logsAvailable">
+ <istrue value="${javacVerbose}" />
+ </condition>
+ <antcall target="gatherLogs" />
+
+
+ </target>
<!-- ===================================================================== -->
@@ -220,7 +228,39 @@
<!-- Steps to do to publish the build results -->
<!-- ===================================================================== -->
<target name="publish"></target>
+ <!-- ===================================================================== -->
+ <!-- Helper targets -->
+ <!-- ===================================================================== -->
+ <target
+ name="gatherLogs"
+ if="logsAvailable">
+ <mkdir dir="${buildDirectory}/${buildLabel}/testcompilelogs" />
+ <antcall target="allElements">
+ <param
+ name="target"
+ value="gatherLogs" />
+ </antcall>
+ <unzip
+ dest="${buildDirectory}/${buildLabel}/testcompilelogs"
+ overwrite="true">
+ <fileset dir="${buildDirectory}/features/org.eclipse.wst.tests.feature">
+ <include name="**/*.log.zip" />
+ </fileset>
+ </unzip>
+
+
+ </target>
+
+ <target
+ name="clean"
+ unless="noclean">
+ <antcall target="allElements">
+ <param
+ name="target"
+ value="cleanElement" />
+ </antcall>
+ </target>
<!-- ===================================================================== -->
<!-- Default target -->
<!-- ===================================================================== -->
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index e616fd5..e4ef6a8 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -1,28 +1,30 @@
<project name="Publish Build" default="default" basedir=".">
- <!-- Properties that must be passed to this script:
+ <!-- Properties that must be passed to this script:
buildDirectory: Path to perform the build in. (A working directory)
buildType: Type of build (nightly, integration etc.)
buildId: Build name
buildLabel: <buildType>-<buildName>-<timestamp>
-->
- <property name="result" value="${buildDirectory}/${buildLabel}" />
+ <property name="result"
+ value="${buildDirectory}/${buildLabel}" />
- <!--name of generated index page-->
- <property name="indexFileName" value="index.php" />
+ <!--name of generated index page-->
+ <property name="indexFileName" value="index.php" />
- <target name="default">
- <antcall target="countFiles" />
- <antcall target="generateIndex" />
- <antcall target="getStaticFiles" />
- </target>
+ <target name="default">
+ <antcall target="countFiles" />
+ <antcall target="generateIndex" />
+ <antcall target="getStaticFiles" />
+ </target>
- <target name="generateIndex">
+ <target name="generateIndex">
- <property name="class" value="org.eclipse.releng.generators.TestResultsGenerator" />
- <taskdef name="indexResults" classname="${class}" />
+ <property name="class"
+ value="org.eclipse.releng.generators.TestResultsGenerator" />
+ <taskdef name="indexResults" classname="${class}" />
- <!--
+ <!--
isBuildTested: true|false should JUnit plugin test results be used to generate index page
dropTokenList: comma separated list of strings which should be replaced by the fileName attribute settings in the testManifest.xml.
xmlDirectoryName: path to directory containing JUnit plugin test results in xml format (see doc is org.eclipse.test).
@@ -37,110 +39,192 @@
-->
- <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" />
+ <property file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
- <tstamp>
- <format property="TODAY" pattern="MMMM d, yyyy" />
- </tstamp>
+ <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=""
+ dropDirectoryName="${result}"
+ testResultsTemplateFileName="${basedir}/templateFiles/testCompileResults.php.template"
+ dropTemplateFileName="${basedir}/templateFiles/${indexTemplateFilename}"
+ testResultsHtmlFileName="testCompileResults.php"
+ dropHtmlFileName="${indexFileName}"
+ hrefTestResultsTargetPath=""
+ hrefCompileLogsTargetPath="testcompilelogs"
+ compileLogsDirectoryName="${result}/testcompilelogs"
+ testManifestFileName="${basedir}/testManifest.xml" />
- <!-- Insert Build Type descriptor -->
- <antcall target="${buildType}" />
+ <tstamp>
+ <format property="TODAY"
+ pattern="MMMM d, yyyy" />
+ </tstamp>
- <!-- Insert Build Date -->
- <replace file="${result}/${indexFileName}" token="@date@" value="${TODAY}" />
+ <!-- Insert Build Type descriptor -->
+ <antcall target="${buildType}" />
- <!-- Insert Build Name -->
- <replace file="${result}/${indexFileName}" token="@build@" value="${buildLabel}" />
+ <!-- Insert Build Date -->
+ <replace file="${result}/${indexFileName}"
+ token="@date@"
+ value="${TODAY}" />
- <!-- Insert Mirror Name -->
- <replace file="${result}/${indexFileName}" token="@mirror@" value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" />
+ <!-- Insert Build Name -->
+ <replace file="${result}/${indexFileName}"
+ token="@build@"
+ value="${buildLabel}" />
- <!-- Insert PreRequsites -->
+ <!-- Insert Mirror Name -->
+ <replace file="${result}/${indexFileName}"
+ token="@mirror@"
+ value="${webtoolsDownloadURL}/${buildBranch}/${buildLabel}/" />
- <replace file="${result}/${indexFileName}" token="@eclipseFile@" value="${eclipse.file.linux-gtk-x86}" />
- <replace file="${result}/${indexFileName}" token="@eclipseURL@" value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
- <replace file="${result}/${indexFileName}" token="@eclipseBuildURL@" value="${eclipse.url}" />
- <replace file="${result}/${indexFileName}" token="@emfFile@" value="${emf.file}" />
- <replace file="${result}/${indexFileName}" token="@emfURL@" value="${emf.url}" />
- <replace file="${result}/${indexFileName}" token="@gefFile@" value="${gef.file}" />
- <replace file="${result}/${indexFileName}" token="@gefURL@" value="${gef.url}/${gef.file}" />
- <replace file="${result}/${indexFileName}" token="@jemFile@" value="${jem.file}" />
- <replace file="${result}/${indexFileName}" token="@jemURL@" value="${jem.url}/${jem.file}" />
- <replace file="${result}/${indexFileName}" token="@dtpFile@" value="${dtp.file}" />
- <replace file="${result}/${indexFileName}" token="@dtpURL@" value="${dtp.url}/${dtp.file}" />
+ <!-- Insert PreRequsites -->
- <mkdir dir="${result}/whatisfixed"/>
- <echo file="${result}/whatisfixed/buglog.html" append="true" >
+ <replace file="${result}/${indexFileName}"
+ token="@eclipseFile@"
+ value="${eclipse.file.linux-gtk-x86}" />
+ <replace file="${result}/${indexFileName}"
+ token="@eclipseURL@"
+ value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
+ <replace file="${result}/${indexFileName}"
+ token="@eclipseBuildURL@"
+ value="${eclipse.url}" />
+ <replace file="${result}/${indexFileName}"
+ token="@emfFile@"
+ value="${emf.file}" />
+ <replace file="${result}/${indexFileName}"
+ token="@emfURL@"
+ value="${emf.url}" />
+ <replace file="${result}/${indexFileName}"
+ token="@gefFile@"
+ value="${gef.file}" />
+ <replace file="${result}/${indexFileName}"
+ token="@gefURL@"
+ value="${gef.url}/${gef.file}" />
+ <replace file="${result}/${indexFileName}"
+ token="@jemFile@"
+ value="${jem.file}" />
+ <replace file="${result}/${indexFileName}"
+ token="@jemURL@"
+ value="${jem.url}/${jem.file}" />
+ <replace file="${result}/${indexFileName}"
+ token="@dtpFile@"
+ value="${dtp.file}" />
+ <replace file="${result}/${indexFileName}"
+ token="@dtpURL@"
+ value="${dtp.url}/${dtp.file}" />
+
+ <mkdir dir="${result}/whatisfixed" />
+ <echo file="${result}/whatisfixed/buglog.html"
+ append="true">
what is fixed list is not available yet!
</echo>
- <!-- Update timestamp on file to permit overwrite through Ant copy task -->
- <touch file="${result}/${indexFileName}" />
- </target>
+ <!-- Update timestamp on file to permit overwrite through Ant copy task -->
+ <touch file="${result}/${indexFileName}" />
+ </target>
- <target name="getStaticFiles">
- <!--get static files required in the buildLabel directory-->
- <copy todir="${result}">
- <fileset dir="${basedir}/staticDropFiles" />
- </copy>
+ <target name="getStaticFiles">
+ <!--get static files required in the buildLabel directory-->
+ <copy todir="${result}">
+ <fileset dir="${basedir}/staticDropFiles" />
+ </copy>
- <!--copy buildnotes from plugin directories-->
- <mkdir dir="${result}/buildnotes" />
- <copy todir="${result}/buildnotes" flatten="true">
- <fileset dir="${buildDirectory}/plugins" includes="**/buildnotes_*.html" />
- </copy>
- </target>
+ <!--copy buildnotes from plugin directories-->
+ <mkdir dir="${result}/buildnotes" />
+ <copy todir="${result}/buildnotes" flatten="true">
+ <fileset dir="${buildDirectory}/plugins"
+ includes="**/buildnotes_*.html" />
+ </copy>
+ </target>
- <target name="countFiles">
- <!-- files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
+ <target name="countFiles">
+ <!-- files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
It is required to generate a link to the build on the downloads page.
Added remove .zip.MD5 - old files before a count
-->
- <delete>
- <fileset dir="${result}" id="id">
- <include name="*.MD5" />
- </fileset>
- </delete>
+ <delete>
+ <fileset dir="${result}" id="id">
+ <include name="*.MD5" />
+ </fileset>
+ </delete>
- <taskdef name="countFiles" classname="org.eclipse.releng.generators.FileCounter" />
+ <taskdef name="countFiles"
+ classname="org.eclipse.releng.generators.FileCounter" />
- <countFiles sourceDirectory="${result}" filterString=".zip,.tar.gz" outputFile="${result}/files.count" />
+ <countFiles sourceDirectory="${result}"
+ filterString=".zip,.tar.gz"
+ outputFile="${result}/files.count" />
- </target>
+ </target>
- <!--Build type descriptors-->
- <target name="I">
- <replace file="${result}/${indexFileName}" token="%wtpandprereqs%" value=" " />
- <replace file="${result}/${indexFileName}" token="@type@" value="Integration" />
- </target>
+ <!--Build type descriptors-->
+ <target name="I">
+ <replace file="${result}/${indexFileName}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace file="${result}/${indexFileName}"
+ token="@type@"
+ value="Integration" />
+ </target>
- <target name="S">
- <replace file="${result}/${indexFileName}" token="%wtpandprereqs%" value=" " />
- <replace file="${result}/${indexFileName}" token="@type@" value="Stable" />
- </target>
+ <target name="S">
+ <replace file="${result}/${indexFileName}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace file="${result}/${indexFileName}"
+ token="@type@"
+ value="Stable" />
+ </target>
- <target name="N">
- <replace file="${result}/${indexFileName}" token="%wtpandprereqs%" value=" " />
- <replace file="${result}/${indexFileName}" token="@type@" value="Nightly" />
- </target>
+ <target name="N">
+ <replace file="${result}/${indexFileName}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace file="${result}/${indexFileName}"
+ token="@type@"
+ value="Nightly" />
+ </target>
- <target name="M">
- <replace file="${result}/${indexFileName}" token="%wtpandprereqs%" value=" " />
- <replace file="${result}/${indexFileName}" token="@type@" value="Maintenance" />
- </target>
+ <target name="M">
+ <replace file="${result}/${indexFileName}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace file="${result}/${indexFileName}"
+ token="@type@"
+ value="Maintenance" />
+ </target>
- <target name="R">
- <replace file="${result}/${indexFileName}" token="%wtpandprereqs%" value=" " />
- <replace file="${result}/${indexFileName}" token="@type@" value="Release" />
- </target>
+ <target name="R">
+ <replace file="${result}/${indexFileName}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace file="${result}/${indexFileName}"
+ token="@type@"
+ value="Release" />
+ </target>
- <target name="T">
- <replace file="${result}/${indexFileName}" token="%wtpandprereqs%" value=" " />
- <replace file="${result}/${indexFileName}" token="@type@" value="Test" />
- </target>
+ <target name="T">
+ <replace file="${result}/${indexFileName}"
+ token="%wtpandprereqs%"
+ value=" " />
+ <replace file="${result}/${indexFileName}"
+ token="@type@"
+ value="Test" />
+ </target>
</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
index bd5a62f..7e1655a 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
@@ -34,13 +34,15 @@
?>
<br> <a href="buildNotes.php">Build notes</a>
<br> <a href="directory.txt">map files</a>
-<br> <a href="testResults.php">Compile logs & test results</a>
+<br> <a href="testResults.php">Compile logs & test results</a>
<?php
echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_err.gif\"/><font color=red>$compileErrors</font> ";
echo "<img src=\"http://download.eclipse.org/webtools/downloads/compile_warn.gif\"/><font color=orange>$compileWarnings</font> ";
echo "<img src=\"http://download.eclipse.org/webtools/downloads/junit_err.gif\"/><font color=red>$junitFailures</font>";
?>
+
+<br> <a href="testCompileResults.php">Test Bundles Compile logs</a>
<br> <a href="whatisfixed/buglog.html">What is fixed</a>
<br> <a href="pii.php">Unused property messages</a>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template
new file mode 100644
index 0000000..134dc61
--- /dev/null
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/testCompileResults.php.template
@@ -0,0 +1,38 @@
+<html>
+<head>
+
+<?php
+ $parts = explode("/", getcwd());
+ $parts2 = explode("-", $parts[count($parts) - 1]);
+ $buildName = $parts2[1];
+
+ echo "<title>Test Results for $buildName </title>";
+?>
+
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
+</head>
+<body>
+<p><b><font face="Verdana" size="+3">Test Plugin Compile Results</font></b> </p>
+
+
+<table border=0 cellspacing=5 cellpadding=2 width="100%" >
+ <tr>
+ <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Test Plugins
+ containing compile errors or warnings </font></b></td>
+ </tr>
+</table>
+
+<table width="77%" border="1">
+ <tr>
+ <td><b>Compile Logs (Jar Files)</b></td>
+ <td><b>Errors</b></td>
+ <td><b>Warnings</b></td>
+ </tr>
+
+ %compilelogs%
+
+</table>
+
+</body>
+</html>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 0143796..33ae417 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -183,6 +183,10 @@
<sysproperty
key="eclipseBuilderDirectory"
value="${pde.builder.path}" />
+ <sysproperty
+ key="buildLabel"
+ value="${buildLabel}" />
+
</java>
</target>
diff --git a/tests/org.eclipse.wtp.releng.tests/versioningReport.xml b/tests/org.eclipse.wtp.releng.tests/versioningReport.xml
index bc272e0..9d164d5 100644
--- a/tests/org.eclipse.wtp.releng.tests/versioningReport.xml
+++ b/tests/org.eclipse.wtp.releng.tests/versioningReport.xml
@@ -4,7 +4,7 @@
<!-- note: this file isn't used in test, just left here as a representative sample of what's produced -->
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.core.filesystem.win32.x86
</entry>
@@ -12,7 +12,7 @@
1.0.0.v20060603
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.core.resources.win32
</entry>
@@ -20,7 +20,7 @@
3.2.0.v20060603
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.jst.common_core.feature.source
</entry>
@@ -28,7 +28,7 @@
1.5.1.v200608082030--0842282_363739
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.jst.doc.isv
</entry>
@@ -36,7 +36,7 @@
1.0.201.v200606130315
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.jst.enterprise_core.feature.source
</entry>
@@ -44,7 +44,7 @@
1.5.2.v200610140800--2PD88PA8APDAGS
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.jst.enterprise_ui.feature.source
</entry>
@@ -52,7 +52,7 @@
1.5.2.v200610070620-pEBq_k_B5F5vHf6
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.jst.server_adapters.feature.source
</entry>
@@ -60,7 +60,7 @@
1.5.2.v200610190100--87cMN7OFSx4YPT
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.jst.server_core.feature.source
</entry>
@@ -68,7 +68,7 @@
1.5.2.v200610070620--2PD88P9LCN7787
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.jst.server_ui.feature.source
</entry>
@@ -76,7 +76,7 @@
1.5.1.v200608082030-PGIEUCdEgCIEO8I
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.jst.web_core.feature.source
</entry>
@@ -84,7 +84,7 @@
1.5.2.v200610070620--87cMN7RkU-WXcu
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.jst.web_ui.feature.source
</entry>
@@ -92,7 +92,7 @@
1.5.1.v200608082030--2PD88P8T_IB_EI
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.platform.source.win32.win32.x86
</entry>
@@ -100,7 +100,7 @@
3.2.1.r321_v20060921-b_XVA-INSQSyMtx
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.rcp.source.win32.win32.x86
</entry>
@@ -108,7 +108,7 @@
3.2.1.r321_v20060801-2ekW2BxmcpPUOoq
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.swt.win32.win32.x86
</entry>
@@ -116,7 +116,7 @@
3.2.1.v3235
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.ui.win32
</entry>
@@ -124,7 +124,7 @@
3.2.0.I20060605-1400
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.update.core.win32
</entry>
@@ -132,7 +132,7 @@
3.2.1.v20092006
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.common_core.feature.source
</entry>
@@ -140,7 +140,7 @@
1.5.2.v200610140800--AXrVWXbElCl05G
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.common_ui.feature.source
</entry>
@@ -148,7 +148,7 @@
1.5.2.v200610140800-qKHiTHohjmcJ67O
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.doc.isv
</entry>
@@ -156,7 +156,7 @@
1.0.202.v200609052345
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.rdb_adapters.feature.source
</entry>
@@ -164,7 +164,7 @@
1.5.2.v200610171240--Cq0bcpjKsVtauY
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.rdb_core.feature.source
</entry>
@@ -172,7 +172,7 @@
1.5.2.v200610171240--3YIAAYCNETEZLJ
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.rdb_ui.feature.source
</entry>
@@ -180,7 +180,7 @@
1.5.2.v200610171240-FTMjwT_jS-R7nrK
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.server_core.feature.source
</entry>
@@ -188,7 +188,7 @@
1.5.2.v200610070620------1G955G6C6L
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.server_ui.feature.source
</entry>
@@ -196,7 +196,7 @@
1.5.2.v200610070620-PGIEUHzQoGdLZGn
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.web_core.feature.source
</entry>
@@ -204,7 +204,7 @@
1.5.2.v200610140800--4hNDDhEmKWFYQL
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.web_ui.feature.source
</entry>
@@ -212,7 +212,7 @@
1.5.2.v200610140800-zjf2SqQvH40Gasr
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.ws_core.feature.source
</entry>
@@ -220,7 +220,7 @@
1.5.2.v200610140800--4hNDDhEmGSKJHa
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.ws_ui.feature.source
</entry>
@@ -228,7 +228,7 @@
1.5.2.v200610070620-hai7Do_y98HDOuI
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.xml_core.feature.source
</entry>
@@ -236,7 +236,7 @@
1.5.1.v200608082030--3YIAAYAjGLENFH
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="bundle">
+<versioningCompare kind="extraInCurrent" codePackageType="bundle">
<entry>
org.eclipse.wst.xml_ui.feature.source
</entry>
@@ -244,7 +244,7 @@
1.5.2.v200610071830-zkiCc0C2eGeGexE
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.core.filesystem.linux.x86
</entry>
@@ -252,7 +252,7 @@
1.0.0.v20060603
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jsf
</entry>
@@ -260,7 +260,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.j2ee.core.tests
</entry>
@@ -268,7 +268,7 @@
1.1.0.v200611281803
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.j2ee.core.tests.performance
</entry>
@@ -276,7 +276,7 @@
1.1.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.j2ee.tests
</entry>
@@ -284,7 +284,7 @@
1.1.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.j2ee.tests.performance
</entry>
@@ -292,7 +292,7 @@
1.1.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.contentassist
</entry>
@@ -300,7 +300,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.contentassist.tests
</entry>
@@ -308,7 +308,7 @@
0.5.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.contentmodel.annotations
</entry>
@@ -316,7 +316,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.context
</entry>
@@ -324,7 +324,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.context.resolver
</entry>
@@ -332,7 +332,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.context.resolver.structureddocument
</entry>
@@ -340,7 +340,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.context.structureddocument
</entry>
@@ -348,7 +348,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.context.symbol
</entry>
@@ -356,7 +356,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.core
</entry>
@@ -364,7 +364,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.core.tests
</entry>
@@ -372,7 +372,7 @@
0.5.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.designtime
</entry>
@@ -380,7 +380,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.doc.dev
</entry>
@@ -388,7 +388,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.doc.user
</entry>
@@ -396,7 +396,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.facesconfig
</entry>
@@ -404,7 +404,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.facesconfig.common
</entry>
@@ -412,7 +412,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.facesconfig.edit
</entry>
@@ -420,7 +420,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.facesconfig.ui
</entry>
@@ -428,7 +428,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.metadata.tests
</entry>
@@ -436,7 +436,7 @@
0.5.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.metadataprocessingtests2
</entry>
@@ -444,7 +444,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.metadataprocessors
</entry>
@@ -452,7 +452,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.taglibprocessing
</entry>
@@ -460,7 +460,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.test.util
</entry>
@@ -468,7 +468,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.ui
</entry>
@@ -476,7 +476,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.ui.tests
</entry>
@@ -484,7 +484,7 @@
0.5.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsf.validation.el
</entry>
@@ -492,7 +492,7 @@
0.5.0.v20060829
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsp.core.tests
</entry>
@@ -500,7 +500,7 @@
1.0.0.v200611160729
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsp.tests.encoding
</entry>
@@ -508,7 +508,7 @@
1.0.0.v200610030446
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsp.ui.tests
</entry>
@@ -516,7 +516,7 @@
1.0.0.v200611082053
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.jsp.ui.tests.performance
</entry>
@@ -524,7 +524,7 @@
1.0.0.v200610030446
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.server.core.tests
</entry>
@@ -532,7 +532,7 @@
1.0.102.v20061013
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.server.generic.tests
</entry>
@@ -540,7 +540,7 @@
1.0.100
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.server.tomcat.core.tests
</entry>
@@ -548,7 +548,7 @@
1.0.100.v20060817
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.server.tomcat.tests.performance
</entry>
@@ -556,7 +556,7 @@
1.0.100.v20060814
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.server.tomcat.ui.tests
</entry>
@@ -564,7 +564,7 @@
1.0.100.v20060814
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.server.ui.tests
</entry>
@@ -572,7 +572,7 @@
1.0.100.v20060814
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.servlet.tests
</entry>
@@ -580,7 +580,7 @@
1.1.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.validation.sample
</entry>
@@ -588,7 +588,7 @@
1.1.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.validation.test
</entry>
@@ -596,7 +596,7 @@
1.1.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.ws.tests
</entry>
@@ -604,7 +604,7 @@
1.0.100
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.jst.ws.tests.performance
</entry>
@@ -612,7 +612,7 @@
1.0.100
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.platform.source.linux.gtk.x86
</entry>
@@ -620,7 +620,7 @@
3.2.1.r321_v20060927-XAZctTQKbVHwDxx
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.rcp.source.linux.gtk.x86
</entry>
@@ -628,7 +628,7 @@
3.2.1.r321_v20060801-2ekX5YZljpGrDeq
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.swt.gtk.linux.x86
</entry>
@@ -636,7 +636,7 @@
3.2.2.v3235a
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.update.core.linux
</entry>
@@ -644,7 +644,7 @@
3.2.0.v20060605
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.common.project.facet.core.tests
</entry>
@@ -652,7 +652,7 @@
1.0.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.common.snippets.tests
</entry>
@@ -660,7 +660,7 @@
1.0.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.common.tests
</entry>
@@ -668,7 +668,7 @@
1.1.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.common.tests.collector
</entry>
@@ -676,7 +676,7 @@
1.1.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.common.tests.performance
</entry>
@@ -684,7 +684,7 @@
1.0.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.common.tests.ui
</entry>
@@ -692,7 +692,7 @@
1.1.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.css.core.tests
</entry>
@@ -700,7 +700,7 @@
1.0.0.v200610030432
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.css.tests.encoding
</entry>
@@ -708,7 +708,7 @@
1.0.0.v200610030432
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.css.ui.tests
</entry>
@@ -716,7 +716,7 @@
1.0.0.v200610030432
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.css.ui.tests.performance
</entry>
@@ -724,7 +724,7 @@
1.0.0.v200610030432
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.dtd.ui.tests
</entry>
@@ -732,7 +732,7 @@
1.0.0.v200610030430
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.html.core.tests
</entry>
@@ -740,7 +740,7 @@
1.0.0.v200610030432
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.html.tests.encoding
</entry>
@@ -748,7 +748,7 @@
1.0.0.v200610030432
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.html.ui.tests
</entry>
@@ -756,7 +756,7 @@
1.0.0.v200610030432
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.html.ui.tests.performance
</entry>
@@ -764,7 +764,7 @@
1.0.0.v200610030432
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.internet.cache.tests
</entry>
@@ -772,7 +772,7 @@
1.0.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.internet.monitor.ui.tests
</entry>
@@ -780,7 +780,7 @@
1.0.100.v20060814
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.rdb.tests.dbdefinition
</entry>
@@ -788,7 +788,7 @@
1.0.0.v200610040310
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.rdb.tests.performance
</entry>
@@ -796,7 +796,7 @@
1.0.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.server.core.tests
</entry>
@@ -804,7 +804,7 @@
1.0.100.v20060824
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.server.tests.performance
</entry>
@@ -812,7 +812,7 @@
1.0.100.v20060814
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.server.ui.tests
</entry>
@@ -820,7 +820,7 @@
1.0.100.v20060814
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.sse.core.tests
</entry>
@@ -828,7 +828,7 @@
1.0.0.v200610030430
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.sse.ui.tests
</entry>
@@ -836,7 +836,7 @@
1.0.0.v200610030430
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.sse.ui.tests.performance
</entry>
@@ -844,7 +844,7 @@
1.0.0.v200610030430
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.ws.tests
</entry>
@@ -852,7 +852,7 @@
1.0.100
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.wsdl.tests
</entry>
@@ -860,7 +860,7 @@
1.0.1
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.wsdl.tests.performance
</entry>
@@ -868,7 +868,7 @@
1.0.1
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.wsdl.tests.ui
</entry>
@@ -876,7 +876,7 @@
1.0.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.wsdl.validation.tests
</entry>
@@ -884,7 +884,7 @@
1.0.202
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.wsi.tests
</entry>
@@ -892,7 +892,7 @@
1.0.0
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.xml.core.tests
</entry>
@@ -900,7 +900,7 @@
1.0.0.v200610030650
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.xml.tests.encoding
</entry>
@@ -908,7 +908,7 @@
1.0.0.v200610030430
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.xml.ui.tests
</entry>
@@ -916,7 +916,7 @@
1.0.0.v200610030430
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.xml.ui.tests.performance
</entry>
@@ -924,7 +924,7 @@
1.0.0.v200610030430
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.xml.validation.tests
</entry>
@@ -932,7 +932,7 @@
1.0.201.v200610030430
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.xsd.tests.performance
</entry>
@@ -940,7 +940,7 @@
1.0.1.v200610030431
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wst.xsd.validation.tests
</entry>
@@ -948,7 +948,7 @@
1.0.201.v200610030430
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="bundle">
+<versioningCompare kind="extraInReference" codePackageType="bundle">
<entry>
org.eclipse.wtp.releng.tests
</entry>
@@ -956,7 +956,7 @@
1.0.0
</reference>
</versioningCompare>
-<versioningCompare kind="error" codePackage="bundle">
+<versioningCompare kind="error" codePackageType="bundle">
<entry>
org.eclipse.jst.common.frameworks
</entry>
@@ -4806,7 +4806,7 @@
1.4.0.v200607181917
</current>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.common_core.feature.source
</entry>
@@ -4814,7 +4814,7 @@
1.5.1.v200608082030--0842282_363739
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.common_sdk.feature
</entry>
@@ -4822,7 +4822,7 @@
1.5.1.v200609111710-842282_2_4252--
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.doc.isv.feature
</entry>
@@ -4830,7 +4830,7 @@
1.5.1.v200609121915--08422828352537
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.enterprise_core.feature.source
</entry>
@@ -4838,7 +4838,7 @@
1.5.2.v200610140800--2PD88PA8APDAGS
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.enterprise_sdk.feature
</entry>
@@ -4846,7 +4846,7 @@
1.5.2.v200610071830-842283229284202
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.enterprise_ui.feature.source
</entry>
@@ -4854,7 +4854,7 @@
1.5.2.v200610070620-pEBq_k_B5F5vHf6
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.sdk
</entry>
@@ -4862,7 +4862,7 @@
1.5.2.v200610070620-dnUUNbBDstmRfV2
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.server_adapters.feature.source
</entry>
@@ -4870,7 +4870,7 @@
1.5.2.v200610190100--87cMN7OFSx4YPT
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.server_core.feature.source
</entry>
@@ -4878,7 +4878,7 @@
1.5.2.v200610070620--2PD88P9LCN7787
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.server_sdk.feature
</entry>
@@ -4886,7 +4886,7 @@
1.5.2.v20061019417-84228323A2322--
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.server_ui.feature.source
</entry>
@@ -4894,7 +4894,7 @@
1.5.1.v200608082030-PGIEUCdEgCIEO8I
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.web_core.feature.patch
</entry>
@@ -4902,7 +4902,7 @@
1.5.2.v200612052215--08422834282565
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.web_core.feature.source
</entry>
@@ -4910,7 +4910,7 @@
1.5.2.v200610070620--87cMN7RkU-WXcu
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.web_sdk.feature
</entry>
@@ -4918,7 +4918,7 @@
1.5.1.v200609111710-842282_2_4252--
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.jst.web_ui.feature.source
</entry>
@@ -4926,7 +4926,7 @@
1.5.1.v200608082030--2PD88P8T_IB_EI
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.common_core.feature.patch
</entry>
@@ -4934,7 +4934,7 @@
1.5.2.v200612052215--1G955G795F5CA5
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.common_core.feature.source
</entry>
@@ -4942,7 +4942,7 @@
1.5.2.v200610140800--AXrVWXbElCl05G
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.common_sdk.feature
</entry>
@@ -4950,7 +4950,7 @@
1.5.2.v200610140800-8422832362_2203
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.common_ui.feature.source
</entry>
@@ -4958,7 +4958,7 @@
1.5.2.v200610140800-qKHiTHohjmcJ67O
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.doc.isv.feature
</entry>
@@ -4966,7 +4966,7 @@
1.5.1.v200609111750--0842282A274567
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.rdb_adapters.feature.source
</entry>
@@ -4974,7 +4974,7 @@
1.5.2.v200610171240--Cq0bcpjKsVtauY
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.rdb_core.feature.source
</entry>
@@ -4982,7 +4982,7 @@
1.5.2.v200610171240--3YIAAYCNETEZLJ
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.rdb_sdk.feature
</entry>
@@ -4990,7 +4990,7 @@
1.5.2.v200610171240-PD88PA8ASADJ8-N
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.rdb_ui.feature.source
</entry>
@@ -4998,7 +4998,7 @@
1.5.2.v200610171240-FTMjwT_jS-R7nrK
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.sdk
</entry>
@@ -5006,7 +5006,7 @@
1.5.2.v200610070620-O2U9W5yZ8Xaybx1
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.server_core.feature.source
</entry>
@@ -5014,7 +5014,7 @@
1.5.2.v200610070620------1G955G6C6L
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.server_sdk.feature
</entry>
@@ -5022,7 +5022,7 @@
1.5.2.v200610071830-8422832292842-X
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.server_ui.feature.source
</entry>
@@ -5030,7 +5030,7 @@
1.5.2.v200610070620-PGIEUHzQoGdLZGn
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.web_core.feature.source
</entry>
@@ -5038,7 +5038,7 @@
1.5.2.v200610140800--4hNDDhEmKWFYQL
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.web_sdk.feature
</entry>
@@ -5046,7 +5046,7 @@
1.5.2.v200610140800-8422832362_220B
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.web_ui.feature.source
</entry>
@@ -5054,7 +5054,7 @@
1.5.2.v200610140800-zjf2SqQvH40Gasr
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.ws_core.feature.source
</entry>
@@ -5062,7 +5062,7 @@
1.5.2.v200610140800--4hNDDhEmGSKJHa
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.ws_sdk.feature
</entry>
@@ -5070,7 +5070,7 @@
1.5.2.v200610071830-8422832292842-v
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.ws_ui.feature.source
</entry>
@@ -5078,7 +5078,7 @@
1.5.2.v200610070620-hai7Do_y98HDOuI
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.xml_core.feature.patch
</entry>
@@ -5086,7 +5086,7 @@
1.5.2.v200612052215--08422834272727
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.xml_core.feature.source
</entry>
@@ -5094,7 +5094,7 @@
1.5.1.v200608082030--3YIAAYAjGLENFH
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.xml_sdk.feature
</entry>
@@ -5102,7 +5102,7 @@
1.5.2.v200610171640-L2zNz6N81T2UwAZ
</reference>
</versioningCompare>
-<versioningCompare kind="extraInCurrent" codePackage="feature">
+<versioningCompare kind="extraInCurrent" codePackageType="feature">
<entry>
org.eclipse.wst.xml_ui.feature.source
</entry>
@@ -5110,7 +5110,7 @@
1.5.2.v200610071830-zkiCc0C2eGeGexE
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.jsf
</entry>
@@ -5118,7 +5118,7 @@
0.5.1.v20060829-fX45f_dlc9W9aIc
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.jst.enterprise_tests.feature
</entry>
@@ -5126,7 +5126,7 @@
1.5.1.v200609111710
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.jst.jsf.doc.feature
</entry>
@@ -5134,7 +5134,7 @@
0.5.0.v20060829------1G955G5K9M
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.jst.jsf.feature
</entry>
@@ -5142,7 +5142,7 @@
0.5.1.v20060829-OJnpNuKYI7O7SAU
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.jst.jsf.tests.feature
</entry>
@@ -5150,7 +5150,7 @@
0.5.0.v20060829------1G955G5K9M
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.jst.server_tests.feature
</entry>
@@ -5158,7 +5158,7 @@
1.5.1.v200609111710------4hNDDhEjIZ
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.jst.tests
</entry>
@@ -5166,7 +5166,7 @@
1.5.1.v200612071245--6vVLTqxlmonm2Z
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.jst.web_tests.feature
</entry>
@@ -5174,7 +5174,7 @@
1.5.1.v200609111710--4hNDDhIGGfGaSe
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.wst.common_tests.feature
</entry>
@@ -5182,7 +5182,7 @@
1.5.1.v200609111555
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.wst.rdb_tests.feature
</entry>
@@ -5190,7 +5190,7 @@
1.5.0.v200610040310--08422832262532
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.wst.server_tests.feature
</entry>
@@ -5198,7 +5198,7 @@
1.5.1.v200609111645------3YIAAYAgFQ
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.wst.tests.feature
</entry>
@@ -5206,7 +5206,7 @@
1.5.1.v200609111510--X12DLi4XYsZVZ8
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.wst.web_tests.feature
</entry>
@@ -5214,7 +5214,7 @@
1.5.1.v200609111705--87cMN7UMMkMskc
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.wst.ws_tests.feature
</entry>
@@ -5222,7 +5222,7 @@
1.5.1.v200609111650
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.wst.xml_tests.feature
</entry>
@@ -5230,7 +5230,7 @@
1.5.1.v200609111545--AXrVWXgVW1WE3W
</reference>
</versioningCompare>
-<versioningCompare kind="extraInReference" codePackage="feature">
+<versioningCompare kind="extraInReference" codePackageType="feature">
<entry>
org.eclipse.wtp.releng.tests.feature
</entry>
@@ -5238,7 +5238,7 @@
1.0.0.v200612071440
</reference>
</versioningCompare>
-<versioningCompare kind="error" codePackage="feature">
+<versioningCompare kind="error" codePackageType="feature">
<entry>
org.eclipse.sdk
</entry>
diff --git a/tests/org.eclipse.wtp.releng.tests/versioningReportToHTML.xsl b/tests/org.eclipse.wtp.releng.tests/versioningReportToHTML.xsl
index b3093f6..5923bd9 100644
--- a/tests/org.eclipse.wtp.releng.tests/versioningReportToHTML.xsl
+++ b/tests/org.eclipse.wtp.releng.tests/versioningReportToHTML.xsl
@@ -36,7 +36,7 @@
<dl>
<xsl:for-each select="versioningCompare">
<xsl:if
- test="@kind = 'error' and @codePackage='bundle'">
+ test="@kind = 'error' and @codePackageType ='bundle'">
<dt style="font-weight: bold; color: crimson">
<xsl:value-of select="entry" />
</dt>
@@ -55,7 +55,7 @@
<dl>
<xsl:for-each select="versioningCompare">
<xsl:if
- test="@kind = 'error' and @codePackage='feature'">
+ test="@kind = 'error' and @codePackageType ='feature'">
<dt style="font-weight: bold; color: crimson">
<xsl:value-of select="entry" />
</dt>
@@ -74,7 +74,7 @@
<dl>
<xsl:for-each select="versioningCompare">
<xsl:if
- test="@kind = 'increase' and @field='qualifier' and @codePackage='bundle'">
+ test="@kind = 'increase' and @field='qualifier' and @codePackageType ='bundle'">
<dt style="font-weight: bold; color: gold">
<xsl:value-of select="entry" />
</dt>
@@ -93,7 +93,7 @@
<dl>
<xsl:for-each select="versioningCompare">
<xsl:if
- test="@kind = 'increase' and @field='qualifier' and @codePackage='features'">
+ test="@kind = 'increase' and @field='qualifier' and @codePackageType ='features'">
<dt style="font-weight: bold; color: gold">
<xsl:value-of select="entry" />
</dt>