diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php
index cd7175b7a9f123e81ab1b903e2514c5fe1b889d1..60d80a60147f8d16e821333556822bba4c037674 100644
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php
@@ -5,20 +5,8 @@
$parts2 = explode("-", $parts[count($parts) - 1]);
$buildName = $parts2[1];
- // Get build type names
- $fileHandle = fopen("../../dlconfig.txt", "r");
- while (!feof($fileHandle)) {
-
- $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
- $parts = explode(",", $aLine);
- $dropNames[trim($parts[0])] = trim($parts[1]);
- }
- fclose($fileHandle);
-
- $buildType = $dropNames[$parts2[0]];
-
- echo "<title>Build Notes for $buildType $buildName </title>";
+ echo "<title>Build Notes 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">
@@ -30,7 +18,7 @@
<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">
- Build Notes for <?php echo "$buildType $buildName"; ?></font></b></td>
+ Build Notes for <?php echo "$buildName"; ?></font></b></td>
</tr>
</table>
<table border="0">
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php
index 93d98868dfc819635f9ebdc01aa278d18317f616..06811384d69b1e163ab12da1859ca96e050f725d 100644
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php
@@ -5,20 +5,7 @@
$parts2 = explode("-", $parts[count($parts) - 1]);
$buildName = $parts2[1];
- // Get build type names
-
- $fileHandle = fopen("../../dlconfig.txt", "r");
- while (!feof($fileHandle)) {
-
- $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
- $parts = explode(",", $aLine);
- $dropNames[trim($parts[0])] = trim($parts[1]);
- }
- fclose($fileHandle);
-
- $buildType = $dropNames[$parts2[0]];
-
- echo "<title>Test Console Output for $buildType $buildName </title>";
+ echo "<title>Test Console Output 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">
@@ -31,7 +18,7 @@
<tr>
<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Console
output from running JUnit plugin tests for
- <?php echo "$buildType $buildName"; ?>
+ <?php echo "$buildName"; ?>
</font></b></td>
</tr>
</table>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template
index f39f71cd21edee566caa6d485e4d91a852b9884f..c94cd00e1a808a2e9c1411a018964744a8bdbdfe 100644
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template
+++ b/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template
@@ -6,20 +6,7 @@
$parts2 = explode("-", $parts[count($parts) - 1]);
$buildName = $parts2[1];
- // Get build type names
-
- $fileHandle = fopen("../../dlconfig.txt", "r");
- while (!feof($fileHandle)) {
-
- $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
- $parts = explode(",", $aLine);
- $dropNames[trim($parts[0])] = trim($parts[1]);
- }
- fclose($fileHandle);
-
- $buildType = $dropNames[$parts2[0]];
-
- echo "<title>Test Results for $buildType $buildName </title>";
+ echo "<title>Test Results for $buildName </title>";
?>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -31,7 +18,7 @@
<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">
- Unit Test Results for <?php echo "$buildType $buildName"; ?> on Various Platforms and JRE</font></b></td>
+ Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
</tr>
</table>
@@ -50,7 +37,7 @@ while ($anEntry = $dir->read())
<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">Unit
- Test Results for <?php echo "$buildType $buildName"; ?> </font></b></td>
+ Test Results for <?php echo "$buildName"; ?> </font></b></td>
</tr>
</table>
<p></p><table border="0">
@@ -71,7 +58,7 @@ while ($anEntry = $dir->read())
<tr>
<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">
Console output logs
- <?php echo "$buildType $buildName"; ?>
+ <?php echo "$buildName"; ?>
</font></b></td>
</tr>
</table>
diff --git a/releng.wtpbuilder/distribution/jsf.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/jsf.site/staticDropFiles/buildNotes.php
index cd7175b7a9f123e81ab1b903e2514c5fe1b889d1..cbb55c088461694f36aea4a0e6cc415ed24fab6a 100644
--- a/releng.wtpbuilder/distribution/jsf.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/jsf.site/staticDropFiles/buildNotes.php
@@ -5,20 +5,7 @@
$parts2 = explode("-", $parts[count($parts) - 1]);
$buildName = $parts2[1];
- // Get build type names
-
- $fileHandle = fopen("../../dlconfig.txt", "r");
- while (!feof($fileHandle)) {
-
- $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
- $parts = explode(",", $aLine);
- $dropNames[trim($parts[0])] = trim($parts[1]);
- }
- fclose($fileHandle);
-
- $buildType = $dropNames[$parts2[0]];
-
- echo "<title>Build Notes for $buildType $buildName </title>";
+ echo "<title>Build Notes 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">
@@ -30,7 +17,7 @@
<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">
- Build Notes for <?php echo "$buildType $buildName"; ?></font></b></td>
+ Build Notes for <?php echo "$buildName"; ?></font></b></td>
</tr>
</table>
<table border="0">
diff --git a/releng.wtpbuilder/distribution/jsf.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/jsf.site/staticDropFiles/consoleLogs.php
index 93d98868dfc819635f9ebdc01aa278d18317f616..06811384d69b1e163ab12da1859ca96e050f725d 100644
--- a/releng.wtpbuilder/distribution/jsf.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/jsf.site/staticDropFiles/consoleLogs.php
@@ -5,20 +5,7 @@
$parts2 = explode("-", $parts[count($parts) - 1]);
$buildName = $parts2[1];
- // Get build type names
-
- $fileHandle = fopen("../../dlconfig.txt", "r");
- while (!feof($fileHandle)) {
-
- $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
- $parts = explode(",", $aLine);
- $dropNames[trim($parts[0])] = trim($parts[1]);
- }
- fclose($fileHandle);
-
- $buildType = $dropNames[$parts2[0]];
-
- echo "<title>Test Console Output for $buildType $buildName </title>";
+ echo "<title>Test Console Output 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">
@@ -31,7 +18,7 @@
<tr>
<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Console
output from running JUnit plugin tests for
- <?php echo "$buildType $buildName"; ?>
+ <?php echo "$buildName"; ?>
</font></b></td>
</tr>
</table>
diff --git a/releng.wtpbuilder/distribution/jsf.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/jsf.site/templateFiles/testResults.php.template
index f39f71cd21edee566caa6d485e4d91a852b9884f..c94cd00e1a808a2e9c1411a018964744a8bdbdfe 100644
--- a/releng.wtpbuilder/distribution/jsf.site/templateFiles/testResults.php.template
+++ b/releng.wtpbuilder/distribution/jsf.site/templateFiles/testResults.php.template
@@ -6,20 +6,7 @@
$parts2 = explode("-", $parts[count($parts) - 1]);
$buildName = $parts2[1];
- // Get build type names
-
- $fileHandle = fopen("../../dlconfig.txt", "r");
- while (!feof($fileHandle)) {
-
- $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
- $parts = explode(",", $aLine);
- $dropNames[trim($parts[0])] = trim($parts[1]);
- }
- fclose($fileHandle);
-
- $buildType = $dropNames[$parts2[0]];
-
- echo "<title>Test Results for $buildType $buildName </title>";
+ echo "<title>Test Results for $buildName </title>";
?>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -31,7 +18,7 @@
<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">
- Unit Test Results for <?php echo "$buildType $buildName"; ?> on Various Platforms and JRE</font></b></td>
+ Unit Test Results for <?php echo "$buildName"; ?> on Various Platforms and JRE</font></b></td>
</tr>
</table>
@@ -50,7 +37,7 @@ while ($anEntry = $dir->read())
<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">Unit
- Test Results for <?php echo "$buildType $buildName"; ?> </font></b></td>
+ Test Results for <?php echo "$buildName"; ?> </font></b></td>
</tr>
</table>
<p></p><table border="0">
@@ -71,7 +58,7 @@ while ($anEntry = $dir->read())
<tr>
<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">
Console output logs
- <?php echo "$buildType $buildName"; ?>
+ <?php echo "$buildName"; ?>
</font></b></td>
</tr>
</table>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php
index cd7175b7a9f123e81ab1b903e2514c5fe1b889d1..44f59ca04c95d5dda8110da360ca1be0b7ebf40f 100644
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php
@@ -1,24 +1,11 @@
<html>
<head>
<?php
- $parts = explode("/", getcwd());
- $parts2 = explode("-", $parts[count($parts) - 1]);
- $buildName = $parts2[1];
-
- // Get build type names
+ $parts = explode("/", getcwd());
+ $parts2 = explode("-", $parts[count($parts) - 1]);
+ $buildName = $parts2[1];
- $fileHandle = fopen("../../dlconfig.txt", "r");
- while (!feof($fileHandle)) {
-
- $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
- $parts = explode(",", $aLine);
- $dropNames[trim($parts[0])] = trim($parts[1]);
- }
- fclose($fileHandle);
-
- $buildType = $dropNames[$parts2[0]];
-
- echo "<title>Build Notes for $buildType $buildName </title>";
+ echo "<title>Build Notes 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">
@@ -28,33 +15,33 @@
<p><b><font face="Verdana" size="+3">Build Notes</font></b> </p>
<table border=0 cellspacing=5 cellpadding=2 width="100%" >
- <tr>
+ <tr>
<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">
- Build Notes for <?php echo "$buildType $buildName"; ?></font></b></td>
+ Build Notes for <?php echo "$buildName"; ?></font></b></td>
</tr>
</table>
<table border="0">
<?php
- $hasNotes = false;
- $aDirectory = dir("buildnotes");
- while ($anEntry = $aDirectory->read()) {
- if ($anEntry != "." && $anEntry != "..") {
- $parts = explode("_", $anEntry);
- $baseName = $parts[1];
- $parts = explode(".", $baseName);
- $component = $parts[0];
- $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
- echo "<tr>";
- echo "$line";
- echo "</tr>";
- $hasNotes = true;
- }
- }
- aDirectory.closedir();
- if (!$hasNotes) {
- echo "<br>There are no build notes for this build.";
- }
+ $hasNotes = false;
+ $aDirectory = dir("buildnotes");
+ while ($anEntry = $aDirectory->read()) {
+ if ($anEntry != "." && $anEntry != "..") {
+ $parts = explode("_", $anEntry);
+ $baseName = $parts[1];
+ $parts = explode(".", $baseName);
+ $component = $parts[0];
+ $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
+ echo "<tr>";
+ echo "$line";
+ echo "</tr>";
+ $hasNotes = true;
+ }
+ }
+ aDirectory.closedir();
+ if (!$hasNotes) {
+ echo "<br>There are no build notes for this build.";
+ }
?>
</table>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/consoleLogs.php
index 93d98868dfc819635f9ebdc01aa278d18317f616..06811384d69b1e163ab12da1859ca96e050f725d 100644
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/consoleLogs.php
@@ -5,20 +5,7 @@
$parts2 = explode("-", $parts[count($parts) - 1]);
$buildName = $parts2[1];
- // Get build type names
-
- $fileHandle = fopen("../../dlconfig.txt", "r");
- while (!feof($fileHandle)) {
-
- $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
- $parts = explode(",", $aLine);
- $dropNames[trim($parts[0])] = trim($parts[1]);
- }
- fclose($fileHandle);
-
- $buildType = $dropNames[$parts2[0]];
-
- echo "<title>Test Console Output for $buildType $buildName </title>";
+ echo "<title>Test Console Output 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">
@@ -31,7 +18,7 @@
<tr>
<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Console
output from running JUnit plugin tests for
- <?php echo "$buildType $buildName"; ?>
+ <?php echo "$buildName"; ?>
</font></b></td>
</tr>
</table>