diff --git a/downloadsites/.project b/downloadsites/.project
index 66655bc5f529810357f9aaebf315bd1370024c83..2eadc659ef79452692a0d158faba2b9352ebd32b 100644
--- a/downloadsites/.project
+++ b/downloadsites/.project
@@ -8,6 +8,19 @@
         have them under version control, etc.
     </comment>
     <projects></projects>
-    <buildSpec></buildSpec>
-    <natures></natures>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.php.core.PhpIncrementalProjectBuilder</name>
+      <arguments>
+      </arguments>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.wst.validation.validationbuilder</name>
+      <arguments>
+      </arguments>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.php.core.PHPNature</nature>
+  </natures>
 </projectDescription>
diff --git a/downloadsites/.projectOptions b/downloadsites/.projectOptions
new file mode 100644
index 0000000000000000000000000000000000000000..09e02ab37d0b43019d0d1d468dbbcb9cbca7c960
--- /dev/null
+++ b/downloadsites/.projectOptions
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpProjectOptions>
+	<projectOption name="org.eclipse.php.core.defaultEncoding">
+	</projectOption>
+	<projectOption name="org.eclipse.php.core.contextRoot">
+	</projectOption>
+	<includepath>
+	</includepath>
+</phpProjectOptions>
diff --git a/downloadsites/.settings/org.eclipse.php.core.prefs b/downloadsites/.settings/org.eclipse.php.core.prefs
new file mode 100644
index 0000000000000000000000000000000000000000..70676e38a11c2537f4036d604787a22bac27cc2f
--- /dev/null
+++ b/downloadsites/.settings/org.eclipse.php.core.prefs
@@ -0,0 +1,4 @@
+#Sat Jul 28 19:23:27 EDT 2007
+eclipse.preferences.version=1
+phpVersion=php5
+use_asp_tags_as_php=false
diff --git a/downloadsites/webtools/committers/README.txt b/downloadsites/webtools/README.txt
similarity index 100%
rename from downloadsites/webtools/committers/README.txt
rename to downloadsites/webtools/README.txt
diff --git a/downloadsites/webtools/committers/access_err.gif b/downloadsites/webtools/access_err.gif
similarity index 100%
rename from downloadsites/webtools/committers/access_err.gif
rename to downloadsites/webtools/access_err.gif
diff --git a/downloadsites/webtools/committers/access_warn.gif b/downloadsites/webtools/access_warn.gif
similarity index 100%
rename from downloadsites/webtools/committers/access_warn.gif
rename to downloadsites/webtools/access_warn.gif
diff --git a/downloadsites/webtools/committers/api_err.gif b/downloadsites/webtools/api_err.gif
similarity index 100%
rename from downloadsites/webtools/committers/api_err.gif
rename to downloadsites/webtools/api_err.gif
diff --git a/downloadsites/webtools/committers/api_junit.gif b/downloadsites/webtools/api_junit.gif
similarity index 100%
rename from downloadsites/webtools/committers/api_junit.gif
rename to downloadsites/webtools/api_junit.gif
diff --git a/downloadsites/webtools/committers/api_removed.gif b/downloadsites/webtools/api_removed.gif
similarity index 100%
rename from downloadsites/webtools/committers/api_removed.gif
rename to downloadsites/webtools/api_removed.gif
diff --git a/downloadsites/webtools/bottomAndFooter.php b/downloadsites/webtools/bottomAndFooter.php
new file mode 100644
index 0000000000000000000000000000000000000000..5f3219cc69d2b76a352cdbcbfb237ea834fcfe67
--- /dev/null
+++ b/downloadsites/webtools/bottomAndFooter.php
@@ -0,0 +1,108 @@
+<table border="0" width="100%" cellpadding="2">
+	<tbody>
+		<tr>
+			<td valign="top" width="40%">
+			<table border="0" cellpadding="2">
+				<tbody>
+					<tr>
+						<td width="100%" bgcolor="#0080c0" valign="top"><b><font
+							face="Arial,Helvetica"><font color="#ffffff">Download Related
+						Links</font> </font></b></td>
+					</tr>
+					<tr>
+						<td valign="top">
+
+
+						<p><a
+							href="http://archive.eclipse.org/webtools/downloads/index.php"
+							target="_top">Archived Builds</a> are previously significant
+						builds that are no longer required, but which we keep on a
+						non-mirrored site, for historical and academic use.</p>
+
+						<?php
+						echo $pageFooterEnd;
+						?></td>
+					</tr>
+				</tbody>
+			</table>
+			</td>
+
+			<td />
+			
+			
+			<td width="45%" valign="top">
+			<table border="0" cellpadding="2">
+				<tbody>
+					<tr>
+						<td width="100%" colspan="4" bgcolor="#0080c0" valign="top"><b><font
+							face="Arial,Helvetica"><font color="#ffffff">Metrics Legend</font>
+						</font></b></td>
+					</tr>
+
+					<tr>
+						<td valign="top"><img src="../compile_err.gif" width="16"
+							height="16" /></td>
+						<td valign="top" width="50%">compilation errors.</td>
+						<td valign="top"><img src="../compile_warn.gif" width="16"
+							height="16" /></td>
+						<td valign="top" width="50%">compilation warnings.</td>
+					</tr>
+					<tr>
+						<td valign="top"><img src="../access_err.gif" width="16"
+							height="16" /></td>
+						<td valign="top" width="50%">Access Rule Violations</td>
+						<td valign="top"><img src="../access_warn.gif" width="16"
+							height="16" /></td>
+						<td valign="top" width="50%">Access Rule Warnings</td>
+					</tr>
+					<tr>
+						<td valign="top"><img src="../junit_err.gif" width="16"
+							height="16" /></td>
+						<td valign="top" width="50%">junit failures.</td>
+						<td valign="top"><img src="../pending1.gif" width="16" height="16" /></td>
+						<td valign="top" width="50%">Pending results</td>
+					</tr>
+					<tr>
+						<td valign="top"><img src="../api_err.gif" width="16" height="16" /></td>
+						<td valign="top" width="50%">API violations.</td>
+
+						<td valign="top"><img src="../api_junit.gif" width="16"
+							height="16" /></td>
+						<td valign="top" width="50%">APIs without junit testcases.</td>
+					</tr>
+					<tr>
+						<td valign="top"><img src="../api_removed.gif" width="16"
+							height="16" /></td>
+						<td valign="top" width="50%">removed APIs.</td>
+					</tr>
+					<tr>
+						<td valign="top"><b>(</b>nnn<b>)</b></td>
+						<td valign="top">Number of bundles, jars, and wars, or number of
+						unit tests.</td>
+						<td valign="top"><b>NA</b></td>
+						<td valign="top"><b>N</b>ot <b>A</b>vailable</td>
+					</tr>
+
+
+
+
+				</tbody>
+			</table>
+			</td>
+		</tr>
+	</tbody>
+</table>
+
+
+<!-- footer -->
+<center>
+<hr />
+<p>All downloads are provided under the terms and conditions of the <a
+	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
+User Agreement</a> unless otherwise specified.</p>
+
+<p>If you have problems downloading the drops, contact the <font
+	size="-1" face="arial,helvetica,geneva"><a
+	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
+</center>
+<!-- end footer -->
diff --git a/downloadsites/webtools/committers/editedindex.php b/downloadsites/webtools/committers/editedindex.php
deleted file mode 100644
index c187b9262a72f7cfcdaf87d3fcd2d3bbb7dc45fa..0000000000000000000000000000000000000000
--- a/downloadsites/webtools/committers/editedindex.php
+++ /dev/null
@@ -1,569 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<title>WTP Downloads</title>
-
-
-<?php
-//ini_set("display_errors", "true");
-//error_reporting (E_ALL);
-
-//todo: compute downloadprefix based on host server, and stage of declaration
-$downloadprefix="http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops/R2.0/R-2.0-200706260303/";
-
-// todo: unsure if can handle filenames that are URLs?
-function fileSizeInMegs($filename) {
-        // handy constant to compute file size in megabytes
-        $onemeg=1024*1024;
-        $zipfilesize=filesize($filename);
-        $zipfilesize=round($zipfilesize/$onemeg, 0);
-        return $zipfilesize;
-}
-
-// expecting grandTotalErrors and grandTotalTests
-$filename = "unitTestsSummary.xml";
-if (file_exists($filename)) {
-        $prefix = "unitTests_";
-        $unitTestsSummary = simplexml_load_file($filename);
-        foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-                $name = $summaryItem->name;
-                $value = $summaryItem->value;
-                $code= "\$" . $prefix . $name . " = " . $value . ";";
-                //echo "<br />code: " . $code;
-                eval($code);
-        }
-}
-
-$filename = "compilelogsSummary.xml";
-$prefix = "code_";
-$compileSummary = simplexml_load_file($filename);
-foreach ($compileSummary->summaryItem as $summaryItem) {
-        $name = $summaryItem->name;
-        $value = $summaryItem->value;
-        $code= "\$" . $prefix . $name . " = " . $value . ";";
-        //echo "<br />code: " . $code;
-        eval($code);
-}
-
-$filename = "testcompilelogsSummary.xml";
-$prefix = "test_";
-$compileSummary = simplexml_load_file($filename);
-foreach ($compileSummary->summaryItem as $summaryItem) {
-        $name = $summaryItem->name;
-        $value = $summaryItem->value;
-        $code= "\$" . $prefix . $name . " = " . $value . ";";
-        //echo "<br />code: " . $code;
-        eval($code);
-}
-
-
-?>
-
-
-</head>
-
-<body>
-
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-        <tr>
-                <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b>Release
-                Build: R-2.0-200706260303</b></font></td>
-
-
-        <tr>
-                <td><font size="-1">June 26, 2007</font></td>
-        </tr>
-        <tr>
-                <td>
-                <p>The Eclipse Web Tools Platform Project provides tools for Web
-                Development, and is a platform for adopters making add-on tools for
-                Web Development.</p>
-                </td>
-        </tr>
-</table>
-
-<!-- ***********  Required Prerequisites **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align="left" valign="top" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Required
-                Prerequisites</font></td>
-        </tr>
-        <tr>
-                <td>These are the prerequisites project packages to run the Web Tools
-                Platform. They must be downloaded and installed before WTP can be
-                installed or used.</td>
-        </tr>
-        <tr>
-                <table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-                        <tr valign="top">
-                            <td width="10%"/>&nbsp;&nbsp;&nbsp;&nbsp;
-                                <td>Eclipse Platform (Platform, JDT, PDE)</td>
-                                <td align="right"><a href="http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/eclipse-SDK-3.3-linux-gtk.tar.gz">eclipse-SDK-3.3-linux-gtk.tar.gz</a> or <a
-                                        href=http://download.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500>other platforms</a></td>
-                        </tr>
-                        <tr valign="top">
-                            <td width="10%"/>&nbsp;&nbsp;&nbsp;&nbsp;
-                                <td>Eclipse Modeling Framework (EMF, XSD InfoSet, SDO)</td>
-                                <td align="right"><a href="http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/emf-sdo-xsd-SDK-2.3.0.zip">emf-sdo-xsd-SDK-2.3.0.zip</a></td>
-                        </tr>
-                        <tr valign="top">
-                            <td width="10%"/>&nbsp;&nbsp;&nbsp;&nbsp;
-                                <td>Graphical Editing Framework (GEF)</td>
-                                <td align="right"><a href="http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/drops/R-3.3-200706281000/GEF-SDK-3.3.zip">GEF-SDK-3.3.zip</a></td>
-                        </tr>
-                        <tr valign="top">
-                            <td width="10%"/>&nbsp;&nbsp;&nbsp;&nbsp;
-                                <td>Data Tools Platform (DTP)</td>
-                                <td align="right"><a href="http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/1.5/dtp-sdk_1.5.zip">dtp-sdk_1.5.zip</a></td>
-                        </tr>
-                </table>
-        </tr>
-</table>
-
-<!-- ***********  WTP ALL-IN-ONE **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web
-                Tools Platform All-In-One Packages</font></td>
-        </tr>
-
-        <tr>
-                <td align="left" valign="top" colspan="5">
-                <p>The WTP All-In-One zip files includes the features and plugins
-                  from the WST, JST (including JSF), and JPT projects. They also
-                  include  the complete set of software to start using WTP
-                  immediately. This package already has the complete set of prerequisites,
-                  eclipse 3.3 sdk, emf, gef and dtp distributions from the Europa
-                  release. You will not need anything else.</p>
-          </td>
-        </tr>
-        <tr>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Platform:</b></td>
-                                <td align="left" valign="top">
-                                <p>Windows (Supported Versions)</p>
-                                </td>
-                                <?php
-
-                                $zipfilename="wtp-all-in-one-sdk-R-2.0-200706260303-win32";
-
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeInMegs($filename);
-                                echo '  <td align="right" valign="top" width="10%">
-                           <a href="' . ${downloadprefix} . ${filename} . '">' . "wtp-all-in-one-sdk-win32" . '</a>
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                           (' . ${zipfilesize} . 'M)
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                           [<a href="checksum/' . ${filename} . '.md5">md5</a>]
-                        </td>';
-
-                                ?>
-                        </tr>
-
-                        <tr>
-
-
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Platform:</b></td>
-
-                                <td align="left" valign="top">
-                                <p>Linux (x86/GTK 2) (Supported Versions)</p>
-
-                                <?php
-
-                                $zipfilename="wtp-all-in-one-sdk-R-2.0-200706260303-linux-gtk";
-
-                                $filename=$zipfilename.".tar.gz";
-                                $zipfilesize=fileSizeInMegs($filename);
-                                echo '<td align="right" valign="top" width="10%">
-                        <a href="' . ${downloadprefix} . ${filename} . '">' . "wtp-all-in-one-sdk-linux-gtk" . '</a>
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                        (' . ${zipfilesize} . 'M)
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                        [<a href="checksum/' . ${filename} . '.md5">md5</a>]
-                        </td>';
-                                ?>
-
-                        </tr>
-
-                        <tr>
-
-                                <td align="left" valign="top" width="10%"><b>Platform:</b></td>
-                                <td align="left" valign="top">
-                                <p>Mac OSX (Mac/Carbon) (Supported Versions)</p>
-                                <?php
-
-                                $zipfilename="wtp-all-in-one-sdk-R-2.0-200706260303-macosx-carbon";
-
-                                $filename=$zipfilename.".tar.gz";
-                                $zipfilesize=fileSizeInMegs($filename);
-                                echo '<td align="right" valign="top" width="10%">
-                        <a href="' . ${downloadprefix} . ${filename} . '">' . "wtp-all-in-one-sdk-macosx-carbon" . '</a>
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                        (' . ${zipfilesize} . 'M)
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                        [<a href="checksum/' . ${filename} . '.md5">md5</a>]
-                        </td>';
-                                ?>
-
-                        </tr>
-                </table>
-
-
-        <tr>
-
-</table>
-
-<!-- ***********  WTP **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-                Platform Complete</font></td>
-        </tr>
-
-        <tr>
-                <td align="left" valign="top" colspan="5">
-                <p>The WTP zip files includes the features and plugins from the WST,
-                JST (including JSF), and JPT projects.</p>
-                </td>
-        </tr>
-        <tr>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Web App Developers:</b></td>
-                                <td align="left" valign="top">
-                                <p>This non-SDK package is for most users. It includes the runnable
-                                code and end-user documentation for those using the tools to develop
-                                web applications.</p>
-                                </td>
-                                <?php
-
-                                $zipfilename="wtp-R-2.0-200706260303";
-
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeInMegs($filename);
-                                echo '  <td align="right" valign="top" width="10%">
-                           <a href="' . ${downloadprefix} . ${filename} . '">' . "wtp" . '</a>
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                           (' . ${zipfilesize} . 'M)
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                           [<a href="checksum/' . ${filename} . '.md5">md5</a>]
-                        </td>';
-
-                                ?>
-                        </tr>
-
-                        <tr>
-
-
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Tool Developers:</b></td>
-
-                                <td align="left" valign="top">
-                                <p>The SDK package includes source code and developer documentation
-                                for those using WTP as a platform to build more tools, as well as
-                                everything that is in the non-SDK version.</p>
-
-                                <?php
-
-                                $zipfilename="wtp-sdk-R-2.0-200706260303";
-
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeInMegs($filename);
-                                echo '<td align="right" valign="top" width="10%">
-                        <a href="' . ${downloadprefix} . ${filename} . '">' . "wtp-sdk" . '</a>
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                        (' . ${zipfilesize} . 'M)
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                        [<a href="checksum/' . ${filename} . '.md5">md5</a>]
-                        </td>';
-                                ?>
-
-                        </tr>
-
-                        <tr>
-
-                                <td align="left" valign="top" width="10%"></td>
-                                <td align="left" valign="top">
-                                <p>The Automated Test zip contains the unit tests.</p>
-                                <?php
-
-                                $zipfilename="wtp-Automated-Tests-R-2.0-200706260303";
-
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeInMegs($filename);
-                                echo '<td align="right" valign="top" width="10%">
-                        <a href="' . ${downloadprefix} . ${filename} . '">' . "wtp-Automated-Tests" . '</a>
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                        (' . ${zipfilesize} . 'M)
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                        [<a href="checksum/' . ${filename} . '.md5">md5</a>]
-                        </td>';
-                                ?>
-
-                        </tr>
-                </table>
-
-
-        <tr>
-
-</table>
-
-
-<!-- ***********  WST **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Standard Tools</font></td>
-        </tr>
-
-        <tr>
-                <td align="left" valign="top" colspan="5">
-                <p>The WST zip files includes the features and plugins from the WST Project. </p>
-                </td>
-        </tr>
-        <tr>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Web App Developers:</b></td>
-                                <td align="left" valign="top">
-                                <p>This non-SDK package is for most users. It includes the runnable
-                                code and end-user documentation for those using the tools to develop
-                                web applications. In particular, non-Java oriented Web Apps (such as HTML, 
-                                XML, CSS, etc).</p>
-                                </td>
-                                <?php
-
-                                $zipfilename="wtp-wst-R-2.0-200706260303";
-
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeInMegs($filename);
-                                echo '  <td align="right" valign="top" width="10%">
-                           <a href="' . ${downloadprefix} . ${filename} . '">' . "wst" . '</a>
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                           (' . ${zipfilesize} . 'M)
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                           [<a href="checksum/' . ${filename} . '.md5">md5</a>]
-                        </td>';
-
-                                ?>
-                        </tr>
-
-                        <tr>
-
-
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Tool Developers:</b></td>
-
-                                <td align="left" valign="top">
-                                <p>The SDK package includes source code and developer documentation
-                                for those using WST as a platform to build more tools, as well as
-                                everything that is in the non-SDK version.</p>
-
-                                <?php
-
-                                $zipfilename="wtp-wst-sdk-R-2.0-200706260303";
-
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeInMegs($filename);
-                                echo '<td align="right" valign="top" width="10%">
-                        <a href="' . ${downloadprefix} . ${filename} . '">' . "wtp-wst-sdk" . '</a>
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                        (' . ${zipfilesize} . 'M)
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                        [<a href="checksum/' . ${filename} . '.md5">md5</a>]
-                        </td>';
-                                ?>
-
-                        </tr>
-
-                        <tr>
-
-                                <td align="left" valign="top" width="10%"></td>
-                                <td align="left" valign="top">
-                                <p>The Automated Test zip contains the unit tests.</p>
-                                <?php
-
-                                $zipfilename="wtp-wst-Automated-Tests-R-2.0-200706260303";
-
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeInMegs($filename);
-                                echo '<td align="right" valign="top" width="10%">
-                        <a href="' . ${downloadprefix} . ${filename} . '">' . "wtp-wst-Automated-Tests" . '</a>
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                        (' . ${zipfilesize} . 'M)
-                        </td>
-                        <td align="right" valign="top" width="5%">
-                        [<a href="checksum/' . ${filename} . '.md5">md5</a>]
-                        </td>';
-                                ?>
-
-                        </tr>
-                </table>
-
-
-        <tr>
-
-</table>
-
-
-
-
-<!-- ***********  Build Status **************  -->
-<table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-                and other interesting details</font></td>
-        </tr>
-        <tr>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
-
-                        <tr>
-                                <td>
-                                <?php
-                                $buildmachineScript="../../../displayBuildMachine.php";
-                                if (file_exists($buildmachineScript))
-                                {
-                                        include $buildmachineScript;
-                                        echo displayBuildMachine();
-                                }
-                                ?> 
-                                <a href="buildNotes.php">Build notes</a> <br />
-                                <a href="directory.txt">map files</a> <br /> 
-                                <?php
-
-                                if (isset($unitTests_grandTotalErrors)) {
-                                        $errorColor="green";
-                                        if ($unitTests_grandTotalErrors > 0) {
-                                                $errorColor="red";
-                                        }
-                                        echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-                                        echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-                                }
-                                else {
-                                        echo "<br /><font color=\"orange\">Unit tests are pending</font>&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-                                }
-                                ?> <br />
-                                <a href="compileResults.php">Compile logs: Code Bundles</a> 
-                                <?php
-                                echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-                                echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-                                echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-                                echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-                                echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
-                                ?> <br />
-                                <a href="testCompileResults.php">Compile logs: Test Bundles</a> 
-                                <?php
-                                echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-                                echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-                                echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-                                echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-                                echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-                                ?> <br />
-                               
-                                <?php
-                                if (file_exists("versioningReportName.php"))
-                                {
-                                        include "versioningReportName.php";
-                                        $fname="${versionReportFilename}.html";
-                                        if (file_exists($fname)) {
-                                                echo "<br /> <a href='$fname'>Versioning Information</a>";
-                                        }
-}
-?> <?php
-echo "<br />";
-if (file_exists("./apiresults/api-progress.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
-}
-if (file_exists("./apiresults/api-info-summary.html"))
-{
-        echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
-}
-if (file_exists("./apiresults/api-ref-compatibility.html"))
-{    
-        echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
-}
-if (file_exists("./apiresults/api-violation-summary.html"))
-{ 
-        echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
-}
-if (file_exists("./apiresults/component-api-violation-all.html"))
-{ 
-        echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{ 
-        echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
-}
-if (file_exists("./apiresults/api-javadoc-summary.html"))
-{ 
-        echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
-}
-if (file_exists("./apiresults/api-tc-summary.html"))
-{ 
-        echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
-}
-?> <?php
-if (file_exists("./perfresults/graph/performance.php"))
-{
-        echo "<br />";
-        echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-        echo "<br />";
-}
-?></td>
-                        </tr>
-
-
-                </table>
-        </tr>
-</table>
-
-
-
-<!-- footer -->
-<center>
-<hr>
-<p>All downloads are provided under the terms and conditions of the <a
-        href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-        face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-        href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-
-</center>
-<!-- end footer -->
-
-
-</body>
-</html>
diff --git a/downloadsites/webtools/committers/fixPendingHack.sh b/downloadsites/webtools/committers/fixPendingHack.sh
deleted file mode 100644
index e9701be1e9e5695db94f82430410c2905d986083..0000000000000000000000000000000000000000
--- a/downloadsites/webtools/committers/fixPendingHack.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-
-
-fromString="\<font size=\"-1\" color=\"#FF0000\"\>pending\</font\>"
-toString="\<img src = \"OK.gif\" width=19 height=23\>"
-replaceCommand="s!${fromString}!${toString}!g"
-echo "replaceCommand: ${replaceCommand}"
-perl -w -pi -e "${replaceCommand}" index.php
- 
diff --git a/downloadsites/webtools/committers/index.php b/downloadsites/webtools/committers/index.php
index 5f6ae10c01b0f244498ea9c598a6c6d4f630b919..bd04bab7027cc30f6af85bafe670b70305d139ea 100644
--- a/downloadsites/webtools/committers/index.php
+++ b/downloadsites/webtools/committers/index.php
@@ -1,34 +1,55 @@
-<html>
+<?php
+echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?> \n" ;
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css">
-<title>Eclipse Web Tools Platform (WTP) Downloads - for Committers and
-Early Testers</title>
+<?php
+include 'pagePropertyVariables.php';
+?>
+
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" />
+<link rel="stylesheet" href="../wtpDropStyle.css" />
+<title><?php echo $pageTitle; ?></title>
 </head>
 <body>
 
-<!-- heading start -->
+
 <?php
 
 // tiny banner to remind when looking at "local" machine results
 $serverName = $_SERVER["SERVER_NAME"];
 
 if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-  echo '<center><p>Reminder: this is <font color="#FF0000">', $serverName,'</font>  See also <a href="http://download.eclipse.org/webtools/downloads" target="_top">Live public eclipse site</a>.</center><hr />';
+    echo '<center>
+          <p>
+          Reminder: this is <font color="#FF0000">' . 
+    $serverName .
+    '</font>
+          See also 
+          <a href="http://download.eclipse.org/webtools/downloads" target="_top">
+          the live public Eclipse site
+          </a>.
+          </p>
+          <hr />
+          </center>';
+
 }
 
 if (function_exists("date_default_timezone_set")) {
-  date_default_timezone_set("UTC");
-  //echo "<p>default timezone: ";
-  //echo date_default_timezone_get();
-  //echo "</p>";
+    date_default_timezone_set("UTC");
+    //echo "<p>default timezone: ";
+    //echo date_default_timezone_get();
+    //echo "</p>";
 }
 
 ?>
 
 
 <?php
-//ini_set("display_errors", "true");
-//error_reporting (E_ALL);
+ini_set("display_errors", "true");
+error_reporting (E_ALL);
 ?>
 
 <?php
@@ -37,548 +58,14 @@ $C = strcmp($QString, "test");
 ?>
 
 
-<table border=0 cellpadding=0 width="100%">
-<tr>
-<td width="35%"><font class=indextop> Web Tools Platform<br>
-committer downloads</font><br>
-<font class=indexsub>Latest early trial downloads from the Web Tools Platform project</font></td>
-<td width="35%" align="right"><a href="http://www.eclipse.org/webtools/main.html"><img border="0"src="wtplogonarrow.jpg" height="95" width="207"></a></td>
-</tr>
-</table>
-
-<!-- heading end -->
-
-
-<hr />
-<table border=0 cellpadding=2 width="70%" align="center">
-	<tr>
-		<td>
-		<p>This is the starting page for where you can find the latest <a
-			href="http://wiki.eclipse.org/index.php/WTP_Build_Types">continuous build</a> produced by the <a
-			href="http://www.eclipse.org/webtools/main.html">Eclipse Web Tools
-		Platform (WTP) Project</a>. Please note that each build page details
-		the pre-reqs for that particular build.</p>
-
-		<p>If you got here to this continuous-build site by accident or casual
-		browsing, please be aware that <a
-			href="http://download.eclipse.org/webtools/downloads/" target="_top">
-		declared builds</a> are available!</p>
-		</td>
-	</tr>
-</table>
-
 <?php
-$contents = substr(file_get_contents('dlconfig.txt'),0,-1);
-$contents = str_replace("\n", "", $contents);
-
-#split the content file by & and fill the arrays
-$elements = explode("&",$contents);
-$t = 0;
-$p = 0;
-for ($c = 0; $c < count($elements); $c++) {
-  $tString = "dropType";
-  $pString = "dropPrefix";
-  if (strstr($elements[$c],$tString)) {
-    $temp = preg_split("/=/",$elements[$c]);
-    $dropType[$t] = trim($temp[1]);
-    $t++;
-  }
-  if (strstr($elements[$c],$pString)) {
-    $temp = preg_split("/=/",$elements[$c]);
-    $dropPrefix[$p] = trim($temp[1]);
-    $p++;
-  }
-}
-
-// debug
-// echo "Debug: droptype count: ", count($dropType), "<br />";
-
-for ($i = 0; $i < count($dropType); $i++) {
-  $dt = $dropType[$i];
-  $dt = trim($dt);
-  $typeToPrefix[$dt] = $dropPrefix[$i];
-
-  //   echo "Debug prefix: ", $dropPrefix[$i], "<br />";
-  //   echo "Debug dropType: ", $dropType[$i], "<br />";
-
-}
-
-$buildBranches = array();
-$buildBranches[0]="R3.0";
-$buildBranches[1]="R2.0";
-$buildBranches[2]="R1.5";
-$buildBranches[3]="R1.0";
-$buildBranches[4]="R0.7";
-include 'report.php';
-include 'report2.php';
-
-$latestTimeStamp=array();
-$latestFile = array();
-
-echo "<table border=0 cellpadding=2 width=\"100%\"><tr>";
-echo "<td align=\"center\" bgcolor=\"#0080C0\"><b><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">";
-echo "Latest Downloads (In progress, towards a declared build)";
-echo "</td></font></b>";
-echo "</tr></table>";
-
-
-
-foreach ($buildBranches as $buildBranch ) {
-
-  $aBranchDirectoryName = "drops/".$buildBranch;
-  if (file_exists($aBranchDirectoryName) && is_dir($aBranchDirectoryName)) {
-    $aDirectory = dir($aBranchDirectoryName);
-    $latestTimeStamp[$buildBranch] = array();
-    $latestFile[$buildBranch] = array();
-
-
-    while (false !== ($anEntry = $aDirectory->read())) {
-
-      // Short cut because we know aDirectory only contains other directories.
-      if ($anEntry != "." && $anEntry!="..") {
-        // echo "Debug anEntry: $anEntry<br />" ;
-        $aDropDirectoryName = "drops/".$buildBranch."/".$anEntry;
-
-
-        if (is_dir($aDropDirectoryName) && is_Readable($aDropDirectoryName)) {
-          $aDropDirectory = dir($aDropDirectoryName);
-          //echo "Debug aDropDirectory: $aDropDirectory->path <br />" ;
-
-          $fileCount = 0;
-          while ($aDropEntry = $aDropDirectory->read()) {
-            // echo "Debug aDropEntry: $aDropEntry<br />" ;
-            if ( (stristr($aDropEntry, ".tar.gz")) || (stristr($aDropEntry, ".zip")) )  {
-              // Count the dropfile entry in the directory (so we won't display links, if not all there
-              $fileCount = $fileCount + 1;
-            }
-          }
-
-          $aDropDirectory->close();
-
-        }
-        // Read the count file
-        $countFile = "drops/".$buildBranch."/".$anEntry."/files.count";
-        $indexFile = "drops/".$buildBranch."/".$anEntry."/index.html";
-
-
-        if (!file_exists($indexFile)) {
-          $indexFile = "drops/".$buildBranch."/".$anEntry."/index.php";
-        }
-
-
-        if (file_exists($countFile) && file_exists($indexFile)) {
-          $anArray = file($countFile);
-          // debug
-          //echo "Number according to files.count: ", $anArray[0];
-          //echo "   actual counted files: ", $fileCount;
-
-          // If a match - process the directoryVV -- we simply look that there's more
-          // zip's than we expect, since it frequently breaks where the count is slighly
-          // off, such as when we add, after the fact, an all-in-one zip.
-          if ($anArray[0] <= $fileCount) {
-            // debug
-            //echo "yes, counted equaled expected count<br>";
-
-            $entryParts = explode("-", $anEntry);
-            if (count($entryParts) == 3) {
-              // debug
-              //echo "yes, counted parts was 3<br>";
-              $buildTypePart = $entryParts[0];
-              $buckets[$buildBranch][$buildTypePart][] = $anEntry;
-
-              $timePart = $entryParts[2];
-              $year = substr($timePart, 0, 4);
-              $month = substr($timePart, 4, 2);
-              $day = substr($timePart, 6, 2);
-              $hour = substr($timePart,8,2);
-              $minute = substr($timePart,10,2);
-
-              $newTimePart = "$year-$month-$day $hour:$minute UTC";
-
-              $timeStamp = strtotime($newTimePart);
-
-              $timeStamps[$anEntry] = gmdate("D, j M Y -- H:i  \(\U\T\C\)", $timeStamp);
-
-              // debug
-              //  echo "<br />buildBranch:  $buildBranch <br />";
-              //  echo "<br />parts[0]:  -$buildTypePart- <br />";
-              //  echo "latestTimeStamp[buildBranch]:";
-              //  echo $latestTimeStamp[$buildBranch];
-              //  echo "latestTimeStamp:";
-              //  echo $latestTimeStamp;
-
-              if ((sizeof($latestTimeStamp[$buildBranch]) > 0) &&
-              (isset($latestTimeStamp[$buildBranch][$buildTypePart])))
-              {
-                if ($timeStamp > $latestTimeStamp[$buildBranch][$buildTypePart])
-                {
-                  $latestTimeStamp[$buildBranch][$buildTypePart] = $timeStamp;
-                  $latestFile[$buildBranch][$buildTypePart] = $anEntry;
-                }
-              }
-              else
-              {
-                $latestTimeStamp[$buildBranch][$buildTypePart] = $timeStamp;
-                $latestFile[$buildBranch][$buildTypePart] = $anEntry;
-
-              }
-            }
-
-          }
-        }
-
-      }
-    }
-
-    $aDirectory->close();
-  }}
-
+include '../topAndInit.php';
+include '../latestBuilds.php';
+include '../recentHistory.php';
+include '../bottomAndFooter.php';
 ?>
 
 
-<table width="70%" align="center" cellpadding=2>
-<tr>
-<td width="25%"><b>Build Type</b></td>
-<td width="25%"><b>Build Name</b></td>
-<td width="15%"><b>Stream</b></td>
-<td width="40%"><b>Build Date</b></td>
-</tr>
-
-
-
-<?php
-foreach($dropType as $value) {
-  $prefix=$typeToPrefix[$value];
-
-  foreach($buildBranches as $bValue) {
-
-    if (array_key_exists($prefix, $latestFile[$bValue])) {
-      $fileName = $latestFile[$bValue][$prefix];
-      echo "<tr>";
-      echo "<td width=\"25%\">$value</td>";
-
-
-      $fileNameParts = explode("-", $fileName);
-
-      if (sizeof($fileNameParts) > 1) {
-        // Uncomment the line below if we need click through licenses.
-        // echo "<td><a href=license.php?license=drops/$bValue/$fileName>$parts[1]</a></td>";
-
-        // Comment the line below if we need click through licenses.
-        echo "<td  width=\"25%\"><a href=\"drops/$bValue/$fileName/\">$fileNameParts[1]</a></td>";
-        echo "<td width=\"15%\">$bValue</td>";
-        echo "<td width=\"40%\">$timeStamps[$fileName]</td>";
-        echo "</tr>";
-      }
-    }
-  }
-}
-?>
-
-<table border="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#0080C0">
-&nbsp;
-</td>
-</tr></table>
-
-
-</table>
-
-<table border="0" cellpadding="2" width="100%">
-	<tr>
-		<td align="center" bgcolor="#999999"><font color="#FFFFFF" face="Arial,Helvetica"><b>Recent History</b></font></td>
-	</tr>
-</table>
-
-<?php
-foreach($dropType as $value) {
-  $prefix=$typeToPrefix[$value];
-
-
-  echo "
-                <table width=\"100%\" cellpadding=2>
-                <tr bgcolor=\"#999999\">
-                <td align=left><b><a name=\"$value\"><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">";
-  echo "$value";
-  echo "</font></a></b></td>";
-  echo "</tr>";
-
-  echo "<tr>
-                <td align=left>
-                <table  width=\"100%\" cellpadding=2>
-                <tr>
-                <td width=\"13%\"><b>Build Name</b></td>
-								<td width=\"8%\"><b>Stream</b></td>
-                <td width=\"20%\"><b>Build Date</b></td>
-                <td></td>
-                </tr>";
-
-  foreach($buildBranches as $bValue) {
-    if (array_key_exists($bValue, $buckets) && $buckets[$bValue] != NULL
-    && array_key_exists($prefix, $buckets[$bValue])) {
-      echo "<tr><td colspan=\"11\"/><hr/></tr>";
-      $aBucket = $buckets[$bValue][$prefix];
-      if (isset($aBucket)) {
-        rsort($aBucket);
-
-        $i = 0;
-        $ts = array();
-        $ts2iv = array();
-        foreach($aBucket as $iv) {
-          $ivParts = explode("-", $iv);
-          $ts[$i] = $ivParts[2];
-          $ts2iv[$ts[$i]] = $iv;
-          $i++;
-        }
-
-        rsort($ts);
-        $i = 0;
-        $aBucket = array();
-        foreach($ts as $tsvalue) {
-          $aBucket[$i] = $ts2iv[$tsvalue];
-          $i++;
-        }
-
-        foreach($aBucket as $innerValue) {
-          
-          $innerValueParts = explode("-", $innerValue);
-          echo "<tr>";
-
-          // Uncomment the line below if we need click through licenses.
-          // echo "<td><a href=\"license.php?license=drops/$bValue/$innerValue\">$innerValueParts[1]</a></td>";
-
-          // Comment the line below if we need click through licenses.
-          echo "<td width=\"13%\"><a href=\"drops/$bValue/$innerValue/\">$innerValueParts[1]</a></td>";
-          echo "<td width=\"8%\">$bValue</td>";
-          echo "<td width=\"20%\">$timeStamps[$innerValue]</td>";
-          echo "<td></td>";
-
-          // if compilelogsSummary.xml exists, assume the "new way" (summary in xml file).
-          // else, assume old way
-          //echo "drops/$bValue/$innerValue/compilelogsSummary.xml";
-          if (file_exists("drops/$bValue/$innerValue/compilelogsSummary.xml"))
-          {
-            $filename = "drops/$bValue/$innerValue/compilelogsSummary.xml";
-            $prefix = "code_";
-            $compileSummary = simplexml_load_file($filename);
-            foreach ($compileSummary->summaryItem as $summaryItem) {
-              $name = $summaryItem->name;
-              $value = $summaryItem->value;
-              $code= "\$" . $prefix . $name . " = " . $value . ";";
-              //echo "<br />code: " . $code;
-              eval($code);
-            }
-            //echo "drops/$bValue/$innerValue/testcompilelogsSummary.xml";
-            $filename = "drops/$bValue/$innerValue/testcompilelogsSummary.xml";
-            $prefix = "test_";
-            $compileSummary = simplexml_load_file($filename);
-            foreach ($compileSummary->summaryItem as $summaryItem) {
-              $name = $summaryItem->name;
-              $value = $summaryItem->value;
-              $code= "\$" . $prefix . $name . " = " . $value . ";";
-              //echo "<br />code: " . $code;
-              eval($code);
-            }
-
-            if (file_exists("drops/$bValue/$innerValue/unitTestsSummary.xml")) {
-              $filename = "drops/$bValue/$innerValue/unitTestsSummary.xml";
-              $prefix = "unittest_";
-              $unitTestsSummary = simplexml_load_file($filename);
-              foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-                $name = $summaryItem->name;
-                $value = $summaryItem->value;
-                $code= "\$" . $prefix . $name . " = " . $value . ";";
-                // echo "<br />code: " . $code;
-                eval($code);
-              }
-            }
-            else {
-              unset($unittest_grandTotalErrors, $unittest_grandTotalTests);
-            }
-
-            $totalCommpileErrors = $code_totalErrors + $test_totalErrors;
-            $totalCompileOtherWarnings = $code_totalWarnings;
-            $totalBundles = $code_totalBundles + $test_totalBundles;
-            $totalForbidden = $code_totalforbiddenAccessWarningCount + $test_totalforbiddenAccessWarningCount;
-            $totalDiscouraged = $code_totaldiscouragedAccessWarningCount + $test_totaldiscouragedAccessWarningCount;
-
-            echo "<td width=\"6%\">($totalBundles)</td>";
-            echo "<td width=\"6%\"><img src=\"compile_err.gif\" width=\"16\" height=\"16\"/><font color=red>$totalCommpileErrors</font></td>";
-            echo "<td width=\"6%\"><img src=\"compile_warn.gif\" width=\"16\" height=\"16\"/><font color=orange>$totalCompileOtherWarnings</font></td>";
-            echo "<td width=\"6%\"><img src=\"access_err.gif\" width=\"16\" height=\"16\"/><font color=red>$totalForbidden</font></td>";
-            echo "<td width=\"6%\"><img src=\"access_warn.gif\" width=\"16\" height=\"16\"/><font color=orange>$totalDiscouraged</font></td>";
-
-            if (isset($unittest_grandTotalErrors)) {
-              echo "<td width=\"6%\"><img src=\"junit_err.gif\" width=\"16\" height=\"16\"/><font color=red>$unittest_grandTotalErrors</font></td>";
-              echo "<td width=\"6%\">($unittest_grandTotalTests)</td>";
-            }
-            else {
-              echo "<td width=\"6%\"><img src=\"pending.gif\" width=\"16\" height=\"16\"/></td>";
-              echo "<td width=\"6%\"><img src=\"pending.gif\" width=\"16\" height=\"16\"/></td>";
-            }
-            echo "</tr>";
-          }
-          // if compileResults.php exists, assume the "new way" (testResults and compileResult seperated).
-          // else, assume old way
-          else if (file_exists("drops/$bValue/$innerValue/compileResults.php"))
-          {
-            $testResults = parse2_testResults("drops/$bValue/$innerValue/testResults.php");
-            list ($junitFailures) = $testResults;
-
-            $compileResults = parse2_compileResults("drops/$bValue/$innerValue/compileResults.php");
-            list ($compileErrors, $compileAccessWarnings, $compileOtherWarnings) = $compileResults;
-            $testCompileResults = parse2_compileResults("drops/$bValue/$innerValue/testCompileResults.php");
-            list ($testCompileErrors, $testCompileAccessWarnings, $testCompileOtherWarnings) = $testCompileResults;
-
-            $totalCommpileErrors = $compileErrors + $testCompileErrors;
-            // we'll just use code for warnning summaries, for now
-            $totalAccessWarnings = $compileAccessWarnings;
-            $totalCompileOtherWarnings = $compileOtherWarnings;
-
-            echo "<td width=\"6%\">&nbsp;</td>";
-            echo "<td width=\"6%\"><img src=\"compile_err.gif\" width=\"16\" height=\"16\"/><font color=red>$totalCommpileErrors</font></td>";
-            echo "<td width=\"6%\"><img src=\"compile_warn.gif\" width=\"16\" height=\"16\"/><font color=orange>$totalCompileOtherWarnings</font></td>";
-						if ($junitFailures < 0) {
-									echo "<td width=\"6%\"><img src=\"pending.gif\" width=\"16\" height=\"16\"/><font color=red>&nbsp;</font></td>";
-						}
-						else {
-									echo "<td width=\"6%\"><img src=\"junit_err.gif\" width=\"16\" height=\"16\"/><font color=red>$junitFailures</font></td>";
-						}
-
-            echo "</tr>";
-
-          }
-          else {
-            $testResults = parse_testResult("drops/$bValue/$innerValue/testResults.php");
-            list ($compileErrors, $compileWarnings, $junitFailures) = $testResults;
-
-            echo "<td width=\"6%\">&nbsp;</td>";
-            echo "<td width=\"6%\"><img src=\"compile_err.gif\" width=\"16\" height=\"16\"/><font color=red>$compileErrors</font></td>";
-            echo "<td width=\"6%\"><img src=\"compile_warn.gif\" width=\"16\" height=\"16\"/><font color=orange>$compileWarnings</font></td>";
-           	echo "<td width=\"6%\"><img src=\"junit_err.gif\" width=\"16\" height=\"16\"/><font color=red>$junitFailures</font></td>";
-
-            echo "</tr>";
-          }
-        }
-      }}}
-      echo "</table></table>";
-}
-?>
-
-<table border="0" cellpadding="2" width="100%">
-	<tr>
-		<td bgcolor="#999999">&nbsp;</td>
-	</tr>
-</table>
-
-
-<table border="0" width="100%" cellpadding="2">
-	<tbody>
-		<tr>
-			<td valign="top" width="40%">
-
-
-			<table border="0" cellpadding="2">
-				<tbody>
-					<tr>
-						<td width="100%" bgcolor="#0080c0" valign="top"><b><font
-							face="Arial,Helvetica"><font color="#ffffff">Download Related
-						Links</font> </font></b></td>
-					</tr>
-					<tr>
-						<td valign="top">
-
-
-						<p><a
-							href="http://archive.eclipse.org/webtools/downloads/index.php"
-							target="_top">Archived Builds</a> are previously significant
-						builds that are no longer required, but which we keep on a
-						non-mirrored site, for historical and academic use.</p>
-
-						<p><a href="http://download.eclipse.org/webtools/downloads/"
-							target="_top">Declared builds</a> are available which are for
-						end-users and adopters.</p>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-
-			</td>
-
-			<td />
-			
-			
-			<td width="45%" valign="top">
-			<table border="0" cellpadding="2">
-				<tbody>
-					<tr>
-						<td width="100%" colspan="4" bgcolor="#0080c0" valign="top"><b><font
-							face="Arial,Helvetica"><font color="#ffffff">Metrics Legend</font>
-						</font></b></td>
-					</tr>
-
-					<tr>
-						<td valign="top"><img src="compile_err.gif" width="16" height="16" /></td>
-						<td valign="top" width="50%">compilation errors.</td>
-						<td valign="top"><img src="compile_warn.gif" width="16" height="16" /></td>
-						<td valign="top" width="50%">compilation warnings.</td>
-					</tr>
-					<tr>
-						<td valign="top"><img src="access_err.gif" width="16" height="16" /></td>
-						<td valign="top" width="50%">Access Rule Violations</td>
-						<td valign="top"><img src="access_warn.gif" width="16" height="16" /></td>
-						<td valign="top" width="50%">Access Rule Warnings</td>
-					</tr>
-					<tr>
-						<td valign="top"><img src="junit_err.gif" width="16" height="16" /></td>
-						<td valign="top" width="50%">junit failures.</td>
-						<td valign="top"><img src="pending1.gif" width="16" height="16" /></td>
-						<td valign="top" width="50%">Pending results</td>
-					</tr>
-					<tr>
-						<td valign="top"><img src="api_err.gif" width="16" height="16" /></td>
-						<td valign="top" width="50%">API violations.</td>
-
-						<td valign="top"><img src="api_junit.gif" width="16" height="16" /></td>
-						<td valign="top" width="50%">APIs without junit testcases.</td>
-					</tr>
-					<tr>
-						<td valign="top"><img src="api_removed.gif" width="16" height="16" /></td>
-						<td valign="top" width="50%">removed APIs.</td>
-					</tr>
-					<tr>
-						<td valign="top"><b>(</b>nnn<b>)</b></td>
-						<td valign="top">Number of bundles, jars, and wars, or number of
-						unit tests.</td>
-
-						<td valign="top"><b>NA</b></td>
-						<td valign="top"><b>N</b>ot <b>A</b>vailable</td>
-					</tr>
-				</tbody>
-			</table>
-			</td>
-		</tr>
-	</tbody>
-</table>
-
-<!-- footer -->
-<center>
-<hr />
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	size="-1" face="arial,helvetica,geneva"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-</center>
-<!-- end footer -->
-
 </body>
 </html>
-<?php
-if (isset($old_error_handler) && sizeof($old_error_handler)) {
-  set_error_handler($old_error_handler);
-}
-?>
+
diff --git a/downloadsites/webtools/committers/pagePropertyVariables.php b/downloadsites/webtools/committers/pagePropertyVariables.php
new file mode 100644
index 0000000000000000000000000000000000000000..2e4978deb1607b6f60e49e35761dd675aa1e0b13
--- /dev/null
+++ b/downloadsites/webtools/committers/pagePropertyVariables.php
@@ -0,0 +1,30 @@
+<?php
+
+$pageTitle="Eclipse Web Tools Platform (WTP) Downloads - for Committers and
+Early Testers";
+$indexTop="<font class=indextop>
+Web Tools Platform<br />
+committer downloads</font><br />
+<font class=indexsub>Latest early trial downloads from the Web Tools Platform project</font>";
+
+$pageExplanation="
+    <p>This is the starting page for where you can find the latest <a
+      href=\"http://wiki.eclipse.org/index.php/WTP_Build_Types\">continuous build</a> produced by the <a
+      href=\"http://www.eclipse.org/webtools/main.php\">Eclipse Web Tools
+    Platform (WTP) Project</a>. Please note that each build page details
+    the pre-reqs for that particular build.</p>
+
+    <p>If you got here to this continuous-build site by accident or casual
+    browsing, please be aware that <a
+      href=\"http://download.eclipse.org/webtools/downloads/\" target=\"_top\">
+    declared builds</a> are available!</p>
+
+";
+
+$mainTableHeader="Latest Downloads (In progress, towards a declared build)";
+
+$pageFooterEnd="<p><a href=\"http://download.eclipse.org/webtools/downloads/\"
+              target=\"_top\">Declared builds</a> are available which are for
+            end-users and adopters.</p>"; 
+
+?>
\ No newline at end of file
diff --git a/downloadsites/webtools/committers/drops/promoteToEclipse.properties b/downloadsites/webtools/committers/promoteToEclipse.properties
similarity index 100%
rename from downloadsites/webtools/committers/drops/promoteToEclipse.properties
rename to downloadsites/webtools/committers/promoteToEclipse.properties
diff --git a/downloadsites/webtools/committers/drops/rename.sh b/downloadsites/webtools/committers/rename.sh
similarity index 100%
rename from downloadsites/webtools/committers/drops/rename.sh
rename to downloadsites/webtools/committers/rename.sh
diff --git a/downloadsites/webtools/committers/report.php b/downloadsites/webtools/committers/report.php
deleted file mode 100644
index 1d011d2f0e1a0b1d916cfd190ac47017bc36a743..0000000000000000000000000000000000000000
--- a/downloadsites/webtools/committers/report.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-  function count_pattern($directory, $filenameFilter, $pattern)
-  {
-    $count = 0;
-    $dir = dir($directory);
-    while ($anEntry = $dir->read())
-    {
-      if ($anEntry != "." && $anEntry != "..")
-      {
-        $anEntry = $directory."/".$anEntry;
-        if (is_dir($anEntry))
-        {
-          $count += count_pattern($anEntry, $filenameFilter, $pattern);
-        }
-        else
-        {
-          if (stristr($anEntry, $filenameFilter))
-          {
-
-            $handle = @fopen($anEntry, "r");
-            if (FALSE !== $handle) {
-                    $size = filesize($anEntry);
-                    $content = fread($handle, $size);
-                    fclose($handle);
-                    $count += substr_count($content, $pattern);
-            }
-          }
-        }
-      }
-    }
-    return $count;
-  }
-
-  function parse_testResult($filename)
-  {
-    $junitFailures = 0;
-    $compileErrors = 0;
-    $compileWarnings = 0;
-    if (is_file($filename)) {
-    $handle = @fopen($filename, "r");
-    if ($handle)
-    {
-      $size = filesize($filename);
-      $content = fread($handle, $size);
-      fclose($handle);
-      $junitStart = strpos($content, "Errors &amp; Failures");
-      $junitEnd = strpos($content, "</table>", $junitStart);
-      $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-      $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-      while ($start !== false)
-      {
-        $start += 29;
-        $stop = strpos($junitInfo, "</font></b></td>", $start);
-        if ($stop !== false)
-        {
-          $result = substr($junitInfo, $start, $stop - $start);
-          if (is_numeric($result))
-          {
-            $junitFailures += $result;
-          }
-          else if (strcmp($result, "DNF") == 0)
-          {
-            $junitFailures++;
-          }
-        }
-        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-      }
-      $compileStart = strpos($content, "Compile Logs (Jar Files)");
-      $compileEnd = strpos($content, "</table>", $compileStart);
-      $compileInfo = substr($content, $compileStart, $compileEnd - $compileStart);
-      $rowStart = strpos($compileInfo, "<tr>");
-      while ($rowStart !== false)
-      {
-        $start += 4;
-        $rowStop = strpos($compileInfo, "</tr>", $rowStart);
-        if ($rowStop !== false)
-        {
-          $row = substr($compileInfo, $rowStart, $rowStop - $rowStart);
-          $cellStart = strpos($row, "<td");
-          $gotError = false;
-          $gotWarning = false;
-          while ($cellStart !== false && (!$gotError || !$gotWarning))
-          {
-            // this parsing logic got a bit more complicated in M2_33 basebuild, as the
-            // tag <td align="center"> was used, instead of <td>
-            // $cellStart += 4;
-            $cellStart = strpos($row, ">", $cellStart);
-            $cellStart = $cellStart + 1;
-            $cellStop = strpos($row, "</td>", $cellStart);
-            if ($cellStop !== false)
-            {
-              $cell = substr($row, $cellStart, $cellStop - $cellStart);
-              if (is_numeric($cell))
-              {
-                if (!$gotError)
-                {
-                  $compileErrors += $cell;
-                  $gotError = true;
-                }
-                else if (!$gotWarning)
-                {
-                  $compileWarnings += $cell;
-                  $gotWarning = true;
-                }
-              }
-            }
-            // this parsing logic got a bit more complicated in M2_33 basebuild, as the
-            // tag <td align="center"> was used, instead of <td>
-            $cellStart = strpos($row, "<td", $cellStop);
-          }
-        }
-        $rowStart = strpos($compileInfo, "<tr>", $rowStop);
-      }
-    }
-    }
-    $results = array($compileErrors, $compileWarnings, $junitFailures);
-    return $results;
-  }
-
-  function parse($filename, $key)
-  {
-    if (!is_readable($filename))
-    {
-      return 0;
-    }
-    $value;
-    $handle = @fopen($filename, "r");
-    if (!$handle)
-    {
-      return 0;
-    }
-    $size = filesize($filename);
-    $content = fread($handle, $size);
-    fclose($handle);
-    $start = strpos($content, $key);
-    while ($start !== false)
-    {
-      $start += strlen($key);
-      $stop = strpos($content, "\"", $start);
-      if ($stop !== false)
-      {
-        $value += substr($content, $start, $stop - $start);
-      }
-      $start = strpos($content, $key, $stop);
-    }
-    return $value;
-  }
-?>
diff --git a/downloadsites/webtools/committers/report2.php b/downloadsites/webtools/committers/report2.php
deleted file mode 100644
index bf92db58c62550e70afe319718194f07eca87102..0000000000000000000000000000000000000000
--- a/downloadsites/webtools/committers/report2.php
+++ /dev/null
@@ -1,127 +0,0 @@
-
-        <?php
-
-function parse2_testResults($filename)
-{
-        $junitFailures = -1;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $junitFailures = 0;
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
-}
-
-function parse2_compileResults($filename)
-{
-        $compileErrors = 0;
-        $compileAccessWarnings = 0;
-        $compileOtherWarnings = 0;
-        if (is_file($filename)) {
-                //echo "$filename<br />";
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        //echo "size: $size<br />";
-                        $content = fread($handle, $size);
-                        fclose($handle);
-
-                        //echo "$content";
-                        $compileStart = strpos($content, "<table id=tabledata");
-                        $compileEnd = strpos($content, "</table", $compileStart);
-                        $compileInfo = substr($content, $compileStart, $compileEnd - $compileStart);
-                        //echo "compileInfo: $compileInfo<br />";
-                        $rowStart = strpos($compileInfo, "<tr>");
-                        $rowStart = strpos($compileInfo, "<tr>");
-                        $start = $rowStart+4;
-                        while ($rowStart !== false)
-                        {
-
-                                $start += 4;
-                                $rowStop = strpos($compileInfo, "</tr>", $rowStart);
-                                //if ($rowStop !== false)
-                                //{
-                                        $row = substr($compileInfo, $rowStart, $rowStop - $rowStart);
-                                        //echo "$row";
-                                        //while ($cellStart !== false)
-                                        //{
-                                                // this parsing logic got a bit more complicated in M5_33 basebuild, as the
-                                                // a whole different structure was used.
-                                                // we'll try to quick fix this, but need our own index task
-                                                $cellStart = strpos($row, "#ERROR");
-                                                $cellStart = strpos($row, ">", $cellStart);
-                                                $cellStart = $cellStart + 1;
-                                                $cellStop = strpos($row, "<", $cellStart);
-                                                if ($cellStop !== false)
-                                                {
-                                                        $cell = substr($row, $cellStart, $cellStop - $cellStart);
-                                                        if (is_numeric($cell))
-                                                        {
-                                                                        $compileErrors += $cell;
-                                                        }
-                                                        $cellStart = strpos($row, "#ACCESSRULES_WARNINGS");
-                                                        $cellStart = strpos($row, ">", $cellStart);
-                                                        $cellStart = $cellStart + 1;
-                                                        $cellStop = strpos($row, "<", $cellStart);
-                                                        $cell = substr($row, $cellStart, $cellStop - $cellStart);
-                                                        if (is_numeric($cell))
-                                                        {
-                                                                        $compileAccessWarnings += $cell;
-                                                        }
-                                                        $cellStart = strpos($row, "#OTHER_WARNINGS");
-                                                        $cellStart = strpos($row, ">", $cellStart);
-                                                        $cellStart = $cellStart + 1;
-                                                        $cellStop = strpos($row, "<", $cellStart);
-                                                        $cell = substr($row, $cellStart, $cellStop - $cellStart);
-                                                        if (is_numeric($cell))
-                                                        {
-                                                                        $compileOtherWarnings += $cell;
-                                                        }
-                                                }
-                                                // look for next row.
-                                                //$cellStart = strpos($row, "<tr", $cellStop);
-                                        //}
-                                //}
-                                $rowStart = strpos($compileInfo, "<tr>", $rowStop);
-                        }
-                }
-        }
-
-        $results = array($compileErrors, $compileAccessWarnings, $compileOtherWarnings);
-        return $results;
-}
-
-
-
-?>
-
-
diff --git a/downloadsites/webtools/compileLogSumaryXML.php b/downloadsites/webtools/compileLogSumaryXML.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ddee00aab27ffaa898dad6c209895c251403498
--- /dev/null
+++ b/downloadsites/webtools/compileLogSumaryXML.php
@@ -0,0 +1,64 @@
+
+<?php
+
+$filename = "drops/$bValue/$innerValue/compilelogsSummary.xml";
+$prefixForVariable = "code_";
+$compileSummary = simplexml_load_file($filename);
+foreach ($compileSummary->summaryItem as $summaryItem) {
+    $name = $summaryItem->name;
+    $value = $summaryItem->value;
+    $code= "\$" . $prefixForVariable . $name . " = " . $value . ";";
+    //echo "<br />code: " . $code;
+    eval($code);
+}
+
+$filename = "drops/$bValue/$innerValue/testcompilelogsSummary.xml";
+$prefixForVariable = "test_";
+$compileSummary = simplexml_load_file($filename);
+foreach ($compileSummary->summaryItem as $summaryItem) {
+    $name = $summaryItem->name;
+    $value = $summaryItem->value;
+    $code= "\$" . $prefixForVariable . $name . " = " . $value . ";";
+    //echo "<br />code: " . $code;
+    eval($code);
+}
+
+if (file_exists("drops/$bValue/$innerValue/unitTestsSummary.xml")) {
+    $filename = "drops/$bValue/$innerValue/unitTestsSummary.xml";
+    $prefixForVariable = "unittest_";
+    $unitTestsSummary = simplexml_load_file($filename);
+    foreach ($unitTestsSummary->summaryItem as $summaryItem) {
+        $name = $summaryItem->name;
+        $value = $summaryItem->value;
+        $code= "\$" . $prefixForVariable . $name . " = " . $value . ";";
+        // echo "<br />code: " . $code;
+        eval($code);
+    }
+}
+else {
+    unset($unittest_grandTotalErrors, $unittest_grandTotalTests);
+}
+
+$totalCommpileErrors = $code_totalErrors + $test_totalErrors;
+$totalCompileOtherWarnings = $code_totalWarnings;
+$totalBundles = $code_totalBundles + $test_totalBundles;
+$totalForbidden = $code_totalforbiddenAccessWarningCount + $test_totalforbiddenAccessWarningCount;
+$totalDiscouraged = $code_totaldiscouragedAccessWarningCount + $test_totaldiscouragedAccessWarningCount;
+
+echo "<td width=\"6%\">($totalBundles)</td>";
+echo "<td width=\"6%\"><img src=\"../compile_err.gif\" width=\"16\" height=\"16\"/><font color=red>$totalCommpileErrors</font></td>";
+echo "<td width=\"6%\"><img src=\"../compile_warn.gif\" width=\"16\" height=\"16\"/><font color=orange>$totalCompileOtherWarnings</font></td>";
+echo "<td width=\"6%\"><img src=\"../access_err.gif\" width=\"16\" height=\"16\"/><font color=red>$totalForbidden</font></td>";
+echo "<td width=\"6%\"><img src=\"../access_warn.gif\" width=\"16\" height=\"16\"/><font color=orange>$totalDiscouraged</font></td>";
+
+if (isset($unittest_grandTotalErrors)) {
+    echo "<td width=\"6%\"><img src=\"../junit_err.gif\" width=\"16\" height=\"16\"/><font color=red>$unittest_grandTotalErrors</font></td>";
+    echo "<td width=\"6%\">($unittest_grandTotalTests)</td>";
+}
+else {
+    echo "<td width=\"6%\"><img src=\"../pending.gif\" width=\"16\" height=\"16\"/></td>";
+    echo "<td width=\"6%\"><img src=\"../pending.gif\" width=\"16\" height=\"16\"/></td>";
+}
+
+
+?>
\ No newline at end of file
diff --git a/downloadsites/webtools/committers/compile_err.gif b/downloadsites/webtools/compile_err.gif
similarity index 100%
rename from downloadsites/webtools/committers/compile_err.gif
rename to downloadsites/webtools/compile_err.gif
diff --git a/downloadsites/webtools/committers/compile_warn.gif b/downloadsites/webtools/compile_warn.gif
similarity index 100%
rename from downloadsites/webtools/committers/compile_warn.gif
rename to downloadsites/webtools/compile_warn.gif
diff --git a/downloadsites/webtools/downloads/README.txt b/downloadsites/webtools/downloads/README.txt
deleted file mode 100644
index 52acffd5d2d1d39625573cabf5318b91ce92df23..0000000000000000000000000000000000000000
--- a/downloadsites/webtools/downloads/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Most of the files in this directory are 
-maintained in webtools cvs's releng.wtptools
-project, in the downloadsites directory. 
diff --git a/downloadsites/webtools/downloads/access_err.gif b/downloadsites/webtools/downloads/access_err.gif
deleted file mode 100644
index 4f0748abc07d0bfb1843809a7b4cb4ddf6ded917..0000000000000000000000000000000000000000
Binary files a/downloadsites/webtools/downloads/access_err.gif and /dev/null differ
diff --git a/downloadsites/webtools/downloads/access_warn.gif b/downloadsites/webtools/downloads/access_warn.gif
deleted file mode 100644
index 8386e3e02a26c4922cb7ee4f8d978de11617db66..0000000000000000000000000000000000000000
Binary files a/downloadsites/webtools/downloads/access_warn.gif and /dev/null differ
diff --git a/downloadsites/webtools/downloads/api_err.gif b/downloadsites/webtools/downloads/api_err.gif
deleted file mode 100644
index 4054878e8cfa7c6d67fa06b69ee82bd464bd470d..0000000000000000000000000000000000000000
Binary files a/downloadsites/webtools/downloads/api_err.gif and /dev/null differ
diff --git a/downloadsites/webtools/downloads/api_junit.gif b/downloadsites/webtools/downloads/api_junit.gif
deleted file mode 100644
index c3723772e4c7c616f420dd0f82f96c1ba4847d1d..0000000000000000000000000000000000000000
Binary files a/downloadsites/webtools/downloads/api_junit.gif and /dev/null differ
diff --git a/downloadsites/webtools/downloads/api_removed.gif b/downloadsites/webtools/downloads/api_removed.gif
deleted file mode 100644
index 2b1d43822886ca8293c64ca31860f9598a043102..0000000000000000000000000000000000000000
Binary files a/downloadsites/webtools/downloads/api_removed.gif and /dev/null differ
diff --git a/downloadsites/webtools/downloads/compile_err.gif b/downloadsites/webtools/downloads/compile_err.gif
deleted file mode 100644
index c2bfdd606b59240410feb5ce0f1dc8ec7c7f35e3..0000000000000000000000000000000000000000
Binary files a/downloadsites/webtools/downloads/compile_err.gif and /dev/null differ
diff --git a/downloadsites/webtools/downloads/compile_warn.gif b/downloadsites/webtools/downloads/compile_warn.gif
deleted file mode 100644
index cf4fdf93c71b7ab2cb28dfd06fed9c563fa29214..0000000000000000000000000000000000000000
Binary files a/downloadsites/webtools/downloads/compile_warn.gif and /dev/null differ
diff --git a/downloadsites/webtools/downloads/index.php b/downloadsites/webtools/downloads/index.php
index cce3d02f60e3c2fe575d6040d98609353b82e931..bd04bab7027cc30f6af85bafe670b70305d139ea 100644
--- a/downloadsites/webtools/downloads/index.php
+++ b/downloadsites/webtools/downloads/index.php
@@ -1,33 +1,55 @@
-<html>
+<?php
+echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?> \n" ;
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
 <head>
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css">
-<title>Eclipse Web Tools Platform (WTP) Downloads</title>
+<?php
+include 'pagePropertyVariables.php';
+?>
+
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" />
+<link rel="stylesheet" href="../wtpDropStyle.css" />
+<title><?php echo $pageTitle; ?></title>
 </head>
 <body>
 
-<!-- heading start -->
+
 <?php
 
 // tiny banner to remind when looking at "local" machine results
 $serverName = $_SERVER["SERVER_NAME"];
 
 if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-  echo '<center><p>Reminder: this is <font color="#FF0000">', $serverName,'</font>  See also <a href="http://download.eclipse.org/webtools/downloads" target="_top">Live public eclipse site</a>.</center><hr />';
+    echo '<center>
+          <p>
+          Reminder: this is <font color="#FF0000">' . 
+    $serverName .
+    '</font>
+          See also 
+          <a href="http://download.eclipse.org/webtools/downloads" target="_top">
+          the live public Eclipse site
+          </a>.
+          </p>
+          <hr />
+          </center>';
+
 }
 
 if (function_exists("date_default_timezone_set")) {
-  date_default_timezone_set("UTC");
-  //echo "<p>default timezone: ";
-  //echo date_default_timezone_get();
-  //echo "</p>";
+    date_default_timezone_set("UTC");
+    //echo "<p>default timezone: ";
+    //echo date_default_timezone_get();
+    //echo "</p>";
 }
 
 ?>
 
 
 <?php
-//ini_set("display_errors", "true");
-//error_reporting (E_ALL);
+ini_set("display_errors", "true");
+error_reporting (E_ALL);
 ?>
 
 <?php
@@ -36,561 +58,14 @@ $C = strcmp($QString, "test");
 ?>
 
 
-<table border=0 cellpadding=0 width="100%">
-<tr>
-<td width="35%"><font class=indextop> Web Tools Platform<br>
-downloads</font><br>
-<font class=indexsub>Latest downloads from the Web Tools Platform project</font></td>
-<td width="35%" align="right"><a href="http://www.eclipse.org/webtools/main.html"><img border="0"src="wtplogonarrow.jpg" height="95" width="207"></a></td>
-</tr>
-</table>
-
-<!-- heading end -->
-
-
-<hr />
-<table border=0 cellpadding=2 width="70%" align="center">
-	<tr>
-		<td>
-		<p>This is the starting page for where you can find the latest <a
-			href="http://wiki.eclipse.org/index.php/WTP_Build_Types">declared build</a> produced by the <a
-			href="http://www.eclipse.org/webtools/main.html">Eclipse Web Tools
-		Platform (WTP) Project</a>.</p>
-		<p>Please note that each declared-build page details the pre-reqs for
-		that particular build. The WTP 1.0.x builds go with Eclipse 3.1 based
-		pre-reqs, and the WTP 1.5.x builds go with Eclipse 3.2 based pre-reqs.</p>
-
-		<p>As an alternative to downloading zips from the build pages, our
-		released builds can be <a
-			href="http://download.eclipse.org/webtools/updates/">installed via
-		Update Manager</a>, from an existing installation of Eclipse.</p>
-		</td>
-	</tr>
-</table>
-
-
-
-
-<?php
-$contents = substr(file_get_contents('dlconfig.txt'),0,-1);
-$contents = str_replace("\n", "", $contents);
-
-#split the content file by & and fill the arrays
-$elements = explode("&",$contents);
-$t = 0;
-$p = 0;
-for ($c = 0; $c < count($elements); $c++) {
-  $tString = "dropType";
-  $pString = "dropPrefix";
-  if (strstr($elements[$c],$tString)) {
-    $temp = preg_split("/=/",$elements[$c]);
-    $dropType[$t] = trim($temp[1]);
-    $t++;
-  }
-  if (strstr($elements[$c],$pString)) {
-    $temp = preg_split("/=/",$elements[$c]);
-    $dropPrefix[$p] = trim($temp[1]);
-    $p++;
-  }
-}
-
-// debug
-// echo "Debug: droptype count: ", count($dropType), "<br />";
-
-for ($i = 0; $i < count($dropType); $i++) {
-  $dt = $dropType[$i];
-  $dt = trim($dt);
-  $typeToPrefix[$dt] = $dropPrefix[$i];
-
-  //   echo "Debug prefix: ", $dropPrefix[$i], "<br />";
-  //   echo "Debug dropType: ", $dropType[$i], "<br />";
-
-}
-
-$buildBranches = array();
-$buildBranches[0]="R3.0";
-$buildBranches[1]="R2.0";
-$buildBranches[2]="R1.5";
-$buildBranches[3]="R1.0";
-$buildBranches[4]="R0.7";
-include 'report.php';
-include 'report2.php';
-
-$latestTimeStamp=array();
-$latestFile = array();
-
-echo "<table border=0 cellpadding=2 width=\"100%\"><tr>";
-echo "<td align=\"center\" bgcolor=\"#0080C0\"><b><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">";
-echo "Latest Downloads";
-echo "</td></font></b>";
-echo "</tr></table>";
-
-
-
-foreach ($buildBranches as $buildBranch ) {
-
-  $aBranchDirectoryName = "drops/".$buildBranch;
-  if (file_exists($aBranchDirectoryName) && is_dir($aBranchDirectoryName)) {
-    $aDirectory = dir($aBranchDirectoryName);
-    $latestTimeStamp[$buildBranch] = array();
-    $latestFile[$buildBranch] = array();
-
-
-    while (false !== ($anEntry = $aDirectory->read())) {
-
-      // Short cut because we know aDirectory only contains other directories.
-      if ($anEntry != "." && $anEntry!="..") {
-        // echo "Debug anEntry: $anEntry<br />" ;
-        $aDropDirectoryName = "drops/".$buildBranch."/".$anEntry;
-
-
-        if (is_dir($aDropDirectoryName) && is_Readable($aDropDirectoryName)) {
-          $aDropDirectory = dir($aDropDirectoryName);
-          //echo "Debug aDropDirectory: $aDropDirectory->path <br />" ;
-
-          $fileCount = 0;
-          while ($aDropEntry = $aDropDirectory->read()) {
-            // echo "Debug aDropEntry: $aDropEntry<br />" ;
-            if ( (stristr($aDropEntry, ".tar.gz")) || (stristr($aDropEntry, ".zip")) )  {
-              // Count the dropfile entry in the directory (so we won't display links, if not all there
-              $fileCount = $fileCount + 1;
-            }
-          }
-
-          $aDropDirectory->close();
-
-        }
-        // Read the count file
-        $countFile = "drops/".$buildBranch."/".$anEntry."/files.count";
-        $indexFile = "drops/".$buildBranch."/".$anEntry."/index.html";
-
-
-        if (!file_exists($indexFile)) {
-          $indexFile = "drops/".$buildBranch."/".$anEntry."/index.php";
-        }
-
-
-        if (file_exists($countFile) && file_exists($indexFile)) {
-          $anArray = file($countFile);
-          // debug
-          //echo "Number according to files.count: ", $anArray[0];
-          //echo "   actual counted files: ", $fileCount;
-
-          // If a match - process the directoryVV -- we simply look that there's more
-          // zip's than we expect, since it frequently breaks where the count is slighly
-          // off, such as when we add, after the fact, an all-in-one zip.
-          if ($anArray[0] <= $fileCount) {
-            // debug
-            //echo "yes, counted equaled expected count<br>";
-
-            $entryParts = explode("-", $anEntry);
-            if (count($entryParts) == 3) {
-              // debug
-              //echo "yes, counted parts was 3<br>";
-              $buildTypePart = $entryParts[0];
-              $buckets[$buildBranch][$buildTypePart][] = $anEntry;
-
-              $timePart = $entryParts[2];
-              $year = substr($timePart, 0, 4);
-              $month = substr($timePart, 4, 2);
-              $day = substr($timePart, 6, 2);
-              $hour = substr($timePart,8,2);
-              $minute = substr($timePart,10,2);
-
-              $newTimePart = "$year-$month-$day $hour:$minute UTC";
-
-              $timeStamp = strtotime($newTimePart);
-
-              $timeStamps[$anEntry] = gmdate("D, j M Y -- H:i  \(\U\T\C\)", $timeStamp);
-
-              // debug
-              //  echo "<br />buildBranch:  $buildBranch <br />";
-              //  echo "<br />parts[0]:  -$buildTypePart- <br />";
-              //  echo "latestTimeStamp[buildBranch]:";
-              //  echo $latestTimeStamp[$buildBranch];
-              //  echo "latestTimeStamp:";
-              //  echo $latestTimeStamp;
-
-              if ((sizeof($latestTimeStamp[$buildBranch]) > 0) &&
-              (isset($latestTimeStamp[$buildBranch][$buildTypePart])))
-              {
-                if ($timeStamp > $latestTimeStamp[$buildBranch][$buildTypePart])
-                {
-                  $latestTimeStamp[$buildBranch][$buildTypePart] = $timeStamp;
-                  $latestFile[$buildBranch][$buildTypePart] = $anEntry;
-                }
-              }
-              else
-              {
-                $latestTimeStamp[$buildBranch][$buildTypePart] = $timeStamp;
-                $latestFile[$buildBranch][$buildTypePart] = $anEntry;
-
-              }
-            }
-
-          }
-        }
-
-      }
-    }
-
-    $aDirectory->close();
-  }}
-
-?>
-
-
-<table width="70%" align="center" cellpadding=2>
-<tr>
-<td width="25%"><b>Build Type</b></td>
-<td width="25%"><b>Build Name</b></td>
-<td width="15%"><b>Stream</b></td>
-<td width="40%"><b>Build Date</b></td>
-</tr>
-
-
-
-<?php
-foreach($dropType as $value) {
-  $prefix=$typeToPrefix[$value];
-
-  foreach($buildBranches as $bValue) {
-
-    if (array_key_exists($prefix, $latestFile[$bValue])) {
-      $fileName = $latestFile[$bValue][$prefix];
-      echo "<tr>";
-      echo "<td width=\"25%\">$value</td>";
-
-
-      $fileNameParts = explode("-", $fileName);
-
-      if (sizeof($fileNameParts) > 1) {
-        // Uncomment the line below if we need click through licenses.
-        // echo "<td><a href=license.php?license=drops/$bValue/$fileName>$parts[1]</a></td>";
-
-        // Comment the line below if we need click through licenses.
-        echo "<td  width=\"25%\"><a href=\"drops/$bValue/$fileName/\">$fileNameParts[1]</a></td>";
-        echo "<td width=\"15%\">$bValue</td>";
-        echo "<td width=\"40%\">$timeStamps[$fileName]</td>";
-        echo "</tr>";
-      }
-    }
-  }
-}
-?>
-
-<table border="0" cellpadding="2" width="100%">
-<tr>
-<td bgcolor="#0080C0">
-&nbsp;
-</td>
-</tr></table>
-
-
-</table>
-
-<table border="0" cellpadding="2" width="100%">
-	<tr>
-		<td align="center" bgcolor="#999999"><font color="#FFFFFF" face="Arial,Helvetica"><b>Recent History</b></font></td>
-	</tr>
-</table>
-
-
 <?php
-foreach($dropType as $value) {
-  $prefix=$typeToPrefix[$value];
-
-
-  echo "
-                <table width=\"100%\" cellpadding=2>
-                <tr bgcolor=\"#999999\">
-                <td align=left><b><a name=\"$value\"><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">";
-  echo "$value";
-  echo "</font></a></b></td>";
-  echo "</tr>";
-
-  echo "<tr>
-                <td align=left>
-                <table  width=\"100%\" cellpadding=2>
-                <tr>
-                <td width=\"13%\"><b>Build Name</b></td>
-								<td width=\"8%\"><b>Stream</b></td>
-                <td width=\"20%\"><b>Build Date</b></td>
-                <td></td>
-                </tr>";
-
-  foreach($buildBranches as $bValue) {
-    if (array_key_exists($bValue, $buckets) && $buckets[$bValue] != NULL
-    && array_key_exists($prefix, $buckets[$bValue])) {
-      echo "<tr><td colspan=\"11\"/><hr/></tr>";
-      $aBucket = $buckets[$bValue][$prefix];
-      if (isset($aBucket)) {
-        rsort($aBucket);
-
-        $i = 0;
-        $ts = array();
-        $ts2iv = array();
-        foreach($aBucket as $iv) {
-          $ivParts = explode("-", $iv);
-          $ts[$i] = $ivParts[2];
-          $ts2iv[$ts[$i]] = $iv;
-          $i++;
-        }
-
-        rsort($ts);
-        $i = 0;
-        $aBucket = array();
-        foreach($ts as $tsvalue) {
-          $aBucket[$i] = $ts2iv[$tsvalue];
-          $i++;
-        }
-
-        foreach($aBucket as $innerValue) {
-          
-          $innerValueParts = explode("-", $innerValue);
-          echo "<tr>";
-
-          // Uncomment the line below if we need click through licenses.
-          // echo "<td><a href=\"license.php?license=drops/$bValue/$innerValue\">$innerValueParts[1]</a></td>";
-
-          // Comment the line below if we need click through licenses.
-          echo "<td width=\"13%\"><a href=\"drops/$bValue/$innerValue/\">$innerValueParts[1]</a></td>";
-          echo "<td width=\"8%\">$bValue</td>";
-          echo "<td width=\"20%\">$timeStamps[$innerValue]</td>";
-          echo "<td></td>";
-
-          // if compilelogsSummary.xml exists, assume the "new way" (summary in xml file).
-          // else, assume old way
-          //echo "drops/$bValue/$innerValue/compilelogsSummary.xml";
-          if (file_exists("drops/$bValue/$innerValue/compilelogsSummary.xml"))
-          {
-            $filename = "drops/$bValue/$innerValue/compilelogsSummary.xml";
-            $prefix = "code_";
-            $compileSummary = simplexml_load_file($filename);
-            foreach ($compileSummary->summaryItem as $summaryItem) {
-              $name = $summaryItem->name;
-              $value = $summaryItem->value;
-              $code= "\$" . $prefix . $name . " = " . $value . ";";
-              //echo "<br />code: " . $code;
-              eval($code);
-            }
-            //echo "drops/$bValue/$innerValue/testcompilelogsSummary.xml";
-            $filename = "drops/$bValue/$innerValue/testcompilelogsSummary.xml";
-            $prefix = "test_";
-            $compileSummary = simplexml_load_file($filename);
-            foreach ($compileSummary->summaryItem as $summaryItem) {
-              $name = $summaryItem->name;
-              $value = $summaryItem->value;
-              $code= "\$" . $prefix . $name . " = " . $value . ";";
-              //echo "<br />code: " . $code;
-              eval($code);
-            }
-
-            if (file_exists("drops/$bValue/$innerValue/unitTestsSummary.xml")) {
-              $filename = "drops/$bValue/$innerValue/unitTestsSummary.xml";
-              $prefix = "unittest_";
-              $unitTestsSummary = simplexml_load_file($filename);
-              foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-                $name = $summaryItem->name;
-                $value = $summaryItem->value;
-                $code= "\$" . $prefix . $name . " = " . $value . ";";
-                // echo "<br />code: " . $code;
-                eval($code);
-              }
-            }
-            else {
-              unset($unittest_grandTotalErrors, $unittest_grandTotalTests);
-            }
-
-            $totalCommpileErrors = $code_totalErrors + $test_totalErrors;
-            $totalCompileOtherWarnings = $code_totalWarnings;
-            $totalBundles = $code_totalBundles + $test_totalBundles;
-            $totalForbidden = $code_totalforbiddenAccessWarningCount + $test_totalforbiddenAccessWarningCount;
-            $totalDiscouraged = $code_totaldiscouragedAccessWarningCount + $test_totaldiscouragedAccessWarningCount;
-
-            echo "<td width=\"6%\">($totalBundles)</td>";
-            echo "<td width=\"6%\"><img src=\"compile_err.gif\" width=\"16\" height=\"16\"/><font color=red>$totalCommpileErrors</font></td>";
-            echo "<td width=\"6%\"><img src=\"compile_warn.gif\" width=\"16\" height=\"16\"/><font color=orange>$totalCompileOtherWarnings</font></td>";
-            echo "<td width=\"6%\"><img src=\"access_err.gif\" width=\"16\" height=\"16\"/><font color=red>$totalForbidden</font></td>";
-            echo "<td width=\"6%\"><img src=\"access_warn.gif\" width=\"16\" height=\"16\"/><font color=orange>$totalDiscouraged</font></td>";
-
-            if (isset($unittest_grandTotalErrors)) {
-              echo "<td width=\"6%\"><img src=\"junit_err.gif\" width=\"16\" height=\"16\"/><font color=red>$unittest_grandTotalErrors</font></td>";
-              echo "<td width=\"6%\">($unittest_grandTotalTests)</td>";
-            }
-            else {
-              echo "<td width=\"6%\"><img src=\"pending.gif\" width=\"16\" height=\"16\"/></td>";
-              echo "<td width=\"6%\"><img src=\"pending.gif\" width=\"16\" height=\"16\"/></td>";
-            }
-            echo "</tr>";
-          }
-          // if compileResults.php exists, assume the "new way" (testResults and compileResult seperated).
-          // else, assume old way
-          else if (file_exists("drops/$bValue/$innerValue/compileResults.php"))
-          {
-            $testResults = parse2_testResults("drops/$bValue/$innerValue/testResults.php");
-            list ($junitFailures) = $testResults;
-
-            $compileResults = parse2_compileResults("drops/$bValue/$innerValue/compileResults.php");
-            list ($compileErrors, $compileAccessWarnings, $compileOtherWarnings) = $compileResults;
-            $testCompileResults = parse2_compileResults("drops/$bValue/$innerValue/testCompileResults.php");
-            list ($testCompileErrors, $testCompileAccessWarnings, $testCompileOtherWarnings) = $testCompileResults;
-
-            $totalCommpileErrors = $compileErrors + $testCompileErrors;
-            // we'll just use code for warnning summaries, for now
-            $totalAccessWarnings = $compileAccessWarnings;
-            $totalCompileOtherWarnings = $compileOtherWarnings;
-             
-            echo "<td width=\"6%\">&nbsp;</td>";
-            echo "<td width=\"6%\"><img src=\"compile_err.gif\" width=\"16\" height=\"16\"/><font color=red>$totalCommpileErrors</font></td>";
-            echo "<td width=\"6%\"><img src=\"compile_warn.gif\" width=\"16\" height=\"16\"/><font color=orange>$totalCompileOtherWarnings</font></td>";
-
-            if ($junitFailures < 0) {
-            	echo "<td width=\"6%\"><img src=\"pending.gif\" width=\"16\" height=\"16\"/><font color=red>&nbsp;</font></td>";
-            }
-            else {
-            	echo "<td width=\"6%\"><img src=\"junit_err.gif\" width=\"16\" height=\"16\"/><font color=red>$junitFailures</font></td>";
-            }
-
-            echo "</tr>";
-
-          }
-          else {
-            $testResults = parse_testResult("drops/$bValue/$innerValue/testResults.php");
-            list ($compileErrors, $compileWarnings, $junitFailures) = $testResults;
-
-            echo "<td width=\"6%\">&nbsp;</td>";
-            echo "<td width=\"6%\"><img src=\"compile_err.gif\" width=\"16\" height=\"16\"/><font color=red>$compileErrors</font></td>";
-            echo "<td width=\"6%\"><img src=\"compile_warn.gif\" width=\"16\" height=\"16\"/><font color=orange>$compileWarnings</font></td>";
-           	echo "<td width=\"6%\"><img src=\"junit_err.gif\" width=\"16\" height=\"16\"/><font color=red>$junitFailures</font></td>";
-
-            echo "</tr>";
-          }
-        }
-      }}}
-      echo "</table></table>";
-}
+include '../topAndInit.php';
+include '../latestBuilds.php';
+include '../recentHistory.php';
+include '../bottomAndFooter.php';
 ?>
 
-<table border="0" cellpadding="2" width="100%">
-	<tr>
-		<td bgcolor="#999999">&nbsp;</td>
-	</tr>
-</table>
-
-
-<table border="0" width="100%" cellpadding="2">
-	<tbody>
-		<tr>
-			<td valign="top" width="40%">
-			
-			
-			<table border="0" cellpadding="2">
-				<tbody>
-					<tr>
-						<td width="100%" bgcolor="#0080c0" valign="top"><b><font
-							face="Arial,Helvetica"><font color="#ffffff">Download Related
-						Links</font> </font></b></td>
-					</tr>
-					<tr>
-						<td valign="top">
-
-
-						<p><a
-							href="http://archive.eclipse.org/webtools/downloads/index.php"
-							target="_top">Archived Builds</a> are previously significant
-						builds that are no longer required, but which we keep on a
-						non-mirrored site, for historical and academic use.</p>
-
-						<p><a href="http://download.eclipse.org/webtools/committers/"
-							target="_top">Continuous builds</a> are also available which are for
-						committers and early testers.</p>	
-						</td>
-					</tr>
-				</tbody>
-			</table>
-			</td>
-			
-			<td />
-			
-			<td width="45%" valign="top">
-			<table border="0" cellpadding="2">
-				<tbody>
-					<tr>
-						<td width="100%" colspan="4" bgcolor="#0080c0" valign="top"><b><font
-							face="Arial,Helvetica"><font color="#ffffff">Metrics Legend</font>
-						</font></b></td>
-					</tr>
-
-
-
-
-					<tr>
-							<td valign="top"><img src="compile_err.gif" width="16" height="16"  /></td>
-							<td valign="top" width="50%">compilation errors.</td>
-							<td valign="top"><img src="compile_warn.gif" width="16" height="16" /></td>
-							<td valign="top" width="50%">compilation warnings.</td>
-					</tr>
-					<tr>
-							<td valign="top"><img src="access_err.gif"  width="16" height="16"  /></td>
-							<td valign="top" width="50%">Access Rule Violations</td>
-							<td valign="top"><img src="access_warn.gif" width="16" height="16"  /></td>
-							<td valign="top" width="50%">Access Rule Warnings</td>
-					</tr>
-					<tr>
-							<td valign="top"><img src="junit_err.gif"  width="16" height="16" /></td>
-							<td valign="top" width="50%">junit failures.</td>
-						<td valign="top"><img src="pending1.gif" width="16" height="16" /></td>
-							<td valign="top" width="50%">Pending results</td>
-					</tr>
-					<tr>
-						  <td valign="top"><img src="api_err.gif"  width="16" height="16" /></td>
-							<td valign="top" width="50%">API violations.</td>
-							
-							<td valign="top"><img src="api_junit.gif"  width="16" height="16" /></td>
-							<td valign="top" width="50%">APIs without junit testcases.</td>
-						</tr>
-						<tr>						
-							<td valign="top"><img src="api_removed.gif"  width="16" height="16" /></td>
-							<td valign="top" width="50%">removed APIs.</td>
-					</tr>
-					<tr>
-						<td valign="top"><b>(</b>nnn<b>)</b></td>
-						<td valign="top">Number of bundles, jars, and wars, or number of
-						unit tests.</td>
-						<td valign="top"><b>NA</b></td>
-						<td valign="top"><b>N</b>ot <b>A</b>vailable</td>
-					</tr>
-
-
-
-
-				</tbody>
-			</table>
-			</td>
-		</tr>
-	</tbody>
-</table>
-
-
-<!-- footer -->
-<center>
-<hr />
-<p>All downloads are provided under the terms and conditions of the <a
-	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
-User Agreement</a> unless otherwise specified.</p>
-
-<p>If you have problems downloading the drops, contact the <font
-	size="-1" face="arial,helvetica,geneva"><a
-	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
-</center>
-<!-- end footer -->
-
 
 </body>
 </html>
-<?php
-if (isset($old_error_handler) && sizeof($old_error_handler)) {
-  set_error_handler($old_error_handler);
-}
-?>
+
diff --git a/downloadsites/webtools/downloads/junit_err.gif b/downloadsites/webtools/downloads/junit_err.gif
deleted file mode 100644
index 1b7ff9de097c6edf4a1f8bea018859942d04bb65..0000000000000000000000000000000000000000
Binary files a/downloadsites/webtools/downloads/junit_err.gif and /dev/null differ
diff --git a/downloadsites/webtools/downloads/pagePropertyVariables.php b/downloadsites/webtools/downloads/pagePropertyVariables.php
new file mode 100644
index 0000000000000000000000000000000000000000..d099d742352948e45a0a22b811df1f0b14c9e9ea
--- /dev/null
+++ b/downloadsites/webtools/downloads/pagePropertyVariables.php
@@ -0,0 +1,30 @@
+<?php
+
+$pageTitle="Eclipse Web Tools Platform (WTP) Downloads";
+$indexTop="<font class=indextop>
+ Web Tools Platform<br />
+downloads</font><br />
+<font class=indexsub>Latest downloads from the Web Tools Platform project</font>";
+
+$pageExplanation="
+    <p>This is the starting page for where you can find the latest <a
+      href=\"http://wiki.eclipse.org/index.php/WTP_Build_Types\">declared build</a> produced by the <a
+      href=\"http://www.eclipse.org/webtools/main.php\">Eclipse Web Tools
+    Platform (WTP) Project</a>.</p>
+    <p>Please note that each declared-build page details the pre-reqs for
+    that particular build. The WTP 1.0.x builds go with Eclipse 3.1 based
+    pre-reqs, and the WTP 1.5.x builds go with Eclipse 3.2 based pre-reqs.</p>
+
+    <p>As an alternative to downloading zips from the build pages, our
+    released builds can be <a
+      href=\"http://download.eclipse.org/webtools/updates/\">installed via
+    Update Manager</a>, from an existing installation of Eclipse.</p>
+";
+
+$mainTableHeader="Latest Downloads";
+
+$pageFooterEnd="<p><a href=\"http://download.eclipse.org/webtools/committers/\"
+              target=\"_top\">Continuous builds</a> are also available which are for
+            committers and early testers.</p>"; 
+
+?>
\ No newline at end of file
diff --git a/downloadsites/webtools/downloads/pending.gif b/downloadsites/webtools/downloads/pending.gif
deleted file mode 100644
index 66db2a627b7af1993ba6acc7e25ec24f2bf994f5..0000000000000000000000000000000000000000
Binary files a/downloadsites/webtools/downloads/pending.gif and /dev/null differ
diff --git a/downloadsites/webtools/downloads/pending1.gif b/downloadsites/webtools/downloads/pending1.gif
deleted file mode 100644
index 1b2ea6ebcfe9b3acebacfb61f004e105bb6fb502..0000000000000000000000000000000000000000
Binary files a/downloadsites/webtools/downloads/pending1.gif and /dev/null differ
diff --git a/downloadsites/webtools/downloads/wtplogonarrow.jpg b/downloadsites/webtools/downloads/wtplogonarrow.jpg
deleted file mode 100644
index c433588d247c19ea24ca812544ab13149f469f2e..0000000000000000000000000000000000000000
Binary files a/downloadsites/webtools/downloads/wtplogonarrow.jpg and /dev/null differ
diff --git a/downloadsites/webtools/downloads/wtplogosmall.jpg b/downloadsites/webtools/downloads/wtplogosmall.jpg
deleted file mode 100644
index 71bea774e4cd0783f442018822323abe6bab1c69..0000000000000000000000000000000000000000
Binary files a/downloadsites/webtools/downloads/wtplogosmall.jpg and /dev/null differ
diff --git a/downloadsites/webtools/handleSummaryResults.php b/downloadsites/webtools/handleSummaryResults.php
new file mode 100644
index 0000000000000000000000000000000000000000..c6aa7e10e9f79d1337aa516e1cf11c91a08b95f5
--- /dev/null
+++ b/downloadsites/webtools/handleSummaryResults.php
@@ -0,0 +1,18 @@
+<?php
+// if compilelogsSummary.xml exists, assume the "new way" (summary in xml file).
+// else, assume old way
+//echo "drops/$bValue/$innerValue/compilelogsSummary.xml";
+if (file_exists("drops/$bValue/$innerValue/compilelogsSummary.xml"))
+{
+    include 'compileLogSumaryXML.php';
+}
+// if compileResults.php exists, assume the "new way" (testResults and compileResult seperated).
+// else, assume old way
+else if (file_exists("drops/$bValue/$innerValue/compileResults.php"))
+{
+    include 'parse2Handling.php';
+}
+else {
+    include 'parseHandling.php';
+}
+?>
\ No newline at end of file
diff --git a/downloadsites/webtools/index.php b/downloadsites/webtools/index.php
index 37354e5a6f70f7e5a263b80fad685e80411f1567..e5d31604397fc6f9d9dcdcac746b4f3e5e968998 100644
--- a/downloadsites/webtools/index.php
+++ b/downloadsites/webtools/index.php
@@ -1,3 +1,3 @@
 <?php
-        header("location: http://download.eclipse.org/webtools/downloads/");
+        header("location: downloads/");
 ?>
diff --git a/downloadsites/webtools/committers/junit_err.gif b/downloadsites/webtools/junit_err.gif
similarity index 100%
rename from downloadsites/webtools/committers/junit_err.gif
rename to downloadsites/webtools/junit_err.gif
diff --git a/downloadsites/webtools/latestBuilds.php b/downloadsites/webtools/latestBuilds.php
new file mode 100644
index 0000000000000000000000000000000000000000..174f72555514e18fa838e61e898f59bb77b5c629
--- /dev/null
+++ b/downloadsites/webtools/latestBuilds.php
@@ -0,0 +1,168 @@
+<?php
+
+$debugLatest=false;
+
+$latestTimeStamp=array();
+$latestFile = array();
+
+echo "<table border=0 cellpadding=2 width=\"100%\"><tr>";
+echo "<td align=\"center\" bgcolor=\"#0080C0\"><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">";
+echo $mainTableHeader;
+echo "</font></td>";
+echo "</tr></table>";
+
+
+
+foreach ($buildBranches as $buildBranch ) {
+
+    $aBranchDirectoryName = "drops/".$buildBranch;
+    if (file_exists($aBranchDirectoryName) && is_dir($aBranchDirectoryName)) {
+        $aDirectory = dir($aBranchDirectoryName);
+        $latestTimeStamp[$buildBranch] = array();
+        $latestFile[$buildBranch] = array();
+
+
+        while (false !== ($anEntry = $aDirectory->read())) {
+
+            // Short cut because we know aDirectory only contains other directories.
+            if ($anEntry != "." && $anEntry!="..") {
+
+                // echo "Debug anEntry: $anEntry<br />" ;
+                $aDropDirectoryName = "drops/".$buildBranch."/".$anEntry;
+
+
+                if (is_dir($aDropDirectoryName) && is_Readable($aDropDirectoryName)) {
+                    $aDropDirectory = dir($aDropDirectoryName);
+                    //echo "Debug aDropDirectory: $aDropDirectory->path <br />" ;
+
+                    $fileCount = 0;
+                    while ($aDropEntry = $aDropDirectory->read()) {
+                        // echo "Debug aDropEntry: $aDropEntry<br />" ;
+                        if ( (stristr($aDropEntry, ".tar.gz")) || (stristr($aDropEntry, ".zip")) )  {
+                            // Count the dropfile entry in the directory (so we won't display links, if not all there
+                            $fileCount = $fileCount + 1;
+                        }
+                    }
+
+                    $aDropDirectory->close();
+
+                }
+                // Read the count file
+                $countFile = "drops/".$buildBranch."/".$anEntry."/files.count";
+                $indexFile = "drops/".$buildBranch."/".$anEntry."/index.html";
+
+
+                if (!file_exists($indexFile)) {
+                    $indexFile = "drops/".$buildBranch."/".$anEntry."/index.php";
+                }
+
+
+                if (file_exists($countFile) && file_exists($indexFile)) {
+                    $anArray = file($countFile);
+                    // debug
+                    //echo "Number according to files.count: ", $anArray[0];
+                    //echo "   actual counted files: ", $fileCount;
+
+                    // If a match - process the directoryVV -- we simply look that there's more
+                    // zip's than we expect, since it frequently breaks where the count is slighly
+                    // off, such as when we add, after the fact, an all-in-one zip.
+                    if ($anArray[0] <= $fileCount) {
+                        // debug
+                        //echo "yes, counted equaled expected count<br />";
+
+                        $entryParts = explode("-", $anEntry);
+                        if (count($entryParts) == 3) {
+                            // debug
+                            //echo "yes, counted parts was 3<br />";
+                            $buildTypePart = $entryParts[0];
+                            $buckets[$buildBranch][$buildTypePart][] = $anEntry;
+                            if ($debugLatest) {
+                                echo "Found: $buildBranch, $buildTypePart, $anEntry <br />";
+                            }
+
+                            $timePart = $entryParts[2];
+                            $year = substr($timePart, 0, 4);
+                            $month = substr($timePart, 4, 2);
+                            $day = substr($timePart, 6, 2);
+                            $hour = substr($timePart,8,2);
+                            $minute = substr($timePart,10,2);
+
+                            $newTimePart = "$year-$month-$day $hour:$minute UTC";
+
+                            $timeStamp = strtotime($newTimePart);
+
+                            $timeStamps[$anEntry] = gmdate("D, j M Y -- H:i  \(\U\T\C\)", $timeStamp);
+
+                            // debug
+                            //  echo "<br />buildBranch:  $buildBranch <br />";
+                            //  echo "<br />parts[0]:  -$buildTypePart- <br />";
+                            //  echo "latestTimeStamp[buildBranch]:";
+                            //  echo $latestTimeStamp[$buildBranch];
+                            //  echo "latestTimeStamp:";
+                            //  echo $latestTimeStamp;
+
+                            if ((sizeof($latestTimeStamp[$buildBranch]) > 0) &&
+                            (isset($latestTimeStamp[$buildBranch][$buildTypePart])))
+                            {
+                                if ($timeStamp > $latestTimeStamp[$buildBranch][$buildTypePart])
+                                {
+                                    $latestTimeStamp[$buildBranch][$buildTypePart] = $timeStamp;
+                                    $latestFile[$buildBranch][$buildTypePart] = $anEntry;
+                                }
+                            }
+                            else
+                            {
+                                $latestTimeStamp[$buildBranch][$buildTypePart] = $timeStamp;
+                                $latestFile[$buildBranch][$buildTypePart] = $anEntry;
+
+                            }
+                        }
+
+                    }
+                }
+
+            }
+        }
+
+        $aDirectory->close();
+    }}
+
+    ?>
+
+
+<table width="70%" align="center" cellpadding=2>
+	<tr>
+		<td width="25%"><b>Build Type</b></td>
+		<td width="25%"><b>Build Name</b></td>
+		<td width="15%"><b>Stream</b></td>
+		<td width="40%"><b>Build Date</b></td>
+	</tr>
+
+
+
+	<?php
+	foreach($dropType as $value) {
+	    $prefix=$typeToPrefix[$value];
+
+	    foreach($buildBranches as $bValue) {
+
+	        if (array_key_exists ($bValue, $latestFile) && array_key_exists($prefix, $latestFile[$bValue])) {
+	            $fileName = $latestFile[$bValue][$prefix];
+	            echo "<tr>";
+	            echo "<td width=\"25%\">$value</td>";
+
+
+	            $fileNameParts = explode("-", $fileName);
+
+	            if (sizeof($fileNameParts) > 1) {
+	                echo "<td  width=\"25%\"><a href=\"drops/$bValue/$fileName/\">$fileNameParts[1]</a></td>";
+	                echo "<td width=\"15%\">$bValue</td>";
+	                echo "<td width=\"40%\">$timeStamps[$fileName]</td>";
+	                echo "</tr>";
+	            }
+	        }
+	    }
+	}
+	?>
+
+</table>
diff --git a/downloadsites/webtools/parse2Handling.php b/downloadsites/webtools/parse2Handling.php
new file mode 100644
index 0000000000000000000000000000000000000000..ee0c7c29320049ff3f1af800ce6a7c2ca0db9566
--- /dev/null
+++ b/downloadsites/webtools/parse2Handling.php
@@ -0,0 +1,25 @@
+<?php
+$testResults = parse2_testResults("drops/$bValue/$innerValue/testResults.php");
+list ($junitFailures) = $testResults;
+
+$compileResults = parse2_compileResults("drops/$bValue/$innerValue/compileResults.php");
+list ($compileErrors, $compileAccessWarnings, $compileOtherWarnings) = $compileResults;
+$testCompileResults = parse2_compileResults("drops/$bValue/$innerValue/testCompileResults.php");
+list ($testCompileErrors, $testCompileAccessWarnings, $testCompileOtherWarnings) = $testCompileResults;
+
+$totalCommpileErrors = $compileErrors + $testCompileErrors;
+// we'll just use code for warnning summaries, for now
+$totalAccessWarnings = $compileAccessWarnings;
+$totalCompileOtherWarnings = $compileOtherWarnings;
+
+echo "<td width=\"6%\">&nbsp;</td>";
+echo "<td width=\"6%\"><img src=\"../compile_err.gif\" width=\"16\" height=\"16\"/><font color=red>$totalCommpileErrors</font></td>";
+echo "<td width=\"6%\"><img src=\"../compile_warn.gif\" width=\"16\" height=\"16\"/><font color=orange>$totalCompileOtherWarnings</font></td>";
+if ($junitFailures < 0) {
+echo "<td width=\"6%\"><img src=\"../pending.gif\" width=\"16\" height=\"16\"/><font color=red>&nbsp;</font></td>";
+}
+else {
+echo "<td width=\"6%\"><img src=\"../junit_err.gif\" width=\"16\" height=\"16\"/><font color=red>$junitFailures</font></td>";
+}
+
+?>
\ No newline at end of file
diff --git a/downloadsites/webtools/parseHandling.php b/downloadsites/webtools/parseHandling.php
new file mode 100644
index 0000000000000000000000000000000000000000..33d21726b02f0570ed7831e692ea0a465a078ca5
--- /dev/null
+++ b/downloadsites/webtools/parseHandling.php
@@ -0,0 +1,11 @@
+
+<?php
+$testResults = parse_testResult("drops/$bValue/$innerValue/testResults.php");
+list ($compileErrors, $compileWarnings, $junitFailures) = $testResults;
+
+echo "<td width=\"6%\">&nbsp;</td>";
+echo "<td width=\"6%\"><img src=\"../compile_err.gif\" width=\"16\" height=\"16\"/><font color=red>$compileErrors</font></td>";
+echo "<td width=\"6%\"><img src=\"../compile_warn.gif\" width=\"16\" height=\"16\"/><font color=orange>$compileWarnings</font></td>";
+echo "<td width=\"6%\"><img src=\"../junit_err.gif\" width=\"16\" height=\"16\"/><font color=red>$junitFailures</font></td>";
+
+?>
\ No newline at end of file
diff --git a/downloadsites/webtools/committers/pending.gif b/downloadsites/webtools/pending.gif
similarity index 100%
rename from downloadsites/webtools/committers/pending.gif
rename to downloadsites/webtools/pending.gif
diff --git a/downloadsites/webtools/committers/pending1.gif b/downloadsites/webtools/pending1.gif
similarity index 100%
rename from downloadsites/webtools/committers/pending1.gif
rename to downloadsites/webtools/pending1.gif
diff --git a/downloadsites/webtools/recentHistory.php b/downloadsites/webtools/recentHistory.php
new file mode 100644
index 0000000000000000000000000000000000000000..fc7e25c1470fb167e06cb754d748f1b51ef36a0d
--- /dev/null
+++ b/downloadsites/webtools/recentHistory.php
@@ -0,0 +1,120 @@
+<table border="0" cellpadding="2" width="100%">
+	<tr>
+		<td align="center" bgcolor="#999999"><font color="#FFFFFF"
+			face="Arial,Helvetica">Recent History</font></td>
+	</tr>
+</table>
+
+<?php
+
+$debugRecentHistory=false;
+
+foreach($dropType as $value) {
+    $prefix=$typeToPrefix[$value];
+
+    if ($debugRecentHistory) {
+        echo "dropType value: $value <br />";
+        echo "prefix: $prefix <br />";
+    }
+
+    echo "<table width=\"100%\" cellpadding=2>
+            <tr bgcolor=\"#999999\">
+            <td align=left colspan=\"11\">
+            <a name=\"$prefix\">
+            <font color=\"#FFFFFF\" face=\"Arial,Helvetica\">";
+    echo "$value";
+    echo "</font></a></td>";
+    echo "</tr>";
+
+    echo "<tr>
+            <td width=\"13%\">Build Name</td>
+            <td width=\"8%\">Stream</td>
+            <td width=\"20%\">Build Date</td>
+            <td colspan=\"8\">&nbsp;</td>
+          </tr>";
+
+    if ($debugRecentHistory) {
+        echo "buildBranches: <br />";
+        foreach($buildBranches as $tempbuildBranches) {
+            echo "$tempbuildBranches <br />";
+        }
+        echo "buckets: <br />";
+        if (isset($buckets)) {
+            foreach($buckets as $tempbuckets) {
+                foreach($tempbuckets as $tempbucket) {
+                    foreach ($tempbucket as $oneTempBucket) {
+                        echo "onetempBucket: $oneTempBucket <br />";
+                    }
+                }
+            }
+        }
+    }
+
+    foreach($buildBranches as $bValue) {
+        if ($debugRecentHistory) {
+            echo "loop through each buildBranch: $bValue <br />";
+        }
+        if (isset($buckets) && array_key_exists($bValue, $buckets) && array_key_exists($prefix, $buckets[$bValue]))
+        //&& $buckets[$bValue] != NULL && array_key_exists($prefix, $buckets[$bValue]))
+        {
+            echo "<tr><td colspan=\"11\"><hr/></td></tr>";
+            $aBranchBucket = $buckets[$bValue][$prefix];
+            if (isset($aBranchBucket)) {
+                rsort($aBranchBucket);
+                if ($debugRecentHistory) {
+                    echo "buckets in this branch: <br />";
+                    foreach($aBranchBucket as $tempBucket) {
+                        echo "$tempBucket <br />";
+                    }
+                }
+                /*
+                 $i = 0;
+                 $ts = array();
+                 $ts2iv = array();
+                 foreach($aBranchBucket as $iv) {
+                 $ivParts = explode("-", $iv);
+                 $ts[$i] = $ivParts[2];
+                 $ts2iv[$ts[$i]] = $iv;
+                 $i++;
+                 }
+
+                 rsort($ts);
+                 $i = 0;
+                 $anewBucket = array();
+                 foreach($ts as $tsvalue) {
+                 $anewBucket[$i] = $ts2iv[$tsvalue];
+                 $i++;
+                 }
+                 */
+                foreach($aBranchBucket as $innerValue) {
+                    if ($debugRecentHistory) {
+                        echo "innerValue: $innerValue <br />";
+                    }
+                    $innerValueParts = explode("-", $innerValue);
+                    echo "<tr>";
+                    echo "<td width=\"13%\"><a href=\"drops/$bValue/$innerValue/\">$innerValueParts[1]</a></td>";
+                    echo "<td width=\"8%\">$bValue</td>";
+                    echo "<td width=\"20%\">$timeStamps[$innerValue]</td>";
+                    echo "<td>&nbsp;</td>";
+                    // our recent summary results handling requires php 5 (for simple xml file loading)
+                    // so, if not php 5, just don't display any summary results
+                    // This was found to be required, since some mirror our whole site (e.g. IBM) and not all their
+                    // mirrors use PHP 5
+                    if (phpversion() >= 5) {
+                        include 'handleSummaryResults.php';
+                    }
+                    echo "</tr>";
+                }
+            }
+        }
+    }
+    echo "</table>";
+
+}
+?>
+
+<table border="0" cellpadding="2" width="100%">
+	<tr>
+		<td bgcolor="#999999">&nbsp;</td>
+	</tr>
+</table>
diff --git a/downloadsites/webtools/downloads/report.php b/downloadsites/webtools/report.php
similarity index 100%
rename from downloadsites/webtools/downloads/report.php
rename to downloadsites/webtools/report.php
diff --git a/downloadsites/webtools/downloads/report2.php b/downloadsites/webtools/report2.php
similarity index 100%
rename from downloadsites/webtools/downloads/report2.php
rename to downloadsites/webtools/report2.php
diff --git a/downloadsites/webtools/topAndInit.php b/downloadsites/webtools/topAndInit.php
new file mode 100644
index 0000000000000000000000000000000000000000..15f5a033bd8baa897a712854f23ffa9a46d93667
--- /dev/null
+++ b/downloadsites/webtools/topAndInit.php
@@ -0,0 +1,68 @@
+
+
+
+<table border=0 cellpadding=0 width="100%">
+	<tr>
+		<td width="35%"><?php echo $indexTop; ?></td>
+		<td width="35%" align="right"><a
+			href="http://www.eclipse.org/webtools/main.php"><img border="0"
+			src="../wtplogonarrow.jpg" height="95" width="207" /></a></td>
+	</tr>
+</table>
+
+<!-- heading end -->
+
+
+<hr />
+<table border=0 cellpadding=2 width="70%" align="center">
+	<tr>
+		<td><?php echo $pageExplanation; ?></td>
+	</tr>
+</table>
+
+<?php
+$contents = substr(file_get_contents('dlconfig.txt'),0,-1);
+$contents = str_replace("\n", "", $contents);
+
+#split the content file by & and fill the arrays
+$elements = explode("&",$contents);
+$t = 0;
+$p = 0;
+for ($c = 0; $c < count($elements); $c++) {
+    $tString = "dropType";
+    $pString = "dropPrefix";
+    if (strstr($elements[$c],$tString)) {
+        $temp = preg_split("/=/",$elements[$c]);
+        $dropType[$t] = trim($temp[1]);
+        $t++;
+    }
+    if (strstr($elements[$c],$pString)) {
+        $temp = preg_split("/=/",$elements[$c]);
+        $dropPrefix[$p] = trim($temp[1]);
+        $p++;
+    }
+}
+
+// debug
+// echo "Debug: droptype count: ", count($dropType), "<br />";
+
+for ($i = 0; $i < count($dropType); $i++) {
+    $dt = $dropType[$i];
+    $dt = trim($dt);
+    $typeToPrefix[$dt] = $dropPrefix[$i];
+
+    //   echo "Debug prefix: ", $dropPrefix[$i], "<br />";
+    //   echo "Debug dropType: ", $dropType[$i], "<br />";
+
+}
+
+$buildBranches = array();
+$buildBranches[0]="R3.0";
+$buildBranches[1]="R2.0";
+$buildBranches[2]="R1.5";
+$buildBranches[3]="R1.0";
+$buildBranches[4]="R0.7";
+include '../report.php';
+include '../report2.php';
+
+?>
diff --git a/downloadsites/webtools/wtpDropStyle.css b/downloadsites/webtools/wtpDropStyle.css
new file mode 100644
index 0000000000000000000000000000000000000000..556c62bcce5bbb63d02842a7d2e4ba6587c0311e
--- /dev/null
+++ b/downloadsites/webtools/wtpDropStyle.css
@@ -0,0 +1,2 @@
+@CHARSET "ISO-8859-1";
+
diff --git a/downloadsites/webtools/committers/wtplogonarrow.jpg b/downloadsites/webtools/wtplogonarrow.jpg
similarity index 100%
rename from downloadsites/webtools/committers/wtplogonarrow.jpg
rename to downloadsites/webtools/wtplogonarrow.jpg
diff --git a/downloadsites/webtools/committers/wtplogosmall.jpg b/downloadsites/webtools/wtplogosmall.jpg
similarity index 100%
rename from downloadsites/webtools/committers/wtplogosmall.jpg
rename to downloadsites/webtools/wtplogosmall.jpg