cleanup and format
diff --git a/releng.wtpbuilder/.buildpath b/releng.wtpbuilder/.buildpath
index 8bcb4b5..c64c67f 100644
--- a/releng.wtpbuilder/.buildpath
+++ b/releng.wtpbuilder/.buildpath
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <buildpath>
-	<buildpathentry kind="src" path=""/>
-	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
+     <buildpathentry kind="src" path=""/>
+     <buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
 </buildpath>
diff --git a/releng.wtpbuilder/.settings/org.eclipse.php.core.prefs b/releng.wtpbuilder/.settings/org.eclipse.php.core.prefs
index 7f1ff5f..d5b998b 100644
--- a/releng.wtpbuilder/.settings/org.eclipse.php.core.prefs
+++ b/releng.wtpbuilder/.settings/org.eclipse.php.core.prefs
@@ -1,4 +1,7 @@
-#Sun Sep 30 02:13:25 EDT 2007
+#Sat Mar 05 22:26:34 EST 2011
 eclipse.preferences.version=1
+org.eclipse.php.core.phpDoc=false
+org.eclipse.php.core.phpForamtterIndentationSize=4
+org.eclipse.php.core.phpForamtterUseTabs=false
 phpVersion=php5
 use_asp_tags_as_php=false
diff --git a/releng.wtpbuilder/.settings/org.eclipse.php.ui.prefs b/releng.wtpbuilder/.settings/org.eclipse.php.ui.prefs
new file mode 100644
index 0000000..c9a56d5
--- /dev/null
+++ b/releng.wtpbuilder/.settings/org.eclipse.php.ui.prefs
@@ -0,0 +1,3 @@
+#Sat Mar 05 22:26:37 EST 2011
+eclipse.preferences.version=1
+org.eclipse.php.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="php_gettercomment_context" deleted\="false" description\="Comment for getter methods" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="php_settercomment_context" deleted\="false" description\="Comment for setter methods" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${field_type} ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="php_constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * Enter description here ...\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="php_filecomment_context" deleted\="false" description\="Comment for created PHP files" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.filecomment" name\="filecomment">/**\r\n * Enter description here ...\r\n * \r\n */\r\n</template><template autoinsert\="true" context\="php_typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.typecomment" name\="typecomment">/**\r\n * Enter description here ...\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="php_fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * Enter description here ...\r\n * @var ${field_type}\r\n */</template><template autoinsert\="true" context\="php_methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.methodcomment" name\="methodcomment">/**\r\n * Enter description here ...\r\n * ${cursor}${tags}\r\n */</template><template autoinsert\="true" context\="php_overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.overridecomment" name\="overridecomment">/* (non-PHPdoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="php_delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="php_newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="false" context\="php_classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="false" context\="php_interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="php_catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.catchblock" name\="catchblock">// ${TODO} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="php_methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.methodbody" name\="methodbody">// ${TODO} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="php_constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${TODO} Auto-generated constructor stub</template><template autoinsert\="true" context\="php_getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="php_setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="php_new_file_context" deleted\="false" description\="Simple php file" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.author" name\="New simple PHP file">&lt;?php\r\n${cursor}</template><template autoinsert\="true" context\="php_new_file_context" deleted\="false" description\="html 4.01 frameset" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.html.frameset" name\="New PHP file - HTML frameset">&lt;\!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"&gt;\r\n&lt;html&gt;\r\n&lt;head&gt;\r\n&lt;meta http-equiv\="Content-Type" content\="text/html; charset\=${encoding}"&gt;\r\n&lt;title&gt;Insert title here&lt;/title&gt;\r\n&lt;/head&gt;\r\n&lt;frameset&gt;\r\n    &lt;frame&gt;\r\n    &lt;frame&gt;\r\n    &lt;noframes&gt;\r\n    &lt;body&gt;\r\n    &lt;p&gt;This page uses frames. The current browser you are using does not support frames.&lt;/p&gt;\r\n    &lt;?php\r\n${cursor}\r\n\t?&gt;\r\n    &lt;/body&gt;\r\n    &lt;/noframes&gt;\r\n&lt;/frameset&gt;\r\n&lt;/html&gt;</template></templates>
diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index ad7d517..a44eff3 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -23,17 +23,17 @@
 archivesFormat=*,*,*-antZip
 
 logExtension=.xml
-# 	Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
-# 	using the JDT Compiler Adapter to compile.
+#      Asks the compiler for verbose output.  This should be set to true in order for *.bin.log files to be generated when
+#      using the JDT Compiler Adapter to compile.
 javacVerbose=true
-# 	javacFailOnError must be false otherwise the
-# 	build will terminated at the first compile error
+#      javacFailOnError must be false otherwise the
+#      build will terminated at the first compile error
 javacFailOnError=false
 javacDebugInfo=true
 
-# 	Asks the compiler for verbose output.  This should be set
+#      Asks the compiler for verbose output.  This should be set
 #   to true in order for *.bin.log files to be generated when
-# 	using the JDT Compiler Adapter to compile.
+#      using the JDT Compiler Adapter to compile.
 javacVerbose=true
 #############################################################
 
diff --git a/releng.wtpbuilder/build.xml b/releng.wtpbuilder/build.xml
index a933c99..8464635 100644
--- a/releng.wtpbuilder/build.xml
+++ b/releng.wtpbuilder/build.xml
@@ -25,12 +25,12 @@
         level="debug"
         message="keyCfgFile: ${keyCfgFile}"/>
     <property file="${keyCfgFile}"/>
-	
-	<!-- TODO: I don't think this is loaded here. Wrong basedir? -->
+
+     <!-- TODO: I don't think this is loaded here. Wrong basedir? -->
     <property file="${ant.project.name}.properties"/>
-	
-      	
-	<!-- = = = end standard properties pattern = = = -->
+
+
+     <!-- = = = end standard properties pattern = = = -->
     <fail
         unless="build.distribution"
         message="build.distribution must be specified"/>
@@ -89,8 +89,8 @@
             file="${buildDirectory}/${buildLabel}/noTestsProvided.txt"/>
 
     </target>
-	
-	<!-- we dont' use 'upload' any longer ... TODO: remove? -->
+
+     <!-- we dont' use 'upload' any longer ... TODO: remove? -->
     <target
         name="upload"
         depends="init"
@@ -108,8 +108,8 @@
         <dirname
             file="${ant.file}"
             property="wtp.builder.home"/>
-        
-    	
+
+
         <!-- if not set above, assume R3.2.0 -->
         <!-- this happens, for example, when using a "tempTest" branch -->
         <property
@@ -158,7 +158,7 @@
         <available
             file="${wtp.builder.home}/distribution/${build.distribution}.package/build.xml"
             type="file"
-            property="package_distro_target_exists"/>    	
+            property="package_distro_target_exists"/>         
         <!--
             fetch the HEAD stream of all projects if build type
             specified as N
diff --git a/releng.wtpbuilder/buildtemplates/components/template/customTargets.xml b/releng.wtpbuilder/buildtemplates/components/template/customTargets.xml
index b6ebcaa..d92207c 100644
--- a/releng.wtpbuilder/buildtemplates/components/template/customTargets.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template/customTargets.xml
@@ -182,7 +182,7 @@
       Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml b/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml
index d0310e2..6539990 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_sdk/customTargets.xml
@@ -182,7 +182,7 @@
       Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml b/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml
index ab60081..f05006f 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_tests/customTargets.xml
@@ -182,7 +182,7 @@
       Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
index ff75faf..19f1928 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
@@ -284,70 +284,42 @@
     <target name="I">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Integration"/>
     </target>
     <target name="S">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Stable"/>
     </target>
     <target name="N">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Nightly"/>
     </target>
     <target name="M">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Maintenance"/>
     </target>
     <target name="R">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Release"/>
     </target>
     <target name="T">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Test"/>
     </target>
     <target name="P">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Patches"/>
     </target>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/buildNotes.php
index f666887..6237289 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/buildNotes.php
@@ -1,5 +1,7 @@
 <html>
 <head>
+
+
 <?php
 $parts = explode("/", getcwd());
 $parts2 = explode("-", $parts[count($parts) - 1]);
@@ -9,55 +11,60 @@
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 </head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Build Notes</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica"> Build Notes for <?php echo "$buildName"; ?>
+                    </font> </b></td>
+          </tr>
+     </table>
+     <table border="0">
 
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		//print_r($anEntry);
-		//echo "<br />";
 
-		$subject = $anEntry;
-		$pattern = '/^buildnotes_(.*)/i';
-		preg_match($pattern, $subject, $matches);
-		$subject = $matches[1];
-		//print_r($subject);
-		//echo "<br />";
-		$pattern = '/^(.*)\.html$/';
-		preg_match($pattern, $subject, $matches);
-		//print_r($matches);
-		//echo "<br />";
 
-		$component = $matches[1];
+     <?php
+     $hasNotes = false;
+     $aDirectory = dir("buildnotes");
+     while ($anEntry = $aDirectory->read()) {
+         if ($anEntry != "." && $anEntry != "..") {
+             //print_r($anEntry);
+             //echo "<br />";
 
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
+             $subject = $anEntry;
+             $pattern = '/^buildnotes_(.*)/i';
+             preg_match($pattern, $subject, $matches);
+             $subject = $matches[1];
+             //print_r($subject);
+             //echo "<br />";
+             $pattern = '/^(.*)\.html$/';
+             preg_match($pattern, $subject, $matches);
+             //print_r($matches);
+             //echo "<br />";
 
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
+             $component = $matches[1];
 
-</table>
+             $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
+             echo "<tr>";
+             echo "$line";
+             echo "</tr>";
+             $hasNotes = true;
+
+         }
+     }
+     $aDirectory.closedir();
+     if (!$hasNotes) {
+         echo "<br>There are no build notes for this build.";
+     }
+     ?>
+
+     </table>
 </body>
 </html>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/consoleLogs.php
index 2ee3c36..885ca2f 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/consoleLogs.php
@@ -1,5 +1,7 @@
 <html>
 <head>
+
+
 <?php
 $parts = explode("/", getcwd());
 $parts2 = explode("-", $parts[count($parts) - 1]);
@@ -9,86 +11,90 @@
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 <title>Console Logs from Running JUnit Plug-in Tests</title>
 </head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Test Console Output</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica">Console output from running
+                              JUnit plugin tests for <?php echo "$buildName"; ?> </font> </b></td>
+          </tr>
+     </table>
+     <table border="0">
 
 
-sort($entries);
-sort($direntries);
 
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
+     <?php
+     $rootDir = "testResults/consolelogs";
+     $hasNotes = false;
+     $aDirectory = dir($rootDir);
+     $index = 0;
+     $dirindex = 0;
+     while ($anEntry = $aDirectory->read()) {
+         if ($anEntry != "." && $anEntry != "..") {
+             if (is_file("$rootDir/$anEntry")) {
+                 $entries[$index] = $anEntry;
+                 $index++;
+             } else if (is_dir("$rootDir/$anEntry")) {
+                 $direntries[$dirindex] = $anEntry;
+                 $dirindex++;
+             }
+         }
+     }
+     $aDirectory->close();
 
 
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
+     sort($entries);
+     sort($direntries);
 
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
+     for ($i = 0; $i < $dirindex; $i++) {
+         $anEntry = $direntries[$i];
+         $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
+         echo "<tr>";
+         echo "$line";
+         echo "</tr>";
+     }
+     for ($i = 0; $i < $index; $i++) {
+         $anEntry = $entries[$i];
+         $logsize = filesize("testResults/consolelogs/$anEntry");
 
 
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
+         $level = 0;
+         if ($logsize > 20000) {
+             $level = 2;
+         }
+         else if ($logsize > 2000) {
+             $level = 1;
+         }
 
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
+         if ($level == 0) {
+             $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+         }
+         else if ($level == 1) {
+             $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+         } else if ($level == 2) {
+             $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+         }
 
-</table>
+
+         echo "<tr>";
+         echo "$line";
+         echo "</tr>";
+         $hasNotes = true;
+     }
+
+     if (!$hasNotes) {
+         echo "<br>There are no test logs for this build.";
+     }
+     ?>
+
+     </table>
 </body>
 </html>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/logIndex.php
index 721ca00..28da816 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/logIndex.php
@@ -1,10 +1,12 @@
 <html>
 <head>
+
+
 <?php
 
 function endsWith( $str, $sub ) {
 
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+    return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
 }
 
 $parts = explode("/", getcwd());
@@ -15,71 +17,75 @@
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 <title>Console Logs from Running JUnit Plug-in Tests</title>
 </head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Test Console Output</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica">Console output from running
+                              JUnit plugin tests for <?php echo "$buildName"; ?> </font> </b></td>
+          </tr>
+     </table>
+     <table border="0">
 
 
-sort($entries);
 
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
+     <?php
+     $hasNotes = false;
+     $aDirectory = dir(".");
+     $index = 0;
+     while ($anEntry = $aDirectory->read()) {
+         if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+             $entries[$index] = $anEntry;
+             $index++;
+         }
+     }
+     aDirectory.closedir();
 
 
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
+     sort($entries);
 
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
+     for ($i = 0; $i < $index; $i++) {
+         $anEntry = $entries[$i];
+         $logsize = filesize("$anEntry");
 
 
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
+         $level = 0;
+         if ($logsize > 20000) {
+             $level = 2;
+         }
+         else if ($logsize > 2000) {
+             $level = 1;
+         }
 
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
+         if ($level == 0) {
+             $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+         }
+         else if ($level == 1) {
+             $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+         } else if ($level == 2) {
+             $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+         }
 
-</table>
+
+         echo "<tr>";
+         echo "$line";
+         echo "</tr>";
+         $hasNotes = true;
+     }
+
+     if (!$hasNotes) {
+         echo "<br>There are no test logs for this build.";
+     }
+     ?>
+
+     </table>
 </body>
 </html>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/miscUtil.php
index 0c10808..ab2b23c 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/miscUtil.php
@@ -4,245 +4,245 @@
 // handy constant to compute file size in megabytes
 
 function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
+    $onemeg=1024*1024;
+    $zipfilesize=filesize($filename);
+    $zipfilesize=round($zipfilesize/$onemeg, 0);
+    return $zipfilesize;
 }
 
 function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-		$zipfilesize=filesize($filename);
-		if ($zipfilesize > $criteria) {
-			$zipfilesize=round($zipfilesize/$onemeg, 0);
-			$scaleChar = "M";
-		}
-		else {
-			$zipfilesize=round($zipfilesize/$onekilo, 0);
-			$scaleChar = "K";
-		}
-	}
-	else {
-		$zipfilesize = 0;
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
+    $onekilo=1024;
+    $onemeg=$onekilo * $onekilo;
+    $criteria = 10 * $onemeg;
+    $scaleChar = "M";
+    if (file_exists($filename)) {
+        $zipfilesize=filesize($filename);
+        if ($zipfilesize > $criteria) {
+            $zipfilesize=round($zipfilesize/$onemeg, 0);
+            $scaleChar = "M";
+        }
+        else {
+            $zipfilesize=round($zipfilesize/$onekilo, 0);
+            $scaleChar = "K";
+        }
+    }
+    else {
+        $zipfilesize = 0;
+    }
+    $result =  "(" . $zipfilesize . $scaleChar . ")";
+    return $result;
 }
 
 
 function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
+    echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
+    echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
+    echo $zipfilesize;
+    echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
+    echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
+    echo "</td>";
 }
 
 function displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
+    echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
+    echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
+    echo $zipfilesize;
+    echo "</td>";
 }
 
 
 function displayp2repoarchives($zipfilename, $downloadprefix, $fileShortDescription, $label, $description) {
 
-	$filename=$zipfilename.".zip";
-	if (file_exists($filename)) {
-		echo "<tr>";
+    $filename=$zipfilename.".zip";
+    if (file_exists($filename)) {
+        echo "<tr>";
 
-		echo "<td align=\"left\" valign=\"top\" width=\"10%\"><b>".$label."</b></td>";
-		echo "<td align=\"left\" valign=\"top\">";
-		echo "<p>".$description."</p>";
-		echo "</td>";
+        echo "<td align=\"left\" valign=\"top\" width=\"10%\"><b>".$label."</b></td>";
+        echo "<td align=\"left\" valign=\"top\">";
+        echo "<p>".$description."</p>";
+        echo "</td>";
 
-		$zipfilesize=fileSizeForDisplay($filename);
-		 
-		displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+        $zipfilesize=fileSizeForDisplay($filename);
 
-		echo "</tr>";
-	}
+        displayRepoFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+
+        echo "</tr>";
+    }
 
 }
 
 
 function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
 {
-	$result = false;
+    $result = false;
 
-	$allowURLopen = ini_get('allow_url_fopen');
+    $allowURLopen = ini_get('allow_url_fopen');
 
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		}
-	}
-	return $result;
+    if ($allowURLopen && stream_last_modified($url)) {
+        $result = true;
+    }
+    else {
+        // TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
+        // is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
+        $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+        if (file_exists($wholePath)) {
+            $result = true;
+        }
+    }
+    return $result;
 }
 
 function stream_last_modified($url)
 {
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
+    if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
+    {
+        if (!($fp = @fopen($url, 'r')))
+        return NULL;
 
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
+        $meta = stream_get_meta_data($fp);
+        for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
+        {
+            if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
+            {
+                $modtime = substr($meta['wrapper_data'][$j], 15);
+                break;
+            }
+        }
+        fclose($fp);
+    }
+    else
+    {
+        $parts = parse_url($url);
+        $host  = $parts['host'];
+        $path  = $parts['path'];
 
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
+        if (!($fp = @fsockopen($host, 80)))
+        return NULL;
 
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
+        $req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
+        fputs($fp, $req);
 
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
+        while (!feof($fp))
+        {
+            $str = fgets($fp, 4096);
+            if (strstr(strtolower($str), 'last-modified'))
+            {
+                $modtime = substr($str, 15);
+                break;
+            }
+        }
+        fclose($fp);
+    }
+    return isset($modtime) ? strtotime($modtime) : time();
 }
 
 function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
+    global $debugScript;
+    global $debugFunctions;
+    $localuri = $uriToCheck;
 
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
+    $debugMirrorList = false;
+    if ($debugScript) {
+        echo "uriToCheck: " . $localuri . "<br />";
+    }
 
-	$xmlcount = 0;
+    $xmlcount = 0;
 
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
+    /* This method true and accurate method of parsing mirror results
+     * may be expensive, and would
+    * likely cause artificially high counts of "downloads".
+    * Could maybe use if somehow only checked once ever 5 minutes or something.
 
 
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
+    // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
+    $holdLevel = error_reporting(E_ERROR);
+    $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
+    error_reporting($holdLevel);
 
 
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
+    if ($mirrorsxml) {
+    if ($debugFunctions) {
+    echo "root node: " . $mirrorsxml->getName() . "<br />";
+    }
+    if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
+    foreach ($mirrorsxml->children() as $mirror) {
+    if (strcmp($mirror->getName(),"mirror") == 0) {
+    $xmlcount=$xmlcount+1;
+    }
+    if ($debugMirrorList) {
+    print_r($mirror);
+    echo "<br />";
+    }
+    }
+    }
+    if ($debugFunctions) {
+    echo "Mirror count: " . $xmlcount . "<br />";
+    }
+    }
+    */
+    /*
+     * Use simple heuristic based on pattern
+    * in the URI ... if it contains "/downloads/" then assume it's mirrored
+    */
+    if (strpos($uriToCheck, "webtools/downloads/") > 0) {
+        $xmlcount = 1;
+    }
+    return ($xmlcount > 0);
 
 }
 
 // TODO: replace with Phoenix variables
 function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
+    global $debugScript;
+    global $debugFunctions;
+    // getBrowser is expensive, so cache the data
+    static $browser;
+    $platform = "unknown";
 
 
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
+    if(ini_get("browscap")) {
+        if(!isset($browser)){
+            $browser = get_browser(null, true);
+        }
 
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
+        if ($browser) {
+            $rawPlatform = $browser['platform'];
+            if ($debugFunctions) {
+                echo "browser platfrom: " . $rawPlatform . "<br />" ;
+            }
 
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
+            if ($debugFunctions) {
+                $browserKeys = array_keys($browser);
+                foreach ($browserKeys as $key) {
+                    echo $key . ": " . $browser[$key] . "<br />";
+                }
+            }
+        }
+        if (strpos($rawPlatform, "Win") === 0) {
+            $platform="windows";
+        } else if (strpos($rawPlatform, "Linux") === 0) {
+            $platform="linux";
+        } else if (strpos($rawPlatform, "Mac") === 0) {
+            $platform="mac";
+        }
+    }
+    return $platform;
 }
 
 function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
+    // todo: we really only need "if exists" so could make a bit more efficient
+    // I tried "file_exists" but is didn't seem to work on my test server
+    // For these pre-reqs, we assume if they exist, they are mirrored. This is true
+    // 99% of the time.
 
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
+    if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
+        $reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
+    } else {
+        $reflink=$prereqfilename;
+    }
+    return $reflink;
 }
 ?>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/report2.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/report2.php
index cb68e7b..f3e1171 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/report2.php
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/staticDropFiles/report2.php
@@ -3,40 +3,40 @@
 
 function parse_testResults($filename)
 {
-	$junitFailures = 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);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
+    $junitFailures = 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);
+            }
+            $results = array($junitFailures);
+            return $results;
+        }
+    }
 }
 
 
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php
index 459da02..94b59e9 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/index.html.template.php
@@ -2,6 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 
+
+
+
+
 <?php
 
 //ini_set("display_errors", "true");
@@ -177,12 +181,12 @@
 
 $keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/@zipprefix@-sdk-$build.zip";
 if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
+     $mirrorScript=$eclipseMirrorScript;
+     $downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
 }
 
 if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
+     echo "inferred platform: " . getPlatform();
 }
 
 
@@ -193,59 +197,59 @@
 $displayTestSummary=false;
 if (phpversion() >= 5) {
 
-	$code_totalBundles=0;
-	$code_totalErrors=0;
-	$code_totalWarnings=0;
-	$code_totalforbiddenAccessWarningCount=0;
-	$code_totaldiscouragedAccessWarningCount=0;
+     $code_totalBundles=0;
+     $code_totalErrors=0;
+     $code_totalWarnings=0;
+     $code_totalforbiddenAccessWarningCount=0;
+     $code_totaldiscouragedAccessWarningCount=0;
 
-	$test_totalBundles=0;
-	$test_totalErrors=0;
-	$test_totalWarnings=0;
-	$test_totalforbiddenAccessWarningCount=0;
-	$test_totaldiscouragedAccessWarningCount=0;
+     $test_totalBundles=0;
+     $test_totalErrors=0;
+     $test_totalWarnings=0;
+     $test_totalforbiddenAccessWarningCount=0;
+     $test_totaldiscouragedAccessWarningCount=0;
 
 
-	$displayTestSummary=true;
-	// 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);
-		}
-	}
+     $displayTestSummary=true;
+     // 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";
-	if (file_exists($filename)) {
-		$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 = "compilelogsSummary.xml";
+     if (file_exists($filename)) {
+          $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";
-	if (file_exists($filename)) {
-		$prefix = "test_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
+     $filename = "testcompilelogsSummary.xml";
+     if (file_exists($filename)) {
+          $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);
+          }
+     }
 }
 
 
@@ -254,10 +258,10 @@
 
 
 if (isset($incubating) && ($incubating == "true")) {
-	echo '<title>WTP Incubator Downloads</title>';
+     echo '<title>WTP Incubator Downloads</title>';
 }
 else {
-	echo '<title>WTP Downloads</title>';
+     echo '<title>WTP Downloads</title>';
 }
 
 ?>
@@ -267,16 +271,18 @@
 
 <body>
 
+
+
 <?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>
+    echo '<center>
           <p>
           Reminder: this is <font color="#FF0000">' . 
-	$serverName .
+    $serverName .
         '</font>
           See also
           <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
@@ -287,584 +293,626 @@
 }
 ?>
 
+
+
 <?php if ("true" === $incubating) {
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
-	echo "        Build: $build</b></font></td>";
-	echo "		<td align=\"right\" rowspan=\"3\"><a";
-	echo "			href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
-	echo "			src=\"http://www.eclipse.org/images/egg-incubation.png\"";
-	echo "			alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
+    echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
+    echo "     <tr>";
+    echo "          <td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
+    echo "        Build: $build</b></font></td>";
+    echo "          <td align=\"right\" rowspan=\"3\"><a";
+    echo "               href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
+    echo "               src=\"http://www.eclipse.org/images/egg-incubation.png\"";
+    echo "               alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
 
 
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
-	echo "		tools for development that are just getting started, or are";
-	echo "		experimental in some fashion.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
+    echo "     <tr valign=\"top\">";
+    echo "          <td><font size=\"-1\">" . $builddate . "</font></td>";
+    echo "     </tr>";
+    echo "     <tr valign=\"top\">";
+    echo "          <td>";
+    echo "          <p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
+    echo "          tools for development that are just getting started, or are";
+    echo "          experimental in some fashion.</p>";
+    echo "          </td>";
+    echo "     </tr>";
+    echo "</table>";
 
 } else {
 
-	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-	echo "	<tr>";
-	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
-	echo "		Build: " . $build . "</b></font></td>";
+    echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
+    echo "     <tr>";
+    echo "          <td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
+    echo "          Build: " . $build . "</b></font></td>";
 
-	echo "	<tr valign=\"top\">";
-	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
-	echo "	</tr>";
-	echo "	<tr valign=\"top\">";
-	echo "		<td>";
-	echo "		<p>The Eclipse Web Tools Platform Project provides tools for Web";
-	echo "			Development, and is a platform for adopters making add-on tools for";
-	echo "			Web Development.</p>";
-	echo "		</td>";
-	echo "	</tr>";
-	echo "</table>";
+    echo "     <tr valign=\"top\">";
+    echo "          <td><font size=\"-1\">" . $builddate . "</font></td>";
+    echo "     </tr>";
+    echo "     <tr valign=\"top\">";
+    echo "          <td>";
+    echo "          <p>The Eclipse Web Tools Platform Project provides tools for Web";
+    echo "               Development, and is a platform for adopters making add-on tools for";
+    echo "               Web Development.</p>";
+    echo "          </td>";
+    echo "     </tr>";
+    echo "</table>";
 
 } ?>
 
 
-<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">All-in-one
-		Packages</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>For most uses, we recommend web-developers download the
-		"all-in-one" package, <a href="http://www.eclipse.org/downloads/">Eclipse
-		IDE for Java EE Developers</a>, from the main Eclipse download site.</p>
-		</td>
-	</tr>
-</table>
+     <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">All-in-one
+                         Packages</font></td>
+          </tr>
+          <tr>
+               <td>
+                    <p>
+                         For most uses, we recommend web-developers download the
+                         "all-in-one" package, <a href="http://www.eclipse.org/downloads/">Eclipse
+                              IDE for Java EE Developers</a>, from the main Eclipse download
+                         site.
+                    </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">Prerequisites
-		and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to build or run these packages. All are
-		not necessarily required, but instead some subset. Also listed are
-		some frequently needed links for committer-required packages when
-		creating new development environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		<p></p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
+     <!-- ***********  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">Prerequisites
+                         and Handy Extras</font></td>
+          </tr>
+          <tr>
+               <td>
+                    <p>These are the prerequisites to build or run these packages. All
+                         are not necessarily required, but instead some subset. Also listed
+                         are some frequently needed links for committer-required packages
+                         when creating new development environments, or targets to run
+                         against.</p>
+                    <p>
+                         Note that WTP requires Java 5 or higher (and, for some things,
+                         actually requires a JDK rather than only a JRE) even though many
+                         other <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a>
+                         can run with <a
+                              href="http://www.eclipse.org/downloads/moreinfo/jre.php">other JRE
+                              levels</a>.
+                    </p>
+                    <p></p>
+               </td>
+          </tr>
+          <tr>
+               <td>
+                    <table border=0 cellspacing=1 cellpadding=1 width="90%"
+                         align="center">
 
-		<?php
-		if ("true" === $prereq_eclipseplatform) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse Platform</td>";
 
 
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipseplatformfilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipseplatformfilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipseplatformfilemacosx;
-			}
+                         <?php
+                         if ("true" === $prereq_eclipseplatform) {
+                             echo "<tr valign=\"top\">";
+                             echo "<td width=\"10%\"></td>";
+                             echo "<td width=\"40%\">Eclipse Platform</td>";
 
-			echo "<td align=\"right\">";
 
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
+                             //customize page depending on user's browser/platform, if we can detect it
+                             $usersPlatform = getPlatform();
+                             // assume windows by default, since likely most frequent, even for cases where
+                             // platform is "unknown". I've noticed Opera reports 'unknown' :(
+                             $recommendedFile=$eclipseplatformfilewindows;
+                             if (strcmp($usersPlatform,"linux")== 0) {
+                                 $recommendedFile=$eclipseplatformfilelinux;
+                             } else if (strcmp($usersPlatform,"mac") == 0) {
+                                 $recommendedFile=$eclipseplatformfilemacosx;
+                             }
 
+                             echo "<td align=\"right\">";
 
-			echo " </tr>";
-		}
-		?>
+                             echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+                             echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+                             echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
 
-		<?php
-		if ("true" === $prereq_eclipse) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
 
+                             echo " </tr>";
+                         }
+                         ?>
 
-			//customize page depending on user's browser/platform, if we can detect it
-			$usersPlatform = getPlatform();
-			// assume windows by default, since likely most frequent, even for cases where
-			// platform is "unknown". I've noticed Opera reports 'unknown' :(
-			$recommendedFile=$eclipsefilewindows;
-			if (strcmp($usersPlatform,"linux")== 0) {
-				$recommendedFile=$eclipsefilelinux;
-			} else if (strcmp($usersPlatform,"mac") == 0) {
-				$recommendedFile=$eclipsefilemacosx;
-			}
 
-			echo "<td align=\"right\">";
 
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-			echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+                         <?php
+                         if ("true" === $prereq_eclipse) {
+                             echo "<tr valign=\"top\">";
+                             echo "<td width=\"10%\"></td>";
+                             echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
 
 
-			echo " </tr>";
-		}
-		?>
+                             //customize page depending on user's browser/platform, if we can detect it
+                             $usersPlatform = getPlatform();
+                             // assume windows by default, since likely most frequent, even for cases where
+                             // platform is "unknown". I've noticed Opera reports 'unknown' :(
+                             $recommendedFile=$eclipsefilewindows;
+                             if (strcmp($usersPlatform,"linux")== 0) {
+                                 $recommendedFile=$eclipsefilelinux;
+                             } else if (strcmp($usersPlatform,"mac") == 0) {
+                                 $recommendedFile=$eclipsefilemacosx;
+                             }
 
-		<?php
-		if ("true" === $prereq_emf) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
+                             echo "<td align=\"right\">";
 
-			echo $emfName . "&nbsp;" . $emfDescription ;
+                             echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+                             echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
+                             echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
 
-			echo "</td>";
-			echo "<td align=\"right\">";
 
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
+                             echo " </tr>";
+                         }
+                         ?>
 
 
-		<?php
-		if ("true" === $prereq_emfxsd) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
 
-			echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
+                         <?php
+                         if ("true" === $prereq_emf) {
+                             echo "<tr valign=\"top\">";
+                             echo "<td width=\"10%\"></td>";
+                             echo "<td>";
 
-			echo "</td>";
-			echo "<td align=\"right\">";
+                             echo $emfName . "&nbsp;" . $emfDescription ;
 
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-			echo " </tr>";
-		}
-		?>
+                             echo "</td>";
+                             echo "<td align=\"right\">";
 
-		<?php
-		if ("true" === $prereq_emftransaction) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
+                             echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
+                             echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
+                             echo " </tr>";
+                         }
+                         ?>
 
-			echo $emftransactionName  . "&nbsp;" . $emftransactionDescription;
 
-			echo "</td>";
-			echo "<td align=\"right\">";
 
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emftransactionMirrorPrefixuri, $emftransactionURL, $emftransactionFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emftransactionBuildHome . "\">equivalent</a></td>";
 
-			echo " </tr>";
-		}
-		?>
+                         <?php
+                         if ("true" === $prereq_emfxsd) {
+                             echo "<tr valign=\"top\">";
+                             echo "<td width=\"10%\"></td>";
+                             echo "<td>";
 
-		<?php
-		if ("true" === $prereq_emfvalidation) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
+                             echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
 
-			echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
+                             echo "</td>";
+                             echo "<td align=\"right\">";
 
-			echo "</td>";
-			echo "<td align=\"right\">";
+                             echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
+                             echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
+                             echo " </tr>";
+                         }
+                         ?>
 
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
 
-			echo " </tr>";
-		}
-		?>
 
-		<?php
-		if ("true" === $prereq_graphiti) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
+                         <?php
+                         if ("true" === $prereq_emftransaction) {
+                             echo "<tr valign=\"top\">";
+                             echo "<td width=\"10%\"></td>";
+                             echo "<td>";
 
-			echo $graphitiName  . "&nbsp;" . $graphitiDescription;
+                             echo $emftransactionName  . "&nbsp;" . $emftransactionDescription;
 
-			echo "</td>";
-			echo "<td align=\"right\">";
+                             echo "</td>";
+                             echo "<td align=\"right\">";
+
+                             echo getPrereqReferenceOrName($eclipseMirrorScript, $emftransactionMirrorPrefixuri, $emftransactionURL, $emftransactionFile, $eclipseFSpathPrefix);
+                             echo " or <a href=\"" . $emftransactionBuildHome . "\">equivalent</a></td>";
+
+                             echo " </tr>";
+                         }
+                         ?>
+
+
+
+                         <?php
+                         if ("true" === $prereq_emfvalidation) {
+                             echo "<tr valign=\"top\">";
+                             echo "<td width=\"10%\"></td>";
+                             echo "<td>";
+
+                             echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
+
+                             echo "</td>";
+                             echo "<td align=\"right\">";
+
+                             echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
+                             echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
+
+                             echo " </tr>";
+                         }
+                         ?>
+
+
+
+                         <?php
+                         if ("true" === $prereq_graphiti) {
+                             echo "<tr valign=\"top\">";
+                             echo "<td width=\"10%\"></td>";
+                             echo "<td>";
+
+                             echo $graphitiName  . "&nbsp;" . $graphitiDescription;
+
+                             echo "</td>";
+                             echo "<td align=\"right\">";
+
+                             echo getPrereqReferenceOrName($eclipseMirrorScript, $graphitiMirrorPrefixuri, $graphitiURL, $graphitiFile, $eclipseFSpathPrefix);
+                             echo " or <a href=\"" . $graphitiBuildHome . "\">equivalent</a></td>";
+
+                             echo " </tr>";
+                         }
+                         ?>
+
+
+
+                         <?php
+                         if ("true" === $prereq_gef) {
+                             echo "<tr valign=\"top\">";
+                             echo "<td width=\"10%\"></td>";
+                             echo "<td>";
+
+                             echo $gefName  . "&nbsp;" . $gefDescription;
+
+                             echo "</td>";
+                             echo "<td align=\"right\">";
+
+                             echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
+                             echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
+
+                             echo " </tr>";
+                         }
+                         ?>
+
+
+
+                         <?php
+                         if ("true" === $prereq_dtp) {
+                             echo "<tr valign=\"top\">";
+                             echo "<td width=\"10%\"></td>";
+                             echo "<td>";
+
+                             echo $dtpName . "&nbsp;" . $dtpDescription;
+
+                             echo "</td>";
+                             echo "<td align=\"right\">";
+
+                             echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
+                             echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
+
+                             echo " </tr>";
+                         }
+                         ?>
+
+
+
+                         <?php
+                         if ("true" === $prereq_wst) {
+                             echo "<tr valign=\"top\">";
+                             echo "<td width=\"10%\"></td>";
+                             echo "<td>";
+
+                             echo $wstName . "&nbsp;" . $wstDescription;
 
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $graphitiMirrorPrefixuri, $graphitiURL, $graphitiFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $graphitiBuildHome . "\">equivalent</a></td>";
+                             echo "</td>";
+                             echo "<td align=\"right\">";
 
-			echo " </tr>";
-		}
-		?>
+                             echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+                             echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
 
-		<?php
-		if ("true" === $prereq_gef) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
+                             echo " </tr>";
+                         }
+                         ?>
 
-			echo $gefName  . "&nbsp;" . $gefDescription;
 
-			echo "</td>";
-			echo "<td align=\"right\">";
 
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
+                         <?php
+                         if ("true" === $prereq_jst) {
+                             echo "<tr valign=\"top\">";
+                             echo "<td width=\"10%\"></td>";
+                             echo "<td>";
 
-			echo " </tr>";
-		}
-		?>
+                             echo $jstName . "&nbsp;" . $jstDescription;
 
-		<?php
-		if ("true" === $prereq_dtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
+                             echo "</td>";
+                             echo "<td align=\"right\">";
 
-			echo $dtpName . "&nbsp;" . $dtpDescription;
+                             echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+                             echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
 
-			echo "</td>";
-			echo "<td align=\"right\">";
+                             echo " </tr>";
+                         }
+                         ?>
 
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
 
-			echo " </tr>";
-		}
-		?>
+                         <?php
+                         if ("true" === $prereq_wtp) {
+                             echo "<tr valign=\"top\">";
+                             echo "<td width=\"10%\"></td>";
+                             echo "<td>";
 
-		<?php
-		if ("true" === $prereq_wst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
+                             echo $wtpName . "&nbsp;" . $wtpDescription;
 
-			echo $wstName . "&nbsp;" . $wstDescription;
+                             echo "</td>";
+                             echo "<td align=\"right\">";
 
-			echo "</td>";
-			echo "<td align=\"right\">";
+                             echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+                             echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
 
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+                             echo " </tr>";
+                         }
+                         ?>
 
-			echo " </tr>";
-		}
-		?>
 
-		<?php
-		if ("true" === $prereq_jst) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
+                         <?php
+                         if ("true" === $prereq_dltk) {
+                             echo "<tr valign=\"top\">";
+                             echo "<td width=\"10%\"></td>";
+                             echo "<td>";
 
-			echo $jstName . "&nbsp;" . $jstDescription;
+                             echo $dltkName . "&nbsp;" . $dltkDescription;
 
-			echo "</td>";
-			echo "<td align=\"right\">";
+                             echo "</td>";
+                             echo "<td align=\"right\">";
 
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+                             echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
+                             echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
 
-			echo " </tr>";
-		}
-		?>
-		<?php
-		if ("true" === $prereq_wtp) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
+                             echo " </tr>";
+                         }
+                         ?>
+                         <tr valign="middle">
+                              <td width="10%"></td>
+                              <td colspan="2">
+                                   <hr />
+                              </td>
+                         </tr>
 
-			echo $wtpName . "&nbsp;" . $wtpDescription;
 
-			echo "</td>";
-			echo "<td align=\"right\">";
 
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
 
-			echo " </tr>";
-		}
-		?>
-		<?php
-		if ("true" === $prereq_dltk) {
-			echo "<tr valign=\"top\">";
-			echo "<td width=\"10%\"></td>";
-			echo "<td>";
 
-			echo $dltkName . "&nbsp;" . $dltkDescription;
 
-			echo "</td>";
-			echo "<td align=\"right\">";
 
-			echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
-			echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
+               <?php
+               if ("true" === $prereq_emf) {
+                    echo "<tr valign=\"top\">";
+                    echo "<td width=\"10%\"></td>";
+                    echo "<td>";
+                    echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
+                    echo "</td> ";
+                    echo "<td align=\"right\">";
+                    echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+                    echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+                    echo "</tr>";
+               }
+               ?>
+               <?php
+               if ("true" === $prereq_emfxsd) {
+                    echo "<tr valign=\"top\">";
+                    echo "<td width=\"10%\"></td>";
+                    echo "<td>";
+                    echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
+                    echo "</td> ";
+                    echo "<td align=\"right\">";
+                    echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+                    echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+                    echo "</tr>";
+               }
+               ?>
 
-			echo " </tr>";
-		}
-		?>
-			<tr valign="middle">
-				<td width="10%"></td>
-				<td colspan="2">
-				<hr />
-				</td>
-			</tr>
+               <?php
+               if ("true" === $prereq_emftransaction) {
+                    echo "<tr valign=\"top\">";
+                    echo "<td width=\"10%\"></td>";
+                    echo "<td>";
+                    echo $emftransactionsourceName . "&nbsp;" . $emftransactionsourceDescription;
+                    echo "</td> ";
+                    echo "<td align=\"right\">";
+                    echo getPrereqReferenceOrName($eclipseMirrorScript, $emftransactionsourceMirrorPrefixuri, $emftransactionsourceURL, $emftransactionsourceFile, $eclipseFSpathPrefix);
+                    echo " or <a href=\"" . $emftransactionsourceBuildHome . "\">equivalent</a></td>";
+                    echo "</tr>";
+               }
+               ?>
 
+               <?php
+               if ("true" === $prereq_emfvalidation) {
+                    echo "<tr valign=\"top\">";
+                    echo "<td width=\"10%\"></td>";
+                    echo "<td>";
+                    echo $emfvalidationsourceName . "&nbsp;" . $emfvalidationsourceDescription;
+                    echo "</td> ";
+                    echo "<td align=\"right\">";
+                    echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
+                    echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
+                    echo "</tr>";
+               }
+               ?>
 
+               <?php
+               if ("true" === $prereq_graphiti) {
+                    echo "<tr valign=\"top\">";
+                    echo "<td width=\"10%\"></td>";
+                    echo "<td>";
+                    echo $graphitisourceName . "&nbsp;" . $graphitisourceDescription;
+                    echo "</td> ";
+                    echo "<td align=\"right\">";
+                    echo getPrereqReferenceOrName($eclipseMirrorScript, $graphitisourceMirrorPrefixuri, $graphitisourceURL, $graphitisourceFile, $eclipseFSpathPrefix);
+                    echo " or <a href=\"" . $graphitisourceBuildHome . "\">equivalent</a></td>";
+                    echo "</tr>";
+               }
+               ?>
 
-			<?php
-			if ("true" === $prereq_emf) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
-			<?php
-			if ("true" === $prereq_emfxsd) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
+               <?php
+               if (true) {
+                    echo "<tr valign=\"top\">";
+                    echo "<td width=\"10%\"></td>";
+                    echo "<td>";
+                    echo "Eclipse Test Framework (required only for Automated JUnit tests)";
+                    echo "</td> ";
+                    echo "<td align=\"right\">";
 
-			<?php
-			if ("true" === $prereq_emftransaction) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emftransactionsourceName . "&nbsp;" . $emftransactionsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emftransactionsourceMirrorPrefixuri, $emftransactionsourceURL, $emftransactionsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emftransactionsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
+                    echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
+                    echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+                    echo "</tr>";
+               }
+               ?>
 
-			<?php
-			if ("true" === $prereq_emfvalidation) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $emfvalidationsourceName . "&nbsp;" . $emfvalidationsourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
 
-			<?php
-			if ("true" === $prereq_graphiti) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo $graphitisourceName . "&nbsp;" . $graphitisourceDescription;
-				echo "</td> ";
-				echo "<td align=\"right\">";
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $graphitisourceMirrorPrefixuri, $graphitisourceURL, $graphitisourceFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $graphitisourceBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
+               <tr valign="top">
+                    <td width="10%"></td>
+                    <td>Eclipse releng tool (required only for committers to more easily
+                    "release" code to a build)</td>
+                    <td align="right"><?php
+                    echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
+                    echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+                    ?>
 
-			<?php
-			if (true) {
-				echo "<tr valign=\"top\">";
-				echo "<td width=\"10%\"></td>";
-				echo "<td>";
-				echo "Eclipse Test Framework (required only for Automated JUnit tests)";
-				echo "</td> ";
-				echo "<td align=\"right\">";
+               </tr>
 
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				echo "</tr>";
-			}
-			?>
+               <tr valign="top">
+                    <td width="10%"></td>
+                    <td>Third Party code from Orbit. Not required and is currently much
+                    more than needed for WTP, but some committers like using to create a
+                    PDE target.</td>
+                    <td align="right"><?php
+                    echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
+                    echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
+                    ?>
 
+               </tr>
 
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
+          </table>
+               </td>
+          </tr>
+     </table>
 
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Third Party code from Orbit. Not required and is currently much
-				more than needed for WTP, but some committers like using to create a
-				PDE target.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
 
-		</table>
-		</td>
-	</tr>
-</table>
+     <!-- ***********  P2 Zips **************  -->
 
 
-<!-- ***********  P2 Zips **************  -->
 
-				<?php
+                    <?php
 
-				$bellwether_name="repos";
-				if (file_exists($bellwether_name)) {
-					// if-then-include section
-					// include this whole section if (and only if) the bellwether file exists.
-					// For example, it may not exist on builds for "old" streams.
-					?>
+                    $bellwether_name="repos";
+                    if (file_exists($bellwether_name)) {
+                         // if-then-include section
+                         // include this whole section if (and only if) the bellwether file exists.
+                         // For example, it may not exist on builds for "old" streams.
+                         ?>
 
 <table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="2" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">P2
-		repositories in zipped format files.</font></td>
-	</tr>
+     <tr>
+          <td align=left valign=top colspan="2" bgcolor="#0080C0"><font
+               face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">P2
+          repositories in zipped format files.</font></td>
+     </tr>
 
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>These are archive versions of P2 repositories that can be
-		downloaded and installed into a development environment or PDE target.
-		Its is recommended to install, rather than to to unzip the traditional
-		packages, since it is more informative of missing prerequites or
-		conflicting dependencies.</p>
-		</td>
-	</tr>
+     <tr>
+          <td align="left" valign="top" colspan="5">
+          <p>These are archive versions of P2 repositories that can be
+          downloaded and installed into a development environment or PDE target.
+          Its is recommended to install, rather than to to unzip the traditional
+          packages, since it is more informative of missing prerequites or
+          conflicting dependencies.</p>
+          </td>
+     </tr>
 
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+     <tr>
+          <td>
+          <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
 
-		<?php
+          <?php
 
-		$shortname="@shortname@";
-		$zipfilename=$bellwether_name."/".$shortname."-buildrepo-".$build;
-		displayp2repoarchives($zipfilename, $downloadprefix, $shortname         , "Minimal", "Executable code");
-		$zipfilename=$bellwether_name."/".$shortname."_sdk-buildrepo-".$build;
-		displayp2repoarchives($zipfilename, $downloadprefix, $shortname." sdk"  , "SDK", "Executable code and source");
-		$zipfilename=$bellwether_name."/".$shortname."_tests-buildrepo-".$build;
-		displayp2repoarchives($zipfilename, $downloadprefix, $shortname." tests", "Tests", "Unit tests");
+          $shortname="@shortname@";
+          $zipfilename=$bellwether_name."/".$shortname."-buildrepo-".$build;
+          displayp2repoarchives($zipfilename, $downloadprefix, $shortname         , "Minimal", "Executable code");
+          $zipfilename=$bellwether_name."/".$shortname."_sdk-buildrepo-".$build;
+          displayp2repoarchives($zipfilename, $downloadprefix, $shortname." sdk"  , "SDK", "Executable code and source");
+          $zipfilename=$bellwether_name."/".$shortname."_tests-buildrepo-".$build;
+          displayp2repoarchives($zipfilename, $downloadprefix, $shortname." tests", "Tests", "Unit tests");
 
-		?>
-		</table>
-	
-	</tr>
+          ?>
+          </table>
+
+     </tr>
 </table>
 
-		<?php } ?>
+          <?php } ?>
 
 
 <!-- ***********  Traditional Zips **************  -->
 <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"> Traditional
-		Zip Files</font></td>
-	</tr>
+     <tr>
+          <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
+               face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Traditional
+          Zip Files</font></td>
+     </tr>
 
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>@longdescription@ Note: These traditional zip files should be
-		considered deprecated, in favor of using the archived P2 repositories.
-		The tradtional zip files will one day disappear.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+     <tr>
+          <td align="left" valign="top" colspan="5">
+          <p>@longdescription@ Note: These traditional zip files should be
+          considered deprecated, in favor of using the archived P2 repositories.
+          The tradtional zip files will one day disappear.</p>
+          </td>
+     </tr>
+     <tr>
+          <td>
+          <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
 
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
-				<td align="left" valign="top">
-				<p>Executable code only.</p>
-				</td>
-				<?php
-				$zipfilename="@zipprefix@-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="$shortname";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
+               <tr>
+                    <td align="left" valign="top" width="10%"><b>Minimal</b></td>
+                    <td align="left" valign="top">
+                    <p>Executable code only.</p>
+                    </td>
+                    <?php
+                    $zipfilename="@zipprefix@-${build}";
+                    $filename=$zipfilename.".zip";
+                    $zipfilesize=fileSizeForDisplay($filename);
+                    $fileShortDescription="$shortname";
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+                    ?>
+               </tr>
 
-			<tr>
-				<td align="left" valign="top" width="10%"><b>SDK</b></td>
-				<td align="left" valign="top">
-				<p>Executable code and source code.</p>
-				</td>
-				<?php
-				$zipfilename="@zipprefix@-sdk-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="$shortname sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Tests</b></td>
-				<td align="left" valign="top">
-				<p>Unit tests.</p>
-				</td>
-				<?php
-				$zipfilename="@zipprefix@-tests-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="$shortname tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
+               <tr>
+                    <td align="left" valign="top" width="10%"><b>SDK</b></td>
+                    <td align="left" valign="top">
+                    <p>Executable code and source code.</p>
+                    </td>
+                    <?php
+                    $zipfilename="@zipprefix@-sdk-${build}";
+                    $filename=$zipfilename.".zip";
+                    $zipfilesize=fileSizeForDisplay($filename);
+                    $fileShortDescription="$shortname sdk";
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+                    ?>
+               </tr>
+               <tr>
+                    <td align="left" valign="top" width="10%"><b>Tests</b></td>
+                    <td align="left" valign="top">
+                    <p>Unit tests.</p>
+                    </td>
+                    <?php
+                    $zipfilename="@zipprefix@-tests-${build}";
+                    $filename=$zipfilename.".zip";
+                    $zipfilesize=fileSizeForDisplay($filename);
+                    $fileShortDescription="$shortname tests";
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+                    ?>
+               </tr>
+          </table>
+          </td>
+
+
+     <tr>
 
 </table>
 
@@ -876,115 +924,115 @@
 
 <!-- ***********  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>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+     <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>
+          <td>
+          <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-			<tr>
-				<td><!-- 
-				Its silly to always display 'Build notes', but hard to 
-				compute if required or not. 
-				<a href="buildNotes.php">Build notes</a> <br /> 
-				--> <a href="directory.txt">map files</a> <br />
-				<?php
+               <tr>
+                    <td><!-- 
+                    Its silly to always display 'Build notes', but hard to 
+                    compute if required or not. 
+                    <a href="buildNotes.php">Build notes</a> <br /> 
+                    --> <a href="directory.txt">map files</a> <br />
+                    <?php
 
-				if ($displayTestSummary) {
+                    if ($displayTestSummary) {
 
 
-					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 {
-						// we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.
-						echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-						//&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-					}
+                         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 {
+                              // we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.
+                              echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
+                              //&nbsp;&nbsp;<img src=\"pending.gif\"/>";
+                         }
 
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
+                         echo "<br />";
+                         echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
 
-					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;";
+                         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;";
 
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
+                         echo "<br />";
+                         echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
 
-					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;";
-				}
+                         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 />
+                    ?> <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
+                    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>";
+     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>";
+     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>";
+     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>";
+     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>";
+     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>";
+     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>";
+     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>";
+     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 />";
+     echo "<br />";
+     echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
+     echo "<br />";
 }
 ?></td>
-			</tr>
-		</table>
-		</td>
-	</tr>
+               </tr>
+          </table>
+          </td>
+     </tr>
 </table>
 
 
@@ -993,12 +1041,12 @@
 <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
+     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>
+     face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
+     href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
 
 </center>
 <!-- end footer -->
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/testResults.php.template b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/testResults.php.template
index ddad0b7..30e0b9a 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/testResults.php.template
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/testResults.php.template
@@ -2,11 +2,11 @@
 <head>
 
 <?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
+     $parts = explode("/", getcwd());
+     $parts2 = explode("-", $parts[count($parts) - 1]);
+     $buildName = $parts2[1];
+
+     echo "<title>Test Results for $buildName </title>";
 ?>
 
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -94,10 +94,10 @@
     <td class="bold" align="center" width="10%">Total Tests</td>
     <td class="bold" align="center" width="10%">Total Time (s)</td>
   </tr>
-  
-  
+
+
   %testresults%
-  
+
 </table>
 <p></p>
 <br>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
index 66e7c0d..daea5d6 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
@@ -32,8 +32,8 @@
 
 
     <!-- 
-	   Steps to do after the build is done. 
-	 -->
+        Steps to do after the build is done. 
+      -->
     <target name="test">
         <dirname
             file="${ant.file}"
@@ -45,7 +45,7 @@
     </target>
 
     <!-- 
-	  Steps to do to test the build results
+       Steps to do to test the build results
    -->
     <target name="runTest">
         <dirname
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/templateFiles/index.php b/releng.wtpbuilder/buildtemplates/distribution/template.tests/templateFiles/index.php
index a42c883..2ce4399 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/templateFiles/index.php
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/templateFiles/index.php
@@ -1,6 +1,8 @@
 <html>
 <head>
 
+
+
 <?php
 $parts = explode("/", realpath(".."));
 $label = $parts[count($parts) - 1];
@@ -8,78 +10,78 @@
 
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 </head>
 <body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
+     <p>
+          <b><font face="Verdana" size="+3">Test Results</font> </b>
+     </p>
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$label"; ?>
+                    </font> </b></td>
+          </tr>
+     </table>
+     <p></p>
+     <table border="0">
+     </table>
 
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
+     <table width="77%" border="1">
+          <tr>
+               <td width="81%"><b>Tests Performed</b></td>
+               <td width="19%"><b>Errors &amp; Failures</b></td>
+          </tr>
 
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
+          <?
+          $dir = dir("html");
+          while ($anEntry = $dir->read())
+          {
+              if ($anEntry != "." && $anEntry != "..")
+              {
+                  $link = "html/".$anEntry;
+                  $xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
+                  $count = 0;
+                  $fileHandle = fopen($xml, "r");
+                  while (!feof($fileHandle))
+                  {
+                      $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
+                      $count = $count + substr_count($aLine, '<error');
+                  }
+                  fclose($fileHandle);
+                  if ($count > 0)
+                  {
+                      echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
+                      echo "$anEntry";
+                      echo "</font></b></a></td>";
+                      echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
+                  }
+                  else
+                  {
+                      echo "<tr><td><a href=\"$link\">";
+                      echo "$anEntry";
+                      echo "</a></td>";
+                      echo "<td>$count</td></tr>";
+                  }
+              }
+          }
+          ?>
 
-</table>
-<p></p>
-<br>
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
+     </table>
+     <p></p>
+     <br>
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$label"; ?>
+                    </font> </b></td>
+          </tr>
+     </table>
+     <br> These
+     <a href="consolelogs/wtptestlog.txt">logs</a> contain the console
+     output captured while running the JUnit automated tests.
+     <br>
+     <br>
 
 </body>
 </html>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL
index 94d4cd3..bd3fc83 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL
@@ -48,7 +48,7 @@
           var doc = win.document.open();
           doc.write("<html><head><title>Properties of " + name + "</title>");
           doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
+          doc.write("body {font:normal 68% verdana,arial,helvetica;     color:#000000; }");
           doc.write("table tr td, table tr th { font-size: 68%; }");
           doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
           doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
@@ -147,11 +147,11 @@
                 <tr valign="top">
                     <!-- set a nice color depending if there is an error/failure -->
                     <xsl:attribute name="class">
-						<xsl:choose>
-							<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
+                              <xsl:choose>
+                                   <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
+                                   <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
+                              </xsl:choose>
+                         </xsl:attribute>
                     <td>
                         <a href="#{@package}">
                             <xsl:value-of select="@package"/>
@@ -293,11 +293,11 @@
             </tr>
             <tr valign="top">
                 <xsl:attribute name="class">
-				<xsl:choose>
-					<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
+                    <xsl:choose>
+                         <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
+                         <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
+                    </xsl:choose>
+               </xsl:attribute>
                 <td>
                     <xsl:value-of select="$testCount"/>
                 </td>
@@ -420,11 +420,11 @@
         <tr valign="top">
             <!-- set a nice color depending if there is an error/failure -->
             <xsl:attribute name="class">
-			<xsl:choose>
-				<xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
+               <xsl:choose>
+                    <xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
+                    <xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
+               </xsl:choose>
+          </xsl:attribute>
 
             <!-- print testsuite information -->
             <td>
@@ -455,10 +455,10 @@
         mode="print.test">
         <tr valign="top">
             <xsl:attribute name="class">
-			<xsl:choose>
-				<xsl:when test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
+               <xsl:choose>
+                    <xsl:when test="failure | error">Error</xsl:when>
+               </xsl:choose>
+          </xsl:attribute>
             <td>
                 <xsl:value-of select="@name"/>
             </td>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
index 3e1ae8f..c9a3858 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
@@ -19,7 +19,7 @@
         <!--
             if not otherwise set, be sure extraVMargs is at least some
             string, even if unused string. 
-            
+
             Remember, though, extraVMArgs can contain more than one extra arg, 
             so much be passed to VM as a "line", not "value". 
         -->
@@ -251,7 +251,7 @@
         name="summarizeFailure"
         depends="checkFailure"
         if="doFailure">
-    	<!-- TODO: fix sdo junitFailureList.log goes in 'results', at first. Then copied. Then coordinate with releng scripts -->
+         <!-- TODO: fix sdo junitFailureList.log goes in 'results', at first. Then copied. Then coordinate with releng scripts -->
         <echo
             append="true"
             file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
diff --git a/releng.wtpbuilder/buildtemplates/jsdt.properties b/releng.wtpbuilder/buildtemplates/jsdt.properties
index 30625af..8690b7b 100644
--- a/releng.wtpbuilder/buildtemplates/jsdt.properties
+++ b/releng.wtpbuilder/buildtemplates/jsdt.properties
@@ -24,7 +24,7 @@
 
 #  list of prereqs to control what is installed for compile and tests
 prereq.eclipseplatform=true
-        
+
 
 # These next properties are mainly for distribution template files
 
diff --git a/releng.wtpbuilder/buildtemplates/xml.properties b/releng.wtpbuilder/buildtemplates/xml.properties
index f19201b..84b0b15 100644
--- a/releng.wtpbuilder/buildtemplates/xml.properties
+++ b/releng.wtpbuilder/buildtemplates/xml.properties
@@ -1,7 +1,7 @@
 # 'shortname' effects all foldernames too, plus some content, in distribution section
 # should be same name as this property file (for future use). 
 shortname=xml
-    
+
 
 # These first three properties are mainly for component templates
 
diff --git a/releng.wtpbuilder/components/dali-sdk/customTargets.xml b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
index 48478fc..867cac4 100644
--- a/releng.wtpbuilder/components/dali-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
@@ -160,7 +160,7 @@
             target="unrewriteMaps"/>
 
     </target>
-   
+
     <!--
         Steps to do before the repositories are being processed
     -->
@@ -182,9 +182,9 @@
         Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -344,9 +344,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
         Default target
     -->
diff --git a/releng.wtpbuilder/components/dali.tests/customTargets.xml b/releng.wtpbuilder/components/dali.tests/customTargets.xml
index 3a551fa..eaf22e7 100644
--- a/releng.wtpbuilder/components/dali.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/dali.tests/customTargets.xml
@@ -160,7 +160,7 @@
             target="unrewriteMaps"/>
 
     </target>
-    
+
     <!--
         Steps to do before the repositories are being processed
     -->
@@ -182,7 +182,7 @@
         Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -340,9 +340,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
         Default target
     -->
diff --git a/releng.wtpbuilder/components/dali4x-sdk/customTargets.xml b/releng.wtpbuilder/components/dali4x-sdk/customTargets.xml
index 977e9fb..95bd0bb 100644
--- a/releng.wtpbuilder/components/dali4x-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/dali4x-sdk/customTargets.xml
@@ -160,7 +160,7 @@
             target="unrewriteMaps"/>
 
     </target>
- 
+
     <!--
         Steps to do before the repositories are being processed
     -->
@@ -182,7 +182,7 @@
         Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -341,9 +341,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
         Default target
     -->
diff --git a/releng.wtpbuilder/components/dali4x.tests/customTargets.xml b/releng.wtpbuilder/components/dali4x.tests/customTargets.xml
index fefbfcd..3d10308 100644
--- a/releng.wtpbuilder/components/dali4x.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/dali4x.tests/customTargets.xml
@@ -181,7 +181,7 @@
         Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -339,9 +339,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
         Default target
     -->
diff --git a/releng.wtpbuilder/components/jsdt_sdk/allElements.xml b/releng.wtpbuilder/components/jsdt_sdk/allElements.xml
index 6a03a1d..bba7520 100644
--- a/releng.wtpbuilder/components/jsdt_sdk/allElements.xml
+++ b/releng.wtpbuilder/components/jsdt_sdk/allElements.xml
@@ -5,7 +5,7 @@
     <!--
         =====================================================================
     -->
-    <!-- Run a given ${target} on all elements being built						-->
+    <!-- Run a given ${target} on all elements being built                              -->
     <!--
         By default ${topLevelElementType} and ${topLevelElementId}
         should be
@@ -14,18 +14,18 @@
         defined in the builder's build.properties file. You can
         customize by
     -->
-    <!-- setting the type/id values directly here.								-->
+    <!-- setting the type/id values directly here.                                        -->
     <!--
         You can add additional calls to ${genericTargets} to build more
         top
     -->
-    <!-- level elements.									   					-->
-    <!--																		-->
+    <!-- level elements.                                                                         -->
+    <!--                                                                                          -->
     <!--
         The top level must exist in the ${buildDirectory},
         ${baseLocation} or
     -->
-    <!-- ${pluginPath} locations.												-->
+    <!-- ${pluginPath} locations.                                                            -->
     <!--
         =====================================================================
     -->
@@ -48,13 +48,13 @@
         The default assemble target, this will be called to assemble
         each
     -->
-    <!--  config if a custom assemble target is not defined.					-->
-    <!-- The following properties will be defined:								-->
+    <!--  config if a custom assemble target is not defined.                         -->
+    <!-- The following properties will be defined:                                        -->
     <!--
         config : The configuration being assembled eg "win32.win32.x86"
     -->
-    <!-- 		element: The element being assembled eg "org.eclipse.sdk"		-->
-    <!-- 		assembleScriptName: The assemble script to be called			-->
+    <!--           element: The element being assembled eg "org.eclipse.sdk"          -->
+    <!--           assembleScriptName: The assemble script to be called               -->
     <!--
         ======================================================================
     -->
@@ -67,7 +67,7 @@
     <!--
         =====================================================================
     -->
-    <!-- Custom targets to assemble the built elements for particular 			-->
+    <!-- Custom targets to assemble the built elements for particular                -->
     <!--
         configurations. These generally call the generated assemble
         scripts
@@ -75,7 +75,7 @@
     <!--
         (named in ${assembleScriptName}) but may also add pre and post
     -->
-    <!-- processing      														-->
+    <!-- processing                                                                            -->
     <!--
         Add one target for each root element and each configuration for
         which
@@ -91,9 +91,9 @@
     <!--
         be defined for this custom target to be called instead of the
     -->
-    <!-- defaultAssemble target above.											-->
-    <!--	Example:  name="assemble.org.eclipse.sdk"							-->
-    <!--	Example:  name="assemble.org.eclipse.sdk.win32.win32.x86"			-->
+    <!-- defaultAssemble target above.                                                       -->
+    <!--     Example:  name="assemble.org.eclipse.sdk"                                   -->
+    <!--     Example:  name="assemble.org.eclipse.sdk.win32.win32.x86"               -->
     <!--
         ======================================================================
     -->
diff --git a/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml b/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml
index 08a0126..d0bf652 100644
--- a/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml
@@ -199,7 +199,7 @@
       Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -356,9 +356,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
       Default target 
     -->
diff --git a/releng.wtpbuilder/components/jsdt_tests/customTargets.xml b/releng.wtpbuilder/components/jsdt_tests/customTargets.xml
index 0dadc3f..3e60fae 100644
--- a/releng.wtpbuilder/components/jsdt_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jsdt_tests/customTargets.xml
@@ -198,7 +198,7 @@
       Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -355,9 +355,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
       Default target 
     -->
diff --git a/releng.wtpbuilder/components/jst-sdk/customTargets.xml b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
index 085169d..9c03787 100644
--- a/releng.wtpbuilder/components/jst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
@@ -181,7 +181,7 @@
         Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -340,9 +340,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
         Default target
     -->
diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml
index fefbfcd..3d10308 100644
--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml
@@ -181,7 +181,7 @@
         Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -339,9 +339,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
         Default target
     -->
diff --git a/releng.wtpbuilder/components/jst4x-sdk/customTargets.xml b/releng.wtpbuilder/components/jst4x-sdk/customTargets.xml
index 085169d..9c03787 100644
--- a/releng.wtpbuilder/components/jst4x-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jst4x-sdk/customTargets.xml
@@ -181,7 +181,7 @@
         Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -340,9 +340,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
         Default target
     -->
diff --git a/releng.wtpbuilder/components/jst4x.tests/customTargets.xml b/releng.wtpbuilder/components/jst4x.tests/customTargets.xml
index fefbfcd..3d10308 100644
--- a/releng.wtpbuilder/components/jst4x.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst4x.tests/customTargets.xml
@@ -181,7 +181,7 @@
         Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -339,9 +339,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
         Default target
     -->
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index 638c238..0bd2b79 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -182,7 +182,7 @@
         Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -341,9 +341,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
         Default target
     -->
diff --git a/releng.wtpbuilder/components/wst.tests/customTargets.xml b/releng.wtpbuilder/components/wst.tests/customTargets.xml
index 5113339..36c8f90 100644
--- a/releng.wtpbuilder/components/wst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wst.tests/customTargets.xml
@@ -183,7 +183,7 @@
         Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -341,9 +341,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
         Default target
     -->
diff --git a/releng.wtpbuilder/components/wst4x-sdk/customTargets.xml b/releng.wtpbuilder/components/wst4x-sdk/customTargets.xml
index 1343e70..6bf5adb 100644
--- a/releng.wtpbuilder/components/wst4x-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst4x-sdk/customTargets.xml
@@ -183,7 +183,7 @@
         Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -342,9 +342,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
         Default target
     -->
diff --git a/releng.wtpbuilder/components/wst4x.tests/customTargets.xml b/releng.wtpbuilder/components/wst4x.tests/customTargets.xml
index 5113339..36c8f90 100644
--- a/releng.wtpbuilder/components/wst4x.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wst4x.tests/customTargets.xml
@@ -183,7 +183,7 @@
         Steps to do after generating the build scripts.
     -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -341,9 +341,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
         Default target
     -->
diff --git a/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml b/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
index 68fe121..32173a1 100644
--- a/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-buildTools/customTargets.xml
@@ -180,7 +180,7 @@
       Steps to do after generating the build scripts.
      -->
     <target name="postGenerate">
-        
+
         <ant antfile="${wtp.builder.home}/scripts/build/customizeAccessRules.xml"/>
     </target>
     <!--
@@ -310,9 +310,9 @@
         <available
             file="${p2.category.definition.file}"
             property="categoryFileExists"/>
-    </target>	
-	
-	
+    </target>     
+
+
     <!--
         Default target
     -->
diff --git a/releng.wtpbuilder/distribution/dali.build/build.xml b/releng.wtpbuilder/distribution/dali.build/build.xml
index 04c5923..9f12e81 100644
--- a/releng.wtpbuilder/distribution/dali.build/build.xml
+++ b/releng.wtpbuilder/distribution/dali.build/build.xml
@@ -6,7 +6,7 @@
     <property file="${wtp.builder.home}/build.properties"/>
     <property environment="env"/>
 
-	<!-- required to get proper value of doCreateFprojZips -->
+     <!-- required to get proper value of doCreateFprojZips -->
     <property
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
@@ -19,7 +19,7 @@
     <mkdir dir="${transformedRepoLocation}"/>
 
 
-	<!-- main -->
+     <!-- main -->
     <target
         name="build"
         depends="getBaseBuilder">
@@ -50,7 +50,7 @@
                 value="${build.distribuion}.tests"/>
         </ant>
 
-    	<!-- copy early, if we can ... else site won't be created, if we fail -->
+         <!-- copy early, if we can ... else site won't be created, if we fail -->
         <ant antfile="${wtp.builder.home}/scripts/build/copyArtifactsEarly.xml"/>
 
         <antcall target="handleCompilationProblems"/>
@@ -62,8 +62,8 @@
         depends="checkIfCompileProblems"
         if="compilation.problem.found">
 
-    	<!-- if there is a problem, leave a marker file in download directory, so the webpage can 
-    	describe what happened -->
+         <!-- if there is a problem, leave a marker file in download directory, so the webpage can 
+         describe what happened -->
 
         <echo
             message="Compilation problems were found"
@@ -99,8 +99,8 @@
         </available>
         <echo message="compilation.problem path buildDirectory: ${buildDirectory}/plugins/*/"/>
     </target>
-	
-	
+
+
     <!-- invoking runbuild.xml targetting getBaseBuilder -->
     <target
         name="getBaseBuilder"
diff --git a/releng.wtpbuilder/distribution/dali.site/publish.xml b/releng.wtpbuilder/distribution/dali.site/publish.xml
index 0776a0b..1e91671 100644
--- a/releng.wtpbuilder/distribution/dali.site/publish.xml
+++ b/releng.wtpbuilder/distribution/dali.site/publish.xml
@@ -3,11 +3,11 @@
     default="default"
     basedir=".">
 
-	<!-- Properties that must be passed to this script:
+     <!-- Properties that must be passed to this script:
         buildDirectory: Path to perform the build in.  (A working directory)
-        buildType:		Type of build (nightly, integration etc.)
-        buildId:		Build name
-        buildLabel:		<buildType>-<buildName>-<timestamp>
+        buildType:          Type of build (nightly, integration etc.)
+        buildId:          Build name
+        buildLabel:          <buildType>-<buildName>-<timestamp>
     -->
 
     <property environment="env"/>
@@ -15,7 +15,7 @@
     <property
         name="resultDir"
         value="${buildDirectory}/${buildLabel}"/>
-	<!--name of generated index page-->
+     <!--name of generated index page-->
     <property
         name="indexFileName"
         value="index.php"/>
@@ -51,35 +51,35 @@
     <target name="generateCompileIndex">
 
 
-		<!--
+          <!--
             <taskdef name="indexResults" classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator" />
         -->
 
-		<!--
+          <!--
             isBuildTested:  true|false  should JUnit plugin test results be used to generate index page
             dropTokenList:  comma separated list of strings which should be replaced by the fileName attribute settings in the testManifest.xml.
             xmlDirectoryName:  path to directory containing JUnit plugin test results in xml format (see doc is org.eclipse.test).
             dropDirectoryName: path to directory containing the result of the build.
-            testResultsTemplateFileName:  path to template file used to generate page with links to JUnit test results	
+            testResultsTemplateFileName:  path to template file used to generate page with links to JUnit test results     
             testResultsHtmlFileName:  name of file which will be generated with links to JUnit test results
             dropHtmlFileName:  name of generated index page
             hrefTestResultsTargetPath:  relative path from index page to directory containing JUnit html test results
             hrefCompileLogsTargetPath:  relative path from index page directory containing compilelogs
-            testManifestFileName:	name of xml file containing descriptions of zip types and log files
-            
-            
-            
+            testManifestFileName:     name of xml file containing descriptions of zip types and log files
+
+
+
         -->
         <property file="${buildDirectory}/maps/${env.RELENGDALI}/maps/dependencies.properties"/>
 
-		<!-- create tables of test plugin compiles first -->
+          <!-- create tables of test plugin compiles first -->
         <antcall target="generateCompileOutput">
             <param
                 name="outputDirectory"
                 value="${resultDir}/testcompilelogs"/>
         </antcall>
 
-		<!-- create table of code plugins compiles -->
+          <!-- create table of code plugins compiles -->
         <summarizeResults
             isBuildTested="false"
             includeAll="true"
@@ -104,11 +104,11 @@
                 pattern="MMMM d, yyyy"/>
         </tstamp>
 
-		<!--  Insert Build Type descriptor  -->
+          <!--  Insert Build Type descriptor  -->
         <antcall target="${buildType}"/>
         <antcall target="writeData"/>
 
-		<!--  Update timestamp on file to permit overwrite through Ant copy task  -->
+          <!--  Update timestamp on file to permit overwrite through Ant copy task  -->
         <touch file="${resultingIndex}"/>
     </target>
     <target
@@ -139,25 +139,25 @@
         depends="checkIfTested"
         if="doTests">
 
-		<!--
+          <!--
             isBuildTested:  true|false  should JUnit plugin test results be used to generate index page
             dropTokenList:  comma separated list of strings which should be replaced by the fileName attribute settings in the testManifest.xml.
             xmlDirectoryName:  path to directory containing JUnit plugin test results in xml format (see doc is org.eclipse.test).
             dropDirectoryName: path to directory containing the result of the build.
-            testResultsTemplateFileName:  path to template file used to generate page with links to JUnit test results	
+            testResultsTemplateFileName:  path to template file used to generate page with links to JUnit test results     
             testResultsHtmlFileName:  name of file which will be generated with links to JUnit test results
             dropHtmlFileName:  name of generated index page
             hrefTestResultsTargetPath:  relative path from index page to directory containing JUnit html test results
             hrefCompileLogsTargetPath:  relative path from index page directory containing compilelogs
-            testManifestFileName:	name of xml file containing descriptions of zip types and log files
-            
-            
-            
+            testManifestFileName:     name of xml file containing descriptions of zip types and log files
+
+
+
         -->
         <property file="${buildDirectory}/maps/${env.RELENGDALI}/maps/dependencies.properties"/>
 
-		<!-- create table of test plugin compiles first -->
-		<!-- set isBuildTested to true for the "compile only" results -->
+          <!-- create table of test plugin compiles first -->
+          <!-- set isBuildTested to true for the "compile only" results -->
         <summarizeResults
             isBuildTested="true"
             dropTokenList="${dropTokenList}"
@@ -173,20 +173,20 @@
                 pattern="MMMM d, yyyy"/>
         </tstamp>
 
-		<!--  Insert Build Type descriptor  -->
+          <!--  Insert Build Type descriptor  -->
         <antcall target="${buildType}"/>
         <antcall target="writeData"/>
 
-		<!--  Update timestamp on file to permit overwrite through Ant copy task  -->
+          <!--  Update timestamp on file to permit overwrite through Ant copy task  -->
         <touch file="${resultingIndex}"/>
     </target>
     <target name="getStaticFiles">
-		<!--get static files required in the buildLabel directory-->
+          <!--get static files required in the buildLabel directory-->
         <copy todir="${resultDir}">
             <fileset dir="${templateDir}/staticDropFiles"/>
         </copy>
 
-		<!--copy buildnotes from plugin directories-->
+          <!--copy buildnotes from plugin directories-->
         <mkdir dir="${resultDir}/buildnotes"/>
         <copy
             todir="${resultDir}/buildnotes"
@@ -211,15 +211,15 @@
     <target name="repository">
 
 
-		<!-- get our authored, tokenized site.xml file -->
+          <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
             tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true"/>
-		<!-- get the ${buildDirectory}/finalPluginsVersions.properties, and 
+          <!-- get the ${buildDirectory}/finalPluginsVersions.properties, and 
             read as properties -->
-		<!-- substitute property value for tokens -->
+          <!-- substitute property value for tokens -->
         <replace
             file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
@@ -244,7 +244,7 @@
         </replace>
     </target>
     <target name="countFiles">
-		<!--	
+          <!--     
             files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
             It is required to generate a link to the build on the downloads page.
         -->
@@ -254,74 +254,46 @@
             outputFile="${resultDir}/files.count"/>
     </target>
 
-	<!--Build type descriptors-->
+     <!--Build type descriptors-->
     <target name="I">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Integration"/>
     </target>
     <target name="S">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Stable"/>
     </target>
     <target name="N">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Nightly"/>
     </target>
     <target name="M">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Maintenance"/>
     </target>
     <target name="R">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Release"/>
     </target>
     <target name="T">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Test"/>
     </target>
     <target name="P">
         <replace
             file="${resultingIndex}"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            file="${resultingIndex}"
             token="@type@"
             value="Patches"/>
     </target>
@@ -343,13 +315,13 @@
         </condition>
     </target>
     <target name="writeData">
-		<!--  Insert Build Date  -->
+          <!--  Insert Build Date  -->
         <replace
             file="${resultingIndex}"
             token="@date@"
             value="${TODAY}"/>
 
-		<!--  Insert Build Name  -->
+          <!--  Insert Build Name  -->
         <replace
             file="${resultingIndex}"
             token="@build@"
@@ -359,7 +331,7 @@
             token="@buildBranch@"
             value="${buildBranch}"/>
 
-		<!--  Insert PreRequsites  -->
+          <!--  Insert PreRequsites  -->
         <replace
             file="${resultingIndex}"
             token="@eclipseFile@"
@@ -516,7 +488,7 @@
             value="${orbitthirdpartyzip.mirror.prefixuri}"/>
 
 
-		<!-- no longer used. Post 1.5.5 -->
+          <!-- no longer used. Post 1.5.5 -->
         <replace
             file="${resultingIndex}"
             token="@jemFile@"
@@ -533,7 +505,7 @@
             file="${resultingIndex}"
             token="@jem.mirror.prefixuri@"
             value="${jem.mirror.prefixuri}"/>
-		<!-- 
+          <!-- 
             these token/s should not exist in maintenance stream, but 
             do no harm done, so in the interests of keeping builder 
             streams in sync, we'll leave them here as place hold
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php
index f666887..6237289 100644
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/buildNotes.php
@@ -1,5 +1,7 @@
 <html>
 <head>
+
+
 <?php
 $parts = explode("/", getcwd());
 $parts2 = explode("-", $parts[count($parts) - 1]);
@@ -9,55 +11,60 @@
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 </head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Build Notes</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica"> Build Notes for <?php echo "$buildName"; ?>
+                    </font> </b></td>
+          </tr>
+     </table>
+     <table border="0">
 
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		//print_r($anEntry);
-		//echo "<br />";
 
-		$subject = $anEntry;
-		$pattern = '/^buildnotes_(.*)/i';
-		preg_match($pattern, $subject, $matches);
-		$subject = $matches[1];
-		//print_r($subject);
-		//echo "<br />";
-		$pattern = '/^(.*)\.html$/';
-		preg_match($pattern, $subject, $matches);
-		//print_r($matches);
-		//echo "<br />";
 
-		$component = $matches[1];
+     <?php
+     $hasNotes = false;
+     $aDirectory = dir("buildnotes");
+     while ($anEntry = $aDirectory->read()) {
+         if ($anEntry != "." && $anEntry != "..") {
+             //print_r($anEntry);
+             //echo "<br />";
 
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
+             $subject = $anEntry;
+             $pattern = '/^buildnotes_(.*)/i';
+             preg_match($pattern, $subject, $matches);
+             $subject = $matches[1];
+             //print_r($subject);
+             //echo "<br />";
+             $pattern = '/^(.*)\.html$/';
+             preg_match($pattern, $subject, $matches);
+             //print_r($matches);
+             //echo "<br />";
 
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
+             $component = $matches[1];
 
-</table>
+             $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
+             echo "<tr>";
+             echo "$line";
+             echo "</tr>";
+             $hasNotes = true;
+
+         }
+     }
+     $aDirectory.closedir();
+     if (!$hasNotes) {
+         echo "<br>There are no build notes for this build.";
+     }
+     ?>
+
+     </table>
 </body>
 </html>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php
index 2ee3c36..885ca2f 100644
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/consoleLogs.php
@@ -1,5 +1,7 @@
 <html>
 <head>
+
+
 <?php
 $parts = explode("/", getcwd());
 $parts2 = explode("-", $parts[count($parts) - 1]);
@@ -9,86 +11,90 @@
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 <title>Console Logs from Running JUnit Plug-in Tests</title>
 </head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Test Console Output</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica">Console output from running
+                              JUnit plugin tests for <?php echo "$buildName"; ?> </font> </b></td>
+          </tr>
+     </table>
+     <table border="0">
 
 
-sort($entries);
-sort($direntries);
 
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
+     <?php
+     $rootDir = "testResults/consolelogs";
+     $hasNotes = false;
+     $aDirectory = dir($rootDir);
+     $index = 0;
+     $dirindex = 0;
+     while ($anEntry = $aDirectory->read()) {
+         if ($anEntry != "." && $anEntry != "..") {
+             if (is_file("$rootDir/$anEntry")) {
+                 $entries[$index] = $anEntry;
+                 $index++;
+             } else if (is_dir("$rootDir/$anEntry")) {
+                 $direntries[$dirindex] = $anEntry;
+                 $dirindex++;
+             }
+         }
+     }
+     $aDirectory->close();
 
 
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
+     sort($entries);
+     sort($direntries);
 
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
+     for ($i = 0; $i < $dirindex; $i++) {
+         $anEntry = $direntries[$i];
+         $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
+         echo "<tr>";
+         echo "$line";
+         echo "</tr>";
+     }
+     for ($i = 0; $i < $index; $i++) {
+         $anEntry = $entries[$i];
+         $logsize = filesize("testResults/consolelogs/$anEntry");
 
 
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
+         $level = 0;
+         if ($logsize > 20000) {
+             $level = 2;
+         }
+         else if ($logsize > 2000) {
+             $level = 1;
+         }
 
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
+         if ($level == 0) {
+             $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+         }
+         else if ($level == 1) {
+             $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+         } else if ($level == 2) {
+             $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+         }
 
-</table>
+
+         echo "<tr>";
+         echo "$line";
+         echo "</tr>";
+         $hasNotes = true;
+     }
+
+     if (!$hasNotes) {
+         echo "<br>There are no test logs for this build.";
+     }
+     ?>
+
+     </table>
 </body>
 </html>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/logIndex.php
index 721ca00..28da816 100644
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/logIndex.php
@@ -1,10 +1,12 @@
 <html>
 <head>
+
+
 <?php
 
 function endsWith( $str, $sub ) {
 
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+    return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
 }
 
 $parts = explode("/", getcwd());
@@ -15,71 +17,75 @@
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 <title>Console Logs from Running JUnit Plug-in Tests</title>
 </head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Test Console Output</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica">Console output from running
+                              JUnit plugin tests for <?php echo "$buildName"; ?> </font> </b></td>
+          </tr>
+     </table>
+     <table border="0">
 
 
-sort($entries);
 
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
+     <?php
+     $hasNotes = false;
+     $aDirectory = dir(".");
+     $index = 0;
+     while ($anEntry = $aDirectory->read()) {
+         if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+             $entries[$index] = $anEntry;
+             $index++;
+         }
+     }
+     aDirectory.closedir();
 
 
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
+     sort($entries);
 
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
+     for ($i = 0; $i < $index; $i++) {
+         $anEntry = $entries[$i];
+         $logsize = filesize("$anEntry");
 
 
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
+         $level = 0;
+         if ($logsize > 20000) {
+             $level = 2;
+         }
+         else if ($logsize > 2000) {
+             $level = 1;
+         }
 
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
+         if ($level == 0) {
+             $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+         }
+         else if ($level == 1) {
+             $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+         } else if ($level == 2) {
+             $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+         }
 
-</table>
+
+         echo "<tr>";
+         echo "$line";
+         echo "</tr>";
+         $hasNotes = true;
+     }
+
+     if (!$hasNotes) {
+         echo "<br>There are no test logs for this build.";
+     }
+     ?>
+
+     </table>
 </body>
 </html>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/miscUtil.php
index 7a69d09..6fceb35 100644
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/miscUtil.php
@@ -4,211 +4,211 @@
 // handy constant to compute file size in megabytes
 
 function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
+    $onemeg=1024*1024;
+    $zipfilesize=filesize($filename);
+    $zipfilesize=round($zipfilesize/$onemeg, 0);
+    return $zipfilesize;
 }
 
 function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	$zipfilesize=filesize($filename);
-	if ($zipfilesize > $criteria) {
-		$zipfilesize=round($zipfilesize/$onemeg, 0);
-		$scaleChar = "M";
-	}
-	else {
-		$zipfilesize=round($zipfilesize/$onekilo, 0);
-		$scaleChar = "K";
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
+    $onekilo=1024;
+    $onemeg=$onekilo * $onekilo;
+    $criteria = 10 * $onemeg;
+    $scaleChar = "M";
+    $zipfilesize=filesize($filename);
+    if ($zipfilesize > $criteria) {
+        $zipfilesize=round($zipfilesize/$onemeg, 0);
+        $scaleChar = "M";
+    }
+    else {
+        $zipfilesize=round($zipfilesize/$onekilo, 0);
+        $scaleChar = "K";
+    }
+    $result =  "(" . $zipfilesize . $scaleChar . ")";
+    return $result;
 }
 
 
 function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
-	echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
+    echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
+    echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
+    echo $zipfilesize;
+    echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"2%\">";
+    echo "[<a href=\"checksum/$filename.md5\">md5</a>]";
+    echo "</td>";
 }
 
 function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
 {
-	$result = false;
+    $result = false;
 
-	$allowURLopen = ini_get('allow_url_fopen');
+    $allowURLopen = ini_get('allow_url_fopen');
 
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		}
-	}
-	return $result;
+    if ($allowURLopen && stream_last_modified($url)) {
+        $result = true;
+    }
+    else {
+        // TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
+        // is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
+        $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+        if (file_exists($wholePath)) {
+            $result = true;
+        }
+    }
+    return $result;
 }
 
 function stream_last_modified($url)
 {
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
+    if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
+    {
+        if (!($fp = @fopen($url, 'r')))
+        return NULL;
 
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
+        $meta = stream_get_meta_data($fp);
+        for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
+        {
+            if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
+            {
+                $modtime = substr($meta['wrapper_data'][$j], 15);
+                break;
+            }
+        }
+        fclose($fp);
+    }
+    else
+    {
+        $parts = parse_url($url);
+        $host  = $parts['host'];
+        $path  = $parts['path'];
 
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
+        if (!($fp = @fsockopen($host, 80)))
+        return NULL;
 
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
+        $req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
+        fputs($fp, $req);
 
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
+        while (!feof($fp))
+        {
+            $str = fgets($fp, 4096);
+            if (strstr(strtolower($str), 'last-modified'))
+            {
+                $modtime = substr($str, 15);
+                break;
+            }
+        }
+        fclose($fp);
+    }
+    return isset($modtime) ? strtotime($modtime) : time();
 }
 
 function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
+    global $debugScript;
+    global $debugFunctions;
+    $localuri = $uriToCheck;
 
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
+    $debugMirrorList = false;
+    if ($debugScript) {
+        echo "uriToCheck: " . $localuri . "<br />";
+    }
 
-	$xmlcount = 0;
+    $xmlcount = 0;
 
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
+    /* This method true and accurate method of parsing mirror results
+     * may be expensive, and would
+    * likely cause artificially high counts of "downloads".
+    * Could maybe use if somehow only checked once ever 5 minutes or something.
 
 
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
+    // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
+    $holdLevel = error_reporting(E_ERROR);
+    $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
+    error_reporting($holdLevel);
 
 
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
+    if ($mirrorsxml) {
+    if ($debugFunctions) {
+    echo "root node: " . $mirrorsxml->getName() . "<br />";
+    }
+    if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
+    foreach ($mirrorsxml->children() as $mirror) {
+    if (strcmp($mirror->getName(),"mirror") == 0) {
+    $xmlcount=$xmlcount+1;
+    }
+    if ($debugMirrorList) {
+    print_r($mirror);
+    echo "<br />";
+    }
+    }
+    }
+    if ($debugFunctions) {
+    echo "Mirror count: " . $xmlcount . "<br />";
+    }
+    }
+    */
+    /*
+     * Use simple heuristic based on pattern
+    * in the URI ... if it contains "/downloads/" then assume it's mirrored
+    */
+    if (strpos($uriToCheck, "webtools/downloads/") > 0) {
+        $xmlcount = 1;
+    }
+    return ($xmlcount > 0);
 
 }
 
 // TODO: replace with Phoenix variables
 function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
+    global $debugScript;
+    global $debugFunctions;
+    // getBrowser is expensive, so cache the data
+    static $browser;
+    $platform = "unknown";
 
 
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
+    if(ini_get("browscap")) {
+        if(!isset($browser)){
+            $browser = get_browser(null, true);
+        }
 
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
+        if ($browser) {
+            $rawPlatform = $browser['platform'];
+            if ($debugFunctions) {
+                echo "browser platfrom: " . $rawPlatform . "<br />" ;
+            }
 
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
+            if ($debugFunctions) {
+                $browserKeys = array_keys($browser);
+                foreach ($browserKeys as $key) {
+                    echo $key . ": " . $browser[$key] . "<br />";
+                }
+            }
+        }
+        if (strpos($rawPlatform, "Win") === 0) {
+            $platform="windows";
+        } else if (strpos($rawPlatform, "Linux") === 0) {
+            $platform="linux";
+        } else if (strpos($rawPlatform, "Mac") === 0) {
+            $platform="mac";
+        }
+    }
+    return $platform;
 }
 
 
 function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
+    // todo: we really only need "if exists" so could make a bit more efficient
+    // I tried "file_exists" but is didn't seem to work on my test server
+    // For these pre-reqs, we assume if they exist, they are mirrored. This is true
+    // 99% of the time.
 
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
+    if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
+        $reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
+    } else {
+        $reflink=$prereqfilename;
+    }
+    return $reflink;
 }
 ?>
diff --git a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/report2.php
index cb68e7b..f3e1171 100644
--- a/releng.wtpbuilder/distribution/dali.site/staticDropFiles/report2.php
+++ b/releng.wtpbuilder/distribution/dali.site/staticDropFiles/report2.php
@@ -3,40 +3,40 @@
 
 function parse_testResults($filename)
 {
-	$junitFailures = 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);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
+    $junitFailures = 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);
+            }
+            $results = array($junitFailures);
+            return $results;
+        }
+    }
 }
 
 
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php
index 30b8cc5..0c4d51c 100644
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/dali.site/templateFiles/index.html.template.php
@@ -5,6 +5,10 @@
 <title>Dali Downloads</title>
 
 
+
+
+
+
 <?php
 
 $buildBranch="@buildBranch@";
@@ -97,12 +101,12 @@
 
 $keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/dali-sdk-$build.zip";
 if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
+     $mirrorScript=$eclipseMirrorScript;
+     $downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
 }
 
 if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
+     echo "inferred platform: " . getPlatform();
 }
 
 
@@ -113,42 +117,42 @@
 $displayTestSummary=false;
 if (phpversion() >= 5) {
 
-	$displayTestSummary=true;
-	// 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);
-		}
-	}
+     $displayTestSummary=true;
+     // 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 = "compilelogsSummary.xml";
+     $prefix = "code_";
+     $compileSummary = simplexml_load_file($filename);
+     foreach ($compileSummary->summaryItem as $summaryItem) {
+          $name = $summaryItem->name;
+          $value = $summaryItem->value;
+          $code= "\$" . $prefix . $name . " = " . $value . ";";
+          //echo "<br />code: " . $code;
+          eval($code);
+     }
 
-	$filename = "testcompilelogsSummary.xml";
-	$prefix = "test_";
-	$compileSummary = simplexml_load_file($filename);
-	foreach ($compileSummary->summaryItem as $summaryItem) {
-		$name = $summaryItem->name;
-		$value = $summaryItem->value;
-		$code= "\$" . $prefix . $name . " = " . $value . ";";
-		//echo "<br />code: " . $code;
-		eval($code);
-	}
+     $filename = "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);
+     }
 }
 
 
@@ -160,243 +164,267 @@
 <body>
 
 
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-	<tr>
-		<td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-		Build: <?php echo "$build";?></b></font></td>
-	
-	</tr>
-	<tr valign="top">
-		<td><font size="-1"><?php echo "$builddate";?></font></td>
-	</tr>
-	<tr valign="top">
-		<td>
-		<p>These are some special, standalone build for Dali.</p>
-		</td>
-	</tr>
-</table>
+     <table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
+          <tr>
+               <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial"
+                    size="+2"><b><?php echo "$type";?> Build: <?php echo "$build";?> </b>
+               </font></td>
 
-<!-- ***********  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 and Handy Extras</font></td>
-	</tr>
-	<tr>
-		<td>
-		<p>These are the prerequisites to install and run the Web Tools
-		Platform. Also listed are some frequently needed links for
-		committer-required packages when creating new development
-		environments, or targets to run against.</p>
-		<p>Note that WTP requires Java 5 or higher (and, for some things,
-		actually requires a JDK rather than only a JRE) even though many other
-		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-		JRE levels</a>.</p>
-		<p></p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-			<tr valign="top">
-				<td width="10%"></td>
-				<td width="40%">Eclipse Platform (Platform, JDT)</td>
-				<?php
-				//customize page depending on user's browser/platform, if we can detect it
-				$usersPlatform = getPlatform();
-				// assume windows by default, since likely most frequent, even for cases where
-				// platform is "unknown". I've noticed Opera reports 'unknown' :(
-				$recommendedFile=$eclipsefilewindows;
-				if (strcmp($usersPlatform,"linux")== 0) {
-					$recommendedFile=$eclipsefilelinux;
-				} else if (strcmp($usersPlatform,"mac") == 0) {
-					$recommendedFile=$eclipsefilemacosx;
-				}
-				?>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
+          </tr>
+          <tr valign="top">
+               <td><font size="-1"><?php echo "$builddate";?> </font></td>
+          </tr>
+          <tr valign="top">
+               <td>
+                    <p>These are some special, standalone build for Dali.</p>
+               </td>
+          </tr>
+     </table>
 
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Web Standard Tools (WST)</td>
-				<td align="right"><?php
-				// debug
-				// echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $wstMirrorPrefixuri . "/" . $wstFile;
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>J2EE Standard Tools (JST)</td>
-				<td align="right"><?php
-				// debug
-				// echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $jstMirrorPrefixuri . "/" . $jstFile;
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>EMF v2.4 Runtime Minimum executable code.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>EMF XSD v2.4 Runtime Minimum executable code.</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Graphical Editing Framework (GEF)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Data Tools Platform (DTP)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="middle">
-				<td width="10%"></td>
-				<td colspan="2">
-				<hr />
-				</td>
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Eclipse releng tool (required only for committers to more easily
-				"release" code to a build)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-			<tr valign="top">
-				<td width="10%"></td>
-				<td>Third Party code from Orbit (currently much more than needed for
-				WTP, but some committers like having the whole heap in their target)</td>
-				<td align="right"><?php
-				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-				?>
-			
-			</tr>
-
-		</table>
-		</td>
-	</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
-		Incubating Components</font></td>
-	</tr>
-
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>The Zip files includes the features and plugins for the Dali
-		Component.</p>
-		</td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+     <!-- ***********  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 and Handy Extras</font></td>
+          </tr>
+          <tr>
+               <td>
+                    <p>These are the prerequisites to install and run the Web Tools
+                         Platform. Also listed are some frequently needed links for
+                         committer-required packages when creating new development
+                         environments, or targets to run against.</p>
+                    <p>
+                         Note that WTP requires Java 5 or higher (and, for some things,
+                         actually requires a JDK rather than only a JRE) even though many
+                         other <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a>
+                         can run with <a
+                              href="http://www.eclipse.org/downloads/moreinfo/jre.php">other JRE
+                              levels</a>.
+                    </p>
+                    <p></p>
+               </td>
+          </tr>
+          <tr>
+               <td>
+                    <table border=0 cellspacing=1 cellpadding=1 width="90%"
+                         align="center">
+                         <tr valign="top">
+                              <td width="10%"></td>
+                              <td width="40%">Eclipse Platform (Platform, JDT)</td>
 
 
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
-				<td align="left" valign="top">
-				<p>Executable code only.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-jpt-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="dali";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
 
-			<tr>
-				<td align="left" valign="top" width="10%"><b>SDK</b></td>
-				<td align="left" valign="top">
-				<p>Executable code and source code.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-jpt-sdk-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="dali sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Tests</b></td>
-				<td align="left" valign="top">
-				<p>Unit tests.</p>
-				</td>
-				<?php
-				$zipfilename="wtp-jpt-Automated-Tests-${build}";
-				$filename=$zipfilename.".zip";
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription="dali tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-		</table>
-		</td>
-	
-	
-	<tr>
 
-</table>
+                    <?php
+                    //customize page depending on user's browser/platform, if we can detect it
+                    $usersPlatform = getPlatform();
+                    // assume windows by default, since likely most frequent, even for cases where
+                    // platform is "unknown". I've noticed Opera reports 'unknown' :(
+                    $recommendedFile=$eclipsefilewindows;
+                    if (strcmp($usersPlatform,"linux")== 0) {
+                         $recommendedFile=$eclipsefilelinux;
+                    } else if (strcmp($usersPlatform,"mac") == 0) {
+                         $recommendedFile=$eclipsefilemacosx;
+                    }
+                    ?>
+                    <td align="right"><?php
+                    echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+                    echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
+                    echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+                    ?>
+
+               </tr>
+
+                         <tr valign="top">
+                              <td width="10%"></td>
+                              <td>Web Standard Tools (WST)</td>
+                              <td align="right"><?php
+                              // debug
+                              // echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $wstMirrorPrefixuri . "/" . $wstFile;
+                              echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+                              echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+                              ?>
+
+                         </tr>
+
+                         <tr valign="top">
+                              <td width="10%"></td>
+                              <td>J2EE Standard Tools (JST)</td>
+                              <td align="right"><?php
+                              // debug
+                              // echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $jstMirrorPrefixuri . "/" . $jstFile;
+                              echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+                              echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+                              ?>
+
+                         </tr>
+
+                         <tr valign="top">
+                              <td width="10%"></td>
+                              <td>EMF v2.4 Runtime Minimum executable code.</td>
+                              <td align="right"><?php
+                              echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
+                              echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
+                              ?>
+
+                         </tr>
+
+                         <tr valign="top">
+                              <td width="10%"></td>
+                              <td>EMF XSD v2.4 Runtime Minimum executable code.</td>
+                              <td align="right"><?php
+                              echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
+                              echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
+                              ?>
+
+                         </tr>
+
+                         <tr valign="top">
+                              <td width="10%"></td>
+                              <td>Graphical Editing Framework (GEF)</td>
+                              <td align="right"><?php
+                              echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
+                              echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
+                              ?>
+
+                         </tr>
+
+                         <tr valign="top">
+                              <td width="10%"></td>
+                              <td>Data Tools Platform (DTP)</td>
+                              <td align="right"><?php
+                              echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
+                              echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
+                              ?>
+
+                         </tr>
+
+                         <tr valign="middle">
+                              <td width="10%"></td>
+                              <td colspan="2">
+                                   <hr />
+                              </td>
+                         </tr>
+
+                         <tr valign="top">
+                              <td width="10%"></td>
+                              <td>Eclipse Test Framework (required only for Automated JUnit
+                                   tests)</td>
+                              <td align="right"><?php
+                              echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
+                              echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+                              ?>
+
+                         </tr>
+
+                         <tr valign="top">
+                              <td width="10%"></td>
+                              <td>Eclipse releng tool (required only for committers to more
+                                   easily "release" code to a build)</td>
+                              <td align="right"><?php
+                              echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
+                              echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+                              ?>
+
+                         </tr>
+
+                         <tr valign="top">
+                              <td width="10%"></td>
+                              <td>Third Party code from Orbit (currently much more than needed
+                                   for WTP, but some committers like having the whole heap in their
+                                   target)</td>
+                              <td align="right"><?php
+                              echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
+                              echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
+                              ?>
+
+                         </tr>
+
+                    </table>
+               </td>
+          </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
+                         Incubating Components</font></td>
+          </tr>
+
+          <tr>
+               <td align="left" valign="top" colspan="5">
+                    <p>The Zip files includes the features and plugins for the Dali
+                         Component.</p>
+               </td>
+          </tr>
+          <tr>
+               <td>
+                    <table border=0 cellspacing=2 cellpadding=2 width="90%"
+                         align="center">
+
+
+                         <tr>
+                              <td align="left" valign="top" width="10%"><b>Minimal</b></td>
+                              <td align="left" valign="top">
+                                   <p>Executable code only.</p>
+                              </td>
+
+
+
+
+                    <?php
+                    $zipfilename="wtp-jpt-${build}";
+                    $filename=$zipfilename.".zip";
+                    $zipfilesize=fileSizeForDisplay($filename);
+                    $fileShortDescription="dali";
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+                    ?>
+               </tr>
+
+                         <tr>
+                              <td align="left" valign="top" width="10%"><b>SDK</b></td>
+                              <td align="left" valign="top">
+                                   <p>Executable code and source code.</p>
+                              </td>
+
+
+
+
+                    <?php
+                    $zipfilename="wtp-jpt-sdk-${build}";
+                    $filename=$zipfilename.".zip";
+                    $zipfilesize=fileSizeForDisplay($filename);
+                    $fileShortDescription="dali sdk";
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+                    ?>
+               </tr>
+                         <tr>
+                              <td align="left" valign="top" width="10%"><b>Tests</b></td>
+                              <td align="left" valign="top">
+                                   <p>Unit tests.</p>
+                              </td>
+
+
+
+
+                    <?php
+                    $zipfilename="wtp-jpt-Automated-Tests-${build}";
+                    $filename=$zipfilename.".zip";
+                    $zipfilesize=fileSizeForDisplay($filename);
+                    $fileShortDescription="dali tests";
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+                    ?>
+               </tr>
+                    </table>
+               </td>
+
+
+          <tr>
+
+     </table>
 
 
 
@@ -404,131 +432,140 @@
 
 
 
-<!-- ***********  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>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+     <!-- ***********  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>
+               <td>
+                    <table border=0 cellspacing=2 cellpadding=2 width="90%"
+                         align="center">
 
-			<tr>
-				<td><a href="buildNotes.php">Build notes</a> <br />
-				<a href="directory.txt">map files</a> <br />
-				<?php
-
-				if ($displayTestSummary) {
+                         <tr>
+                              <td><a href="buildNotes.php">Build notes</a> <br /> <a
+                                   href="directory.txt">map files</a> <br />
 
 
-					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\"/>";
-					}
 
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
 
-					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;";
+                    <?php
 
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
+                    if ($displayTestSummary) {
 
-					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 />
+                         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\"/>";
+                         }
 
-				<?php
-				if (file_exists("versioningReportName.php")) {
-					include "versioningReportName.php";
-					$fname="${versionReportFilename}.html";
-					if (file_exists($fname)) {
-						echo "<br /> <a href='$fname'>Versioning Information</a>";
-					}
+                         echo "<br />";
+                         echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
+
+                         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;";
+
+                         echo "<br />";
+                         echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
+
+                         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>";
+     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>";
+     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>";
+     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>";
+     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>";
+     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>";
+     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>";
+     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>";
+     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 />";
+     echo "<br />";
+     echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
+     echo "<br />";
 }
 ?></td>
-			</tr>
+                         </tr>
 
 
-		</table>
-		</td>
-	</tr>
-</table>
+                    </table>
+               </td>
+          </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>
+     <!-- 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>
+          <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 -->
+     </center>
+     <!-- end footer -->
 
 
 </body>
diff --git a/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template b/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template
index ddad0b7..30e0b9a 100644
--- a/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template
+++ b/releng.wtpbuilder/distribution/dali.site/templateFiles/testResults.php.template
@@ -2,11 +2,11 @@
 <head>
 
 <?php
-	$parts = explode("/", getcwd());
-	$parts2 = explode("-", $parts[count($parts) - 1]);
-	$buildName = $parts2[1];
-	
-	echo "<title>Test Results for $buildName </title>";
+     $parts = explode("/", getcwd());
+     $parts2 = explode("-", $parts[count($parts) - 1]);
+     $buildName = $parts2[1];
+
+     echo "<title>Test Results for $buildName </title>";
 ?>
 
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -94,10 +94,10 @@
     <td class="bold" align="center" width="10%">Total Tests</td>
     <td class="bold" align="center" width="10%">Total Time (s)</td>
   </tr>
-  
-  
+
+
   %testresults%
-  
+
 </table>
 <p></p>
 <br>
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index f5d1875..fd69551 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -223,7 +223,7 @@
             <arg value="${testRoot}/overallTestWorkspace"/>
             <arg value="-application"/>
             <arg value="org.eclipse.ant.core.antRunner"/>
-<!--        	
+<!--             
             <arg
                 value="-verbose"/>
 -->
diff --git a/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php
index a42c883..2ce4399 100644
--- a/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php
+++ b/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php
@@ -1,6 +1,8 @@
 <html>
 <head>
 
+
+
 <?php
 $parts = explode("/", realpath(".."));
 $label = $parts[count($parts) - 1];
@@ -8,78 +10,78 @@
 
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 </head>
 <body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
+     <p>
+          <b><font face="Verdana" size="+3">Test Results</font> </b>
+     </p>
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$label"; ?>
+                    </font> </b></td>
+          </tr>
+     </table>
+     <p></p>
+     <table border="0">
+     </table>
 
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
+     <table width="77%" border="1">
+          <tr>
+               <td width="81%"><b>Tests Performed</b></td>
+               <td width="19%"><b>Errors &amp; Failures</b></td>
+          </tr>
 
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
+          <?
+          $dir = dir("html");
+          while ($anEntry = $dir->read())
+          {
+              if ($anEntry != "." && $anEntry != "..")
+              {
+                  $link = "html/".$anEntry;
+                  $xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
+                  $count = 0;
+                  $fileHandle = fopen($xml, "r");
+                  while (!feof($fileHandle))
+                  {
+                      $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
+                      $count = $count + substr_count($aLine, '<error');
+                  }
+                  fclose($fileHandle);
+                  if ($count > 0)
+                  {
+                      echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
+                      echo "$anEntry";
+                      echo "</font></b></a></td>";
+                      echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
+                  }
+                  else
+                  {
+                      echo "<tr><td><a href=\"$link\">";
+                      echo "$anEntry";
+                      echo "</a></td>";
+                      echo "<td>$count</td></tr>";
+                  }
+              }
+          }
+          ?>
 
-</table>
-<p></p>
-<br>
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
+     </table>
+     <p></p>
+     <br>
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$label"; ?>
+                    </font> </b></td>
+          </tr>
+     </table>
+     <br> These
+     <a href="consolelogs/wtptestlog.txt">logs</a> contain the console
+     output captured while running the JUnit automated tests.
+     <br>
+     <br>
 
 </body>
 </html>
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/dali.tests/testScripts/JUNIT.XSL
index 5b0777e..e3350e3 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/JUNIT.XSL
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/JUNIT.XSL
@@ -52,7 +52,7 @@
           var doc = win.document.open();
           doc.write("<html><head><title>Properties of " + name + "</title>");
           doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
+          doc.write("body {font:normal 68% verdana,arial,helvetica;     color:#000000; }");
           doc.write("table tr td, table tr th { font-size: 68%; }");
           doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
           doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
@@ -147,11 +147,11 @@
                 <tr valign="top">
                     <!-- set a nice color depending if there is an error/failure -->
                     <xsl:attribute name="class">
-						<xsl:choose>
-							<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
+                              <xsl:choose>
+                                   <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
+                                   <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
+                              </xsl:choose>
+                         </xsl:attribute>
                     <td>
                         <a href="#{@package}">
                             <xsl:value-of select="@package"/>
@@ -290,11 +290,11 @@
             </tr>
             <tr valign="top">
                 <xsl:attribute name="class">
-				<xsl:choose>
-					<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
+                    <xsl:choose>
+                         <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
+                         <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
+                    </xsl:choose>
+               </xsl:attribute>
                 <td>
                     <xsl:value-of select="$testCount"/>
                 </td>
@@ -420,11 +420,11 @@
         <tr valign="top">
             <!-- set a nice color depending if there is an error/failure -->
             <xsl:attribute name="class">
-			<xsl:choose>
-				<xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
+               <xsl:choose>
+                    <xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
+                    <xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
+               </xsl:choose>
+          </xsl:attribute>
 
             <!-- print testsuite information -->
             <td>
@@ -456,10 +456,10 @@
         mode="print.test">
         <tr valign="top">
             <xsl:attribute name="class">
-			<xsl:choose>
-				<xsl:when test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
+               <xsl:choose>
+                    <xsl:when test="failure | error">Error</xsl:when>
+               </xsl:choose>
+          </xsl:attribute>
             <td>
                 <xsl:value-of select="@name"/>
             </td>
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml
index 00aac13..5c5f718 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml
@@ -34,15 +34,15 @@
             name="extraVMargs"
             value=""/>
 
-		<!-- if not otherwise set, use a unique workspace name -->
+          <!-- if not otherwise set, use a unique workspace name -->
         <property
             name="data-dir"
             value="${testRoot}/junitworkspaces/workspace-${classname}"/>
         <property
             name="testRoot"
             value="${testRoot}"/>
-    	  <!-- temporarily changed from 30 minutes to 1 hrs 
-    	  to help spot problematic tests -->
+           <!-- temporarily changed from 30 minutes to 1 hrs 
+           to help spot problematic tests -->
       <!--
         Some common values, of milliseconds to more recognizable units: 
         14400000: 4 hours
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
index 1f70f30..676d2a2 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
@@ -837,7 +837,7 @@
         <echo
             level="info"
             message="Starting Dali Unit Tests"/>
-    	<!--
+         <!--
         <echo
             level="info"
             message="Starting releng tests"/>
@@ -992,7 +992,7 @@
         <echo
             level="info"
             message="Ended JPT Unit Tests"/>
-    	<!--
+         <!--
         <echo
             level="info"
             message="Starting JSF Tests"/>
diff --git a/releng.wtpbuilder/distribution/jsdt.package/build.xml b/releng.wtpbuilder/distribution/jsdt.package/build.xml
index f83d1c8..77f25d9 100644
--- a/releng.wtpbuilder/distribution/jsdt.package/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.package/build.xml
@@ -8,7 +8,7 @@
     <property file="${wtp.builder.home}/build.properties"/>
     <property environment="env"/>
 
-	<!-- required to get proper value of branch specific values -->
+     <!-- required to get proper value of branch specific values -->
     <property
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
diff --git a/releng.wtpbuilder/distribution/jsdt.package/createFinalRepo.xml b/releng.wtpbuilder/distribution/jsdt.package/createFinalRepo.xml
index 8bc80bb..4bd1f32 100644
--- a/releng.wtpbuilder/distribution/jsdt.package/createFinalRepo.xml
+++ b/releng.wtpbuilder/distribution/jsdt.package/createFinalRepo.xml
@@ -10,23 +10,23 @@
     default="build"
     basedir=".">
 
-	<!-- = = = standard properties pattern = = = -->
-	<!--
-	        Note to be cross-platform, "environment variables" are only
-	        appropriate for some variables, e.g. ones we set, since
-	        properties are case sensitive, even if the environment variables
-	        on your operating system are not, e.g. it will be ${env.Path}
-	        not ${env.PATH} on Windows
-	    -->
+     <!-- = = = standard properties pattern = = = -->
+     <!--
+             Note to be cross-platform, "environment variables" are only
+             appropriate for some variables, e.g. ones we set, since
+             properties are case sensitive, even if the environment variables
+             on your operating system are not, e.g. it will be ${env.Path}
+             not ${env.PATH} on Windows
+         -->
     <property environment="env"/>
-	<!--
-	        Let users override standard properties, if desired. If
-	        directory, file, or some properties do not exist, then standard
-	        properties will be used.
-	    -->
+     <!--
+             Let users override standard properties, if desired. If
+             directory, file, or some properties do not exist, then standard
+             properties will be used.
+         -->
     <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
 
-	<!-- = = = end standard properties pattern = = = -->
+     <!-- = = = end standard properties pattern = = = -->
 
 
 
@@ -34,7 +34,7 @@
     <property file="${wtp.builder.home}/build.properties"/>
 
 
-	<!-- required to get proper value of branch specific values, for example, 
+     <!-- required to get proper value of branch specific values, for example, 
             baseComparatorRepoDir, since can vary from forward "integration" stream, 
             and "maintenance" branch -->
     <property
@@ -53,7 +53,7 @@
         name="baseComparatorRepoDirTests"
         value="${baseComparatorRepoDir}"/>
 
-	<!-- if not otherwise set, use these default properties 
+     <!-- if not otherwise set, use these default properties 
     <property
         name="repoDownloadBaseURL"
         value="http://build.eclipse.org/webtools/committers"/> -->
@@ -77,34 +77,34 @@
         name="build"
         depends="doMirror,doMirrorTests">
 
-		<!-- add the new build to the composite -->
-		<!-- 
-    	TODO: after promotion, do we need to delete repo's as directories removed? Or just do occasional cleanup, 
-    	if non-existent child repos are ignored 
-    	TODO: ok to use absolute file system locations for child repos? (And still access via http, later?  
+          <!-- add the new build to the composite -->
+          <!-- 
+         TODO: after promotion, do we need to delete repo's as directories removed? Or just do occasional cleanup, 
+         if non-existent child repos are ignored 
+         TODO: ok to use absolute file system locations for child repos? (And still access via http, later?  
 -->
-		<!-- 
- 
+          <!-- 
+
  On build machine, URL's to repositories will look similar to following URL: 
- 
+
  http://build.eclipse.org/webtools/committers/wtp-R3.3.0-I/20100914034658/I-3.3.0-20100914034658/repository/
- 
+
  which we translate as follows
- 
+
   repoDownloadBaseURL=http://build.eclipse.org/webtools/committers
-  
+
   ${repoDownloadBaseURL}/${projectname}/${timestamp}/${buildLabel}/repository/
- 
+
  repoDownloadBaseURL is machine dependent (will differ from one build machine to another). 
- 
+
  Will be different on "download server", as well. 
- 
+
  -->
 
-		<!-- remember, repoLocation won't exist until later, since it is at the "site", not the 
+          <!-- remember, repoLocation won't exist until later, since it is at the "site", not the 
        working directory -->
-    	
-    	<!-- remember that repos are added to comparator set only when they are promoted to download location -->
+
+         <!-- remember that repos are added to comparator set only when they are promoted to download location -->
         <property
             name="repoLocation"
             value="${repoDownloadBaseURL}/committers/${projectname}/${timestamp}/${buildLabel}/repository/"/>
@@ -128,16 +128,16 @@
             file="${baseComparatorRepoDir}"
             type="dir"
             property="baseComparatorRepoDirExists"/>
-    	<!-- we copy the comparator filter file, used only during tests, to build output location, 
-    	just so it is always available, even if tests ran later -->
+         <!-- we copy the comparator filter file, used only during tests, to build output location, 
+         just so it is always available, even if tests ran later -->
         <copy
             file="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/comparatorfilter.properties"
             todir="${buildDirectory}/${buildLabel}"/>
 
     </target>
-	<!-- normally, the "prime repository" should be created from previous release, 
-	or similar, but if that hasn't been done, we'll automatically create an empty 
-	composite repo which we've stored away for simplicity.-->
+     <!-- normally, the "prime repository" should be created from previous release, 
+     or similar, but if that hasn't been done, we'll automatically create an empty 
+     composite repo which we've stored away for simplicity.-->
     <target
         name="primeRepo"
         depends="init"
@@ -146,7 +146,7 @@
         <copy todir="${baseComparatorRepoDir}">
             <fileset dir="${wtp.builder.home}/emptyRepository/"/>
         </copy>
-		<!-- could probably just set to true, but we'll use same logic as in init, just in case -->
+          <!-- could probably just set to true, but we'll use same logic as in init, just in case -->
         <available
             file="${baseComparatorRepoDir}"
             type="dir"
@@ -209,12 +209,12 @@
                 </exclude>
             </comparator>
 
-			<!-- 
-        	followStrict is sort of a safety measure. All our features should be strict, but in case not, 
-        	will show up early if not mirrored. 
-        	
-        	
-        	-->
+               <!-- 
+             followStrict is sort of a safety measure. All our features should be strict, but in case not, 
+             will show up early if not mirrored. 
+
+
+             -->
             <slicingoptions
                 followStrict="true"
                 includeNonGreedy="false"
@@ -232,7 +232,7 @@
 
         </p2.mirror>
 
-		<!-- create archived repo from contents of 'repository' at this point -->
+          <!-- create archived repo from contents of 'repository' at this point -->
         <property
             name="zippedrepo"
             value="${build.distribution}-repo-${buildLabel}.zip"/>
@@ -301,7 +301,7 @@
 
         </p2.mirror>
 
-		<!-- create archived repo from contents of 'repository' at this point -->
+          <!-- create archived repo from contents of 'repository' at this point -->
         <property
             name="zippedtestsrepo"
             value="${build.distribution}-tests-repo-${buildLabel}.zip"/>
diff --git a/releng.wtpbuilder/distribution/jsdt.package/createmainzips.xml b/releng.wtpbuilder/distribution/jsdt.package/createmainzips.xml
index dbede59..078de03 100644
--- a/releng.wtpbuilder/distribution/jsdt.package/createmainzips.xml
+++ b/releng.wtpbuilder/distribution/jsdt.package/createmainzips.xml
@@ -7,7 +7,7 @@
 <project
     default="build"
     basedir=".">
-	
+
 
        <!-- = = = standard properties pattern = = = -->
        <!--
@@ -67,9 +67,9 @@
         property="labelfileavailable"/>
     <fail unless="labelfileavailable"/>
     <property file="${labelfile}"/>
-	
-	
-	
+
+
+
     <!--
         These properties are normally set by calling task, but for
         "local" tests from command line, they can be set here
@@ -116,9 +116,9 @@
                 value="${build.distribution}-tests-${buildLabel}.zip"/>
         </antcall>
     </target>
-	<!-- 
-	Note: this was done as an import, since eventually there may be more than one ... differ by streams? There may be 
-	better ways ... and may not be needed after all, since turning out to be pretty generic ... driven by "categories". 
-	-->
+     <!-- 
+     Note: this was done as an import, since eventually there may be more than one ... differ by streams? There may be 
+     better ways ... and may not be needed after all, since turning out to be pretty generic ... driven by "categories". 
+     -->
     <import file="${wtp.builder.home}/distribution/${build.distribution}.package/createziptasks.xml"/>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.site/build.xml b/releng.wtpbuilder/distribution/jsdt.site/build.xml
index 7409f80..f26f3c0 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/build.xml
@@ -21,8 +21,8 @@
     <echo message="ant.file: ${ant.file}"/>
     <target name="build">
         <mkdir dir="${buildDirectory}/${buildLabel}"/>
-    	
-    	 <!-- make sure there is a base builder, since we need the launcher -->
+
+          <!-- make sure there is a base builder, since we need the launcher -->
         <ant
             antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
             target="getBaseBuilder"/>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/publish.xml b/releng.wtpbuilder/distribution/jsdt.site/publish.xml
index e60ecfb..35c46e7 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/publish.xml
@@ -291,11 +291,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Integration"/>
     </target>
@@ -303,11 +298,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Stable"/>
     </target>
@@ -315,11 +305,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Nightly"/>
     </target>
@@ -327,11 +312,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Maintenance"/>
     </target>
@@ -339,11 +319,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Release"/>
     </target>
@@ -351,11 +326,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Test"/>
     </target>
@@ -363,11 +333,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Patches"/>
     </target>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/buildNotes.php
index d069f94..57093a1 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/buildNotes.php
@@ -1,5 +1,7 @@
 <html>
 <head>
+
+
 <?php
 $parts = explode("/", getcwd());
 $parts2 = explode("-", $parts[count($parts) - 1]);
@@ -9,43 +11,48 @@
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 </head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Build Notes</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica"> Build Notes for <?php echo "$buildName"; ?>
+                    </font> </b></td>
+          </tr>
+     </table>
+     <table border="0">
 
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		$nameprefixlen=strlen("buildnotes_");
-		$baseName = substr($anEntry,$nameprefixlen);
-		$extpos=strrpos($baseName,".html");
-		$component=substr($baseName,0,$extpos);
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
 
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
 
-</table>
+     <?php
+     $hasNotes = false;
+     $aDirectory = dir("buildnotes");
+     while ($anEntry = $aDirectory->read()) {
+         if ($anEntry != "." && $anEntry != "..") {
+             $nameprefixlen=strlen("buildnotes_");
+             $baseName = substr($anEntry,$nameprefixlen);
+             $extpos=strrpos($baseName,".html");
+             $component=substr($baseName,0,$extpos);
+             $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
+             echo "<tr>";
+             echo "$line";
+             echo "</tr>";
+             $hasNotes = true;
+
+         }
+     }
+     $aDirectory.closedir();
+     if (!$hasNotes) {
+         echo "<br>There are no build notes for this build.";
+     }
+     ?>
+
+     </table>
 </body>
 </html>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/consoleLogs.php
index 2ee3c36..885ca2f 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/consoleLogs.php
@@ -1,5 +1,7 @@
 <html>
 <head>
+
+
 <?php
 $parts = explode("/", getcwd());
 $parts2 = explode("-", $parts[count($parts) - 1]);
@@ -9,86 +11,90 @@
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 <title>Console Logs from Running JUnit Plug-in Tests</title>
 </head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Test Console Output</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica">Console output from running
+                              JUnit plugin tests for <?php echo "$buildName"; ?> </font> </b></td>
+          </tr>
+     </table>
+     <table border="0">
 
 
-sort($entries);
-sort($direntries);
 
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
+     <?php
+     $rootDir = "testResults/consolelogs";
+     $hasNotes = false;
+     $aDirectory = dir($rootDir);
+     $index = 0;
+     $dirindex = 0;
+     while ($anEntry = $aDirectory->read()) {
+         if ($anEntry != "." && $anEntry != "..") {
+             if (is_file("$rootDir/$anEntry")) {
+                 $entries[$index] = $anEntry;
+                 $index++;
+             } else if (is_dir("$rootDir/$anEntry")) {
+                 $direntries[$dirindex] = $anEntry;
+                 $dirindex++;
+             }
+         }
+     }
+     $aDirectory->close();
 
 
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
+     sort($entries);
+     sort($direntries);
 
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
+     for ($i = 0; $i < $dirindex; $i++) {
+         $anEntry = $direntries[$i];
+         $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
+         echo "<tr>";
+         echo "$line";
+         echo "</tr>";
+     }
+     for ($i = 0; $i < $index; $i++) {
+         $anEntry = $entries[$i];
+         $logsize = filesize("testResults/consolelogs/$anEntry");
 
 
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
+         $level = 0;
+         if ($logsize > 20000) {
+             $level = 2;
+         }
+         else if ($logsize > 2000) {
+             $level = 1;
+         }
 
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
+         if ($level == 0) {
+             $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+         }
+         else if ($level == 1) {
+             $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+         } else if ($level == 2) {
+             $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+         }
 
-</table>
+
+         echo "<tr>";
+         echo "$line";
+         echo "</tr>";
+         $hasNotes = true;
+     }
+
+     if (!$hasNotes) {
+         echo "<br>There are no test logs for this build.";
+     }
+     ?>
+
+     </table>
 </body>
 </html>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/logIndex.php
index 721ca00..28da816 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/logIndex.php
@@ -1,10 +1,12 @@
 <html>
 <head>
+
+
 <?php
 
 function endsWith( $str, $sub ) {
 
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+    return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
 }
 
 $parts = explode("/", getcwd());
@@ -15,71 +17,75 @@
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 <title>Console Logs from Running JUnit Plug-in Tests</title>
 </head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Test Console Output</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica">Console output from running
+                              JUnit plugin tests for <?php echo "$buildName"; ?> </font> </b></td>
+          </tr>
+     </table>
+     <table border="0">
 
 
-sort($entries);
 
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
+     <?php
+     $hasNotes = false;
+     $aDirectory = dir(".");
+     $index = 0;
+     while ($anEntry = $aDirectory->read()) {
+         if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+             $entries[$index] = $anEntry;
+             $index++;
+         }
+     }
+     aDirectory.closedir();
 
 
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
+     sort($entries);
 
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
+     for ($i = 0; $i < $index; $i++) {
+         $anEntry = $entries[$i];
+         $logsize = filesize("$anEntry");
 
 
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
+         $level = 0;
+         if ($logsize > 20000) {
+             $level = 2;
+         }
+         else if ($logsize > 2000) {
+             $level = 1;
+         }
 
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
+         if ($level == 0) {
+             $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+         }
+         else if ($level == 1) {
+             $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+         } else if ($level == 2) {
+             $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+         }
 
-</table>
+
+         echo "<tr>";
+         echo "$line";
+         echo "</tr>";
+         $hasNotes = true;
+     }
+
+     if (!$hasNotes) {
+         echo "<br>There are no test logs for this build.";
+     }
+     ?>
+
+     </table>
 </body>
 </html>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/miscUtil.php
index 3c57a68..540468b 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/miscUtil.php
@@ -7,113 +7,113 @@
 
 
 function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
+    $onemeg=1024*1024;
+    $zipfilesize=filesize($filename);
+    $zipfilesize=round($zipfilesize/$onemeg, 0);
+    return $zipfilesize;
 }
 
 function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-		$zipfilesize=filesize($filename);
-		if ($zipfilesize > $criteria) {
-			$zipfilesize=round($zipfilesize/$onemeg, 0);
-			$scaleChar = "M";
-		}
-		else {
-			$zipfilesize=round($zipfilesize/$onekilo, 0);
-			$scaleChar = "K";
-		}
-	}
-	else {
-		$zipfilesize = 0;
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
+    $onekilo=1024;
+    $onemeg=$onekilo * $onekilo;
+    $criteria = 10 * $onemeg;
+    $scaleChar = "M";
+    if (file_exists($filename)) {
+        $zipfilesize=filesize($filename);
+        if ($zipfilesize > $criteria) {
+            $zipfilesize=round($zipfilesize/$onemeg, 0);
+            $scaleChar = "M";
+        }
+        else {
+            $zipfilesize=round($zipfilesize/$onekilo, 0);
+            $scaleChar = "K";
+        }
+    }
+    else {
+        $zipfilesize = 0;
+    }
+    $result =  "(" . $zipfilesize . $scaleChar . ")";
+    return $result;
 }
 
 
 function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>][<a href=\"checksum/$filename.sha1\">sha1</a>]";
-	echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
+    echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
+    echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
+    echo $zipfilesize;
+    echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
+    echo "[<a href=\"checksum/$filename.md5\">md5</a>][<a href=\"checksum/$filename.sha1\">sha1</a>]";
+    echo "</td>";
 }
 
 /*
  * This function needs to add the subdir, if on mirrored server, but not add it if not,
- * since assumed the calling page is such that a relative URL (already in subdir) is correct.
- */
+* since assumed the calling page is such that a relative URL (already in subdir) is correct.
+*/
 function displayFileLineSubdir($downloadprefix, $subdir, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	$fullURL=$downloadprefix.$subdir."/".$filename;
-	if (isMirrored($fullURL)) {
-		echo "<a href=\"" . $fullURL . "\">" . $fileShortDescription . "</a>";
-	}
-	else {
-		echo "<a href=\"" . $filename . "\">" . $fileShortDescription . "</a>";
-	}
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
-	echo "[<a type=\"text/plain\" href=\"checksum/$filename.md5\">md5</a>][<a type=\"text/plain\" href=\"checksum/$filename.sha1\">sha1</a>]";
-	echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
+    $fullURL=$downloadprefix.$subdir."/".$filename;
+    if (isMirrored($fullURL)) {
+        echo "<a href=\"" . $fullURL . "\">" . $fileShortDescription . "</a>";
+    }
+    else {
+        echo "<a href=\"" . $filename . "\">" . $fileShortDescription . "</a>";
+    }
+    echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
+    echo $zipfilesize;
+    echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
+    echo "[<a type=\"text/plain\" href=\"checksum/$filename.md5\">md5</a>][<a type=\"text/plain\" href=\"checksum/$filename.sha1\">sha1</a>]";
+    echo "</td>";
 }
 
 function displayFileLineWithSHA($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"15%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
-	echo "[<a type=\"text/plain\" href=\"checksum/$filename.md5\">md5</a>][<a type=\"text/plain\" href=\"checksum/$filename.sha1\">sha1</a>]";
-	echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"15%\">";
+    echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
+    echo "</td><td align=\"right\" valign=\"top\" width=\"2%\">";
+    echo $zipfilesize;
+    echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
+    echo "[<a type=\"text/plain\" href=\"checksum/$filename.md5\">md5</a>][<a type=\"text/plain\" href=\"checksum/$filename.sha1\">sha1</a>]";
+    echo "</td>";
 }
 
 function displayRepoFileLine($downloadprefix, $subdir, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"" . $downloadprefix . $subdir . "/" . $filename . "\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
-	echo "[<a type=\"text/plain\" href=\"$subdir/checksum/$filename.md5\">md5</a>][<a type=\"text/plain\" href=\"$subdir/checksum/$filename.sha1\">sha1</a>]";
-	echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
+    echo "<a href=\"" . $downloadprefix . $subdir . "/" . $filename . "\">" . $fileShortDescription . "</a>";
+    echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
+    echo $zipfilesize;
+    echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
+    echo "[<a type=\"text/plain\" href=\"$subdir/checksum/$filename.md5\">md5</a>][<a type=\"text/plain\" href=\"$subdir/checksum/$filename.sha1\">sha1</a>]";
+    echo "</td>";
 }
 
 
 function displayp2repoarchives($zipfilename, $subdir, $downloadprefix, $fileShortDescription, $label, $description) {
 
-	$filename=$zipfilename.".zip";
-	$wholepath="./".$subdir."/".$filename;
-	if (file_exists($wholepath)) {
-		echo "<tr>";
+    $filename=$zipfilename.".zip";
+    $wholepath="./".$subdir."/".$filename;
+    if (file_exists($wholepath)) {
+        echo "<tr>";
 
-		echo "<td align=\"left\" valign=\"top\" width=\"10%\"><b>".$label."</b></td>";
-		echo "<td align=\"left\" valign=\"top\">";
-		echo "<p>".$description."</p>";
-		echo "</td>";
+        echo "<td align=\"left\" valign=\"top\" width=\"10%\"><b>".$label."</b></td>";
+        echo "<td align=\"left\" valign=\"top\">";
+        echo "<p>".$description."</p>";
+        echo "</td>";
 
-		$zipfilesize=fileSizeForDisplay($wholepath);
+        $zipfilesize=fileSizeForDisplay($wholepath);
 
-		displayRepoFileLine($downloadprefix, $subdir, $filename, $zipfilesize, $fileShortDescription);
+        displayRepoFileLine($downloadprefix, $subdir, $filename, $zipfilesize, $fileShortDescription);
 
-		echo "</tr>";
-	} else {
+        echo "</tr>";
+    } else {
 
-		// debug only
-		// echo $wholepath."<br/>";
-	}
+        // debug only
+        // echo $wholepath."<br/>";
+    }
 
 }
 
@@ -121,172 +121,172 @@
 
 function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
 {
-	$result = false;
+    $result = false;
 
-	$allowURLopen = ini_get('allow_url_fopen');
+    $allowURLopen = ini_get('allow_url_fopen');
 
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		}
-	}
-	return $result;
+    if ($allowURLopen && stream_last_modified($url)) {
+        $result = true;
+    }
+    else {
+        // TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
+        // is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
+        $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+        if (file_exists($wholePath)) {
+            $result = true;
+        }
+    }
+    return $result;
 }
 
 function stream_last_modified($url)
 {
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
+    if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
+    {
+        if (!($fp = @fopen($url, 'r')))
+        return NULL;
 
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
+        $meta = stream_get_meta_data($fp);
+        for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
+        {
+            if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
+            {
+                $modtime = substr($meta['wrapper_data'][$j], 15);
+                break;
+            }
+        }
+        fclose($fp);
+    }
+    else
+    {
+        $parts = parse_url($url);
+        $host  = $parts['host'];
+        $path  = $parts['path'];
 
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
+        if (!($fp = @fsockopen($host, 80)))
+        return NULL;
 
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
+        $req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
+        fputs($fp, $req);
 
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
+        while (!feof($fp))
+        {
+            $str = fgets($fp, 4096);
+            if (strstr(strtolower($str), 'last-modified'))
+            {
+                $modtime = substr($str, 15);
+                break;
+            }
+        }
+        fclose($fp);
+    }
+    return isset($modtime) ? strtotime($modtime) : time();
 }
 
 function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
+    global $debugScript;
+    global $debugFunctions;
+    $localuri = $uriToCheck;
 
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
+    $debugMirrorList = false;
+    if ($debugScript) {
+        echo "uriToCheck: " . $localuri . "<br />";
+    }
 
-	$xmlcount = 0;
+    $xmlcount = 0;
 
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
+    /* This method true and accurate method of parsing mirror results
+     * may be expensive, and would
+    * likely cause artificially high counts of "downloads".
+    * Could maybe use if somehow only checked once ever 5 minutes or something.
 
 
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
+    // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
+    $holdLevel = error_reporting(E_ERROR);
+    $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
+    error_reporting($holdLevel);
 
 
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
+    if ($mirrorsxml) {
+    if ($debugFunctions) {
+    echo "root node: " . $mirrorsxml->getName() . "<br />";
+    }
+    if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
+    foreach ($mirrorsxml->children() as $mirror) {
+    if (strcmp($mirror->getName(),"mirror") == 0) {
+    $xmlcount=$xmlcount+1;
+    }
+    if ($debugMirrorList) {
+    print_r($mirror);
+    echo "<br />";
+    }
+    }
+    }
+    if ($debugFunctions) {
+    echo "Mirror count: " . $xmlcount . "<br />";
+    }
+    }
+    */
+    /*
+     * Use simple heuristic based on pattern
+    * in the URI ... if it contains "/downloads/" then assume it's mirrored
+    */
+    if (strpos($uriToCheck, "webtools/downloads/") > 0) {
+        $xmlcount = 1;
+    }
+    return ($xmlcount > 0);
 
 }
 
 // TODO: replace with Phoenix variables
 function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
+    global $debugScript;
+    global $debugFunctions;
+    // getBrowser is expensive, so cache the data
+    static $browser;
+    $platform = "unknown";
 
 
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
+    if(ini_get("browscap")) {
+        if(!isset($browser)){
+            $browser = get_browser(null, true);
+        }
 
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
+        if ($browser) {
+            $rawPlatform = $browser['platform'];
+            if ($debugFunctions) {
+                echo "browser platfrom: " . $rawPlatform . "<br />" ;
+            }
 
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
+            if ($debugFunctions) {
+                $browserKeys = array_keys($browser);
+                foreach ($browserKeys as $key) {
+                    echo $key . ": " . $browser[$key] . "<br />";
+                }
+            }
+        }
+        if (strpos($rawPlatform, "Win") === 0) {
+            $platform="windows";
+        } else if (strpos($rawPlatform, "Linux") === 0) {
+            $platform="linux";
+        } else if (strpos($rawPlatform, "Mac") === 0) {
+            $platform="mac";
+        }
+    }
+    return $platform;
 }
 
 function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
+    // todo: we really only need "if exists" so could make a bit more efficient
+    // I tried "file_exists" but is didn't seem to work on my test server
+    // For these pre-reqs, we assume if they exist, they are mirrored. This is true
+    // 99% of the time.
 
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
+    if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
+        $reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
+    } else {
+        $reflink=$prereqfilename;
+    }
+    return $reflink;
 }
 ?>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/report2.php
index cb68e7b..f3e1171 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/report2.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/staticDropFiles/report2.php
@@ -3,40 +3,40 @@
 
 function parse_testResults($filename)
 {
-	$junitFailures = 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);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
+    $junitFailures = 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);
+            }
+            $results = array($junitFailures);
+            return $results;
+        }
+    }
 }
 
 
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/buildvariables.php b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/buildvariables.php
index eedff7f..8fb500c 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/buildvariables.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/buildvariables.php
@@ -211,12 +211,12 @@
 
 $keytestMirrorString=$eclipseMirrorScript . "${eclipseWTPMirrorPrefix}/${build_distribution}-$build.zip";
 if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
+    $mirrorScript=$eclipseMirrorScript;
+    $downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
 }
 
 if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
+    echo "inferred platform: " . getPlatform();
 }
 
 ?>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/components.template.php b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/components.template.php
index 4de1c1c..a20371c 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/components.template.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/components.template.php
@@ -1,6 +1,8 @@
 <html>
 <head>
 
+
+
 <?php
 //ini_set("display_errors", "true");
 //error_reporting (E_ALL);
@@ -21,25 +23,32 @@
 
 <style>
 .bold,.bold TD,.bold TH,.bold TR {
-	font-weight: bold;
+     font-weight: bold;
 }
 </style>
 
 
 </head>
 <body>
-<p><b><font face="Verdana" size="+3">Components</font></b></p>
-<p>These are special-purpose subsets of the WTP build. They are not
-needed for normal use or construction of WTP (if they are needed, they
-are already included in other zip files or repositories). These are
-provided here by special request of committers, for custom distribtions
-or tests.</p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica"> component subsets</font></b></td>
-	</tr>
-</table>
+     <p>
+          <b><font face="Verdana" size="+3">Components</font> </b>
+     </p>
+     <p>These are special-purpose subsets of the WTP build. They are not
+          needed for normal use or construction of WTP (if they are needed, they
+          are already included in other zip files or repositories). These are
+          provided here by special request of committers, for custom
+          distribtions or tests.</p>
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica"> component subsets</font> </b>
+               </td>
+          </tr>
+     </table>
+
+
+
+
 
 <?php
 
@@ -50,41 +59,41 @@
 while ($anEntry = $dir->read())
 {
 
-	echo "<table>";
+     echo "<table>";
 
-	if ($anEntry != "." && $anEntry != ".." && is_file($anEntry))
+     if ($anEntry != "." && $anEntry != ".." && is_file($anEntry))
 
-	{
+     {
 
-		$path_parts = pathinfo($anEntry);
-		$file_extension = $path_parts['extension'];
+          $path_parts = pathinfo($anEntry);
+          $file_extension = $path_parts['extension'];
 
-		if ("zip" === $file_extension) {
-			// echo "       path parts: " . print_r($path_parts) . "<br /> \n";
+          if ("zip" === $file_extension) {
+               // echo "       path parts: " . print_r($path_parts) . "<br /> \n";
 
-			echo "<tr>\n";
+               echo "<tr>\n";
 
-			echo "<td align=\"left\" valign=\"top\" width=\"10%\"></td>\n";
-			// todo: could use indexed general description here?
-			//echo "    <td align=\"left\" valign=\"top\">\n";
-			//echo "     <p>The Automated Test zip contains the unit tests.</p>\n";
+               echo "<td align=\"left\" valign=\"top\" width=\"10%\"></td>\n";
+               // todo: could use indexed general description here?
+               //echo "    <td align=\"left\" valign=\"top\">\n";
+               //echo "     <p>The Automated Test zip contains the unit tests.</p>\n";
 
-			$zipfilename=$path_parts['basename'];
+               $zipfilename=$path_parts['basename'];
 
-			$filename=$zipfilename;
-			$zipfilesize=fileSizeForDisplay($filename);
-			$fileShortDescription=$zipfilename;
-			displayFileLineSubdir($downloadprefix, "components", $filename, $zipfilesize, $fileShortDescription);
+               $filename=$zipfilename;
+               $zipfilesize=fileSizeForDisplay($filename);
+               $fileShortDescription=$zipfilename;
+               displayFileLineSubdir($downloadprefix, "components", $filename, $zipfilesize, $fileShortDescription);
 
-			echo "</tr>\n";
+               echo "</tr>\n";
 
 
 
-		}
+          }
 
 
-	}
-	echo "</table>";
+     }
+     echo "</table>";
 }
 
 ?>
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/displayPrereqs.php b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/displayPrereqs.php
index 4c2f5de..9c6848c 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/displayPrereqs.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/displayPrereqs.php
@@ -1,283 +1,344 @@
 <!-- ***********  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">Prerequisites
-              and Handy Extras</font></td>
-       </tr>
-       <tr>
-              <td>
-              <p>These are the prerequisites to build or run these packages. All are
-              not necessarily required, but instead some subset. Also listed are
-              some frequently needed links for committer-required packages when
-              creating new development environments, or targets to run against.</p>
-              <p>Note that WTP as a whole requires Java 6 even though subsets of WTP and other
-              <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> might
-              run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-              JRE levels</a>.</p>
-              <p></p>
-              </td>
-       </tr>
-       <tr>
-              <td>
-              <table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-
-              <?php
-              if ("true" === $prereq_eclipseplatform) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td width=\"40%\">Eclipse Platform</td>";
+     <tr>
+          <td align="left" valign="top" bgcolor="#0080C0"><font
+               face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
+                    and Handy Extras</font></td>
+     </tr>
+     <tr>
+          <td>
+               <p>These are the prerequisites to build or run these packages. All
+                    are not necessarily required, but instead some subset. Also listed
+                    are some frequently needed links for committer-required packages
+                    when creating new development environments, or targets to run
+                    against.</p>
+               <p>
+                    Note that WTP as a whole requires Java 6 even though subsets of WTP
+                    and other <a href="http://www.eclipse.org/downloads/">Eclipse
+                         Projects</a> might run with <a
+                         href="http://www.eclipse.org/downloads/moreinfo/jre.php">other JRE
+                         levels</a>.
+               </p>
+               <p></p>
+          </td>
+     </tr>
+     <tr>
+          <td>
+               <table border=0 cellspacing=1 cellpadding=1 width="90%"
+                    align="center">
 
 
-                     //customize page depending on user's browser/platform, if we can detect it
-                     $usersPlatform = getPlatform();
-                     // assume windows by default, since likely most frequent, even for cases where
-                     // platform is "unknown". I've noticed Opera reports 'unknown' :(
-                     $recommendedFile=$eclipseplatformfilewindows;
-                     if (strcmp($usersPlatform,"linux")== 0) {
+
+
+
+                    <?php
+                    if ("true" === $prereq_eclipseplatform) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td width=\"40%\">Eclipse Platform</td>";
+
+
+                        //customize page depending on user's browser/platform, if we can detect it
+                        $usersPlatform = getPlatform();
+                        // assume windows by default, since likely most frequent, even for cases where
+                        // platform is "unknown". I've noticed Opera reports 'unknown' :(
+                        $recommendedFile=$eclipseplatformfilewindows;
+                        if (strcmp($usersPlatform,"linux")== 0) {
                             $recommendedFile=$eclipseplatformfilelinux;
-                     } else if (strcmp($usersPlatform,"mac") == 0) {
+                        } else if (strcmp($usersPlatform,"mac") == 0) {
                             $recommendedFile=$eclipseplatformfilemacosx;
-                     }
+                        }
 
-                     echo "<td align=\"right\">";
+                        echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
-                     echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+                        echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
 
 
-                     echo " </tr>";
-              }
-              ?>
-
-              <?php
-              if ("true" === $prereq_eclipse) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
+                        echo " </tr>";
+                    }
+                    ?>
 
 
-                     //customize page depending on user's browser/platform, if we can detect it
-                     $usersPlatform = getPlatform();
-                     // assume windows by default, since likely most frequent, even for cases where
-                     // platform is "unknown". I've noticed Opera reports 'unknown' :(
-                     $recommendedFile=$eclipsefilewindows;
-                     if (strcmp($usersPlatform,"linux")== 0) {
+
+
+
+                    <?php
+                    if ("true" === $prereq_eclipse) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
+
+
+                        //customize page depending on user's browser/platform, if we can detect it
+                        $usersPlatform = getPlatform();
+                        // assume windows by default, since likely most frequent, even for cases where
+                        // platform is "unknown". I've noticed Opera reports 'unknown' :(
+                        $recommendedFile=$eclipsefilewindows;
+                        if (strcmp($usersPlatform,"linux")== 0) {
                             $recommendedFile=$eclipsefilelinux;
-                     } else if (strcmp($usersPlatform,"mac") == 0) {
+                        } else if (strcmp($usersPlatform,"mac") == 0) {
                             $recommendedFile=$eclipsefilemacosx;
-                     }
+                        }
 
-                     echo "<td align=\"right\">";
+                        echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-                     echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
+                        echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
 
 
-                     echo " </tr>";
-              }
-              ?>
-
-              <?php
-              if ("true" === $prereq_emf) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
-
-                     echo $emfName . "&nbsp;" . $emfDescription ;
-
-                     echo "</td>";
-                     echo "<td align=\"right\">";
-
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-                     echo " </tr>";
-              }
-              ?>
+                        echo " </tr>";
+                    }
+                    ?>
 
 
-              <?php
-              if ("true" === $prereq_emfxsd) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
 
-                     echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-                     echo " </tr>";
-              }
-              ?>
+                    <?php
+                    if ("true" === $prereq_emf) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
 
-              <?php
-              if ("true" === $prereq_emfandxsd) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
+                        echo $emfName . "&nbsp;" . $emfDescription ;
 
-                     echo $emfandxsdName . "&nbsp;" . $emfandxsdDescription ;
+                        echo "</td>";
+                        echo "<td align=\"right\">";
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
+                        echo " </tr>";
+                    }
+                    ?>
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $emfandxsdMirrorPrefixuri, $emfandxsdURL, $emfandxsdFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $emfandxsdBuildHome . "\">equivalent</a></td>";
-                     echo " </tr>";
-              }
-              ?>
 
-              <?php
-              if ("true" === $prereq_emfvalidation) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
 
-                     echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>
+                    <?php
+                    if ("true" === $prereq_emfxsd) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
 
-              <?php
-              if ("true" === $prereq_gef) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
+                        echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
 
-                     echo $gefName  . "&nbsp;" . $gefDescription;
+                        echo "</td>";
+                        echo "<td align=\"right\">";
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
+                        echo " </tr>";
+                    }
+                    ?>
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>
 
-              <?php
-              if ("true" === $prereq_dtp) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
 
-                     echo $dtpName . "&nbsp;" . $dtpDescription;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
+                    <?php
+                    if ("true" === $prereq_emfandxsd) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
+                        echo $emfandxsdName . "&nbsp;" . $emfandxsdDescription ;
 
-                     echo " </tr>";
-              }
-              ?>
+                        echo "</td>";
+                        echo "<td align=\"right\">";
 
-              <?php
-              if ("true" === $prereq_wst) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $emfandxsdMirrorPrefixuri, $emfandxsdURL, $emfandxsdFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $emfandxsdBuildHome . "\">equivalent</a></td>";
+                        echo " </tr>";
+                    }
+                    ?>
 
-                     echo $wstName . "&nbsp;" . $wstDescription;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>
 
-              <?php
-              if ("true" === $prereq_jst) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
+                    <?php
+                    if ("true" === $prereq_emfvalidation) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
 
-                     echo $jstName . "&nbsp;" . $jstDescription;
+                        echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
+                        echo "</td>";
+                        echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>
-              <?php
-              if ("true" === $prereq_wtp) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
+                        echo " </tr>";
+                    }
+                    ?>
 
-                     echo $wtpName . "&nbsp;" . $wtpDescription;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>
-              <?php
-              if ("true" === $prereq_wtptests) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
 
-                     echo $wtptestsName . "&nbsp;" . $wtptestsDescription;
+                    <?php
+                    if ("true" === $prereq_gef) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
+                        echo $gefName  . "&nbsp;" . $gefDescription;
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $wtptestsMirrorPrefixuri, $wtptestsURL, $wtptestsFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $wtptestsBuildHome . "\">equivalent</a></td>";
+                        echo "</td>";
+                        echo "<td align=\"right\">";
 
-                     echo " </tr>";
-              }
-              ?>              
-              <?php
-              if ("true" === $prereq_dltk) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
 
-                     echo $dltkName . "&nbsp;" . $dltkDescription;
+                        echo " </tr>";
+                    }
+                    ?>
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>
-                     <tr valign="middle">
-                            <td width="10%"></td>
-                            <td colspan="2">
-                            <hr />
-                            </td>
-                     </tr>
+
+
+                    <?php
+                    if ("true" === $prereq_dtp) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
+
+                        echo $dtpName . "&nbsp;" . $dtpDescription;
+
+                        echo "</td>";
+                        echo "<td align=\"right\">";
+
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
+
+                        echo " </tr>";
+                    }
+                    ?>
+
+
+
+
+
+                    <?php
+                    if ("true" === $prereq_wst) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
+
+                        echo $wstName . "&nbsp;" . $wstDescription;
+
+                        echo "</td>";
+                        echo "<td align=\"right\">";
+
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+
+                        echo " </tr>";
+                    }
+                    ?>
+
+
+
+
+
+                    <?php
+                    if ("true" === $prereq_jst) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
+
+                        echo $jstName . "&nbsp;" . $jstDescription;
+
+                        echo "</td>";
+                        echo "<td align=\"right\">";
+
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+
+                        echo " </tr>";
+                    }
+                    ?>
+
+
+
+
+                    <?php
+                    if ("true" === $prereq_wtp) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
+
+                        echo $wtpName . "&nbsp;" . $wtpDescription;
+
+                        echo "</td>";
+                        echo "<td align=\"right\">";
+
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
+
+                        echo " </tr>";
+                    }
+                    ?>
+
+
+
+
+                    <?php
+                    if ("true" === $prereq_wtptests) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
+
+                        echo $wtptestsName . "&nbsp;" . $wtptestsDescription;
+
+                        echo "</td>";
+                        echo "<td align=\"right\">";
+
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $wtptestsMirrorPrefixuri, $wtptestsURL, $wtptestsFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $wtptestsBuildHome . "\">equivalent</a></td>";
+
+                        echo " </tr>";
+                    }
+                    ?>
+
+
+
+                    <?php
+                    if ("true" === $prereq_dltk) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
+
+                        echo $dltkName . "&nbsp;" . $dltkDescription;
+
+                        echo "</td>";
+                        echo "<td align=\"right\">";
+
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
+
+                        echo " </tr>";
+                    }
+                    ?>
+                    <tr valign="middle">
+                         <td width="10%"></td>
+                         <td colspan="2">
+                              <hr /></td>
+                    </tr>
+
+
+
+
+
+
 
 
 
@@ -346,7 +407,7 @@
                             echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
                             echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
                             ?>
-                     
+
                      </tr>
 
                      <tr valign="top">
@@ -358,11 +419,11 @@
                             echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
                             echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
                             ?>
-                     
+
                      </tr>
 
               </table>
-              </td>
-       </tr>
+          </td>
+     </tr>
 </table>
 
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/headingIntro.php b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/headingIntro.php
index 9cd254e..2b9746f 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/headingIntro.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/headingIntro.php
@@ -1,11 +1,11 @@
 
-<?php 
+<?php
 
 if (isset($incubating) && ($incubating == "true")) {
-       echo '<title>WTP Incubator Downloads</title>';
+    echo '<title>WTP Incubator Downloads</title>';
 }
 else {
-       echo '<title>WTP Downloads</title>';
+    echo '<title>WTP Downloads</title>';
 }
 
 ?>
@@ -17,62 +17,69 @@
 
 
 
+
+
+
+
 <?php if (isset($incubating) && ($incubating == "true")) {
-       echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-       echo " <tr>";
-       echo "        <td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
-       echo "        Build: $build</b></font></td>";
-       echo "        <td align=\"right\" rowspan=\"3\"><a";
-       echo "               href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
-       echo "               src=\"http://www.eclipse.org/images/egg-incubation.png\"";
-       echo "               alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
+    echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
+    echo " <tr>";
+    echo "        <td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
+    echo "        Build: $build</b></font></td>";
+    echo "        <td align=\"right\" rowspan=\"3\"><a";
+    echo "               href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
+    echo "               src=\"http://www.eclipse.org/images/egg-incubation.png\"";
+    echo "               alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
 
 
-       echo " <tr valign=\"top\">";
-       echo "        <td><font size=\"-1\">" . $builddate . "</font></td>";
-       echo " </tr>";
-       echo " <tr valign=\"top\">";
-       echo "        <td>";
-       echo "        <p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
-       echo "        tools for development that are just getting started, or are";
-       echo "        experimental in some fashion.</p>";
-       echo "        </td>";
-       echo " </tr>";
-       echo "</table>";
+    echo " <tr valign=\"top\">";
+    echo "        <td><font size=\"-1\">" . $builddate . "</font></td>";
+    echo " </tr>";
+    echo " <tr valign=\"top\">";
+    echo "        <td>";
+    echo "        <p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
+    echo "        tools for development that are just getting started, or are";
+    echo "        experimental in some fashion.</p>";
+    echo "        </td>";
+    echo " </tr>";
+    echo "</table>";
 
 } else {
 
-       echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-       echo " <tr>";
-       echo "        <td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
-       echo "        Build: " . $build . "</b></font></td>";
+    echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
+    echo " <tr>";
+    echo "        <td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
+    echo "        Build: " . $build . "</b></font></td>";
 
-       echo " <tr valign=\"top\">";
-       echo "        <td><font size=\"-1\">" . $builddate . "</font></td>";
-       echo " </tr>";
-       echo " <tr valign=\"top\">";
-       echo "        <td>";
-       echo "        <p>The Eclipse Web Tools Platform Project provides tools for Web";
-       echo "               Development, and is a platform for adopters making add-on tools for";
-       echo "               Web Development.</p>";
-       echo "        </td>";
-       echo " </tr>";
-       echo "</table>";
+    echo " <tr valign=\"top\">";
+    echo "        <td><font size=\"-1\">" . $builddate . "</font></td>";
+    echo " </tr>";
+    echo " <tr valign=\"top\">";
+    echo "        <td>";
+    echo "        <p>The Eclipse Web Tools Platform Project provides tools for Web";
+    echo "               Development, and is a platform for adopters making add-on tools for";
+    echo "               Web Development.</p>";
+    echo "        </td>";
+    echo " </tr>";
+    echo "</table>";
 
 } ?>
 
 
-<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">All-in-one
-              Packages</font></td>
-       </tr>
-       <tr>
-              <td>
-              <p>For most uses, we recommend web-developers download the
-              "all-in-one" package, <a href="http://www.eclipse.org/downloads/">Eclipse
-              IDE for Java EE Developers</a>, from the main Eclipse download site.</p>
-              </td>
-       </tr>
-</table>
+     <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">All-in-one
+                         Packages</font></td>
+          </tr>
+          <tr>
+               <td>
+                    <p>
+                         For most uses, we recommend web-developers download the
+                         "all-in-one" package, <a href="http://www.eclipse.org/downloads/">Eclipse
+                              IDE for Java EE Developers</a>, from the main Eclipse download
+                         site.
+                    </p>
+               </td>
+          </tr>
+     </table>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
index bdd1b39..ea76723 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
@@ -2,6 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 
+
+
+
+
 <?php
 
 //ini_set("display_errors", "true");
@@ -17,59 +21,59 @@
 $displayTestSummary=false;
 if (phpversion() >= 5) {
 
-	$code_totalBundles=0;
-	$code_totalErrors=0;
-	$code_totalWarnings=0;
-	$code_totalforbiddenAccessWarningCount=0;
-	$code_totaldiscouragedAccessWarningCount=0;
+     $code_totalBundles=0;
+     $code_totalErrors=0;
+     $code_totalWarnings=0;
+     $code_totalforbiddenAccessWarningCount=0;
+     $code_totaldiscouragedAccessWarningCount=0;
 
-	$test_totalBundles=0;
-	$test_totalErrors=0;
-	$test_totalWarnings=0;
-	$test_totalforbiddenAccessWarningCount=0;
-	$test_totaldiscouragedAccessWarningCount=0;
+     $test_totalBundles=0;
+     $test_totalErrors=0;
+     $test_totalWarnings=0;
+     $test_totalforbiddenAccessWarningCount=0;
+     $test_totaldiscouragedAccessWarningCount=0;
 
 
-	$displayTestSummary=true;
-	// 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);
-		}
-	}
+     $displayTestSummary=true;
+     // 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";
-	if (file_exists($filename)) {
-		$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 = "compilelogsSummary.xml";
+     if (file_exists($filename)) {
+          $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";
-	if (file_exists($filename)) {
-		$prefix = "test_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
+     $filename = "testcompilelogsSummary.xml";
+     if (file_exists($filename)) {
+          $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);
+          }
+     }
 }
 
 
@@ -85,50 +89,50 @@
 
 
 <table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="2" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">P2
-		repositories in zipped format files.</font></td>
-	</tr>
+     <tr>
+          <td align=left valign=top colspan="2" bgcolor="#0080C0"><font
+               face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">P2
+          repositories in zipped format files.</font></td>
+     </tr>
 
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>These are archive versions of P2 repositories that can be
-		downloaded and installed into a development environment or PDE target.
-		Its is recommended to install, rather than to to unzip the traditional
-		packages, since it is more informative of missing prerequites or
-		conflicting dependencies.</p>
-		</td>
-	</tr>
+     <tr>
+          <td align="left" valign="top" colspan="5">
+          <p>These are archive versions of P2 repositories that can be
+          downloaded and installed into a development environment or PDE target.
+          Its is recommended to install, rather than to to unzip the traditional
+          packages, since it is more informative of missing prerequites or
+          conflicting dependencies.</p>
+          </td>
+     </tr>
 
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+     <tr>
+          <td>
+          <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-		<?php
+          <?php
 
-		$shortname=${build_distribution}."-repo";
+          $shortname=${build_distribution}."-repo";
 
-		$zipfilename=${shortname}."-".${build};
-		$filename=${zipfilename}.".zip";
-		if (file_exists($filename)) {
-			?>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Code Repository</b></td>
-				<td align="left" valign="top">
-				<p>Archived p2 repository of WTP code. Good for product builders. </p>
-				</td>
-		<?php
-				$zipfilesize=fileSizeForDisplay($filename);
+          $zipfilename=${shortname}."-".${build};
+          $filename=${zipfilename}.".zip";
+          if (file_exists($filename)) {
+               ?>
+               <tr>
+                    <td align="left" valign="top" width="10%"><b>Code Repository</b></td>
+                    <td align="left" valign="top">
+                    <p>Archived p2 repository of WTP code. Good for product builders. </p>
+                    </td>
+          <?php
+                    $zipfilesize=fileSizeForDisplay($filename);
 
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $shortname);
-				?>
-			</tr>
-			<?php } ?>
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $shortname);
+                    ?>
+               </tr>
+               <?php } ?>
               <?php
-		
+
               $shortname="${build_distribution}-tests-repo";
-		
+
               $zipfilename=$shortname."-".$build;
               $filename=$zipfilename.".zip";
               if (file_exists($filename)) {
@@ -140,14 +144,14 @@
                             </td>
                             <?php
                             $zipfilesize=fileSizeForDisplay($filename);
-		
+
                             displayFileLine($downloadprefix, $filename, $zipfilesize, $shortname);
-		?>
+          ?>
                      </tr>
                      <?php } ?>
-		</table>
-	
-	</tr>
+          </table>
+
+     </tr>
 </table>
 
 
@@ -155,92 +159,92 @@
 
 <!-- ***********  Traditional Zips **************  -->
 <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"> Traditional
-		Zip Files</font></td>
-	</tr>
+     <tr>
+          <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
+               face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Traditional
+          Zip Files</font></td>
+     </tr>
 
-	<tr>
-		<td align="left" valign="top" colspan="5"><?php
-		$zipbellwether_name="${build_distribution}-${build}.zip";
-		if (file_exists($zipbellwether_name)) {
-			// if-then-include section
-			// include this whole section if (and only if) the bellwether file exists.
-			// For example, may not have been created yet
-			?>
+     <tr>
+          <td align="left" valign="top" colspan="5"><?php
+          $zipbellwether_name="${build_distribution}-${build}.zip";
+          if (file_exists($zipbellwether_name)) {
+               // if-then-include section
+               // include this whole section if (and only if) the bellwether file exists.
+               // For example, may not have been created yet
+               ?>
 
-		<p>The Zip files includes the features and plugins for this build.</p>
-		<p>Note: These traditional zip files should be considered deprecated,
-		in favor of installing the archived P2 repositories. The tradtional
-		zip files may eventually no longer be provided.</p>
-		<?php } else { ?>
-		<p>The traditonal zip files have not been produced yet (or, perhaps,
-		the build failed or was cancelled). Check back in few minutes.</p>
-		<?php } ?></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+          <p>The Zip files includes the features and plugins for this build.</p>
+          <p>Note: These traditional zip files should be considered deprecated,
+          in favor of installing the archived P2 repositories. The tradtional
+          zip files may eventually no longer be provided.</p>
+          <?php } else { ?>
+          <p>The traditonal zip files have not been produced yet (or, perhaps,
+          the build failed or was cancelled). Check back in few minutes.</p>
+          <?php } ?></td>
+     </tr>
+     <tr>
+          <td>
+          <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-		<?php
-		$zipfilename="${build_distribution}-${build}";
-		$filename=$zipfilename.".zip";
-		if (file_exists($filename)) {
-			?>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
-				<td align="left" valign="top">
-				<p>Executable code only.</p>
-				</td>
-				<?php
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription=${build_distribution};
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<?php } ?>
+          <?php
+          $zipfilename="${build_distribution}-${build}";
+          $filename=$zipfilename.".zip";
+          if (file_exists($filename)) {
+               ?>
+               <tr>
+                    <td align="left" valign="top" width="10%"><b>Minimal</b></td>
+                    <td align="left" valign="top">
+                    <p>Executable code only.</p>
+                    </td>
+                    <?php
+                    $zipfilesize=fileSizeForDisplay($filename);
+                    $fileShortDescription=${build_distribution};
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+                    ?>
+               </tr>
+               <?php } ?>
 
-			<?php
-			$zipfilename="${build_distribution}-sdk-${build}";
-			$filename=$zipfilename.".zip";
-			if (file_exists($filename)) {
-				?>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>SDK</b></td>
-				<td align="left" valign="top">
-				<p>Executable code and source code.</p>
-				</td>
-				<?php
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription=${build_distribution} . "-sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<?php } ?>
+               <?php
+               $zipfilename="${build_distribution}-sdk-${build}";
+               $filename=$zipfilename.".zip";
+               if (file_exists($filename)) {
+                    ?>
+               <tr>
+                    <td align="left" valign="top" width="10%"><b>SDK</b></td>
+                    <td align="left" valign="top">
+                    <p>Executable code and source code.</p>
+                    </td>
+                    <?php
+                    $zipfilesize=fileSizeForDisplay($filename);
+                    $fileShortDescription=${build_distribution} . "-sdk";
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+                    ?>
+               </tr>
+               <?php } ?>
 
-			<?php
-			$zipfilename="${build_distribution}-tests-${build}";
-			$filename=$zipfilename.".zip";
-			if (file_exists($filename)) {
-				?>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Unit Tests</b></td>
-				<td align="left" valign="top">
-				<p>The automated test zip contains unit tests.</p>
-				</td>
-				<?php
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription=${build_distribution} . "-tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<?php } ?>
-		</table>
-		</td>
-	
-	
-	</tr>
+               <?php
+               $zipfilename="${build_distribution}-tests-${build}";
+               $filename=$zipfilename.".zip";
+               if (file_exists($filename)) {
+                    ?>
+               <tr>
+                    <td align="left" valign="top" width="10%"><b>Unit Tests</b></td>
+                    <td align="left" valign="top">
+                    <p>The automated test zip contains unit tests.</p>
+                    </td>
+                    <?php
+                    $zipfilesize=fileSizeForDisplay($filename);
+                    $fileShortDescription=${build_distribution} . "-tests";
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+                    ?>
+               </tr>
+               <?php } ?>
+          </table>
+          </td>
+
+
+     </tr>
 
 </table>
 
@@ -251,104 +255,104 @@
 
 <!-- ***********  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>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+     <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>
+          <td>
+          <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-			<tr>
-				<td><?php 
-				if (isset($displayBuildNotes) && $displayBuildNotes) {
-				   echo "<a href=\"buildNotes.php\">Build notes</a> <br />"; 
-				}
-				?> <a href="directory.txt">map files</a> <br />
-				<?php
+               <tr>
+                    <td><?php 
+                    if (isset($displayBuildNotes) && $displayBuildNotes) {
+                       echo "<a href=\"buildNotes.php\">Build notes</a> <br />"; 
+                    }
+                    ?> <a href="directory.txt">map files</a> <br />
+                    <?php
 
-				if (file_exists("components")) {
-					echo "<a href=\"components/components.php\">Misc Components</a> <br />\n";
-				}
+                    if (file_exists("components")) {
+                         echo "<a href=\"components/components.php\">Misc Components</a> <br />\n";
+                    }
 
 
-				if ($displayTestSummary) {
+                    if ($displayTestSummary) {
 
 
-					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 {
-						$compileProblemMarkerFile="compilationProblems.txt";
-						if (file_exists($compileProblemMarkerFile)) {
-							echo "<br /> <img src=\"compile_err.gif\"/>&nbsp;&nbsp;No unit tests available. The remaining build and tests were canceled since compilation problems were found. Check compiler output summaries.";
-						} else {
-					$installLogName="p2DirectorInstall.log.txt";
-					if (file_exists($installLogName)) {
-								echo "<br /><img src=\"compile_err.gif\"/>&nbsp;&nbsp;No unit tests available. See <a href=\"" . $installLogName . "\">the p2Director install log file </a>from failed test installation attempt";
-							} else {
-								$noTestsProvidedMarkerFile="noTestsProvided.txt";
-								if (file_exists($noTestsProvidedMarkerFile)) {
-									echo "<br /><img src=\"compile_warn.gif\"/>&nbsp;&nbsp;No unit tests available. This build component does not providing any unit tests.";
-								} else {
+                         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 {
+                              $compileProblemMarkerFile="compilationProblems.txt";
+                              if (file_exists($compileProblemMarkerFile)) {
+                                   echo "<br /> <img src=\"compile_err.gif\"/>&nbsp;&nbsp;No unit tests available. The remaining build and tests were canceled since compilation problems were found. Check compiler output summaries.";
+                              } else {
+                         $installLogName="p2DirectorInstall.log.txt";
+                         if (file_exists($installLogName)) {
+                                        echo "<br /><img src=\"compile_err.gif\"/>&nbsp;&nbsp;No unit tests available. See <a href=\"" . $installLogName . "\">the p2Director install log file </a>from failed test installation attempt";
+                                   } else {
+                                        $noTestsProvidedMarkerFile="noTestsProvided.txt";
+                                        if (file_exists($noTestsProvidedMarkerFile)) {
+                                             echo "<br /><img src=\"compile_warn.gif\"/>&nbsp;&nbsp;No unit tests available. This build component does not providing any unit tests.";
+                                        } else {
 
-									// we may really be pending (tests still running) or maybe they failed in unexpted way?.
-									echo "<br /><font color=\"orange\">Unit tests ae pending, or otherwise don't exists, or there is an unanticipated build error.</font>";
+                                             // we may really be pending (tests still running) or maybe they failed in unexpted way?.
+                                             echo "<br /><font color=\"orange\">Unit tests ae pending, or otherwise don't exists, or there is an unanticipated build error.</font>";
 
-								}
-							}
-						}
-					}
+                                        }
+                                   }
+                              }
+                         }
 
-					echo "<br />";
+                         echo "<br />";
 
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
+                         echo "<br />";
+                         echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
 
-					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;";
+                         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;";
 
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
+                         echo "<br />";
+                         echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
 
-					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;";
+                         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;";
 
-					$logname="antBuilderOutput.log";
-					if (file_exists($logname)) {
-						echo "<br /> <a href=\"".$logname."\" type=\"text/plain\">Full Log</a> from build ". fileSizeForDisplay($logname);
-					}
+                         $logname="antBuilderOutput.log";
+                         if (file_exists($logname)) {
+                              echo "<br /> <a href=\"".$logname."\" type=\"text/plain\">Full Log</a> from build ". fileSizeForDisplay($logname);
+                         }
 
 
-				}
+                    }
 
-				?> <br />
+                    ?> <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
+                    if (file_exists("versioningReportName.php")) {
+                         include "versioningReportName.php";
+                         $fname="${versionReportFilename}.html";
+                         if (file_exists($fname)) {
+                              echo "<br /> <a href='$fname'>Versioning Information</a>";
+                         }
 }
 ?></td>
-			</tr>
-		</table>
-		</td>
-	</tr>
+               </tr>
+          </table>
+          </td>
+     </tr>
 </table>
 
 
@@ -357,16 +361,22 @@
 <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
+     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>
+     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/releng.wtpbuilder/distribution/jsdt.site/templateFiles/testResults.php.template.php b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/testResults.php.template.php
index e84339d..8c8ec3a 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/testResults.php.template.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/testResults.php.template.php
@@ -1,6 +1,8 @@
 <html>
 <head>
 
+
+
 <?php
 //ini_set("display_errors", "true");
 //error_reporting (E_ALL);
@@ -16,87 +18,94 @@
 
 <style>
 .bold,.bold TD,.bold TH,.bold TR {
-	font-weight: bold;
+     font-weight: bold;
 }
 
 .numeric,.numeric TD {
-	text-align: right;
-	padding-right: 2em;
+     text-align: right;
+     padding-right: 2em;
 }
 
 .normaltable,.normaltable TD,.normaltable TH {
-	font-family: Bitstream Vera Sans Mono, monospace;
-	font-size: 0.9em;
-	color: Black;
-	background-color: White;
+     font-family: Bitstream Vera Sans Mono, monospace;
+     font-size: 0.9em;
+     color: Black;
+     background-color: White;
 }
 
 .errorltable,.errortable TD,.errortable TH {
-	font-family: Bitstream Vera Sans Mono, monospace;
-	font-size: 0.9em;
-	color: Black;
-	background-color: Red;
-	font-weight: Bold;
+     font-family: Bitstream Vera Sans Mono, monospace;
+     font-size: 0.9em;
+     color: Black;
+     background-color: Red;
+     font-weight: Bold;
 }
 
 .warningtable,.warningtable TD,.warningtable TH {
-	font-family: Bitstream Vera Sans Mono, monospace;
-	font-size: 0.9em;
-	color: Black;
-	background-color: khaki;
+     font-family: Bitstream Vera Sans Mono, monospace;
+     font-size: 0.9em;
+     color: Black;
+     background-color: khaki;
 }
 
 .extraWarningTable,.extraWarningTable TD,.extraWarningTable TH {
-	font-family: Bitstream Vera Sans Mono, monospace;
-	font-size: 0.9em;
-	color: Black;
-	background-color: Yellow;
+     font-family: Bitstream Vera Sans Mono, monospace;
+     font-size: 0.9em;
+     color: Black;
+     background-color: Yellow;
 }
 </style>
 
 
 </head>
 <body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Test Results</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica"> Extra results and logs </font></b></td>
-	</tr>
-</table>
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica"> Extra results and logs </font>
+               </b></td>
+          </tr>
+     </table>
+
+
+
+
 
 <?php
 if (file_exists("testResults"))
 {
-	$dir = dir("testResults");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
+     $dir = dir("testResults");
+     while ($anEntry = $dir->read())
+     {
+          if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
 
-		{
-			if (is_dir($anEntry)) {
-				$link = "testResults/".$anEntry."/results/index.php";
-				echo "<p><a href=\"$link\">$anEntry</a></p> \n";
-			}
-			else {
-				// assume is file
-				$path_parts = pathinfo($anEntry);
-				$file_extension = $path_parts['extension'];
-				if (isset($path_parts['filename'])) {
-					$linkname = $path_parts['filename'];
-				}
-				else {
-					$linkname = $anEntry;
-				}
+          {
+               if (is_dir($anEntry)) {
+                    $link = "testResults/".$anEntry."/results/index.php";
+                    echo "<p><a href=\"$link\">$anEntry</a></p> \n";
+               }
+               else {
+                    // assume is file
+                    $path_parts = pathinfo($anEntry);
+                    $file_extension = $path_parts['extension'];
+                    if (isset($path_parts['filename'])) {
+                         $linkname = $path_parts['filename'];
+                    }
+                    else {
+                         $linkname = $anEntry;
+                    }
 
-				$link = $anEntry;
-				if ("html" === $file_extension || "php" === $file_extension || "log" === $file_extension || "txt" === $file_extension) {
-					echo "<p><a href=testResults/" . $link . ">" . $linkname . "</a></p>\n";
-				}
-			}
-		}
-	}
+                    $link = $anEntry;
+                    if ("html" === $file_extension || "php" === $file_extension || "log" === $file_extension || "txt" === $file_extension) {
+                         echo "<p><a href=testResults/" . $link . ">" . $linkname . "</a></p>\n";
+                    }
+               }
+          }
+     }
 }
 ?>
 
@@ -104,33 +113,33 @@
 
 
 <table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$buildName"; ?>
-		</font></b></td>
-	</tr>
+     <tr>
+          <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+               color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$buildName"; ?>
+          </font></b></td>
+     </tr>
 </table>
 
 <table id=tableunittestdata align="center" width="75%" border="1">
-	<tr>
-		<td class="bold" align="center" width="70%">Test Suite</td>
-		<td class="bold" align="center" width="15%">Errors &amp; Failures</td>
-		<td class="bold" align="center" width="15%">Total Tests</td>
-		<td class="bold" align="center" width="15%">Total Time (s)</td>
-	</tr>
+     <tr>
+          <td class="bold" align="center" width="70%">Test Suite</td>
+          <td class="bold" align="center" width="15%">Errors &amp; Failures</td>
+          <td class="bold" align="center" width="15%">Total Tests</td>
+          <td class="bold" align="center" width="15%">Total Time (s)</td>
+     </tr>
 
 
-	%testresults%
+     %testresults%
 
 </table>
 <p></p>
 <br>
 <table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$buildName"; ?>
-		</font></b></td>
-	</tr>
+     <tr>
+          <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+               color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$buildName"; ?>
+          </font></b></td>
+     </tr>
 </table>
 <br>
 These
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.xml b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
index 074f733..7bc9209 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
@@ -32,8 +32,8 @@
 
 
     <!-- 
-	   Steps to do after the build is done. 
-	 -->
+        Steps to do after the build is done. 
+      -->
     <target name="test">
         <dirname
             file="${ant.file}"
@@ -45,7 +45,7 @@
     </target>
 
     <!-- 
-	  Steps to do to test the build results
+       Steps to do to test the build results
    -->
     <target name="runTest">
         <dirname
@@ -122,7 +122,7 @@
 
     <target name="installTests">
 
-    	<!-- hard code for now 
+         <!-- hard code for now 
         <antcall
             target="installTestsFromZips">
             <param
@@ -139,13 +139,13 @@
     <target
         name="installTestsFromZips"
         depends="init">
-    	
-    	<!-- a bit hard coded here, will need work for general case -->
+
+         <!-- a bit hard coded here, will need work for general case -->
         <property
             name="zipFile"
             value="${compName}-${buildLabel}.zip"/>
 
-    	
+
        <!--
      We use the exec method for unzip, so we won't fail if a 
      prereq can not be unzipped for some reason. See 
@@ -203,8 +203,8 @@
                 error="${testRoot}/results/fullErrorLog.txt"/>
 
         </java>
-    	<!-- If the task succeeds, this ouput log won't be that relevent ... (can be make better in future ... but for now we'll make a copy, 
-    	just in case we need it -->
+         <!-- If the task succeeds, this ouput log won't be that relevent ... (can be make better in future ... but for now we'll make a copy, 
+         just in case we need it -->
         <echo message="p2DirectorInstallResult: ${p2DirectorInstallResult}"/>
 
         <condition property="p2DirectorInstallFailed">
@@ -231,7 +231,7 @@
         name="handleFailedInstall"
         if="p2DirectorInstallFailed">
 
-    	<!-- copy to direct location, as a signal (to web pages) it failed and link should be provided -->
+         <!-- copy to direct location, as a signal (to web pages) it failed and link should be provided -->
         <copy
             file="${testRoot}/results/fullOutput.txt"
             tofile="${buildDirectory}/${buildLabel}/p2DirectorInstall.log.txt"
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/jsdt.tests/templateFiles/index.php
index a42c883..2ce4399 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/templateFiles/index.php
+++ b/releng.wtpbuilder/distribution/jsdt.tests/templateFiles/index.php
@@ -1,6 +1,8 @@
 <html>
 <head>
 
+
+
 <?php
 $parts = explode("/", realpath(".."));
 $label = $parts[count($parts) - 1];
@@ -8,78 +10,78 @@
 
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 </head>
 <body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<p></p>
-<table border="0">
-</table>
+     <p>
+          <b><font face="Verdana" size="+3">Test Results</font> </b>
+     </p>
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$label"; ?>
+                    </font> </b></td>
+          </tr>
+     </table>
+     <p></p>
+     <table border="0">
+     </table>
 
-<table width="77%" border="1">
-	<tr>
-		<td width="81%"><b>Tests Performed</b></td>
-		<td width="19%"><b>Errors &amp; Failures</b></td>
-	</tr>
+     <table width="77%" border="1">
+          <tr>
+               <td width="81%"><b>Tests Performed</b></td>
+               <td width="19%"><b>Errors &amp; Failures</b></td>
+          </tr>
 
-	<?
-	$dir = dir("html");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != "..")
-		{
-			$link = "html/".$anEntry;
-			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-			$count = 0;
-			$fileHandle = fopen($xml, "r");
-			while (!feof($fileHandle))
-			{
-				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-				$count = $count + substr_count($aLine, '<error');
-			}
-			fclose($fileHandle);
-			if ($count > 0)
-			{
-				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-				echo "$anEntry";
-				echo "</font></b></a></td>";
-				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-			}
-			else
-			{
-				echo "<tr><td><a href=\"$link\">";
-				echo "$anEntry";
-				echo "</a></td>";
-				echo "<td>$count</td></tr>";
-			}
-		}
-	}
-	?>
+          <?
+          $dir = dir("html");
+          while ($anEntry = $dir->read())
+          {
+              if ($anEntry != "." && $anEntry != "..")
+              {
+                  $link = "html/".$anEntry;
+                  $xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
+                  $count = 0;
+                  $fileHandle = fopen($xml, "r");
+                  while (!feof($fileHandle))
+                  {
+                      $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
+                      $count = $count + substr_count($aLine, '<error');
+                  }
+                  fclose($fileHandle);
+                  if ($count > 0)
+                  {
+                      echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
+                      echo "$anEntry";
+                      echo "</font></b></a></td>";
+                      echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
+                  }
+                  else
+                  {
+                      echo "<tr><td><a href=\"$link\">";
+                      echo "$anEntry";
+                      echo "</a></td>";
+                      echo "<td>$count</td></tr>";
+                  }
+              }
+          }
+          ?>
 
-</table>
-<p></p>
-<br>
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$label"; ?>
-		</font></b></td>
-	</tr>
-</table>
-<br>
-These
-<a href="consolelogs/wtptestlog.txt">logs</a>
-contain the console output captured while running the JUnit automated
-tests.
-<br>
-<br>
+     </table>
+     <p></p>
+     <br>
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$label"; ?>
+                    </font> </b></td>
+          </tr>
+     </table>
+     <br> These
+     <a href="consolelogs/wtptestlog.txt">logs</a> contain the console
+     output captured while running the JUnit automated tests.
+     <br>
+     <br>
 
 </body>
 </html>
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/JUNIT.XSL
index 94d4cd3..bd3fc83 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/JUNIT.XSL
+++ b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/JUNIT.XSL
@@ -48,7 +48,7 @@
           var doc = win.document.open();
           doc.write("<html><head><title>Properties of " + name + "</title>");
           doc.write("<style>")
-          doc.write("body {font:normal 68% verdana,arial,helvetica;	color:#000000; }");
+          doc.write("body {font:normal 68% verdana,arial,helvetica;     color:#000000; }");
           doc.write("table tr td, table tr th { font-size: 68%; }");
           doc.write("table.properties { border-collapse:collapse; border-left:solid 1 #cccccc; border-top:solid 1 #cccccc; padding:5px; }");
           doc.write("table.properties th { text-align:left; border-right:solid 1 #cccccc; border-bottom:solid 1 #cccccc; background-color:#eeeeee; }");
@@ -147,11 +147,11 @@
                 <tr valign="top">
                     <!-- set a nice color depending if there is an error/failure -->
                     <xsl:attribute name="class">
-						<xsl:choose>
-							<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when test="$errorCount &gt; 0">Error</xsl:when>
-						</xsl:choose>
-					</xsl:attribute>
+                              <xsl:choose>
+                                   <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
+                                   <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
+                              </xsl:choose>
+                         </xsl:attribute>
                     <td>
                         <a href="#{@package}">
                             <xsl:value-of select="@package"/>
@@ -293,11 +293,11 @@
             </tr>
             <tr valign="top">
                 <xsl:attribute name="class">
-				<xsl:choose>
-					<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when test="$errorCount &gt; 0">Error</xsl:when>
-				</xsl:choose>
-			</xsl:attribute>
+                    <xsl:choose>
+                         <xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
+                         <xsl:when test="$errorCount &gt; 0">Error</xsl:when>
+                    </xsl:choose>
+               </xsl:attribute>
                 <td>
                     <xsl:value-of select="$testCount"/>
                 </td>
@@ -420,11 +420,11 @@
         <tr valign="top">
             <!-- set a nice color depending if there is an error/failure -->
             <xsl:attribute name="class">
-			<xsl:choose>
-				<xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
+               <xsl:choose>
+                    <xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
+                    <xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
+               </xsl:choose>
+          </xsl:attribute>
 
             <!-- print testsuite information -->
             <td>
@@ -455,10 +455,10 @@
         mode="print.test">
         <tr valign="top">
             <xsl:attribute name="class">
-			<xsl:choose>
-				<xsl:when test="failure | error">Error</xsl:when>
-			</xsl:choose>
-		</xsl:attribute>
+               <xsl:choose>
+                    <xsl:when test="failure | error">Error</xsl:when>
+               </xsl:choose>
+          </xsl:attribute>
             <td>
                 <xsl:value-of select="@name"/>
             </td>
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml
index 5f2b6c3..e18ca5a 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/test.xml
@@ -3,7 +3,7 @@
     default="all"
     basedir=".">
     <property environment="env"/>
-	<!-- required to get proper value of branch specific properties -->
+     <!-- required to get proper value of branch specific properties -->
     <property
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
@@ -160,10 +160,10 @@
             basedir="${results}/xml"
             destdir="${results}/html"/>
     </target>
-	<!-- 
-	It is a likely a build error if no results have been produced ... but error 
-	message from xslt failure is not very clear. 
-	-->
+     <!-- 
+     It is a likely a build error if no results have been produced ... but error 
+     message from xslt failure is not very clear. 
+     -->
     <target name="checkGenHTMLConditions">
         <echo message="results xml: ${results}/xml"/>
         <available
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
index 2388e11..771cd0c 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
@@ -20,7 +20,7 @@
         <!--
             if not otherwise set, be sure extraVMargs is at least some
             string, even if unused string. 
-            
+
             Remember, though, extraVMArgs can contain more than one extra arg, 
             so much be passed to VM as a "line", not "value". 
         -->
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index eed67ea..c736da7 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -6,7 +6,7 @@
     <property file="${wtp.builder.home}/build.properties"/>
     <property environment="env"/>
 
-	<!-- required to get proper value of doCreateFprojZips -->
+     <!-- required to get proper value of doCreateFprojZips -->
     <property
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
@@ -19,7 +19,7 @@
     <mkdir dir="${transformedRepoLocation}"/>
 
 
-	<!-- main -->
+     <!-- main -->
     <target
         name="build"
         depends="getBaseBuilder">
@@ -88,7 +88,7 @@
     </target>
 
 
-	
+
 <!-- invoking runbuild.xml targetting getBaseBuilder -->
     <target
         name="getBaseBuilder"
diff --git a/releng.wtpbuilder/distribution/wtp.package/build.xml b/releng.wtpbuilder/distribution/wtp.package/build.xml
index c9ad726..f32f146 100644
--- a/releng.wtpbuilder/distribution/wtp.package/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.package/build.xml
@@ -8,7 +8,7 @@
     <property file="${wtp.builder.home}/build.properties"/>
     <property environment="env"/>
 
-	<!-- required to get proper value of branch specific values -->
+     <!-- required to get proper value of branch specific values -->
     <property
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
diff --git a/releng.wtpbuilder/distribution/wtp.package/createFinalRepo.xml b/releng.wtpbuilder/distribution/wtp.package/createFinalRepo.xml
index ab3d3cd..fe83255 100644
--- a/releng.wtpbuilder/distribution/wtp.package/createFinalRepo.xml
+++ b/releng.wtpbuilder/distribution/wtp.package/createFinalRepo.xml
@@ -10,23 +10,23 @@
     default="build"
     basedir=".">
 
-	<!-- = = = standard properties pattern = = = -->
-	<!--
-	        Note to be cross-platform, "environment variables" are only
-	        appropriate for some variables, e.g. ones we set, since
-	        properties are case sensitive, even if the environment variables
-	        on your operating system are not, e.g. it will be ${env.Path}
-	        not ${env.PATH} on Windows
-	    -->
+     <!-- = = = standard properties pattern = = = -->
+     <!--
+             Note to be cross-platform, "environment variables" are only
+             appropriate for some variables, e.g. ones we set, since
+             properties are case sensitive, even if the environment variables
+             on your operating system are not, e.g. it will be ${env.Path}
+             not ${env.PATH} on Windows
+         -->
     <property environment="env"/>
-	<!--
-	        Let users override standard properties, if desired. If
-	        directory, file, or some properties do not exist, then standard
-	        properties will be used.
-	    -->
+     <!--
+             Let users override standard properties, if desired. If
+             directory, file, or some properties do not exist, then standard
+             properties will be used.
+         -->
     <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
 
-	<!-- = = = end standard properties pattern = = = -->
+     <!-- = = = end standard properties pattern = = = -->
 
 
 
@@ -34,7 +34,7 @@
     <property file="${wtp.builder.home}/build.properties"/>
 
 
-	<!-- required to get proper value of branch specific values, for example, 
+     <!-- required to get proper value of branch specific values, for example, 
             baseComparatorRepoDir, since can vary from forward "integration" stream, 
             and "maintenance" branch -->
     <property
@@ -53,7 +53,7 @@
         name="baseComparatorRepoDirTests"
         value="${baseComparatorRepoDir}"/>
 
-	<!-- if not otherwise set, use these default properties 
+     <!-- if not otherwise set, use these default properties 
     <property
         name="repoDownloadBaseURL"
         value="http://build.eclipse.org/webtools/committers"/> -->
@@ -77,34 +77,34 @@
         name="build"
         depends="doMirror,doMirrorTests">
 
-		<!-- add the new build to the composite -->
-		<!-- 
-    	TODO: after promotion, do we need to delete repo's as directories removed? Or just do occasional cleanup, 
-    	if non-existent child repos are ignored 
-    	TODO: ok to use absolute file system locations for child repos? (And still access via http, later?  
+          <!-- add the new build to the composite -->
+          <!-- 
+         TODO: after promotion, do we need to delete repo's as directories removed? Or just do occasional cleanup, 
+         if non-existent child repos are ignored 
+         TODO: ok to use absolute file system locations for child repos? (And still access via http, later?  
 -->
-		<!-- 
- 
+          <!-- 
+
  On build machine, URL's to repositories will look similar to following URL: 
- 
+
  http://build.eclipse.org/webtools/committers/wtp-R3.3.0-I/20100914034658/I-3.3.0-20100914034658/repository/
- 
+
  which we translate as follows
- 
+
   repoDownloadBaseURL=http://build.eclipse.org/webtools/committers
-  
+
   ${repoDownloadBaseURL}/${projectname}/${timestamp}/${buildLabel}/repository/
- 
+
  repoDownloadBaseURL is machine dependent (will differ from one build machine to another). 
- 
+
  Will be different on "download server", as well. 
- 
+
  -->
 
-		<!-- remember, repoLocation won't exist until later, since it is at the "site", not the 
+          <!-- remember, repoLocation won't exist until later, since it is at the "site", not the 
        working directory -->
-    	
-    	<!-- remember that repos are added to comparator set only when they are promoted to download location -->
+
+         <!-- remember that repos are added to comparator set only when they are promoted to download location -->
         <property
             name="repoLocation"
             value="${repoDownloadBaseURL}/committers/${projectname}/${timestamp}/${buildLabel}/repository/"/>
@@ -128,16 +128,16 @@
             file="${baseComparatorRepoDir}"
             type="dir"
             property="baseComparatorRepoDirExists"/>
-    	<!-- we copy the comparator filter file, used only during tests, to build output location, 
-    	just so it is always available, even if tests ran later -->
+         <!-- we copy the comparator filter file, used only during tests, to build output location, 
+         just so it is always available, even if tests ran later -->
         <copy
             file="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/comparatorfilter.properties"
             todir="${buildDirectory}/${buildLabel}"/>
 
     </target>
-	<!-- normally, the "prime repository" should be created from previous release, 
-	or similar, but if that hasn't been done, we'll automatically create an empty 
-	composite repo which we've stored away for simplicity.-->
+     <!-- normally, the "prime repository" should be created from previous release, 
+     or similar, but if that hasn't been done, we'll automatically create an empty 
+     composite repo which we've stored away for simplicity.-->
     <target
         name="primeRepo"
         depends="init"
@@ -146,7 +146,7 @@
         <copy todir="${baseComparatorRepoDir}">
             <fileset dir="${wtp.builder.home}/emptyRepository/"/>
         </copy>
-		<!-- could probably just set to true, but we'll use same logic as in init, just in case -->
+          <!-- could probably just set to true, but we'll use same logic as in init, just in case -->
         <available
             file="${baseComparatorRepoDir}"
             type="dir"
@@ -214,12 +214,12 @@
 
             </comparator>
 
-			<!-- 
-        	followStrict is sort of a safety measure. All our features should be strict, but in case not, 
-        	will show up early if not mirrored. 
-        	
-        	
-        	-->
+               <!-- 
+             followStrict is sort of a safety measure. All our features should be strict, but in case not, 
+             will show up early if not mirrored. 
+
+
+             -->
             <slicingoptions
                 followStrict="true"
                 includeNonGreedy="false"
@@ -237,7 +237,7 @@
 
         </p2.mirror>
 
-		<!-- create archived repo from contents of 'repository' at this point -->
+          <!-- create archived repo from contents of 'repository' at this point -->
         <property
             name="zippedrepo"
             value="${build.distribution}-repo-${buildLabel}.zip"/>
@@ -291,11 +291,11 @@
                      then we need to leave these excluded in place (or, make them stream sensitive, 
                      which doesn't seem worth it
                  -->
-                   <exclude>
-                       <artifact id="org.eclipse.jpt.eclipselink.ui"/>
-                       <artifact id="org.eclipse.jpt.ui"/>
-                       <artifact id="org.eclipse.jst.jsp.core.tests"/>
-                   </exclude>
+                <exclude>
+                    <artifact id="org.eclipse.jpt.eclipselink.ui"/>
+                    <artifact id="org.eclipse.jpt.ui"/>
+                    <artifact id="org.eclipse.jst.jsp.core.tests"/>
+                </exclude>
             </comparator>
 
             <slicingoptions
@@ -311,7 +311,7 @@
 
         </p2.mirror>
 
-		<!-- create archived repo from contents of 'repository' at this point -->
+          <!-- create archived repo from contents of 'repository' at this point -->
         <property
             name="zippedtestsrepo"
             value="${build.distribution}-tests-repo-${buildLabel}.zip"/>
diff --git a/releng.wtpbuilder/distribution/wtp.package/createjaxws.xml b/releng.wtpbuilder/distribution/wtp.package/createjaxws.xml
index 60b5bf9..46b0c56 100644
--- a/releng.wtpbuilder/distribution/wtp.package/createjaxws.xml
+++ b/releng.wtpbuilder/distribution/wtp.package/createjaxws.xml
@@ -7,7 +7,7 @@
 <project
     default="build"
     basedir=".">
-	<!--
+     <!--
         These properties are normally set by calling task, but for
         "local" tests from command line, they can be set here
     -->
@@ -23,7 +23,7 @@
     <echo message="buildDirectory: ${buildDirectory}"/>
     <echo message="buildLabel: ${buildLabel}"/>
     <echo message="wtp.builder.home: ${wtp.builder.home}"/>
-	<!--
+     <!--
         three convenience variables to help avoid typos, etc. Should
         never need to be changed
     -->
diff --git a/releng.wtpbuilder/distribution/wtp.package/createmainzips.xml b/releng.wtpbuilder/distribution/wtp.package/createmainzips.xml
index dbede59..078de03 100644
--- a/releng.wtpbuilder/distribution/wtp.package/createmainzips.xml
+++ b/releng.wtpbuilder/distribution/wtp.package/createmainzips.xml
@@ -7,7 +7,7 @@
 <project
     default="build"
     basedir=".">
-	
+
 
        <!-- = = = standard properties pattern = = = -->
        <!--
@@ -67,9 +67,9 @@
         property="labelfileavailable"/>
     <fail unless="labelfileavailable"/>
     <property file="${labelfile}"/>
-	
-	
-	
+
+
+
     <!--
         These properties are normally set by calling task, but for
         "local" tests from command line, they can be set here
@@ -116,9 +116,9 @@
                 value="${build.distribution}-tests-${buildLabel}.zip"/>
         </antcall>
     </target>
-	<!-- 
-	Note: this was done as an import, since eventually there may be more than one ... differ by streams? There may be 
-	better ways ... and may not be needed after all, since turning out to be pretty generic ... driven by "categories". 
-	-->
+     <!-- 
+     Note: this was done as an import, since eventually there may be more than one ... differ by streams? There may be 
+     better ways ... and may not be needed after all, since turning out to be pretty generic ... driven by "categories". 
+     -->
     <import file="${wtp.builder.home}/distribution/${build.distribution}.package/createziptasks.xml"/>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.package/createnoopzips.xml b/releng.wtpbuilder/distribution/wtp.package/createnoopzips.xml
index cf55f43..dbd3c29 100644
--- a/releng.wtpbuilder/distribution/wtp.package/createnoopzips.xml
+++ b/releng.wtpbuilder/distribution/wtp.package/createnoopzips.xml
@@ -3,12 +3,12 @@
         This script is to create some zips with core, no-optional, features only.
         Limited, specialized usefulness for some adopters, so these zips are not 
         linked or advertised. Not a standard deliverable. 
-        
+
         NOTE: In fact, to save a little time, these "noop" zips have been "disabled" 
         for now, by the 'if' variable named 'createNoopZips' ... which is not defined, so 
         calls to this task by main build.xml, should exit immediately and not create the zips. 
         This will be reinstated in the future ... or, perhaps reinstated as a seperate job. 
-        
+
     -->
 <project
     default="build"
@@ -138,8 +138,8 @@
                 followstrict="true"
                 includeNonGreedy="false"
                 includeOptional="false"/>
-        	<!--
-        	may eventually want to break jpt and jsf tests into "core" parts and "optional" parts. For now, exclude all.
+             <!--
+             may eventually want to break jpt and jsf tests into "core" parts and "optional" parts. For now, exclude all.
             <iu
                 id="org.eclipse.jpt.jpa.tests.feature.feature.group"/>
             <iu
@@ -157,10 +157,10 @@
             <iu id="org.eclipse.wst.web_tests.feature.feature.group"/>
             <iu id="org.eclipse.wst.ws_tests.feature.feature.group"/>
             <iu id="org.eclipse.wst.xml_tests.feature.feature.group"/>
-        	<!-- not these, just core
+             <!-- not these, just core
             <iu
                 id="org.eclipse.wtp.releng.tests.feature.feature.group"/>
-        	-->
+             -->
         </p2.mirror>
         <ant
             antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
index b17b6bb..c5f8de0 100644
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/build.xml
@@ -20,7 +20,7 @@
     <!-- = = = end standard properties pattern = = = -->
     <echo message="ant.file: ${ant.file}"/>
     <target name="build">
-        
+
         <!-- make sure there is a base builder, since we need the launcher -->
         <ant
             antfile="${wtp.builder.home}/scripts/build/runbuild.xml"
@@ -70,8 +70,8 @@
             property="component.dir"/>
         <ant antfile="${wtp.builder.home}/scripts/build/label.xml"/>
         <property file="${buildDirectory}/label.properties"/>
-    	
-    	<!-- buildLabel is defined in label.properties -->
+
+         <!-- buildLabel is defined in label.properties -->
         <mkdir dir="${buildDirectory}/${buildLabel}"/>
 
         <property
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index 2447c90..441dd57 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -291,11 +291,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Integration"/>
     </target>
@@ -303,11 +298,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Stable"/>
     </target>
@@ -315,11 +305,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Nightly"/>
     </target>
@@ -327,11 +312,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Maintenance"/>
     </target>
@@ -339,11 +319,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Release"/>
     </target>
@@ -351,11 +326,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Test"/>
     </target>
@@ -363,11 +333,6 @@
         <replace
             dir="${resultDir}"
             includes="**/*.php,*.xml"
-            token="%wtpandprereqs%"
-            value=" "/>
-        <replace
-            dir="${resultDir}"
-            includes="**/*.php,*.xml"
             token="@type@"
             value="Patches"/>
     </target>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php
index d069f94..57093a1 100644
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/buildNotes.php
@@ -1,5 +1,7 @@
 <html>
 <head>
+
+
 <?php
 $parts = explode("/", getcwd());
 $parts2 = explode("-", $parts[count($parts) - 1]);
@@ -9,43 +11,48 @@
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 </head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Build Notes</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Build Notes</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica"> Build Notes for <?php echo "$buildName"; ?></font></b></td>
-	</tr>
-</table>
-<table border="0">
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica"> Build Notes for <?php echo "$buildName"; ?>
+                    </font> </b></td>
+          </tr>
+     </table>
+     <table border="0">
 
-<?php
-$hasNotes = false;
-$aDirectory = dir("buildnotes");
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		$nameprefixlen=strlen("buildnotes_");
-		$baseName = substr($anEntry,$nameprefixlen);
-		$extpos=strrpos($baseName,".html");
-		$component=substr($baseName,0,$extpos);
-		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-		echo "<tr>";
-		echo "$line";
-		echo "</tr>";
-		$hasNotes = true;
 
-	}
-}
-$aDirectory.closedir();
-if (!$hasNotes) {
-	echo "<br>There are no build notes for this build.";
-}
-?>
 
-</table>
+     <?php
+     $hasNotes = false;
+     $aDirectory = dir("buildnotes");
+     while ($anEntry = $aDirectory->read()) {
+         if ($anEntry != "." && $anEntry != "..") {
+             $nameprefixlen=strlen("buildnotes_");
+             $baseName = substr($anEntry,$nameprefixlen);
+             $extpos=strrpos($baseName,".html");
+             $component=substr($baseName,0,$extpos);
+             $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
+             echo "<tr>";
+             echo "$line";
+             echo "</tr>";
+             $hasNotes = true;
+
+         }
+     }
+     $aDirectory.closedir();
+     if (!$hasNotes) {
+         echo "<br>There are no build notes for this build.";
+     }
+     ?>
+
+     </table>
 </body>
 </html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/consoleLogs.php
index 2ee3c36..885ca2f 100644
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/consoleLogs.php
@@ -1,5 +1,7 @@
 <html>
 <head>
+
+
 <?php
 $parts = explode("/", getcwd());
 $parts2 = explode("-", $parts[count($parts) - 1]);
@@ -9,86 +11,90 @@
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 <title>Console Logs from Running JUnit Plug-in Tests</title>
 </head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Test Console Output</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$rootDir = "testResults/consolelogs";
-$hasNotes = false;
-$aDirectory = dir($rootDir);
-$index = 0;
-$dirindex = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != "..") {
-		if (is_file("$rootDir/$anEntry")) {
-			$entries[$index] = $anEntry;
-			$index++;
-		} else if (is_dir("$rootDir/$anEntry")) {
-			$direntries[$dirindex] = $anEntry;
-			$dirindex++;
-		}
-	}
-}
-$aDirectory->close();
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica">Console output from running
+                              JUnit plugin tests for <?php echo "$buildName"; ?> </font> </b></td>
+          </tr>
+     </table>
+     <table border="0">
 
 
-sort($entries);
-sort($direntries);
 
-for ($i = 0; $i < $dirindex; $i++) {
-	$anEntry = $direntries[$i];
-	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-}
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("testResults/consolelogs/$anEntry");
+     <?php
+     $rootDir = "testResults/consolelogs";
+     $hasNotes = false;
+     $aDirectory = dir($rootDir);
+     $index = 0;
+     $dirindex = 0;
+     while ($anEntry = $aDirectory->read()) {
+         if ($anEntry != "." && $anEntry != "..") {
+             if (is_file("$rootDir/$anEntry")) {
+                 $entries[$index] = $anEntry;
+                 $index++;
+             } else if (is_dir("$rootDir/$anEntry")) {
+                 $direntries[$dirindex] = $anEntry;
+                 $dirindex++;
+             }
+         }
+     }
+     $aDirectory->close();
 
 
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
+     sort($entries);
+     sort($direntries);
 
-	if ($level == 0) {
-		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
+     for ($i = 0; $i < $dirindex; $i++) {
+         $anEntry = $direntries[$i];
+         $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
+         echo "<tr>";
+         echo "$line";
+         echo "</tr>";
+     }
+     for ($i = 0; $i < $index; $i++) {
+         $anEntry = $entries[$i];
+         $logsize = filesize("testResults/consolelogs/$anEntry");
 
 
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
+         $level = 0;
+         if ($logsize > 20000) {
+             $level = 2;
+         }
+         else if ($logsize > 2000) {
+             $level = 1;
+         }
 
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
+         if ($level == 0) {
+             $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+         }
+         else if ($level == 1) {
+             $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+         } else if ($level == 2) {
+             $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+         }
 
-</table>
+
+         echo "<tr>";
+         echo "$line";
+         echo "</tr>";
+         $hasNotes = true;
+     }
+
+     if (!$hasNotes) {
+         echo "<br>There are no test logs for this build.";
+     }
+     ?>
+
+     </table>
 </body>
 </html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/logIndex.php
index 721ca00..28da816 100644
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/logIndex.php
@@ -1,10 +1,12 @@
 <html>
 <head>
+
+
 <?php
 
 function endsWith( $str, $sub ) {
 
-	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+    return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
 }
 
 $parts = explode("/", getcwd());
@@ -15,71 +17,75 @@
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
-	type="text/css">
+     type="text/css">
 <title>Console Logs from Running JUnit Plug-in Tests</title>
 </head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Test Console Output</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica">Console output from running
-		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
-	</tr>
-</table>
-<table border="0">
-
-<?php
-$hasNotes = false;
-$aDirectory = dir(".");
-$index = 0;
-while ($anEntry = $aDirectory->read()) {
-	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-		$entries[$index] = $anEntry;
-		$index++;
-	}
-}
-aDirectory.closedir();
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica">Console output from running
+                              JUnit plugin tests for <?php echo "$buildName"; ?> </font> </b></td>
+          </tr>
+     </table>
+     <table border="0">
 
 
-sort($entries);
 
-for ($i = 0; $i < $index; $i++) {
-	$anEntry = $entries[$i];
-	$logsize = filesize("$anEntry");
+     <?php
+     $hasNotes = false;
+     $aDirectory = dir(".");
+     $index = 0;
+     while ($anEntry = $aDirectory->read()) {
+         if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+             $entries[$index] = $anEntry;
+             $index++;
+         }
+     }
+     aDirectory.closedir();
 
 
-	$level = 0;
-	if ($logsize > 20000) {
-		$level = 2;
-	}
-	else if ($logsize > 2000) {
-		$level = 1;
-	}
+     sort($entries);
 
-	if ($level == 0) {
-		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-	}
-	else if ($level == 1) {
-		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-	} else if ($level == 2) {
-		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-	}
+     for ($i = 0; $i < $index; $i++) {
+         $anEntry = $entries[$i];
+         $logsize = filesize("$anEntry");
 
 
-	echo "<tr>";
-	echo "$line";
-	echo "</tr>";
-	$hasNotes = true;
-}
+         $level = 0;
+         if ($logsize > 20000) {
+             $level = 2;
+         }
+         else if ($logsize > 2000) {
+             $level = 1;
+         }
 
-if (!$hasNotes) {
-	echo "<br>There are no test logs for this build.";
-}
-?>
+         if ($level == 0) {
+             $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+         }
+         else if ($level == 1) {
+             $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+         } else if ($level == 2) {
+             $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+         }
 
-</table>
+
+         echo "<tr>";
+         echo "$line";
+         echo "</tr>";
+         $hasNotes = true;
+     }
+
+     if (!$hasNotes) {
+         echo "<br>There are no test logs for this build.";
+     }
+     ?>
+
+     </table>
 </body>
 </html>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/miscUtil.php
index 3c57a68..540468b 100644
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/miscUtil.php
@@ -7,113 +7,113 @@
 
 
 function fileSizeInMegs($filename) {
-	$onemeg=1024*1024;
-	$zipfilesize=filesize($filename);
-	$zipfilesize=round($zipfilesize/$onemeg, 0);
-	return $zipfilesize;
+    $onemeg=1024*1024;
+    $zipfilesize=filesize($filename);
+    $zipfilesize=round($zipfilesize/$onemeg, 0);
+    return $zipfilesize;
 }
 
 function fileSizeForDisplay($filename) {
-	$onekilo=1024;
-	$onemeg=$onekilo * $onekilo;
-	$criteria = 10 * $onemeg;
-	$scaleChar = "M";
-	if (file_exists($filename)) {
-		$zipfilesize=filesize($filename);
-		if ($zipfilesize > $criteria) {
-			$zipfilesize=round($zipfilesize/$onemeg, 0);
-			$scaleChar = "M";
-		}
-		else {
-			$zipfilesize=round($zipfilesize/$onekilo, 0);
-			$scaleChar = "K";
-		}
-	}
-	else {
-		$zipfilesize = 0;
-	}
-	$result =  "(" . $zipfilesize . $scaleChar . ")";
-	return $result;
+    $onekilo=1024;
+    $onemeg=$onekilo * $onekilo;
+    $criteria = 10 * $onemeg;
+    $scaleChar = "M";
+    if (file_exists($filename)) {
+        $zipfilesize=filesize($filename);
+        if ($zipfilesize > $criteria) {
+            $zipfilesize=round($zipfilesize/$onemeg, 0);
+            $scaleChar = "M";
+        }
+        else {
+            $zipfilesize=round($zipfilesize/$onekilo, 0);
+            $scaleChar = "K";
+        }
+    }
+    else {
+        $zipfilesize = 0;
+    }
+    $result =  "(" . $zipfilesize . $scaleChar . ")";
+    return $result;
 }
 
 
 function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>][<a href=\"checksum/$filename.sha1\">sha1</a>]";
-	echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
+    echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
+    echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
+    echo $zipfilesize;
+    echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
+    echo "[<a href=\"checksum/$filename.md5\">md5</a>][<a href=\"checksum/$filename.sha1\">sha1</a>]";
+    echo "</td>";
 }
 
 /*
  * This function needs to add the subdir, if on mirrored server, but not add it if not,
- * since assumed the calling page is such that a relative URL (already in subdir) is correct.
- */
+* since assumed the calling page is such that a relative URL (already in subdir) is correct.
+*/
 function displayFileLineSubdir($downloadprefix, $subdir, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	$fullURL=$downloadprefix.$subdir."/".$filename;
-	if (isMirrored($fullURL)) {
-		echo "<a href=\"" . $fullURL . "\">" . $fileShortDescription . "</a>";
-	}
-	else {
-		echo "<a href=\"" . $filename . "\">" . $fileShortDescription . "</a>";
-	}
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
-	echo "[<a type=\"text/plain\" href=\"checksum/$filename.md5\">md5</a>][<a type=\"text/plain\" href=\"checksum/$filename.sha1\">sha1</a>]";
-	echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
+    $fullURL=$downloadprefix.$subdir."/".$filename;
+    if (isMirrored($fullURL)) {
+        echo "<a href=\"" . $fullURL . "\">" . $fileShortDescription . "</a>";
+    }
+    else {
+        echo "<a href=\"" . $filename . "\">" . $fileShortDescription . "</a>";
+    }
+    echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
+    echo $zipfilesize;
+    echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
+    echo "[<a type=\"text/plain\" href=\"checksum/$filename.md5\">md5</a>][<a type=\"text/plain\" href=\"checksum/$filename.sha1\">sha1</a>]";
+    echo "</td>";
 }
 
 function displayFileLineWithSHA($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"15%\">";
-	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"2%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
-	echo "[<a type=\"text/plain\" href=\"checksum/$filename.md5\">md5</a>][<a type=\"text/plain\" href=\"checksum/$filename.sha1\">sha1</a>]";
-	echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"15%\">";
+    echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
+    echo "</td><td align=\"right\" valign=\"top\" width=\"2%\">";
+    echo $zipfilesize;
+    echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
+    echo "[<a type=\"text/plain\" href=\"checksum/$filename.md5\">md5</a>][<a type=\"text/plain\" href=\"checksum/$filename.sha1\">sha1</a>]";
+    echo "</td>";
 }
 
 function displayRepoFileLine($downloadprefix, $subdir, $filename, $zipfilesize, $fileShortDescription) {
-	echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
-	echo "<a href=\"" . $downloadprefix . $subdir . "/" . $filename . "\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
-	echo $zipfilesize;
-	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
-	echo "[<a type=\"text/plain\" href=\"$subdir/checksum/$filename.md5\">md5</a>][<a type=\"text/plain\" href=\"$subdir/checksum/$filename.sha1\">sha1</a>]";
-	echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"30%\">";
+    echo "<a href=\"" . $downloadprefix . $subdir . "/" . $filename . "\">" . $fileShortDescription . "</a>";
+    echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
+    echo $zipfilesize;
+    echo "</td>";
+    echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
+    echo "[<a type=\"text/plain\" href=\"$subdir/checksum/$filename.md5\">md5</a>][<a type=\"text/plain\" href=\"$subdir/checksum/$filename.sha1\">sha1</a>]";
+    echo "</td>";
 }
 
 
 function displayp2repoarchives($zipfilename, $subdir, $downloadprefix, $fileShortDescription, $label, $description) {
 
-	$filename=$zipfilename.".zip";
-	$wholepath="./".$subdir."/".$filename;
-	if (file_exists($wholepath)) {
-		echo "<tr>";
+    $filename=$zipfilename.".zip";
+    $wholepath="./".$subdir."/".$filename;
+    if (file_exists($wholepath)) {
+        echo "<tr>";
 
-		echo "<td align=\"left\" valign=\"top\" width=\"10%\"><b>".$label."</b></td>";
-		echo "<td align=\"left\" valign=\"top\">";
-		echo "<p>".$description."</p>";
-		echo "</td>";
+        echo "<td align=\"left\" valign=\"top\" width=\"10%\"><b>".$label."</b></td>";
+        echo "<td align=\"left\" valign=\"top\">";
+        echo "<p>".$description."</p>";
+        echo "</td>";
 
-		$zipfilesize=fileSizeForDisplay($wholepath);
+        $zipfilesize=fileSizeForDisplay($wholepath);
 
-		displayRepoFileLine($downloadprefix, $subdir, $filename, $zipfilesize, $fileShortDescription);
+        displayRepoFileLine($downloadprefix, $subdir, $filename, $zipfilesize, $fileShortDescription);
 
-		echo "</tr>";
-	} else {
+        echo "</tr>";
+    } else {
 
-		// debug only
-		// echo $wholepath."<br/>";
-	}
+        // debug only
+        // echo $wholepath."<br/>";
+    }
 
 }
 
@@ -121,172 +121,172 @@
 
 function resourceExist($url, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)
 {
-	$result = false;
+    $result = false;
 
-	$allowURLopen = ini_get('allow_url_fopen');
+    $allowURLopen = ini_get('allow_url_fopen');
 
-	if ($allowURLopen && stream_last_modified($url)) {
-		$result = true;
-	}
-	else {
-		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
-		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-		if (file_exists($wholePath)) {
-			$result = true;
-		}
-	}
-	return $result;
+    if ($allowURLopen && stream_last_modified($url)) {
+        $result = true;
+    }
+    else {
+        // TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
+        // is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
+        $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+        if (file_exists($wholePath)) {
+            $result = true;
+        }
+    }
+    return $result;
 }
 
 function stream_last_modified($url)
 {
-	if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
-	{
-		if (!($fp = @fopen($url, 'r')))
-		return NULL;
+    if (function_exists('version_compare') && version_compare(phpversion(), '4.3.0') > 0)
+    {
+        if (!($fp = @fopen($url, 'r')))
+        return NULL;
 
-		$meta = stream_get_meta_data($fp);
-		for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
-		{
-			if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
-			{
-				$modtime = substr($meta['wrapper_data'][$j], 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	else
-	{
-		$parts = parse_url($url);
-		$host  = $parts['host'];
-		$path  = $parts['path'];
+        $meta = stream_get_meta_data($fp);
+        for ($j = 0; isset($meta['wrapper_data'][$j]); $j++)
+        {
+            if (strstr(strtolower($meta['wrapper_data'][$j]), 'last-modified'))
+            {
+                $modtime = substr($meta['wrapper_data'][$j], 15);
+                break;
+            }
+        }
+        fclose($fp);
+    }
+    else
+    {
+        $parts = parse_url($url);
+        $host  = $parts['host'];
+        $path  = $parts['path'];
 
-		if (!($fp = @fsockopen($host, 80)))
-		return NULL;
+        if (!($fp = @fsockopen($host, 80)))
+        return NULL;
 
-		$req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
-		fputs($fp, $req);
+        $req = "HEAD $path HTTP/1.0\r\nUser-Agent: PHP/".phpversion()."\r\nHost: $host:80\r\nAccept: */*\r\n\r\n";
+        fputs($fp, $req);
 
-		while (!feof($fp))
-		{
-			$str = fgets($fp, 4096);
-			if (strstr(strtolower($str), 'last-modified'))
-			{
-				$modtime = substr($str, 15);
-				break;
-			}
-		}
-		fclose($fp);
-	}
-	return isset($modtime) ? strtotime($modtime) : time();
+        while (!feof($fp))
+        {
+            $str = fgets($fp, 4096);
+            if (strstr(strtolower($str), 'last-modified'))
+            {
+                $modtime = substr($str, 15);
+                break;
+            }
+        }
+        fclose($fp);
+    }
+    return isset($modtime) ? strtotime($modtime) : time();
 }
 
 function isMirrored($uriToCheck) {
-	global $debugScript;
-	global $debugFunctions;
-	$localuri = $uriToCheck;
+    global $debugScript;
+    global $debugFunctions;
+    $localuri = $uriToCheck;
 
-	$debugMirrorList = false;
-	if ($debugScript) {
-		echo "uriToCheck: " . $localuri . "<br />";
-	}
+    $debugMirrorList = false;
+    if ($debugScript) {
+        echo "uriToCheck: " . $localuri . "<br />";
+    }
 
-	$xmlcount = 0;
+    $xmlcount = 0;
 
-	/* This method true and accurate method of parsing mirror results
-	 * may be expensive, and would
-	 * likely cause artificially high counts of "downloads".
-	 * Could maybe use if somehow only checked once ever 5 minutes or something.
+    /* This method true and accurate method of parsing mirror results
+     * may be expensive, and would
+    * likely cause artificially high counts of "downloads".
+    * Could maybe use if somehow only checked once ever 5 minutes or something.
 
 
-	 // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
-	 $holdLevel = error_reporting(E_ERROR);
-	 $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
-	 error_reporting($holdLevel);
+    // turn off warnings, as sometimes HTML is returned, which causes lots of warnings
+    $holdLevel = error_reporting(E_ERROR);
+    $mirrorsxml=simplexml_load_file(rawurlencode($localuri) . urlencode("&format=xml"));
+    error_reporting($holdLevel);
 
 
-	 if ($mirrorsxml) {
-	 if ($debugFunctions) {
-	 echo "root node: " . $mirrorsxml->getName() . "<br />";
-	 }
-	 if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
-	 foreach ($mirrorsxml->children() as $mirror) {
-	 if (strcmp($mirror->getName(),"mirror") == 0) {
-	 $xmlcount=$xmlcount+1;
-	 }
-	 if ($debugMirrorList) {
-	 print_r($mirror);
-	 echo "<br />";
-	 }
-	 }
-	 }
-	 if ($debugFunctions) {
-	 echo "Mirror count: " . $xmlcount . "<br />";
-	 }
-	 }
-	 */
-	/*
-	 * Use simple heuristic based on pattern
-	 * in the URI ... if it contains "/downloads/" then assume it's mirrored
-	 */
-	if (strpos($uriToCheck, "webtools/downloads/") > 0) {
-		$xmlcount = 1;
-	}
-	return ($xmlcount > 0);
+    if ($mirrorsxml) {
+    if ($debugFunctions) {
+    echo "root node: " . $mirrorsxml->getName() . "<br />";
+    }
+    if (strcmp($mirrorsxml->getName(), "mirrors") == 0) {
+    foreach ($mirrorsxml->children() as $mirror) {
+    if (strcmp($mirror->getName(),"mirror") == 0) {
+    $xmlcount=$xmlcount+1;
+    }
+    if ($debugMirrorList) {
+    print_r($mirror);
+    echo "<br />";
+    }
+    }
+    }
+    if ($debugFunctions) {
+    echo "Mirror count: " . $xmlcount . "<br />";
+    }
+    }
+    */
+    /*
+     * Use simple heuristic based on pattern
+    * in the URI ... if it contains "/downloads/" then assume it's mirrored
+    */
+    if (strpos($uriToCheck, "webtools/downloads/") > 0) {
+        $xmlcount = 1;
+    }
+    return ($xmlcount > 0);
 
 }
 
 // TODO: replace with Phoenix variables
 function getPlatform () {
-	global $debugScript;
-	global $debugFunctions;
-	// getBrowser is expensive, so cache the data
-	static $browser;
-	$platform = "unknown";
+    global $debugScript;
+    global $debugFunctions;
+    // getBrowser is expensive, so cache the data
+    static $browser;
+    $platform = "unknown";
 
 
-	if(ini_get("browscap")) {
-		if(!isset($browser)){
-			$browser = get_browser(null, true);
-		}
+    if(ini_get("browscap")) {
+        if(!isset($browser)){
+            $browser = get_browser(null, true);
+        }
 
-		if ($browser) {
-			$rawPlatform = $browser['platform'];
-			if ($debugFunctions) {
-				echo "browser platfrom: " . $rawPlatform . "<br />" ;
-			}
+        if ($browser) {
+            $rawPlatform = $browser['platform'];
+            if ($debugFunctions) {
+                echo "browser platfrom: " . $rawPlatform . "<br />" ;
+            }
 
-			if ($debugFunctions) {
-				$browserKeys = array_keys($browser);
-				foreach ($browserKeys as $key) {
-					echo $key . ": " . $browser[$key] . "<br />";
-				}
-			}
-		}
-		if (strpos($rawPlatform, "Win") === 0) {
-			$platform="windows";
-		} else if (strpos($rawPlatform, "Linux") === 0) {
-			$platform="linux";
-		} else if (strpos($rawPlatform, "Mac") === 0) {
-			$platform="mac";
-		}
-	}
-	return $platform;
+            if ($debugFunctions) {
+                $browserKeys = array_keys($browser);
+                foreach ($browserKeys as $key) {
+                    echo $key . ": " . $browser[$key] . "<br />";
+                }
+            }
+        }
+        if (strpos($rawPlatform, "Win") === 0) {
+            $platform="windows";
+        } else if (strpos($rawPlatform, "Linux") === 0) {
+            $platform="linux";
+        } else if (strpos($rawPlatform, "Mac") === 0) {
+            $platform="mac";
+        }
+    }
+    return $platform;
 }
 
 function getPrereqReferenceOrName($eclipseMirrorScript, $mirrorPrefixuri, $prerequrl, $prereqfilename, $eclipseFSpathPrefix) {
-	// todo: we really only need "if exists" so could make a bit more efficient
-	// I tried "file_exists" but is didn't seem to work on my test server
-	// For these pre-reqs, we assume if they exist, they are mirrored. This is true
-	// 99% of the time.
+    // todo: we really only need "if exists" so could make a bit more efficient
+    // I tried "file_exists" but is didn't seem to work on my test server
+    // For these pre-reqs, we assume if they exist, they are mirrored. This is true
+    // 99% of the time.
 
-	if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
-		$reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
-	} else {
-		$reflink=$prereqfilename;
-	}
-	return $reflink;
+    if (resourceExist($prerequrl, $mirrorPrefixuri, $prereqfilename, $eclipseFSpathPrefix)) {
+        $reflink="<a href=\"" . $eclipseMirrorScript . $mirrorPrefixuri . "/" . $prereqfilename . "\">" . $prereqfilename . "</a>";
+    } else {
+        $reflink=$prereqfilename;
+    }
+    return $reflink;
 }
 ?>
diff --git a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/report2.php
index cb68e7b..f3e1171 100644
--- a/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/report2.php
+++ b/releng.wtpbuilder/distribution/wtp.site/staticDropFiles/report2.php
@@ -3,40 +3,40 @@
 
 function parse_testResults($filename)
 {
-	$junitFailures = 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);
-			}
-			$results = array($junitFailures);
-			return $results;
-		}
-	}
+    $junitFailures = 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);
+            }
+            $results = array($junitFailures);
+            return $results;
+        }
+    }
 }
 
 
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php
index 030a9de..83a4dc0 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/buildvariables.php
@@ -235,12 +235,12 @@
 
 $keytestMirrorString=$eclipseMirrorScript . "${eclipseWTPMirrorPrefix}/${build_distribution}-$build.zip";
 if (isMirrored($keytestMirrorString) ) {
-	$mirrorScript=$eclipseMirrorScript;
-	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
+    $mirrorScript=$eclipseMirrorScript;
+    $downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
 }
 
 if ($debugScript)  {
-	echo "inferred platform: " . getPlatform();
+    echo "inferred platform: " . getPlatform();
 }
 
 ?>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/components.template.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/components.template.php
index 4de1c1c..a20371c 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/components.template.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/components.template.php
@@ -1,6 +1,8 @@
 <html>
 <head>
 
+
+
 <?php
 //ini_set("display_errors", "true");
 //error_reporting (E_ALL);
@@ -21,25 +23,32 @@
 
 <style>
 .bold,.bold TD,.bold TH,.bold TR {
-	font-weight: bold;
+     font-weight: bold;
 }
 </style>
 
 
 </head>
 <body>
-<p><b><font face="Verdana" size="+3">Components</font></b></p>
-<p>These are special-purpose subsets of the WTP build. They are not
-needed for normal use or construction of WTP (if they are needed, they
-are already included in other zip files or repositories). These are
-provided here by special request of committers, for custom distribtions
-or tests.</p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica"> component subsets</font></b></td>
-	</tr>
-</table>
+     <p>
+          <b><font face="Verdana" size="+3">Components</font> </b>
+     </p>
+     <p>These are special-purpose subsets of the WTP build. They are not
+          needed for normal use or construction of WTP (if they are needed, they
+          are already included in other zip files or repositories). These are
+          provided here by special request of committers, for custom
+          distribtions or tests.</p>
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica"> component subsets</font> </b>
+               </td>
+          </tr>
+     </table>
+
+
+
+
 
 <?php
 
@@ -50,41 +59,41 @@
 while ($anEntry = $dir->read())
 {
 
-	echo "<table>";
+     echo "<table>";
 
-	if ($anEntry != "." && $anEntry != ".." && is_file($anEntry))
+     if ($anEntry != "." && $anEntry != ".." && is_file($anEntry))
 
-	{
+     {
 
-		$path_parts = pathinfo($anEntry);
-		$file_extension = $path_parts['extension'];
+          $path_parts = pathinfo($anEntry);
+          $file_extension = $path_parts['extension'];
 
-		if ("zip" === $file_extension) {
-			// echo "       path parts: " . print_r($path_parts) . "<br /> \n";
+          if ("zip" === $file_extension) {
+               // echo "       path parts: " . print_r($path_parts) . "<br /> \n";
 
-			echo "<tr>\n";
+               echo "<tr>\n";
 
-			echo "<td align=\"left\" valign=\"top\" width=\"10%\"></td>\n";
-			// todo: could use indexed general description here?
-			//echo "    <td align=\"left\" valign=\"top\">\n";
-			//echo "     <p>The Automated Test zip contains the unit tests.</p>\n";
+               echo "<td align=\"left\" valign=\"top\" width=\"10%\"></td>\n";
+               // todo: could use indexed general description here?
+               //echo "    <td align=\"left\" valign=\"top\">\n";
+               //echo "     <p>The Automated Test zip contains the unit tests.</p>\n";
 
-			$zipfilename=$path_parts['basename'];
+               $zipfilename=$path_parts['basename'];
 
-			$filename=$zipfilename;
-			$zipfilesize=fileSizeForDisplay($filename);
-			$fileShortDescription=$zipfilename;
-			displayFileLineSubdir($downloadprefix, "components", $filename, $zipfilesize, $fileShortDescription);
+               $filename=$zipfilename;
+               $zipfilesize=fileSizeForDisplay($filename);
+               $fileShortDescription=$zipfilename;
+               displayFileLineSubdir($downloadprefix, "components", $filename, $zipfilesize, $fileShortDescription);
 
-			echo "</tr>\n";
+               echo "</tr>\n";
 
 
 
-		}
+          }
 
 
-	}
-	echo "</table>";
+     }
+     echo "</table>";
 }
 
 ?>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php
index ccdd2ae..a51cadb 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/displayPrereqs.php
@@ -1,319 +1,388 @@
 <!-- ***********  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">Prerequisites
-              and Handy Extras</font></td>
-       </tr>
-       <tr>
-              <td>
-              <p>These are the prerequisites to build or run these packages. All are
-              not necessarily required, but instead some subset. Also listed are
-              some frequently needed links for committer-required packages when
-              creating new development environments, or targets to run against.</p>
-              <p>Note that WTP as a whole requires Java 6 even though subsets of WTP and other
-              <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> might
-              run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-              JRE levels</a>.</p>
-              <p></p>
-              </td>
-       </tr>
-       <tr>
-              <td>
-              <table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-
-              <?php
-              if ("true" === $prereq_eclipseplatform) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td width=\"40%\">Eclipse Platform</td>";
+     <tr>
+          <td align="left" valign="top" bgcolor="#0080C0"><font
+               face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
+                    and Handy Extras</font></td>
+     </tr>
+     <tr>
+          <td>
+               <p>These are the prerequisites to build or run these packages. All
+                    are not necessarily required, but instead some subset. Also listed
+                    are some frequently needed links for committer-required packages
+                    when creating new development environments, or targets to run
+                    against.</p>
+               <p>
+                    Note that WTP as a whole requires Java 6 even though subsets of WTP
+                    and other <a href="http://www.eclipse.org/downloads/">Eclipse
+                         Projects</a> might run with <a
+                         href="http://www.eclipse.org/downloads/moreinfo/jre.php">other JRE
+                         levels</a>.
+               </p>
+               <p></p>
+          </td>
+     </tr>
+     <tr>
+          <td>
+               <table border=0 cellspacing=1 cellpadding=1 width="90%"
+                    align="center">
 
 
-                     //customize page depending on user's browser/platform, if we can detect it
-                     $usersPlatform = getPlatform();
-                     // assume windows by default, since likely most frequent, even for cases where
-                     // platform is "unknown". I've noticed Opera reports 'unknown' :(
-                     $recommendedFile=$eclipseplatformfilewindows;
-                     if (strcmp($usersPlatform,"linux")== 0) {
+
+
+
+                    <?php
+                    if ("true" === $prereq_eclipseplatform) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td width=\"40%\">Eclipse Platform</td>";
+
+
+                        //customize page depending on user's browser/platform, if we can detect it
+                        $usersPlatform = getPlatform();
+                        // assume windows by default, since likely most frequent, even for cases where
+                        // platform is "unknown". I've noticed Opera reports 'unknown' :(
+                        $recommendedFile=$eclipseplatformfilewindows;
+                        if (strcmp($usersPlatform,"linux")== 0) {
                             $recommendedFile=$eclipseplatformfilelinux;
-                     } else if (strcmp($usersPlatform,"mac") == 0) {
+                        } else if (strcmp($usersPlatform,"mac") == 0) {
                             $recommendedFile=$eclipseplatformfilemacosx;
-                     }
+                        }
 
-                     echo "<td align=\"right\">";
+                        echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
-                     echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+                        echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
 
 
-                     echo " </tr>";
-              }
-              ?>
-
-              <?php
-              if ("true" === $prereq_eclipse) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
+                        echo " </tr>";
+                    }
+                    ?>
 
 
-                     //customize page depending on user's browser/platform, if we can detect it
-                     $usersPlatform = getPlatform();
-                     // assume windows by default, since likely most frequent, even for cases where
-                     // platform is "unknown". I've noticed Opera reports 'unknown' :(
-                     $recommendedFile=$eclipsefilewindows;
-                     if (strcmp($usersPlatform,"linux")== 0) {
+
+
+
+                    <?php
+                    if ("true" === $prereq_eclipse) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
+
+
+                        //customize page depending on user's browser/platform, if we can detect it
+                        $usersPlatform = getPlatform();
+                        // assume windows by default, since likely most frequent, even for cases where
+                        // platform is "unknown". I've noticed Opera reports 'unknown' :(
+                        $recommendedFile=$eclipsefilewindows;
+                        if (strcmp($usersPlatform,"linux")== 0) {
                             $recommendedFile=$eclipsefilelinux;
-                     } else if (strcmp($usersPlatform,"mac") == 0) {
+                        } else if (strcmp($usersPlatform,"mac") == 0) {
                             $recommendedFile=$eclipsefilemacosx;
-                     }
+                        }
 
-                     echo "<td align=\"right\">";
+                        echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-                     echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
+                        echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
 
 
-                     echo " </tr>";
-              }
-              ?>
-
-              <?php
-              if ("true" === $prereq_emf) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
-
-                     echo $emfName . "&nbsp;" . $emfDescription ;
-
-                     echo "</td>";
-                     echo "<td align=\"right\">";
-
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-                     echo " </tr>";
-              }
-              ?>
+                        echo " </tr>";
+                    }
+                    ?>
 
 
-              <?php
-              if ("true" === $prereq_emfxsd) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
 
-                     echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-                     echo " </tr>";
-              }
-              ?>
+                    <?php
+                    if ("true" === $prereq_emf) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
 
-              <?php
-              if ("true" === $prereq_emfandxsd) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
+                        echo $emfName . "&nbsp;" . $emfDescription ;
 
-                     echo $emfandxsdName . "&nbsp;" . $emfandxsdDescription ;
+                        echo "</td>";
+                        echo "<td align=\"right\">";
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
+                        echo " </tr>";
+                    }
+                    ?>
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $emfandxsdMirrorPrefixuri, $emfandxsdURL, $emfandxsdFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $emfandxsdBuildHome . "\">equivalent</a></td>";
-                     echo " </tr>";
-              }
-              ?>
 
-              <?php
-              if ("true" === $prereq_gef) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
 
-                     echo $gefName  . "&nbsp;" . $gefDescription;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>
+                    <?php
+                    if ("true" === $prereq_emfxsd) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
 
-              <?php
-              if ("true" === $prereq_dtp) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
+                        echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
 
-                     echo $dtpName . "&nbsp;" . $dtpDescription;
+                        echo "</td>";
+                        echo "<td align=\"right\">";
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
+                        echo " </tr>";
+                    }
+                    ?>
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>
 
-              <?php
-              if ("true" === $prereq_emftransaction) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
 
-                     echo $emftransactionName  . "&nbsp;" . $emftransactionDescription;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
+                    <?php
+                    if ("true" === $prereq_emfandxsd) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $emftransactionMirrorPrefixuri, $emftransactionURL, $emftransactionFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $emftransactionBuildHome . "\">equivalent</a></td>";
+                        echo $emfandxsdName . "&nbsp;" . $emfandxsdDescription ;
 
-                     echo " </tr>";
-              }
-              ?>
+                        echo "</td>";
+                        echo "<td align=\"right\">";
 
-              <?php
-              if ("true" === $prereq_emfvalidation) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $emfandxsdMirrorPrefixuri, $emfandxsdURL, $emfandxsdFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $emfandxsdBuildHome . "\">equivalent</a></td>";
+                        echo " </tr>";
+                    }
+                    ?>
 
-                     echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>
 
-              <?php
-              if ("true" === $prereq_graphiti) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
+                    <?php
+                    if ("true" === $prereq_gef) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
 
-                     echo $graphitiName  . "&nbsp;" . $graphitiDescription;
+                        echo $gefName  . "&nbsp;" . $gefDescription;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
+                        echo "</td>";
+                        echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $graphitiMirrorPrefixuri, $graphitiURL, $graphitiFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $graphitiBuildHome . "\">equivalent</a></td>";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>
+                        echo " </tr>";
+                    }
+                    ?>
 
-              <?php
-              if ("true" === $prereq_wst) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
 
-                     echo $wstName . "&nbsp;" . $wstDescription;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>
+                    <?php
+                    if ("true" === $prereq_dtp) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
 
-              <?php
-              if ("true" === $prereq_jst) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
+                        echo $dtpName . "&nbsp;" . $dtpDescription;
 
-                     echo $jstName . "&nbsp;" . $jstDescription;
+                        echo "</td>";
+                        echo "<td align=\"right\">";
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+                        echo " </tr>";
+                    }
+                    ?>
 
-                     echo " </tr>";
-              }
-              ?>
-              <?php
-              if ("true" === $prereq_wtp) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
 
-                     echo $wtpName . "&nbsp;" . $wtpDescription;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>
-              <?php
-              if ("true" === $prereq_wtptests) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
+                    <?php
+                    if ("true" === $prereq_emftransaction) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
 
-                     echo $wtptestsName . "&nbsp;" . $wtptestsDescription;
+                        echo $emftransactionName  . "&nbsp;" . $emftransactionDescription;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
+                        echo "</td>";
+                        echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $wtptestsMirrorPrefixuri, $wtptestsURL, $wtptestsFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $wtptestsBuildHome . "\">equivalent</a></td>";
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $emftransactionMirrorPrefixuri, $emftransactionURL, $emftransactionFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $emftransactionBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>              
-              <?php
-              if ("true" === $prereq_dltk) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td>";
+                        echo " </tr>";
+                    }
+                    ?>
 
-                     echo $dltkName . "&nbsp;" . $dltkDescription;
 
-                     echo "</td>";
-                     echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
 
-                     echo " </tr>";
-              }
-              ?>
-                     <tr valign="middle">
-                            <td width="10%"></td>
-                            <td colspan="2">
-                            <hr />
-                            </td>
-                     </tr>
+
+                    <?php
+                    if ("true" === $prereq_emfvalidation) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
+
+                        echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
+
+                        echo "</td>";
+                        echo "<td align=\"right\">";
+
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
+
+                        echo " </tr>";
+                    }
+                    ?>
+
+
+
+
+
+                    <?php
+                    if ("true" === $prereq_graphiti) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
+
+                        echo $graphitiName  . "&nbsp;" . $graphitiDescription;
+
+                        echo "</td>";
+                        echo "<td align=\"right\">";
+
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $graphitiMirrorPrefixuri, $graphitiURL, $graphitiFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $graphitiBuildHome . "\">equivalent</a></td>";
+
+                        echo " </tr>";
+                    }
+                    ?>
+
+
+
+
+
+                    <?php
+                    if ("true" === $prereq_wst) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
+
+                        echo $wstName . "&nbsp;" . $wstDescription;
+
+                        echo "</td>";
+                        echo "<td align=\"right\">";
+
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+
+                        echo " </tr>";
+                    }
+                    ?>
+
+
+
+
+
+                    <?php
+                    if ("true" === $prereq_jst) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
+
+                        echo $jstName . "&nbsp;" . $jstDescription;
+
+                        echo "</td>";
+                        echo "<td align=\"right\">";
+
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+
+                        echo " </tr>";
+                    }
+                    ?>
+
+
+
+
+                    <?php
+                    if ("true" === $prereq_wtp) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
+
+                        echo $wtpName . "&nbsp;" . $wtpDescription;
+
+                        echo "</td>";
+                        echo "<td align=\"right\">";
+
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
+
+                        echo " </tr>";
+                    }
+                    ?>
+
+
+
+
+                    <?php
+                    if ("true" === $prereq_wtptests) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
+
+                        echo $wtptestsName . "&nbsp;" . $wtptestsDescription;
+
+                        echo "</td>";
+                        echo "<td align=\"right\">";
+
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $wtptestsMirrorPrefixuri, $wtptestsURL, $wtptestsFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $wtptestsBuildHome . "\">equivalent</a></td>";
+
+                        echo " </tr>";
+                    }
+                    ?>
+
+
+
+                    <?php
+                    if ("true" === $prereq_dltk) {
+                        echo "<tr valign=\"top\">";
+                        echo "<td width=\"10%\"></td>";
+                        echo "<td>";
+
+                        echo $dltkName . "&nbsp;" . $dltkDescription;
+
+                        echo "</td>";
+                        echo "<td align=\"right\">";
+
+                        echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
+                        echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
+
+                        echo " </tr>";
+                    }
+                    ?>
+                    <tr valign="middle">
+                         <td width="10%"></td>
+                         <td colspan="2">
+                              <hr /></td>
+                    </tr>
+
+
+
+
+
+
 
 
 
@@ -368,7 +437,7 @@
                             echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
                             echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
                             ?>
-                     
+
                      </tr>
 
                      <tr valign="top">
@@ -380,11 +449,11 @@
                             echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
                             echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
                             ?>
-                     
+
                      </tr>
 
               </table>
-              </td>
-       </tr>
+          </td>
+     </tr>
 </table>
 
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/fproject.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/fproject.php
index 2dc86fe..fcd0fe1 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/fproject.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/fproject.php
@@ -2,44 +2,53 @@
 
                             $bellwether_zipfilename="wtp-common-fproj-".$build.".zip";
                             if (file_exists($bellwether_zipfilename)) {
-                                   // if-then-include section
-                                   // include this whole section if (and only if) the bellwether file exists.
-                                   // For example, it may not exist on builds for "old" streams.
-                                   ?>
+                                // if-then-include section
+                                // include this whole section if (and only if) the bellwether file exists.
+                                // For example, it may not exist on builds for "old" streams.
+                                ?>
 
 <!-- ***********  Faceted Project Framework **************  -->
 <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">Faceted
-              Project Framework</font></td>
-       </tr>
+     <tr>
+          <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
+               face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Faceted
+                    Project Framework</font></td>
+     </tr>
 
-       <tr>
-              <td align="left" valign="top" colspan="5">
-              <p>The Faceted Project Framework allows creation of modular projects
-              in Eclipse so that the user can easily add and remove functionality.
-              All WTP projects leverage this framework, but it can also be used
-              independent of WTP.</p>
-              <p>The JDT Enablement component extends the Faceted Project Framework
-              to integrate with Java Development Tools. The component includes the
-              Java facet, modeling of the JVM-based runtimes and tools for
-              simplifying Java library management for facet authors.</p>
-              <p>Note: you only need this zip file(s) if you want to use only this
-              function. If you download the WTP (or WST) zip file, it is already
-              included there.</p>
-              </td>
-       </tr>
-       <tr>
-              <td>
-              <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+     <tr>
+          <td align="left" valign="top" colspan="5">
+               <p>The Faceted Project Framework allows creation of modular projects
+                    in Eclipse so that the user can easily add and remove functionality.
+                    All WTP projects leverage this framework, but it can also be used
+                    independent of WTP.</p>
+               <p>The JDT Enablement component extends the Faceted Project Framework
+                    to integrate with Java Development Tools. The component includes the
+                    Java facet, modeling of the JVM-based runtimes and tools for
+                    simplifying Java library management for facet authors.</p>
+               <p>Note: you only need this zip file(s) if you want to use only this
+                    function. If you download the WTP (or WST) zip file, it is already
+                    included there.</p>
+          </td>
+     </tr>
+     <tr>
+          <td>
+               <table border=0 cellspacing=2 cellpadding=2 width="90%"
+                    align="center">
 
 
-                     <tr>
-                            <td align="left" valign="top" width="10%"><b>Framework</b></td>
-                            <td align="left" valign="top">
-                            <p>Runtime</p>
-                            </td>
+                    <tr>
+                         <td align="left" valign="top" width="10%"><b>Framework</b></td>
+                         <td align="left" valign="top">
+                              <p>Runtime</p>
+                         </td>
+
+
+
+
+
+
+
+
                             <?php
 
                             $zipfilename="wtp-common-fproj-$build";
@@ -52,11 +61,19 @@
                             ?>
                      </tr>
 
-                     <tr>
-                            <td align="left" valign="top" width="10%"><b>&nbsp;</b></td>
-                            <td align="left" valign="top">
-                            <p>SDK</p>
-                            </td>
+                    <tr>
+                         <td align="left" valign="top" width="10%"><b>&nbsp;</b></td>
+                         <td align="left" valign="top">
+                              <p>SDK</p>
+                         </td>
+
+
+
+
+
+
+
+
                             <?php
 
                             $zipfilename="wtp-common-fproj-sdk-$build";
@@ -69,11 +86,19 @@
                             ?>
                      </tr>
 
-                     <tr>
-                            <td align="left" valign="top" width="10%"><b>JDT Enablement</b></td>
-                            <td align="left" valign="top">
-                            <p>Runtime</p>
-                            </td>
+                    <tr>
+                         <td align="left" valign="top" width="10%"><b>JDT Enablement</b></td>
+                         <td align="left" valign="top">
+                              <p>Runtime</p>
+                         </td>
+
+
+
+
+
+
+
+
                             <?php
 
                             $zipfilename="wtp-common-fproj-enablement-jdt-$build";
@@ -86,11 +111,19 @@
                             ?>
                      </tr>
 
-                     <tr>
-                            <td align="left" valign="top" width="10%"><b>&nbsp;</b></td>
-                            <td align="left" valign="top">
-                            <p>SDK</p>
-                            </td>
+                    <tr>
+                         <td align="left" valign="top" width="10%"><b>&nbsp;</b></td>
+                         <td align="left" valign="top">
+                              <p>SDK</p>
+                         </td>
+
+
+
+
+
+
+
+
                             <?php
 
                             $zipfilename="wtp-common-fproj-enablement-jdt-sdk-$build";
@@ -103,13 +136,15 @@
                             ?>
                      </tr>
 
-              </table>
-              </td>
-       </tr>
+               </table>
+          </td>
+     </tr>
 
 </table>
 
-                            <?php
-                            // end the if-then-include section
+
+
+<?php
+// end the if-then-include section
                             }
                             ?>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/headingIntro.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/headingIntro.php
index 9cd254e..2b9746f 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/headingIntro.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/headingIntro.php
@@ -1,11 +1,11 @@
 
-<?php 
+<?php
 
 if (isset($incubating) && ($incubating == "true")) {
-       echo '<title>WTP Incubator Downloads</title>';
+    echo '<title>WTP Incubator Downloads</title>';
 }
 else {
-       echo '<title>WTP Downloads</title>';
+    echo '<title>WTP Downloads</title>';
 }
 
 ?>
@@ -17,62 +17,69 @@
 
 
 
+
+
+
+
 <?php if (isset($incubating) && ($incubating == "true")) {
-       echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-       echo " <tr>";
-       echo "        <td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
-       echo "        Build: $build</b></font></td>";
-       echo "        <td align=\"right\" rowspan=\"3\"><a";
-       echo "               href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
-       echo "               src=\"http://www.eclipse.org/images/egg-incubation.png\"";
-       echo "               alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
+    echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
+    echo " <tr>";
+    echo "        <td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
+    echo "        Build: $build</b></font></td>";
+    echo "        <td align=\"right\" rowspan=\"3\"><a";
+    echo "               href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
+    echo "               src=\"http://www.eclipse.org/images/egg-incubation.png\"";
+    echo "               alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
 
 
-       echo " <tr valign=\"top\">";
-       echo "        <td><font size=\"-1\">" . $builddate . "</font></td>";
-       echo " </tr>";
-       echo " <tr valign=\"top\">";
-       echo "        <td>";
-       echo "        <p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
-       echo "        tools for development that are just getting started, or are";
-       echo "        experimental in some fashion.</p>";
-       echo "        </td>";
-       echo " </tr>";
-       echo "</table>";
+    echo " <tr valign=\"top\">";
+    echo "        <td><font size=\"-1\">" . $builddate . "</font></td>";
+    echo " </tr>";
+    echo " <tr valign=\"top\">";
+    echo "        <td>";
+    echo "        <p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
+    echo "        tools for development that are just getting started, or are";
+    echo "        experimental in some fashion.</p>";
+    echo "        </td>";
+    echo " </tr>";
+    echo "</table>";
 
 } else {
 
-       echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
-       echo " <tr>";
-       echo "        <td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
-       echo "        Build: " . $build . "</b></font></td>";
+    echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
+    echo " <tr>";
+    echo "        <td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
+    echo "        Build: " . $build . "</b></font></td>";
 
-       echo " <tr valign=\"top\">";
-       echo "        <td><font size=\"-1\">" . $builddate . "</font></td>";
-       echo " </tr>";
-       echo " <tr valign=\"top\">";
-       echo "        <td>";
-       echo "        <p>The Eclipse Web Tools Platform Project provides tools for Web";
-       echo "               Development, and is a platform for adopters making add-on tools for";
-       echo "               Web Development.</p>";
-       echo "        </td>";
-       echo " </tr>";
-       echo "</table>";
+    echo " <tr valign=\"top\">";
+    echo "        <td><font size=\"-1\">" . $builddate . "</font></td>";
+    echo " </tr>";
+    echo " <tr valign=\"top\">";
+    echo "        <td>";
+    echo "        <p>The Eclipse Web Tools Platform Project provides tools for Web";
+    echo "               Development, and is a platform for adopters making add-on tools for";
+    echo "               Web Development.</p>";
+    echo "        </td>";
+    echo " </tr>";
+    echo "</table>";
 
 } ?>
 
 
-<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">All-in-one
-              Packages</font></td>
-       </tr>
-       <tr>
-              <td>
-              <p>For most uses, we recommend web-developers download the
-              "all-in-one" package, <a href="http://www.eclipse.org/downloads/">Eclipse
-              IDE for Java EE Developers</a>, from the main Eclipse download site.</p>
-              </td>
-       </tr>
-</table>
+     <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">All-in-one
+                         Packages</font></td>
+          </tr>
+          <tr>
+               <td>
+                    <p>
+                         For most uses, we recommend web-developers download the
+                         "all-in-one" package, <a href="http://www.eclipse.org/downloads/">Eclipse
+                              IDE for Java EE Developers</a>, from the main Eclipse download
+                         site.
+                    </p>
+               </td>
+          </tr>
+     </table>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
index d6bfc21..8462ad6 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template.php
@@ -2,6 +2,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 
+
+
+
+
 <?php
 
 //ini_set("display_errors", "true");
@@ -17,59 +21,59 @@
 $displayTestSummary=false;
 if (phpversion() >= 5) {
 
-	$code_totalBundles=0;
-	$code_totalErrors=0;
-	$code_totalWarnings=0;
-	$code_totalforbiddenAccessWarningCount=0;
-	$code_totaldiscouragedAccessWarningCount=0;
+     $code_totalBundles=0;
+     $code_totalErrors=0;
+     $code_totalWarnings=0;
+     $code_totalforbiddenAccessWarningCount=0;
+     $code_totaldiscouragedAccessWarningCount=0;
 
-	$test_totalBundles=0;
-	$test_totalErrors=0;
-	$test_totalWarnings=0;
-	$test_totalforbiddenAccessWarningCount=0;
-	$test_totaldiscouragedAccessWarningCount=0;
+     $test_totalBundles=0;
+     $test_totalErrors=0;
+     $test_totalWarnings=0;
+     $test_totalforbiddenAccessWarningCount=0;
+     $test_totaldiscouragedAccessWarningCount=0;
 
 
-	$displayTestSummary=true;
-	// 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);
-		}
-	}
+     $displayTestSummary=true;
+     // 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";
-	if (file_exists($filename)) {
-		$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 = "compilelogsSummary.xml";
+     if (file_exists($filename)) {
+          $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";
-	if (file_exists($filename)) {
-		$prefix = "test_";
-		$compileSummary = simplexml_load_file($filename);
-		foreach ($compileSummary->summaryItem as $summaryItem) {
-			$name = $summaryItem->name;
-			$value = $summaryItem->value;
-			$code= "\$" . $prefix . $name . " = " . $value . ";";
-			//echo "<br />code: " . $code;
-			eval($code);
-		}
-	}
+     $filename = "testcompilelogsSummary.xml";
+     if (file_exists($filename)) {
+          $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);
+          }
+     }
 }
 
 
@@ -85,46 +89,46 @@
 
 
 <table border=0 cellspacing=2 cellpadding=2 width="100%">
-	<tr>
-		<td align=left valign=top colspan="2" bgcolor="#0080C0"><font
-			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">P2
-		repositories in zipped format files.</font></td>
-	</tr>
+     <tr>
+          <td align=left valign=top colspan="2" bgcolor="#0080C0"><font
+               face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">P2
+          repositories in zipped format files.</font></td>
+     </tr>
 
-	<tr>
-		<td align="left" valign="top" colspan="5">
-		<p>These are archive versions of P2 repositories that can be
-		downloaded and installed into a development environment or PDE target.
-		Its is recommended to install, rather than to to unzip the traditional
-		packages, since it is more informative of missing prerequites or
-		conflicting dependencies.</p>
-		</td>
-	</tr>
+     <tr>
+          <td align="left" valign="top" colspan="5">
+          <p>These are archive versions of P2 repositories that can be
+          downloaded and installed into a development environment or PDE target.
+          Its is recommended to install, rather than to to unzip the traditional
+          packages, since it is more informative of missing prerequites or
+          conflicting dependencies.</p>
+          </td>
+     </tr>
 
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+     <tr>
+          <td>
+          <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-		<?php
+          <?php
 
-		$shortname=${build_distribution}."-repo";
+          $shortname=${build_distribution}."-repo";
 
-		$zipfilename=${shortname}."-".${build};
-		$filename=${zipfilename}.".zip";
-		if (file_exists($filename)) {
-			?>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Code Repository</b></td>
-				<td align="left" valign="top">
-				<p>Archived p2 repository of WTP code. Good for product builders. </p>
-				</td>
-				<?php
-				$zipfilesize=fileSizeForDisplay($filename);
-				
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $shortname);
-				?>
-			</tr>
-			<?php } ?>
+          $zipfilename=${shortname}."-".${build};
+          $filename=${zipfilename}.".zip";
+          if (file_exists($filename)) {
+               ?>
+               <tr>
+                    <td align="left" valign="top" width="10%"><b>Code Repository</b></td>
+                    <td align="left" valign="top">
+                    <p>Archived p2 repository of WTP code. Good for product builders. </p>
+                    </td>
+                    <?php
+                    $zipfilesize=fileSizeForDisplay($filename);
+
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $shortname);
+                    ?>
+               </tr>
+               <?php } ?>
               <?php
 
               $shortname="${build_distribution}-tests-repo";
@@ -140,223 +144,223 @@
                             </td>
                             <?php
                             $zipfilesize=fileSizeForDisplay($filename);
-                            
+
                             displayFileLine($downloadprefix, $filename, $zipfilesize, $shortname);
                             ?>
                      </tr>
                      <?php } ?>
-		</table>
-	
-	</tr>
+          </table>
+
+     </tr>
 </table>
 
 
 <!-- ***********  Traditional Zips **************  -->
 <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"> Traditional
-		Zip Files</font></td>
-	</tr>
+     <tr>
+          <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
+               face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Traditional
+          Zip Files</font></td>
+     </tr>
 
-	<tr>
-		<td align="left" valign="top" colspan="5"><?php
-		$zipbellwether_name="${build_distribution}-${build}.zip";
-		if (file_exists($zipbellwether_name)) {
-			// if-then-include section
-			// include this whole section if (and only if) the bellwether file exists.
-			// For example, may not have been created yet
-			?>
+     <tr>
+          <td align="left" valign="top" colspan="5"><?php
+          $zipbellwether_name="${build_distribution}-${build}.zip";
+          if (file_exists($zipbellwether_name)) {
+               // if-then-include section
+               // include this whole section if (and only if) the bellwether file exists.
+               // For example, may not have been created yet
+               ?>
 
-		<p>The Zip files includes the features and plugins for this build.</p>
-		<p>Note: These traditional zip files should be considered deprecated,
-		in favor of installing the archived P2 repositories. The tradtional
-		zip files may eventually no longer be provided.</p>
-		<?php } else { ?>
-		<p>The traditonal zip files have not been produced yet (or, perhaps,
-		the build failed or was cancelled). Check back in few minutes.</p>
-		<?php } ?></td>
-	</tr>
-	<tr>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+          <p>The Zip files includes the features and plugins for this build.</p>
+          <p>Note: These traditional zip files should be considered deprecated,
+          in favor of installing the archived P2 repositories. The tradtional
+          zip files may eventually no longer be provided.</p>
+          <?php } else { ?>
+          <p>The traditonal zip files have not been produced yet (or, perhaps,
+          the build failed or was cancelled). Check back in few minutes.</p>
+          <?php } ?></td>
+     </tr>
+     <tr>
+          <td>
+          <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-		<?php
-		$zipfilename="${build_distribution}-${build}";
-		$filename=$zipfilename.".zip";
-		if (file_exists($filename)) {
-			?>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Web App Developers:</b></td>
-				<td align="left" valign="top" width="55%">
-				<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
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription=${build_distribution};
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<?php } ?>
+          <?php
+          $zipfilename="${build_distribution}-${build}";
+          $filename=$zipfilename.".zip";
+          if (file_exists($filename)) {
+               ?>
+               <tr>
+                    <td align="left" valign="top" width="10%"><b>Web App Developers:</b></td>
+                    <td align="left" valign="top" width="55%">
+                    <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
+                    $zipfilesize=fileSizeForDisplay($filename);
+                    $fileShortDescription=${build_distribution};
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+                    ?>
+               </tr>
+               <?php } ?>
 
-			<?php
-			$zipfilename="${build_distribution}-sdk-${build}";
-			$filename=$zipfilename.".zip";
-			if (file_exists($filename)) {
-				?>
-			<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>
-				</td>
-				<?php
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription=${build_distribution} . "-sdk";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
-			</tr>
-			<?php } ?>
+               <?php
+               $zipfilename="${build_distribution}-sdk-${build}";
+               $filename=$zipfilename.".zip";
+               if (file_exists($filename)) {
+                    ?>
+               <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>
+                    </td>
+                    <?php
+                    $zipfilesize=fileSizeForDisplay($filename);
+                    $fileShortDescription=${build_distribution} . "-sdk";
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+                    ?>
+               </tr>
+               <?php } ?>
 
-			<?php
-			$zipfilename="${build_distribution}-tests-${build}";
-			$filename=$zipfilename.".zip";
-			if (file_exists($filename)) {
-				?>
-			<tr>
-				<td align="left" valign="top" width="10%"><b>Unit Tests</b></td>
-				<td align="left" valign="top">
-				<p>The automated test zip contains unit tests.</p>
-				</td>
-				<?php
-				$zipfilesize=fileSizeForDisplay($filename);
-				$fileShortDescription=${build_distribution} . "-tests";
-				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-				?>
+               <?php
+               $zipfilename="${build_distribution}-tests-${build}";
+               $filename=$zipfilename.".zip";
+               if (file_exists($filename)) {
+                    ?>
+               <tr>
+                    <td align="left" valign="top" width="10%"><b>Unit Tests</b></td>
+                    <td align="left" valign="top">
+                    <p>The automated test zip contains unit tests.</p>
+                    </td>
+                    <?php
+                    $zipfilesize=fileSizeForDisplay($filename);
+                    $fileShortDescription=${build_distribution} . "-tests";
+                    displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+                    ?>
 
-			</tr>
-			<?php } ?>
-		</table>
-		</td>
+               </tr>
+               <?php } ?>
+          </table>
+          </td>
 
 
-	</tr>
+     </tr>
 
 </table>
 
-			<?php include 'webdev.php'; ?>
+               <?php include 'webdev.php'; ?>
 
-			<?php include 'fproject.php'; ?>
+               <?php include 'fproject.php'; ?>
 
 
 
 <!-- ***********  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>
-		<td>
-		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+     <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>
+          <td>
+          <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-			<tr>
-				<td><?php 
-				if (isset($displayBuildNotes) && $displayBuildNotes) {
-					echo "<a href=\"buildNotes.php\">Build notes</a> <br />";
-				}
-				?> <a href="directory.txt">map files</a> <br />
-				<?php
+               <tr>
+                    <td><?php 
+                    if (isset($displayBuildNotes) && $displayBuildNotes) {
+                         echo "<a href=\"buildNotes.php\">Build notes</a> <br />";
+                    }
+                    ?> <a href="directory.txt">map files</a> <br />
+                    <?php
 
-				if (file_exists("components")) {
-					echo "<a href=\"components/components.php\">Misc Components</a> <br />\n";
-				}
+                    if (file_exists("components")) {
+                         echo "<a href=\"components/components.php\">Misc Components</a> <br />\n";
+                    }
 
 
-				if ($displayTestSummary) {
+                    if ($displayTestSummary) {
 
 
-					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 {
-						$compileProblemMarkerFile="compilationProblems.txt";
-						if (file_exists($compileProblemMarkerFile)) {
-							echo "<br /> <img src=\"compile_err.gif\"/>&nbsp;&nbsp;No unit tests available. The remaining build and tests were canceled since compilation problems were found. Check compiler output summaries.";
-						} else {
-							$installLogName="p2DirectorInstall.log.txt";
-							if (file_exists($installLogName)) {
-								echo "<br /><img src=\"compile_err.gif\"/>&nbsp;&nbsp;No unit tests available. See <a href=\"" . $installLogName . "\">the p2Director install log file </a>from failed test installation attempt";
-							} else {
-								$noTestsProvidedMarkerFile="noTestsProvided.txt";
-								if (file_exists($noTestsProvidedMarkerFile)) {
-									echo "<br /><img src=\"compile_warn.gif\"/>&nbsp;&nbsp;No unit tests available. This build component does not providing any unit tests.";
-								} else {
+                         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 {
+                              $compileProblemMarkerFile="compilationProblems.txt";
+                              if (file_exists($compileProblemMarkerFile)) {
+                                   echo "<br /> <img src=\"compile_err.gif\"/>&nbsp;&nbsp;No unit tests available. The remaining build and tests were canceled since compilation problems were found. Check compiler output summaries.";
+                              } else {
+                                   $installLogName="p2DirectorInstall.log.txt";
+                                   if (file_exists($installLogName)) {
+                                        echo "<br /><img src=\"compile_err.gif\"/>&nbsp;&nbsp;No unit tests available. See <a href=\"" . $installLogName . "\">the p2Director install log file </a>from failed test installation attempt";
+                                   } else {
+                                        $noTestsProvidedMarkerFile="noTestsProvided.txt";
+                                        if (file_exists($noTestsProvidedMarkerFile)) {
+                                             echo "<br /><img src=\"compile_warn.gif\"/>&nbsp;&nbsp;No unit tests available. This build component does not providing any unit tests.";
+                                        } else {
 
-									// we may really be pending (tests still running) or maybe they failed in unexpted way?.
-									echo "<br /><font color=\"orange\">Unit tests ae pending, or otherwise don't exists, or there is an unanticipated build error.</font>";
+                                             // we may really be pending (tests still running) or maybe they failed in unexpted way?.
+                                             echo "<br /><font color=\"orange\">Unit tests ae pending, or otherwise don't exists, or there is an unanticipated build error.</font>";
 
-								}
-							}
-						}
-					}
+                                        }
+                                   }
+                              }
+                         }
 
 
 
 
 
-					echo "<br />";
+                         echo "<br />";
 
-					echo "<br />";
-					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
+                         echo "<br />";
+                         echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
 
-					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;";
+                         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;";
 
-					echo "<br />";
-					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
+                         echo "<br />";
+                         echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
 
-					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;";
+                         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;";
 
-					$logname="antBuilderOutput.log";
-					if (file_exists($logname)) {
-						echo "<br /> <a href=\"".$logname."\" type=\"text/plain\">Full Log</a> from build ". fileSizeForDisplay($logname);
-					}
+                         $logname="antBuilderOutput.log";
+                         if (file_exists($logname)) {
+                              echo "<br /> <a href=\"".$logname."\" type=\"text/plain\">Full Log</a> from build ". fileSizeForDisplay($logname);
+                         }
 
 
-				}
+                    }
 
-				?> <br />
+                    ?> <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>";
-					}
-				}
-				?></td>
-			</tr>
-		</table>
-		</td>
-	</tr>
+                    <?php
+                    if (file_exists("versioningReportName.php")) {
+                         include "versioningReportName.php";
+                         $fname="${versionReportFilename}.html";
+                         if (file_exists($fname)) {
+                              echo "<br /> <a href='$fname'>Versioning Information</a>";
+                         }
+                    }
+                    ?></td>
+               </tr>
+          </table>
+          </td>
+     </tr>
 </table>
 
 
@@ -365,16 +369,22 @@
 <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
+     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>
+     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/releng.wtpbuilder/distribution/wtp.site/templateFiles/testResults.php.template.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/testResults.php.template.php
index e84339d..8c8ec3a 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/testResults.php.template.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/testResults.php.template.php
@@ -1,6 +1,8 @@
 <html>
 <head>
 
+
+
 <?php
 //ini_set("display_errors", "true");
 //error_reporting (E_ALL);
@@ -16,87 +18,94 @@
 
 <style>
 .bold,.bold TD,.bold TH,.bold TR {
-	font-weight: bold;
+     font-weight: bold;
 }
 
 .numeric,.numeric TD {
-	text-align: right;
-	padding-right: 2em;
+     text-align: right;
+     padding-right: 2em;
 }
 
 .normaltable,.normaltable TD,.normaltable TH {
-	font-family: Bitstream Vera Sans Mono, monospace;
-	font-size: 0.9em;
-	color: Black;
-	background-color: White;
+     font-family: Bitstream Vera Sans Mono, monospace;
+     font-size: 0.9em;
+     color: Black;
+     background-color: White;
 }
 
 .errorltable,.errortable TD,.errortable TH {
-	font-family: Bitstream Vera Sans Mono, monospace;
-	font-size: 0.9em;
-	color: Black;
-	background-color: Red;
-	font-weight: Bold;
+     font-family: Bitstream Vera Sans Mono, monospace;
+     font-size: 0.9em;
+     color: Black;
+     background-color: Red;
+     font-weight: Bold;
 }
 
 .warningtable,.warningtable TD,.warningtable TH {
-	font-family: Bitstream Vera Sans Mono, monospace;
-	font-size: 0.9em;
-	color: Black;
-	background-color: khaki;
+     font-family: Bitstream Vera Sans Mono, monospace;
+     font-size: 0.9em;
+     color: Black;
+     background-color: khaki;
 }
 
 .extraWarningTable,.extraWarningTable TD,.extraWarningTable TH {
-	font-family: Bitstream Vera Sans Mono, monospace;
-	font-size: 0.9em;
-	color: Black;
-	background-color: Yellow;
+     font-family: Bitstream Vera Sans Mono, monospace;
+     font-size: 0.9em;
+     color: Black;
+     background-color: Yellow;
 }
 </style>
 
 
 </head>
 <body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
+     <p>
+          <b><font face="Verdana" size="+3">Test Results</font> </b>
+     </p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica"> Extra results and logs </font></b></td>
-	</tr>
-</table>
+     <table border=0 cellspacing=5 cellpadding=2 width="100%">
+          <tr>
+               <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+                         color="#FFFFFF" face="Arial,Helvetica"> Extra results and logs </font>
+               </b></td>
+          </tr>
+     </table>
+
+
+
+
 
 <?php
 if (file_exists("testResults"))
 {
-	$dir = dir("testResults");
-	while ($anEntry = $dir->read())
-	{
-		if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
+     $dir = dir("testResults");
+     while ($anEntry = $dir->read())
+     {
+          if ($anEntry != "." && $anEntry != ".." && $anEntry != "consolelogs" && $anEntry != "html" && $anEntry != "xml")
 
-		{
-			if (is_dir($anEntry)) {
-				$link = "testResults/".$anEntry."/results/index.php";
-				echo "<p><a href=\"$link\">$anEntry</a></p> \n";
-			}
-			else {
-				// assume is file
-				$path_parts = pathinfo($anEntry);
-				$file_extension = $path_parts['extension'];
-				if (isset($path_parts['filename'])) {
-					$linkname = $path_parts['filename'];
-				}
-				else {
-					$linkname = $anEntry;
-				}
+          {
+               if (is_dir($anEntry)) {
+                    $link = "testResults/".$anEntry."/results/index.php";
+                    echo "<p><a href=\"$link\">$anEntry</a></p> \n";
+               }
+               else {
+                    // assume is file
+                    $path_parts = pathinfo($anEntry);
+                    $file_extension = $path_parts['extension'];
+                    if (isset($path_parts['filename'])) {
+                         $linkname = $path_parts['filename'];
+                    }
+                    else {
+                         $linkname = $anEntry;
+                    }
 
-				$link = $anEntry;
-				if ("html" === $file_extension || "php" === $file_extension || "log" === $file_extension || "txt" === $file_extension) {
-					echo "<p><a href=testResults/" . $link . ">" . $linkname . "</a></p>\n";
-				}
-			}
-		}
-	}
+                    $link = $anEntry;
+                    if ("html" === $file_extension || "php" === $file_extension || "log" === $file_extension || "txt" === $file_extension) {
+                         echo "<p><a href=testResults/" . $link . ">" . $linkname . "</a></p>\n";
+                    }
+               }
+          }
+     }
 }
 ?>
 
@@ -104,33 +113,33 @@
 
 
 <table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$buildName"; ?>
-		</font></b></td>
-	</tr>
+     <tr>
+          <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+               color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$buildName"; ?>
+          </font></b></td>
+     </tr>
 </table>
 
 <table id=tableunittestdata align="center" width="75%" border="1">
-	<tr>
-		<td class="bold" align="center" width="70%">Test Suite</td>
-		<td class="bold" align="center" width="15%">Errors &amp; Failures</td>
-		<td class="bold" align="center" width="15%">Total Tests</td>
-		<td class="bold" align="center" width="15%">Total Time (s)</td>
-	</tr>
+     <tr>
+          <td class="bold" align="center" width="70%">Test Suite</td>
+          <td class="bold" align="center" width="15%">Errors &amp; Failures</td>
+          <td class="bold" align="center" width="15%">Total Tests</td>
+          <td class="bold" align="center" width="15%">Total Time (s)</td>
+     </tr>
 
 
-	%testresults%
+     %testresults%
 
 </table>
 <p></p>
 <br>
 <table border=0 cellspacing=5 cellpadding=2 width="100%">
-	<tr>
-		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
-			color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$buildName"; ?>
-		</font></b></td>
-	</tr>
+     <tr>
+          <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+               color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$buildName"; ?>
+          </font></b></td>
+     </tr>
 </table>
 <br>
 These
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/webdev.php b/releng.wtpbuilder/distribution/wtp.site/templateFiles/webdev.php
index d1c1f7a..9ecd10c 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/webdev.php
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/webdev.php
@@ -2,40 +2,49 @@
 
                             $bellwether_zipfilename="wst-sdk-".$build.".zip";
                             if (file_exists($bellwether_zipfilename)) {
-                                   // if-then-include section
-                                   // include this whole section if (and only if) the bellwether file exists.
-                                   // For example, it may not exist on builds for "old" streams.
-                                   ?>
+                                // if-then-include section
+                                // include this whole section if (and only if) the bellwether file exists.
+                                // For example, it may not exist on builds for "old" streams.
+                                ?>
 
 <!-- ***********  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">Traditional
-              zip files for Web Development Tools</font></td>
-       </tr>
+     <tr>
+          <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
+               face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Traditional
+                    zip files for Web Development Tools</font></td>
+     </tr>
 
-       <tr>
-              <td align="left" valign="top" colspan="5">
-              <p>These zip files includes the features and plugins for (non-Java EE)
-              Web Development, including JavaScript, XML, HTML, CSS.</p>
-              <p>Note: you only need this zip file(s) if you want to use only this
-              function. If you download the WTP zip file, it is already included
-              there.</p>
-              </td>
-       </tr>
-       <tr>
-              <td>
-              <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+     <tr>
+          <td align="left" valign="top" colspan="5">
+               <p>These zip files includes the features and plugins for (non-Java
+                    EE) Web Development, including JavaScript, XML, HTML, CSS.</p>
+               <p>Note: you only need this zip file(s) if you want to use only this
+                    function. If you download the WTP zip file, it is already included
+                    there.</p>
+          </td>
+     </tr>
+     <tr>
+          <td>
+               <table border=0 cellspacing=2 cellpadding=2 width="90%"
+                    align="center">
 
 
-                     <tr>
-                            <td align="left" valign="top" width="10%"><b>Tool Developers:</b></td>
+                    <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>
+                         <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
 
@@ -46,14 +55,30 @@
                             $fileShortDescription="wst-sdk";
                             displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
                             ?>
-                     
-                     </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>
+
+
+
+
+
+
+
+                    </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="wst.tests-$build";
@@ -64,14 +89,24 @@
                             displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
 
                             ?>
-                     
-                     </tr>
-
-              </table>
-              </td>
 
 
-       </tr>
+
+
+
+
+
+
+
+                    </tr>
+
+               </table>
+          </td>
+
+
+     </tr>
 
 </table>
+
+
 <?php } ?>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index cb6e15e..e930970 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -117,28 +117,28 @@
                 value="all"/>
         </antcall>
     </target>
-	
-	<!-- 
-	note: the 'test.installed' attribute is a temporary hack
-	to allow standalone tests to do the install themselves. 
-	Eventually, this script should be improved so this hack would 
-	be not required. The "location" of the 
-	zips/repos are indirectly currently "hard coded" to 
-	be in /projects/... but 
-	this should become a variable, sometimes (maybe) 
-	set to /projects/..., 
-	more often set to some URL from committers or downloads pages. 
-	See the repos values below in repo install: 
-	   value="file://${buildDirectory}/${buildLabel}/repository/,file://${buildDirectory}/${buildLabel}/repositoryunittests/"/>
-	These should be changed to be something like 
-	   value="${coderepo},${unittestsrepo}"/>
-	 Or similar. Then could be set as desired. 
-	-->
+
+     <!-- 
+     note: the 'test.installed' attribute is a temporary hack
+     to allow standalone tests to do the install themselves. 
+     Eventually, this script should be improved so this hack would 
+     be not required. The "location" of the 
+     zips/repos are indirectly currently "hard coded" to 
+     be in /projects/... but 
+     this should become a variable, sometimes (maybe) 
+     set to /projects/..., 
+     more often set to some URL from committers or downloads pages. 
+     See the repos values below in repo install: 
+        value="file://${buildDirectory}/${buildLabel}/repository/,file://${buildDirectory}/${buildLabel}/repositoryunittests/"/>
+     These should be changed to be something like