cleanup for restructuring
diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index c566196..c6bd9e4 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -1,5 +1,6 @@
 
-# comment out, if you want tests to run
+# uncomment if its desired to skip unit tests
+# (if not already defined from elsewhere)
 # skipUnitTests=yes
 
 # 	javacFailOnError must be false otherwise the 
@@ -30,7 +31,6 @@
 #eclipse.builder.fetch=true
 
 
-
 # WTP specific builder
 wtpBuildTools.url=http://www.eclipse.org/external/webtools/wtpBuildTools/drops/R3.0/T-T200706302239-200706302239/updateSite/plugins 
 wtpBuildTools.file=org.eclipse.wtp.releng.tools_1.0.0.v200706302235.jar
diff --git a/releng.wtpbuilder/components/jst-sdk/customTargets.xml b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
index affee8c..b7a6575 100644
--- a/releng.wtpbuilder/components/jst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jst-sdk/customTargets.xml
@@ -15,8 +15,10 @@
     <target name="allElements">
         <echo level="info" message="Target:${target} " />
         <echo level="debug" message="basedir: ${basedir}" />
+        <echo level="debug" message="component: ${component}" />
         <echo level="debug" message="buildDirectory: ${buildDirectory}" />
         <echo level="debug" message="baseLocation: ${baseLocation}" />
+        <echo level="debug" message="generic target: ${genericTargets}" />
         <ant
             antfile="${genericTargets}"
             target="${target}">
@@ -73,7 +75,7 @@
     <!-- Check out map files from correct repository -->
     <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
     <!-- ===================================================================== -->
-    <target name="checkLocal">
+   <target name="checkLocal" depends="check.useLocalMaps" if="useLocalMaps">
         <available
             property="mapsLocal"
             file="${buildDirectory}/maps/${env.RELENG}" />
@@ -97,19 +99,29 @@
             value="HEAD" />
 
 
-        <property
+        <echo level="info" message="${mapCvsRoot} ${mapVersionTag} "></echo>       
+       <property
             name="cvsPackage"
-            value="${env.RELENG}" />
-        <echo level="info" message="${mapCvsRoot} ${mapVersionTag} " />
-        <echo level="info" message="cvsPackage = ${cvsPackage} " />
-
+            value="${env.RELENGMAPS}" />
+        <echo level="debug" message="${mapCvsRoot} ${mapVersionTag} " />
+        <echo level="debug" message="cvsPackage = ${cvsPackage} " />
         <cvs
             cvsRoot="${mapCvsRoot}"
             package="${cvsPackage}"
             dest="${buildDirectory}/maps"
-            tag="${mapVersionTag}" 
+            tag="${mapVersionTag}"
             quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}"/>
+            reallyquiet="${env.CVS_REALLY_QUIET}" />
+<!--
+        <cvs
+                  cvsRoot="${mapCvsRoot}"
+                  package="${env.RELENGMAPS}"
+                  dest="${buildDirectory}/maps"
+                  tag="${mapVersionTag}"
+                  quiet="${env.CVS_QUIET}"
+                  reallyquiet="${env.CVS_REALLY_QUIET}" />            	
+-->     
+
         <cvs
             cvsRoot="${mapCvsRoot}"
             package="${env.RELENGJSF}"
@@ -117,6 +129,8 @@
             tag="${releng-jsf-mapVersionTag}" 
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}" />
+
+
         <!--tag the map files project-->
         <antcall target="tagMapFiles">
             <param
@@ -124,13 +138,15 @@
                 value="${mapCvsRoot}" />
         </antcall>
 
-        <!-- copy all maps to the same place. Be sure to copy only "maps", as there may be "dependancies" etc, 
-            in releng-jsf that would be out of date -->
-        <copy todir="${buildDirectory}/maps/${env.RELENG}/maps">
-            <fileset dir="${buildDirectory}/maps/${env.RELENGJSF}/maps">
-                <include name="*.map" />
-            </fileset>
-        </copy>
+      <!-- copy all maps to the same place. Be sure to copy only "maps", as there may be "dependancies" etc, 
+          that could be out of date -->
+    	<!-- turns out this "one flat directory" appears not needed!
+      <copy todir="${buildDirectory}/maps/${env.RELENG}/maps" flatten="true">
+          <fileset dir="${buildDirectory}/maps/">
+          	<include name="**/*.map" />
+          </fileset>
+      </copy>
+    	-->    
 
     </target>
 
@@ -476,4 +492,11 @@
             message="You must specify a target when invoking this file" />
     </target>
 
+  <target name="check.useLocalMaps">
+      <condition property="useLocalMaps">
+          <equals arg1="${env.USE_LOCAL_MAPS}" arg2="true" />
+      </condition>
+  </target>
+
+
 </project>
diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml
index 3bf0f77..e2f5a5e 100644
--- a/releng.wtpbuilder/components/jst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jst-sdk/dependency.xml
@@ -25,15 +25,16 @@
 		</antcall>
 
 		<antcall target="getAndInstall">
-			<param name="groupId" value="dtp" />
-		</antcall>
-		<antcall target="getAndInstall">
 			<param name="groupId" value="eclipse" />
 		</antcall>
 		<antcall target="getAndInstall">
 			<param name="groupId" value="eclipseTestFramework" />
 		</antcall>
 
+		<antcall target="getAndInstall">
+			<param name="groupId" value="dtp" />
+		</antcall>
+
 	</target>
 
 
diff --git a/releng.wtpbuilder/components/jst.tests/customTargets.xml b/releng.wtpbuilder/components/jst.tests/customTargets.xml
index f92c3b5..e3c1369 100644
--- a/releng.wtpbuilder/components/jst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jst.tests/customTargets.xml
@@ -2,6 +2,8 @@
     name="Build specific targets and properties"
     default="noDefault">
 
+    <property file="build.properties" />
+
     <property environment="env" />
 
     <!-- ===================================================================== -->
@@ -11,6 +13,7 @@
     <target name="allElements">
         <echo level="info"  message="Target:${target} " />
         <echo level="debug" message="basedir: ${basedir}" />
+        <echo level="debug" message="component: ${component}" />
         <echo level="debug" message="buildDirectory: ${buildDirectory}" />
         <echo level="debug" message="baseLocation: ${baseLocation}" />
         <ant
@@ -71,7 +74,7 @@
     <!-- Check out map files from correct repository -->
     <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
     <!-- ===================================================================== -->
-    <target name="checkLocal">
+    <target name="checkLocal" depends="check.useLocalMaps" if="useLocalMaps">
         <available
             property="mapsLocal"
             file="${buildDirectory}/maps/${env.RELENG}" />
@@ -90,26 +93,35 @@
         <property
             name="mapVersionTag"
             value="HEAD" />
+
         <property
             name="releng-jsf-mapVersionTag"
             value="HEAD" />
 
 
-        <echo level="info" message="${mapCvsRoot} ${mapVersionTag} "></echo>
+        <echo level="info" message="${mapCvsRoot} ${mapVersionTag} "></echo>       
+       <property
+            name="cvsPackage"
+            value="${env.RELENGMAPS}" />
+        <echo level="debug" message="${mapCvsRoot} ${mapVersionTag} " />
+        <echo level="debug" message="cvsPackage = ${cvsPackage} " />
         <cvs
             cvsRoot="${mapCvsRoot}"
-            package="${env.RELENG}"
+            package="${cvsPackage}"
             dest="${buildDirectory}/maps"
             tag="${mapVersionTag}"
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}" />
+<!--
         <cvs
-            cvsRoot="${mapCvsRoot}"
-            package="${env.RELENGJSF}"
-            dest="${buildDirectory}/maps"
-            tag="${releng-jsf-mapVersionTag}"
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}" />
+                  cvsRoot="${mapCvsRoot}"
+                  package="${env.RELENGMAPS}"
+                  dest="${buildDirectory}/maps"
+                  tag="${mapVersionTag}"
+                  quiet="${env.CVS_QUIET}"
+                  reallyquiet="${env.CVS_REALLY_QUIET}" />            	
+-->  
+
         <!--tag the map files project-->
         <antcall target="tagMapFiles">
             <param
@@ -117,13 +129,16 @@
                 value="${mapCvsRoot}" />
         </antcall>
 
-        <!-- copy all maps to the same place. Be sure to copy only "maps", as there may be "dependancies" etc, 
-            in releng-jsf that would be out of date -->
-        <copy todir="${buildDirectory}/maps/${env.RELENG}/maps">
-            <fileset dir="${buildDirectory}/maps/${env.RELENGJSF}/maps">
-                <include name="*.map" />
-            </fileset>
-        </copy>
+      <!-- copy all maps to the same place. Be sure to copy only "maps", as there may be "dependancies" etc, 
+          that could be out of date -->
+    	<!-- turns out this "one flat directory" appears not needed!
+      <copy todir="${buildDirectory}/maps/${env.RELENG}/maps" flatten="true">
+          <fileset dir="${buildDirectory}/maps/">
+          	<include name="**/*.map" />
+          </fileset>
+      </copy>
+    	-->          
+        
     </target>
 
     <target
@@ -150,6 +165,9 @@
         <dirname
             file="${ant.file}"
             property="component.dir" />
+        <echo level="debug" message="ant.file: ${ant.file}" />
+        <echo level="debug" message="component.dir: ${component.dir}" />
+
         <ant
             antfile="${component.dir}/dependency.xml"
             target="get">
@@ -220,7 +238,7 @@
 
 
     <!-- ===================================================================== -->
-    <!-- Steps to do to test the build results -->
+    <!-- Steps to test the build results -->
     <!-- ===================================================================== -->
     <target name="test"></target>
 
@@ -277,4 +295,10 @@
             message="You must specify a target when invoking this file" />
     </target>
 
+  <target name="check.useLocalMaps">
+      <condition property="useLocalMaps">
+          <equals arg1="${env.USE_LOCAL_MAPS}" arg2="true" />
+      </condition>
+  </target>
+
 </project>
diff --git a/releng.wtpbuilder/components/jst/customTargets.xml b/releng.wtpbuilder/components/jst/customTargets.xml
index a0b5e2f..471aed6 100644
--- a/releng.wtpbuilder/components/jst/customTargets.xml
+++ b/releng.wtpbuilder/components/jst/customTargets.xml
@@ -3,7 +3,11 @@
     default="noDefault">
 
     <property environment="env" />
-    
+
+    <property
+        name="buildDirectory"
+        value="${buildDirectory}" />
+            
     <!-- ===================================================================== -->
     <!-- Run a given ${target} on all elements being built -->
     <!-- Add on <ant> task for each top level element being built. -->
@@ -11,8 +15,10 @@
     <target name="allElements">
         <echo level="info" message="Target:${target} " />
         <echo level="debug" message="basedir: ${basedir}" />
+        <echo level="debug" message="component: ${component}" />
         <echo level="debug" message="buildDirectory: ${buildDirectory}" />
         <echo level="debug" message="baseLocation: ${baseLocation}" />
+        <echo level="debug" message="generic target: ${genericTargets}" />
         <ant
             antfile="${genericTargets}"
             target="${target}">
@@ -74,8 +80,8 @@
     <!-- Check out map files from correct repository -->
     <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
     <!-- ===================================================================== -->
-    <target name="checkLocal">
-    	<condition property="mapsLocal">
+   <target name="checkLocal" depends="check.useLocalMaps" if="useLocalMaps">
+     	<condition property="mapsLocal">
     	  <and>
     	  	<available file="${buildDirectory}/maps/${env.RELENG}" />
     	  	<available file="${buildDirectory}/maps/${env.RELENGJSF}" />
@@ -101,22 +107,28 @@
             value="HEAD" />
             
             
-            
-        <echo level="info" message="${mapCvsRoot} ${mapVersionTag} "></echo>
+        <echo level="info" message="${mapCvsRoot} ${mapVersionTag} "></echo>       
+       <property
+            name="cvsPackage"
+            value="${env.RELENGMAPS}" />
+        <echo level="debug" message="${mapCvsRoot} ${mapVersionTag} " />
+        <echo level="debug" message="cvsPackage = ${cvsPackage} " />
         <cvs
             cvsRoot="${mapCvsRoot}"
-            package="${env.RELENG}"
+            package="${cvsPackage}"
             dest="${buildDirectory}/maps"
-            tag="${mapVersionTag}" 
+            tag="${mapVersionTag}"
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}" />
+<!--
         <cvs
-            cvsRoot="${mapCvsRoot}"
-            package="${env.RELENGJSF}"
-            dest="${buildDirectory}/maps"
-            tag="${releng-jsf-mapVersionTag}" 
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}"/>
+                  cvsRoot="${mapCvsRoot}"
+                  package="${env.RELENGMAPS}"
+                  dest="${buildDirectory}/maps"
+                  tag="${mapVersionTag}"
+                  quiet="${env.CVS_QUIET}"
+                  reallyquiet="${env.CVS_REALLY_QUIET}" />            	
+-->                              	
             
         <!--tag the map files project-->
         <antcall target="tagMapFiles">
@@ -125,13 +137,15 @@
                 value="${mapCvsRoot}" />
         </antcall>
 
-        <!-- copy all maps to the same place. Be sure to copy only "maps", as there may be "dependancies" etc, 
-            in releng-jsf that would be out of date -->
-        <copy todir="${buildDirectory}/maps/${env.RELENG}/maps">
-            <fileset dir="${buildDirectory}/maps/${env.RELENGJSF}/maps">
-                <include name="*.map" />
-            </fileset>
-        </copy>
+      <!-- copy all maps to the same place. Be sure to copy only "maps", as there may be "dependancies" etc, 
+          that could be out of date -->
+    	<!-- turns out this "one flat directory" appears not needed!
+      <copy todir="${buildDirectory}/maps/${env.RELENG}/maps" flatten="true">
+          <fileset dir="${buildDirectory}/maps/">
+          	<include name="**/*.map" />
+          </fileset>
+      </copy>
+    	-->    
 
 
 
@@ -161,6 +175,9 @@
         <dirname
             file="${ant.file}"
             property="component.dir" />
+        <echo level="debug" message="ant.file: ${ant.file}" />
+        <echo level="debug" message="component.dir: ${component.dir}" />
+
         <ant
             antfile="${component.dir}/dependency.xml"
             target="get">
@@ -328,4 +345,10 @@
             message="You must specify a target when invoking this file" />
     </target>
 
+  <target name="check.useLocalMaps">
+      <condition property="useLocalMaps">
+          <equals arg1="${env.USE_LOCAL_MAPS}" arg2="true" />
+      </condition>
+  </target>
+
 </project>
diff --git a/releng.wtpbuilder/components/jst/dependency.xml b/releng.wtpbuilder/components/jst/dependency.xml
index 42c5730..09e0553 100644
--- a/releng.wtpbuilder/components/jst/dependency.xml
+++ b/releng.wtpbuilder/components/jst/dependency.xml
@@ -17,6 +17,14 @@
 			<param name="groupId" value="orbitthirdpartymap" />
 			<param name="base.install.dir" value="${buildDirectory}/maps/${env.RELENG}/maps/" />
 		</antcall>
+
+
+		<property name="pde.builder.path" value="${env.BUILD_HOME}/builders/${eclipse.builder.version}/${eclipse.builder}" />
+		<echo level="debug" message="pde.builder.path: ${pde.builder.path}" />
+		<echo level="debug" message="eclipse.builder.version: ${eclipse.builder.version}" />
+		<echo level="debug" message="eclipse.builder: ${eclipse.builder}" />
+
+
 		<antcall target="getAndInstall">
 			<param name="groupId" value="emf" />
 		</antcall>
diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
index 13f4b77..f2d5928 100644
--- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml
@@ -4,6 +4,10 @@
 
     <property environment="env" />
 
+    <property
+        name="buildDirectory"
+        value="${buildDirectory}" />
+
     <!-- ===================================================================== -->
     <!-- Run a given ${target} on all elements being built -->
     <!-- Add on <ant> task for each top level element being built. -->
@@ -11,6 +15,7 @@
     <target name="allElements">
         <echo level="info" message="Target:${target} " />
         <echo level="debug" message="basedir: ${basedir}" />
+        <echo level="debug" message="component: ${component}" />
         <echo level="debug" message="buildDirectory: ${buildDirectory}" />
         <echo level="debug" message="baseLocation: ${baseLocation}" />
         <echo level="debug" message="generic target: ${genericTargets}" />
@@ -86,7 +91,7 @@
     <!-- Check out map files from correct repository -->
     <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
     <!-- ===================================================================== -->
-    <target name="checkLocal">
+   <target name="checkLocal" depends="check.useLocalMaps" if="useLocalMaps">
         <available
             property="mapsLocal"
             file="${buildDirectory}/maps/${env.RELENG}" />
@@ -100,15 +105,18 @@
         <property
             name="mapCvsRoot"
             value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
+
+        <!-- if not otherwise set, assume HEAD -->
         <property
             name="mapVersionTag"
             value="HEAD" />
+            
+        <echo level="info" message="${mapCvsRoot} ${mapVersionTag} "></echo>       
         <property
             name="cvsPackage"
-            value="${env.RELENG}" />
+            value="${env.RELENGMAPS}" />
         <echo level="debug" message="${mapCvsRoot} ${mapVersionTag} " />
         <echo level="debug" message="cvsPackage = ${cvsPackage} " />
-
         <cvs
             cvsRoot="${mapCvsRoot}"
             package="${cvsPackage}"
@@ -116,12 +124,33 @@
             tag="${mapVersionTag}"
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}" />
+<!--
+        <cvs
+                  cvsRoot="${mapCvsRoot}"
+                  package="${env.RELENGMAPS}"
+                  dest="${buildDirectory}/maps"
+                  tag="${mapVersionTag}"
+                  quiet="${env.CVS_QUIET}"
+                  reallyquiet="${env.CVS_REALLY_QUIET}" />            	
+-->    
+
         <!--tag the map files project-->
         <antcall target="tagMapFiles">
             <param
                 name="mapCvsRoot"
                 value="${mapCvsRoot}" />
         </antcall>
+
+      <!-- copy all maps to the same place. Be sure to copy only "maps", as there may be "dependancies" etc, 
+          that could be out of date -->
+    	<!-- turns out this "one flat directory" appears not needed!
+      <copy todir="${buildDirectory}/maps/${env.RELENG}/maps" flatten="true">
+          <fileset dir="${buildDirectory}/maps/">
+          	<include name="**/*.map" />
+          </fileset>
+      </copy>
+    	-->    
+
     </target>
 
     <target
@@ -353,4 +382,10 @@
             message="You must specify a target when invoking this file" />
     </target>
 
+  <target name="check.useLocalMaps">
+      <condition property="useLocalMaps">
+          <equals arg1="${env.USE_LOCAL_MAPS}" arg2="true" />
+      </condition>
+    </target>
+
 </project>
diff --git a/releng.wtpbuilder/components/wst-sdk/dependency.xml b/releng.wtpbuilder/components/wst-sdk/dependency.xml
index 192f696..aa44bc0 100644
--- a/releng.wtpbuilder/components/wst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/wst-sdk/dependency.xml
@@ -32,6 +32,7 @@
 		<antcall target="getAndInstall">
 			<param name="groupId" value="eclipseTestFramework" />
 		</antcall>
+		
 		<antcall target="getAndInstall">
 			<param name="groupId" value="dita" />
 		</antcall>
diff --git a/releng.wtpbuilder/components/wst.tests/build.properties b/releng.wtpbuilder/components/wst.tests/build.properties
index 64164a4..23bb688 100644
--- a/releng.wtpbuilder/components/wst.tests/build.properties
+++ b/releng.wtpbuilder/components/wst.tests/build.properties
@@ -17,12 +17,12 @@
 # Set collectingFolder and archivePrefix to . if you want to create archives without
 # trailing eclipse in the paths of the included files
 collectingFolder=eclipse
-
+logExtension=.xml
 # The prefix that will be used in the generated archive.
 # Does not make sense to use a different archivePrefix than collectingFolder, 
 # because zip wouldn't find any files to include into the target zip otherwise
 archivePrefix=eclipse
-logExtension=.xml
+
 # Whether or not to include debug info in the output jars
 javacDebugInfo=false 
 
diff --git a/releng.wtpbuilder/components/wst.tests/customTargets.xml b/releng.wtpbuilder/components/wst.tests/customTargets.xml
index 9660db7..9830a72 100644
--- a/releng.wtpbuilder/components/wst.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/wst.tests/customTargets.xml
@@ -11,6 +11,7 @@
     <target name="allElements">
         <echo level="info" message="Target:${target} " />
         <echo level="debug" message="basedir: ${basedir}" />
+        <echo level="debug" message="component: ${component}" />
         <echo level="debug" message="buildDirectory: ${buildDirectory}" />
         <echo level="debug" message="baseLocation: ${baseLocation}" />
         <ant
@@ -69,7 +70,7 @@
     <!-- Check out map files from correct repository -->
     <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
     <!-- ===================================================================== -->
-    <target name="checkLocal">
+    <target name="checkLocal" depends="check.useLocalMaps" if="useLocalMaps">
         <available
             property="mapsLocal"
             file="${buildDirectory}/maps/${env.RELENG}" />
@@ -83,12 +84,17 @@
         <property
             name="mapCvsRoot"
             value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
+
+        <!-- if not otherwise set, assume HEAD -->
         <property
             name="mapVersionTag"
             value="HEAD" />
-        <property
+
+
+        <echo level="info" message="${mapCvsRoot} ${mapVersionTag} "></echo>       
+       <property
             name="cvsPackage"
-            value="${env.RELENG}" />
+            value="${env.RELENGMAPS}" />
         <echo level="debug" message="${mapCvsRoot} ${mapVersionTag} " />
         <echo level="debug" message="cvsPackage = ${cvsPackage} " />
         <cvs
@@ -98,12 +104,32 @@
             tag="${mapVersionTag}"
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}" />
+<!--
+        <cvs
+                  cvsRoot="${mapCvsRoot}"
+                  package="${env.RELENGMAPS}"
+                  dest="${buildDirectory}/maps"
+                  tag="${mapVersionTag}"
+                  quiet="${env.CVS_QUIET}"
+                  reallyquiet="${env.CVS_REALLY_QUIET}" />            	
+-->              
         <!--tag the map files project-->
         <antcall target="tagMapFiles">
             <param
                 name="mapCvsRoot"
                 value="${mapCvsRoot}" />
         </antcall>
+
+      <!-- copy all maps to the same place. Be sure to copy only "maps", as there may be "dependancies" etc, 
+          that could be out of date -->
+    	<!-- turns out this "one flat directory" appears not needed!
+      <copy todir="${buildDirectory}/maps/${env.RELENG}/maps" flatten="true">
+          <fileset dir="${buildDirectory}/maps/">
+          	<include name="**/*.map" />
+          </fileset>
+      </copy>
+    	-->          
+        
     </target>
 
     <target
@@ -279,4 +305,10 @@
             message="You must specify a target when invoking this file" />
     </target>
 
+  <target name="check.useLocalMaps">
+      <condition property="useLocalMaps">
+          <equals arg1="${env.USE_LOCAL_MAPS}" arg2="true" />
+      </condition>
+    </target>
+
 </project>
diff --git a/releng.wtpbuilder/components/wst/build.properties b/releng.wtpbuilder/components/wst/build.properties
index d64b428..23bb688 100644
--- a/releng.wtpbuilder/components/wst/build.properties
+++ b/releng.wtpbuilder/components/wst/build.properties
@@ -17,7 +17,7 @@
 # Set collectingFolder and archivePrefix to . if you want to create archives without
 # trailing eclipse in the paths of the included files
 collectingFolder=eclipse
-
+logExtension=.xml
 # The prefix that will be used in the generated archive.
 # Does not make sense to use a different archivePrefix than collectingFolder, 
 # because zip wouldn't find any files to include into the target zip otherwise
@@ -26,8 +26,6 @@
 # Whether or not to include debug info in the output jars
 javacDebugInfo=false 
 
-logExtension=.xml
-
 # Whether or not to fail the build if there are compiler errors
 javacFailOnError=true
 
diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml
index f82dd63..769294e 100644
--- a/releng.wtpbuilder/components/wst/customTargets.xml
+++ b/releng.wtpbuilder/components/wst/customTargets.xml
@@ -4,6 +4,10 @@
 
     <property environment="env" />
 
+    <property
+        name="buildDirectory"
+        value="${buildDirectory}" />
+            
     <!-- ===================================================================== -->
     <!-- Run a given ${target} on all elements being built -->
     <!-- Add on <ant> task for each top level element being built. -->
@@ -11,6 +15,7 @@
     <target name="allElements">
         <echo level="info" message="Target:${target} " />
         <echo level="debug" message="basedir: ${basedir}" />
+        <echo level="debug" message="component: ${component}" />
         <echo level="debug" message="buildDirectory: ${buildDirectory}" />
         <echo level="debug" message="baseLocation: ${baseLocation}" />
         <echo level="debug" message="generic target: ${genericTargets}" />
@@ -86,7 +91,7 @@
     <!-- Check out map files from correct repository -->
     <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
     <!-- ===================================================================== -->
-    <target name="checkLocal">
+   <target name="checkLocal" depends="check.useLocalMaps" if="useLocalMaps">
         <available
             property="mapsLocal"
             file="${buildDirectory}/maps/${env.RELENG}" />
@@ -100,12 +105,17 @@
         <property
             name="mapCvsRoot"
             value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
+            
+        <!-- if not otherwise set, assume HEAD -->
         <property
             name="mapVersionTag"
             value="HEAD" />
+            
+            
+        <echo level="info" message="${mapCvsRoot} ${mapVersionTag} "></echo>       
         <property
             name="cvsPackage"
-            value="${env.RELENG}" />
+            value="${env.RELENGMAPS}" />
         <echo level="debug" message="${mapCvsRoot} ${mapVersionTag} " />
         <echo level="debug" message="cvsPackage = ${cvsPackage} " />
 
@@ -116,12 +126,35 @@
             tag="${mapVersionTag}"
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}" />
+<!--
+        <cvs
+                  cvsRoot="${mapCvsRoot}"
+                  package="${env.RELENGMAPS}"
+                  dest="${buildDirectory}/maps"
+                  tag="${mapVersionTag}"
+                  quiet="${env.CVS_QUIET}"
+                  reallyquiet="${env.CVS_REALLY_QUIET}" />            	
+-->                              	
+
         <!--tag the map files project-->
         <antcall target="tagMapFiles">
             <param
                 name="mapCvsRoot"
                 value="${mapCvsRoot}" />
         </antcall>
+
+      <!-- copy all maps to the same place. Be sure to copy only "maps", as there may be "dependancies" etc, 
+          that could be out of date -->
+    	<!-- turns out this "one flat directory" appears not needed!
+      <copy todir="${buildDirectory}/maps/${env.RELENG}/maps" flatten="true">
+          <fileset dir="${buildDirectory}/maps/">
+          	<include name="**/*.map" />
+          </fileset>
+      </copy>
+    	-->    
+
+
+
     </target>
 
     <target
@@ -356,4 +389,10 @@
             message="You must specify a target when invoking this file" />
     </target>
 
+  <target name="check.useLocalMaps">
+      <condition property="useLocalMaps">
+          <equals arg1="${env.USE_LOCAL_MAPS}" arg2="true" />
+      </condition>
+  </target>
+  
 </project>
diff --git a/releng.wtpbuilder/components/wtp-patches-tests/build.properties b/releng.wtpbuilder/components/wtp-patches-tests/build.properties
new file mode 100644
index 0000000..2f5bd06
--- /dev/null
+++ b/releng.wtpbuilder/components/wtp-patches-tests/build.properties
@@ -0,0 +1,39 @@
+###############################################################################
+# Copyright (c) 2003, 2006 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials 
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+
+# patch feature
+patchFeature=org.eclipse.wtp.patch.tests.assembly.feature
+
+# The CVS tag to use when fetching the map files from the repository
+mapVersionTag=R1_5_5_patches
+runPackager=true
+
+# This is a subdirectory of $buildDirectory
+# Set collectingFolder and archivePrefix to . if you want to create archives without
+# trailing eclipse in the paths of the included files
+collectingFolder=eclipse
+
+# The prefix that will be used in the generated archive.
+# Does not make sense to use a different archivePrefix than collectingFolder, 
+# because zip wouldn't find any files to include into the target zip otherwise
+archivePrefix=eclipse
+logExtension=.xml
+# Whether or not to include debug info in the output jars
+javacDebugInfo=false 
+
+# Whether or not to fail the build if there are compiler errors
+javacFailOnError=true
+
+##################################################
+# 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
+
diff --git a/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml b/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
new file mode 100644
index 0000000..ec586d1
--- /dev/null
+++ b/releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
@@ -0,0 +1,308 @@
+<project
+    name="Build specific targets and properties"
+    default="noDefault">
+
+    <property file="build.properties" />
+
+    <property environment="env" />
+
+    <!-- ===================================================================== -->
+    <!-- Run a given ${target} on all elements being built -->
+    <!-- Add on <ant> task for each top level element being built. -->
+    <!-- ===================================================================== -->
+    <target name="allElements">
+        <echo level="info" message="Target:${target} " />
+        <echo level="debug" message="basedir: ${basedir}" />
+        <echo level="debug" message="component: ${component}" />
+        <echo level="debug" message="buildDirectory: ${buildDirectory}" />
+        <echo level="debug" message="baseLocation: ${baseLocation}" />
+        <ant
+            antfile="${genericTargets}"
+            target="${target}">
+            <property
+                name="type"
+                value="feature" />
+            <property
+                name="id"
+                value="${patchFeature}" />
+        </ant>
+    </target>
+
+    <!-- ===================================================================== -->
+    <!-- Targets to assemble the built elements for particular configurations  -->
+    <!-- These generally call the generated assemble scripts (named in -->
+    <!-- ${assembleScriptName}) but may also add pre and post processing -->
+    <!-- Add one target for each root element and each configuration -->
+    <!-- ===================================================================== -->
+
+    <target name="assemble.org.eclipse.wtp.patch.tests.assembly.feature">
+        <property
+            name="archiveName"
+            value="wtp-patches-tests-${buildLabel}.zip" />
+        <ant
+            antfile="${assembleScriptName}"
+            dir="${buildDirectory}" />
+    </target>
+
+    <target name="prePackage" />
+
+
+    <target name="postPackage">
+        <property
+            name="archiveName"
+            value="wtp-patches-tests-${buildLabel}.zip" />
+
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
+            target="unpackUpdateJarsAndCreateZippedPackages">
+            <property
+                name="buildDirectory"
+                value="${buildDirectory}" />
+            <property
+                name="buildLabel"
+                value="${buildLabel}" />
+            <property
+                name="archiveName"
+                value="${archiveName}" />
+        </ant>
+
+    </target>
+
+    <!-- ===================================================================== -->
+    <!-- Check out map files from correct repository -->
+    <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
+    <!-- ===================================================================== -->
+  <target name="checkLocal" depends="check.useLocalMaps" if="useLocalMaps">
+      <available
+          property="mapsLocal"
+          file="${buildDirectory}/maps/${env.RELENG}" />
+  </target>
+    <target
+        name="getMapFiles"
+        depends="checkLocal"
+        unless="mapsLocal">
+
+        <!-- ***  change the repo info -->
+        <property
+            name="mapCvsRoot"
+            value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
+        <property
+            name="mapVersionTag"
+            value="HEAD" />
+        <property
+            name="cvsPackage"
+            value="${env.RELENGMAPS}" />
+        <echo level="debug" message="${mapCvsRoot} ${mapVersionTag} " />
+        <echo level="debug" message="cvsPackage = ${cvsPackage} " />
+        <cvs
+            cvsRoot="${mapCvsRoot}"
+            package="${cvsPackage}"
+            dest="${buildDirectory}/maps"
+            tag="${mapVersionTag}"
+            quiet="${env.CVS_QUIET}"
+            reallyquiet="${env.CVS_REALLY_QUIET}" />
+<!--
+    	<cvs
+                  cvsRoot="${mapCvsRoot}"
+                  package="${env.RELENGMAPS}"
+                  dest="${buildDirectory}/maps"
+                  tag="${mapVersionTag}"
+                  quiet="${env.CVS_QUIET}"
+                  reallyquiet="${env.CVS_REALLY_QUIET}" />
+-->                              	
+        <!--tag the map files project-->
+        <antcall target="tagMapFiles">
+            <param
+                name="mapCvsRoot"
+                value="${mapCvsRoot}" />
+        </antcall>
+    	
+      <!-- copy all maps to the same place. Be sure to copy only "maps", as there may be "dependancies" etc, 
+          that could be out of date -->
+    	<!-- turns out this "one flat directory" appears not needed!
+      <copy todir="${buildDirectory}/maps/${env.RELENG}/maps" flatten="true">
+          <fileset dir="${buildDirectory}/maps/">
+          	<include name="**/*.map" />
+          </fileset>
+      </copy>
+    	-->
+    	
+    </target>
+
+    <target
+        name="tagMapFiles"
+        if="tagMaps">
+        <cvs
+            cvsRoot="${mapCvsRoot}"
+            dest="${buildDirectory}/maps"
+            command="tag v${buildType}${timestamp}"
+            quiet="${env.CVS_QUIET}"
+            reallyquiet="${env.CVS_REALLY_QUIET}" />
+    </target>
+
+
+    <!-- ===================================================================== -->
+    <!-- Steps to do before setup -->
+    <!-- ===================================================================== -->
+    <target name="preSetup"></target>
+
+    <!-- ===================================================================== -->
+    <!-- Steps to do after setup but before starting the build proper -->
+    <!-- ===================================================================== -->
+    <target name="postSetup">
+        <dirname
+            file="${ant.file}"
+            property="component.dir" />
+        <echo level="debug" message="ant.file: ${ant.file}" />
+        <echo level="debug" message="component.dir: ${component.dir}" />
+
+        <ant
+            antfile="${component.dir}/dependency.xml"
+            target="get">
+            <property
+                name="dependency.properties"
+                value="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties" />
+            <property
+                name="base.install.dir"
+                value="${buildRoot}" />
+        </ant>
+        <!--fetch the additional pieces to build wst tests -->
+    	<!--
+        <property
+            name="featureOnly"
+            value="false" />
+        <property
+            name="featureAndPlugins"
+            value="true" />
+        <property
+            name="featuresRecursively"
+            value="true" />
+        <ant
+            antfile="genericTargets.xml"
+            dir="${pde.build.scripts}"
+            target="fetchElement">
+            <property
+                name="type"
+                value="feature" />
+            <property
+                name="id"
+                value="org.eclipse.wst" />
+        </ant>
+        -->
+    </target>
+
+    <!-- ===================================================================== -->
+    <!-- Steps to do before fetching the build elements -->
+    <!-- ===================================================================== -->
+    <target name="preFetch"></target>
+
+    <!-- ===================================================================== -->
+    <!-- Steps to do after fetching the build elements -->
+    <!-- ===================================================================== -->
+    <target name="postFetch"></target>
+
+    <!-- ===================================================================== -->
+    <!-- Steps to do before generating the build scripts. -->
+    <!-- ===================================================================== -->
+    <target name="postGenerate">
+    </target>
+    <!-- ===================================================================== -->
+    <!-- Steps to do after generating the build scripts. -->
+    <!-- ===================================================================== -->
+    <target name="preGenerate"></target>
+
+
+    <!-- ===================================================================== -->
+    <!-- Steps to do before running the build.xmls for the elements being built. -->
+    <!-- ===================================================================== -->
+    <target name="preProcess"></target>
+
+    <!-- ===================================================================== -->
+    <!-- Steps to do after running the build.xmls for the elements being built. -->
+    <!-- ===================================================================== -->
+    <target name="postProcess">
+
+        <condition property="logsAvailable">
+            <istrue value="${javacVerbose}" />
+        </condition>
+        <antcall target="gatherLogs" />
+
+    </target>
+
+
+    <!-- ===================================================================== -->
+    <!-- Steps to do before running assemble. -->
+    <!-- ===================================================================== -->
+    <target name="preAssemble"></target>
+
+    <!-- ===================================================================== -->
+    <!-- Steps to do after  running assemble. -->
+    <!-- ===================================================================== -->
+    <target name="postAssemble"></target>
+
+    <!-- ===================================================================== -->
+    <!-- Steps to do after the build is done. -->
+    <!-- ===================================================================== -->
+    <target name="postBuild"></target>
+
+
+
+    <!-- ===================================================================== -->
+    <!-- Steps to test the build results -->
+    <!-- ===================================================================== -->
+    <target name="test"></target>
+
+    <!-- ===================================================================== -->
+    <!-- Steps to do to publish the build results -->
+    <!-- ===================================================================== -->
+    <target name="publish"></target>
+    <!-- ===================================================================== -->
+    <!-- Helper targets -->
+    <!-- ===================================================================== -->
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir dir="${buildDirectory}/${buildLabel}/testcompilelogs" />
+        <echo level="debug"  message="logExtension: ${logExtension}" />
+        <antcall target="allElements">
+            <param
+                name="target"
+                value="gatherLogs" />
+            <param
+                name="logExtension"
+                value="${logExtension}" />
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/testcompilelogs"
+            overwrite="true">
+            <fileset
+                dir="${buildDirectory}/features/${patchFeature}">
+                <include name="**/*.log.zip" />
+            </fileset>
+        </unzip>
+
+
+    </target>
+
+    <target
+        name="clean"
+        unless="noclean">
+        <antcall target="allElements">
+            <param
+                name="target"
+                value="cleanElement" />
+        </antcall>
+    </target>
+    <!-- ===================================================================== -->
+    <!-- Default target                                                        -->
+    <!-- ===================================================================== -->
+    <target name="noDefault">
+        <echo level="error" 
+            message="You must specify a target when invoking this file" />
+    </target>
+  <target name="check.useLocalMaps">
+      <condition property="useLocalMaps">
+          <equals arg1="${env.USE_LOCAL_MAPS}" arg2="true" />
+      </condition>
+  </target>
+</project>
diff --git a/releng.wtpbuilder/components/wtp-patches-tests/dependency.xml b/releng.wtpbuilder/components/wtp-patches-tests/dependency.xml
new file mode 100644
index 0000000..1a795e7
--- /dev/null
+++ b/releng.wtpbuilder/components/wtp-patches-tests/dependency.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!-- ====================================================================== 
+    Properties that must be passed to this script:
+    base.install.dir
+    dependencyTargets
+    local.cache.dir
+    dependency.properties
+
+    
+    ====================================================================== -->
+<project name="test" default="get">
+
+	<target name="get">
+		<antcall target="getAndInstall">
+			<param name="groupId" value="emf" />
+		</antcall>
+		<antcall target="getAndInstall">
+			<param name="groupId" value="gef" />
+		</antcall>
+
+		<antcall target="getAndInstall">
+			<param name="groupId" value="eclipse" />
+		</antcall>
+		<antcall target="getAndInstall">
+			<param name="groupId" value="eclipseTestFramework" />
+		</antcall>
+
+
+		<!-- for patch builds, also get a whole released version to 
+	    compile against -->
+		<antcall target="getAndInstall">
+			<param name="groupId" value="wtp" />
+		</antcall>
+		<!-- including tests -->
+		<antcall target="getAndInstall">
+			<param name="groupId" value="wtp-wst-test" />
+		</antcall>
+		<antcall target="getAndInstall">
+			<param name="groupId" value="wtp-jst-test" />
+		</antcall>
+	</target>
+
+
+	<target name="getAndInstall">
+		<ant antfile="${dependencyTargets}" target="checkDependency">
+			<property name="groupId" value="${groupId}" />
+		</ant>
+		<ant antfile="${dependencyTargets}" target="installDependency">
+			<property name="groupId" value="${groupId}" />
+			<property name="install.destination" value="${base.install.dir}" />
+		</ant>
+	</target>
+
+
+
+
+</project>
+
diff --git a/releng.wtpbuilder/components/wtp-patches/customTargets.xml b/releng.wtpbuilder/components/wtp-patches/customTargets.xml
index 837cee1..635c92c 100644
--- a/releng.wtpbuilder/components/wtp-patches/customTargets.xml
+++ b/releng.wtpbuilder/components/wtp-patches/customTargets.xml
@@ -37,7 +37,6 @@
     <!-- Add one target for each root element and each configuration -->
     <!-- ===================================================================== -->
 
-    <!-- name's can not be variable? -->
     <target name="assemble.org.eclipse.wtp.patch.assembly.feature">
         <property
             name="archiveName"
@@ -78,7 +77,7 @@
     <!-- Check out map files from correct repository -->
     <!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
     <!-- ===================================================================== -->
-    <target name="checkLocal">
+    <target name="checkLocal" depends="check.useLocalMaps" if="useLocalMaps">
         <available
             property="mapsLocal"
             file="${buildDirectory}/maps/${env.RELENG}" />
@@ -92,23 +91,53 @@
         <property
             name="mapCvsRoot"
             value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
+            
+        <!-- if not otherwise set, assume HEAD -->
         <property
             name="mapVersionTag"
             value="HEAD" />
-        <echo level="debug" message="${mapCvsRoot} ${mapVersionTag} "></echo>
+
+
+
+
+            
+        <property
+            name="cvsPackage"
+            value="${env.RELENGMAPS}" />
+        <echo level="debug" message="${mapCvsRoot} ${mapVersionTag} " />
+        <echo level="debug" message="cvsPackage = ${cvsPackage} " />
         <cvs
             cvsRoot="${mapCvsRoot}"
-            package="${env.RELENG}"
+            package="${cvsPackage}"
             dest="${buildDirectory}/maps"
             tag="${mapVersionTag}"
             quiet="${env.CVS_QUIET}"
             reallyquiet="${env.CVS_REALLY_QUIET}" />
+<!--
+        <cvs
+                  cvsRoot="${mapCvsRoot}"
+                  package="${env.RELENGMAPS}"
+                  dest="${buildDirectory}/maps"
+                  tag="${mapVersionTag}"
+                  quiet="${env.CVS_QUIET}"
+                  reallyquiet="${env.CVS_REALLY_QUIET}" />            	
+-->                              	
         <!--tag the map files project-->
         <antcall target="tagMapFiles">
             <param
                 name="mapCvsRoot"
                 value="${mapCvsRoot}" />
         </antcall>
+    	
+      <!-- copy all maps to the same place. Be sure to copy only "maps", as there may be "dependancies" etc, 
+          that could be out of date -->
+    	<!-- turns out this "one flat directory" appears not needed!
+      <copy todir="${buildDirectory}/maps/${env.RELENG}/maps" flatten="true">
+          <fileset dir="${buildDirectory}/maps/">
+          	<include name="**/*.map" />
+          </fileset>
+      </copy>
+    	-->    	
     </target>
 
     <target
@@ -135,6 +164,9 @@
         <dirname
             file="${ant.file}"
             property="component.dir" />
+        <echo level="debug" message="ant.file: ${ant.file}" />
+        <echo level="debug" message="component.dir: ${component.dir}" />
+
         <ant
             antfile="${component.dir}/dependency.xml"
             target="get">
@@ -225,6 +257,7 @@
         name="gatherLogs"
         if="logsAvailable">
         <mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
+        <echo level="debug"  message="logExtension: ${logExtension}" />
         <antcall target="allElements">
             <param
                 name="target"
@@ -259,4 +292,10 @@
             message="You must specify a target when invoking this file" />
     </target>
 
+  <target name="check.useLocalMaps">
+      <condition property="useLocalMaps">
+          <equals arg1="${env.USE_LOCAL_MAPS}" arg2="true" />
+      </condition>
+  </target>
+	
 </project>
diff --git a/releng.wtpbuilder/distribution/patches.build/build.xml b/releng.wtpbuilder/distribution/patches.build/build.xml
index 84d9d8f..9e9e215 100644
--- a/releng.wtpbuilder/distribution/patches.build/build.xml
+++ b/releng.wtpbuilder/distribution/patches.build/build.xml
@@ -5,12 +5,13 @@
 		<property file="${wtp.builder.home}/build.properties" />
 		<property name="buildTargets" value="${wtp.builder.home}/scripts/build/runbuild.xml" />
 
+		<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
 		<ant antfile="${buildTargets}" >
 			<property name="component" value="wtp-patches" />
 		</ant>
-
-		<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-	    
+		<ant antfile="${buildTargets}" >
+			<property name="component" value="wtp-patches-tests" />
+		</ant>
 	</target>
 	
 	<target name="getBaseBuilder" if="eclipse.builder.fetch">
diff --git a/releng.wtpbuilder/distribution/patches.site/build.xml b/releng.wtpbuilder/distribution/patches.site/build.xml
index 2dd1591..bcdfc56 100644
--- a/releng.wtpbuilder/distribution/patches.site/build.xml
+++ b/releng.wtpbuilder/distribution/patches.site/build.xml
@@ -1,4 +1,7 @@
-<project name="Build specific targets and properties" default="build" basedir=".">
+<project
+    name="Build specific targets and properties"
+    default="build"
+    basedir=".">
 
     <!-- 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
@@ -6,26 +9,32 @@
         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.
-      -->
-     <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+        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" />
 
-     <!-- load standard properties for production environment -->
-     <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-     <!-- = = = end standard properties pattern = = = -->
+    <!-- load standard properties for production environment -->
+    <property
+        file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+    <!-- = = = end standard properties pattern = = = -->
 
-    <echo message="ant.file: ${ant.file}"/>
+    <echo message="ant.file: ${ant.file}" />
     <target name="build">
-        <java jar="${eclipse.launcher}" fork="true"  failonerror="true">
+        <java
+            jar="${eclipse.launcher}"
+            fork="true"
+            failonerror="true">
             <jvmarg value="-Dosgi.clean=true" />
             <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
             <jvmarg value="-Dosgi.os=${env.BASEOS}" />
             <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
             <jvmarg value="-Dbuild.trial=${build.trial}" />
             <jvmarg value="-DbuildBranch=${buildBranch}" />
-            <jvmarg value="-Dbuild.pack-all-in-one=${build.pack-all-in-one}" />
+            <jvmarg
+                value="-Dbuild.pack-all-in-one=${build.pack-all-in-one}" />
             <jvmarg value="-DbuildType=${buildType}" />
             <jvmarg value="-DbuildId=${buildId}" />
             <jvmarg value="-DjavacDebugInfo=on" />
@@ -47,11 +56,29 @@
     <!-- Steps to do to publish the build results -->
     <!-- ===================================================================== -->
     <target name="publish">
-        <dirname file="${ant.file}" property="component.dir" />
+        <dirname
+            file="${ant.file}"
+            property="component.dir" />
         <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
         <property file="${buildDirectory}/label.properties" />
 
-        <property name="publish.xml" value="${component.dir}/publish.xml" />
+        <property
+            name="publish.xml"
+            value="${component.dir}/publish.xml" />
+
+        <property
+            name="indexFileName"
+            value="index.php" />
+        <property
+            name="result"
+            value="${buildDirectory}/${buildLabel}" />
+        <property
+            name="indexTemplateFilename"
+            value="index.html.template.php" />
+
+        <copy
+            file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
+            tofile="${buildDirectory}/${indexFileName}" />
 
         <property name="indexFileName" value="index.php" />
         <property name="result" value="${buildDirectory}/${buildLabel}" />
@@ -59,32 +86,55 @@
 		
     	<copy file="${wtp.builder.home}/distribution/patches.site/templateFiles/${indexTemplateFilename}" tofile="${buildDirectory}/${indexFileName}" />
     	
-        <condition property="isBuildTested" value="true">
-            <available file="${buildDirectory}/${buildLabel}/testResults/html" />
+
+        <condition
+            property="isBuildTested"
+            value="true">
+            <available
+                file="${buildDirectory}/${buildLabel}/testResults/html" />
         </condition>
 
-        <ant antfile="${publish.xml}" dir="${component.dir}">
-            <property name="dropTokenList" value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%" />
-            <property name="webtoolsDownloadURL" value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
+        <ant
+            antfile="${publish.xml}"
+            dir="${component.dir}">
+            <property
+                name="dropTokenList"
+                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%" />
+            <property
+                name="webtoolsDownloadURL"
+                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops" />
 
-            <property name="buildBranch" value="${buildBranch}" />
-            <property name="build.pack-all-in-one" value="${build.pack-all-in-one}"/>
+            <property
+                name="buildBranch"
+                value="${buildBranch}" />
+            <property
+                name="build.pack-all-in-one"
+                value="${build.pack-all-in-one}" />
 
-            <property name="isBuildTested" value="${isBuildTested}" />
-            <property name="indexTemplateFilename" value="${indexTemplateFilename}" />
+            <property
+                name="isBuildTested"
+                value="${isBuildTested}" />
+            <property
+                name="indexTemplateFilename"
+                value="${indexTemplateFilename}" />
         </ant>
 
         <!--  Get the build map over for the results to point to. -->
-        <copy file="${buildDirectory}/directory.txt" tofile="${result}/directory.txt" />
+        <copy
+            file="${buildDirectory}/directory.txt"
+            tofile="${result}/directory.txt" />
 
         <!-- Copy info for build identification -->
-        <copy file="${buildDirectory}/buildmachineinfo.properties" tofile="${result}/buildmachineinfo.properties" />
+        <copy
+            file="${buildDirectory}/buildmachineinfo.properties"
+            tofile="${result}/buildmachineinfo.properties" />
 
-    	<!-- final count files -->
-    	<countBuildFiles sourceDirectory="${buildDirectory}/${buildLabel}"
-                    filterString=".zip,.tar.gz"
-                    outputFile="${buildDirectory}/${buildLabel}/files.count" />
-    	
+        <!-- final count files -->
+        <countBuildFiles
+            sourceDirectory="${buildDirectory}/${buildLabel}"
+            filterString=".zip,.tar.gz"
+            outputFile="${buildDirectory}/${buildLabel}/files.count" />
+
     </target>
 
 
diff --git a/releng.wtpbuilder/distribution/patches.site/publish.xml b/releng.wtpbuilder/distribution/patches.site/publish.xml
index f3751ff..722a4d8 100644
--- a/releng.wtpbuilder/distribution/patches.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches.site/publish.xml
@@ -12,6 +12,8 @@
 
     <property environment="env" />
 
+	<property name="component" value="patches" />
+	
     <property
         name="resultDir"
         value="${buildDirectory}/${buildLabel}" />
@@ -22,7 +24,7 @@
 
     <property
         name="templateDir"
-        value="${wtp.builder.home}/distribution/patches.site" />
+        value="${wtp.builder.home}/distribution/${component}.site" />
     <property
         name="resultingIndex"
         value="${resultDir}/${indexFileName}" />
@@ -42,7 +44,7 @@
     <target name="default">
         <copy
             overwrite="true"
-            file="${wtp.builder.home}/distribution/patches.site/templateFiles/${indexTemplateFilename}"
+            file="${wtp.builder.home}/distribution/${component}.site/templateFiles/${indexTemplateFilename}"
             tofile="${resultingIndex}" />
         <antcall target="countFiles" />
         <antcall target="generateCompileIndex" />
@@ -72,13 +74,12 @@
             
             
         -->
-        <property file="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties" />
-
-        <!-- todo: fix summarize results so not error if directory doesn't exist -->
+        <property
+            file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
 
         <!-- create tables of test plugin compiles first -->
-        <!--
-            <summarizeResults isBuildTested="false"
+        <summarizeResults
+            isBuildTested="false"
             includeAll="true"
             dropTokenList="${dropTokenList}"
             xmlDirectoryName=""
@@ -88,17 +89,15 @@
             hrefTestResultsTargetPath=""
             hrefCompileLogsTargetPath="testcompilelogs"
             compileLogsDirectoryName="${resultDir}/testcompilelogs" />
-        -->
-        <!--
-            <xslt 
-            basedir="${resultDir}/testcompilelogs" 
-            destdir="${resultDir}/testcompilelogs" 
+
+        <xslt
+            basedir="${resultDir}/testcompilelogs"
+            destdir="${resultDir}/testcompilelogs"
             includes="**/*.bin.xml"
-            scanincludeddirectories="true" 
-            style="compilerXMLOutputToHTML.xsl" 
-            force="true" />    	
-            
-        -->
+            scanincludeddirectories="true"
+            style="compilerXMLOutputToHTML.xsl"
+            force="true" />
+
         <!-- create table of code plugins compiles -->
         <summarizeResults
             isBuildTested="false"
@@ -130,87 +129,7 @@
         <!--  Insert Build Type descriptor  -->
         <antcall target="${buildType}" />
 
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}" />
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}" />
-
-        <!--  Insert PreRequsites  -->
-
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}" />
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}" />
-        <!-- 
-            Note, some token/s should not exist in maintenance stream, but 
-            no harm done, so in the interests of keeping builder 
-            streams in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@wtp-wst-test.file@"
-            value="${wtp-wst-test.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@wtp-wst-test.url@"
-            value="${wtp-wst-test.url}/${wtp-wst-test.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@wtp-wst-test.name@"
-            value="${wtp-wst-test.name}" />
-            
-        <replace
-            file="${resultingIndex}"
-            token="@wtp-jst-test.file@"
-            value="${wtp-jst-test.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@wtp-jst-test.url@"
-            value="${wtp-jst-test.url}/${wtp-jst-test.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@wtp-jst-test.name@"
-            value="${wtp-jst-test.name}" />
-            
+        <antcall target="writeData" />
 
         <mkdir dir="${resultDir}/whatisfixed" />
         <echo
@@ -243,7 +162,8 @@
             
             
         -->
-        <property file="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties" />
+        <property
+            file="${buildDirectory}/maps/releng/maps/dependencies.properties" />
 
         <!-- create table of test plugin compiles first -->
         <!-- set isBuildTested to true for the "compile only" results -->
@@ -268,69 +188,7 @@
         <!--  Insert Build Type descriptor  -->
         <antcall target="${buildType}" />
 
-        <!--  Insert Build Date  -->
-        <replace
-            file="${resultingIndex}"
-            token="@date@"
-            value="${TODAY}" />
-
-        <!--  Insert Build Name  -->
-        <replace
-            file="${resultingIndex}"
-            token="@build@"
-            value="${buildLabel}" />
-
-        <!--  Insert PreRequsites  -->
-
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
-        <replace
-            file="${resultingIndex}"
-            token="@eclipseBuildURL@"
-            value="${eclipse.url}" />
-        <replace
-            file="${resultingIndex}"
-            token="@emfFile@"
-            value="${emf.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@emfURL@"
-            value="${emf.url}/${emf.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@gefFile@"
-            value="${gef.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@gefURL@"
-            value="${gef.url}/${gef.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@jemFile@"
-            value="${jem.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@jemURL@"
-            value="${jem.url}/${jem.file}" />
-        <!-- 
-            these token/s should not exist in maintenance stream, but 
-            no harm done, so in the interests of keeping builder 
-            streams in sync, we'll leave them here as place hold
-        -->
-        <replace
-            file="${resultingIndex}"
-            token="@dtpFile@"
-            value="${dtp.file}" />
-        <replace
-            file="${resultingIndex}"
-            token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}" />
+        <antcall target="writeData" />
 
         <mkdir dir="${resultDir}/whatisfixed" />
         <echo
@@ -358,6 +216,9 @@
             <fileset
                 dir="${buildDirectory}/plugins"
                 includes="**/buildnotes_*.html" />
+			<fileset
+                dir="${buildDirectory}/features"
+                includes="**/buildnotes_*.html" />
         </copy>
 
 
@@ -379,7 +240,7 @@
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
-            file="${wtp.builder.home}/distribution/patches.site/templateFiles/siteWTP.xml"
+            file="${wtp.builder.home}/distribution/${component}.site/templateFiles/siteWTP.xml"
             tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
             overwrite="true"
             failonerror="true" />
@@ -518,4 +379,172 @@
     </target>
 
 
+    <target name="writeData">
+        <!--  Insert Build Date  -->
+        <replace
+            file="${resultingIndex}"
+            token="@date@"
+            value="${TODAY}" />
+
+        <!--  Insert Build Name  -->
+        <replace
+            file="${resultingIndex}"
+            token="@build@"
+            value="${buildLabel}" />
+
+        <replace
+            file="${resultingIndex}"
+            token="@buildBranch@"
+            value="${buildBranch}" />
+
+        <!--  Insert PreRequsites  -->
+
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseFile@"
+            value="${eclipse.file.linux-gtk-x86}" />
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseURL@"
+            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseBuildURL@"
+            value="${eclipse.url}" />
+
+        <replace
+            file="${resultingIndex}"
+            token="@eclipsefilelinux@"
+            value="${eclipse.file.linux-gtk-x86}" />
+        <replace
+            file="${resultingIndex}"
+            token="@eclipsefilewindows@"
+            value="${eclipse.file.win32-win32-x86}" />
+        <replace
+            file="${resultingIndex}"
+            token="@eclipsefilemacos@"
+            value="${eclipse.file.macosx-carbon-ppc}" />
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseBuildHome@"
+            value="${eclipse.build.home}" />
+        <replace
+            file="${resultingIndex}"
+            token="@eclipse.mirror.prefixuri@"
+            value="${eclipse.mirror.prefixuri}" />
+
+        <replace
+            file="${resultingIndex}"
+            token="@testURL@"
+            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}" />
+        <replace
+            file="${resultingIndex}"
+            token="@testFile@"
+            value="${eclipseTestFramework.file}" />
+
+        <replace
+            file="${resultingIndex}"
+            token="@emfFile@"
+            value="${emf.file}" />
+        <replace
+            file="${resultingIndex}"
+            token="@emfURL@"
+            value="${emf.url}/${emf.file}" />
+        <replace
+            file="${resultingIndex}"
+            token="@emfBuildHome@"
+            value="${emf.build.home}" />
+        <replace
+            file="${resultingIndex}"
+            token="@emf.mirror.prefixuri@"
+            value="${emf.mirror.prefixuri}" />
+
+
+
+        <replace
+            file="${resultingIndex}"
+            token="@gefFile@"
+            value="${gef.file}" />
+        <replace
+            file="${resultingIndex}"
+            token="@gefURL@"
+            value="${gef.url}/${gef.file}" />
+        <replace
+            file="${resultingIndex}"
+            token="@gefBuildHome@"
+            value="${gef.build.home}" />
+        <replace
+            file="${resultingIndex}"
+            token="@gef.mirror.prefixuri@"
+            value="${gef.mirror.prefixuri}" />
+
+        <replace
+            file="${resultingIndex}"
+            token="@eclipserelengFile@"
+            value="${eclipsereleng.file}" />
+        <replace
+            file="${resultingIndex}"
+            token="@eclipserelengURL@"
+            value="${eclipsereleng.url}/${eclipsereleng.file}" />
+
+        <replace
+            file="${resultingIndex}"
+            token="@orbitthirdpartyzipFile@"
+            value="${orbitthirdpartyzip.file}" />
+        <replace
+            file="${resultingIndex}"
+            token="@orbitthirdpartyzipURL@"
+            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}" />
+        <replace
+            file="${resultingIndex}"
+            token="@orbitthirdpartyzipBuildHome@"
+            value="${orbitthirdpartyzip.build.home}" />
+        <replace
+            file="${resultingIndex}"
+            token="@orbitthirdpartyzip.mirror.prefixuri@"
+            value="${orbitthirdpartyzip.mirror.prefixuri}" />
+
+
+        <!-- no longer used. Post 1.5.5 -->
+        <replace
+            file="${resultingIndex}"
+            token="@jemFile@"
+            value="${jem.file}" />
+        <replace
+            file="${resultingIndex}"
+            token="@jemURL@"
+            value="${jem.url}/${jem.file}" />
+        <replace
+            file="${resultingIndex}"
+            token="@jemBuildHome@"
+            value="${jem.build.home}" />
+        <replace
+            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
+        -->
+        <replace
+            file="${resultingIndex}"
+            token="@dtpFile@"
+            value="${dtp.file}" />
+        <replace
+            file="${resultingIndex}"
+            token="@dtpURL@"
+            value="${dtp.url}/${dtp.file}" />
+        <replace
+            file="${resultingIndex}"
+            token="@dtpBuildHome@"
+            value="${dtp.build.home}" />
+        <replace
+            file="${resultingIndex}"
+            token="@dtp.mirror.prefixuri@"
+            value="${dtp.mirror.prefixuri}" />
+
+    </target>
+
+
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/FAIL.gif b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/FAIL.gif
deleted file mode 100644
index 28bba66..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/FAIL.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/OK.gif b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/OK.gif
deleted file mode 100644
index 689e523..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/OK.gif
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/buildNotes.php
index ee71585..e843ecf 100644
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/buildNotes.php
@@ -1,47 +1,61 @@
 <html>
 <head>
 <?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
+$parts = explode("/", getcwd());
+$parts2 = explode("-", $parts[count($parts) - 1]);
+$buildName = $parts2[1];
 
-        echo "<title>Build Notes for $buildName </title>";
+echo "<title>Build Notes for $buildName </title>";
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.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 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 != "..") {
-                        $parts = explode("_", $anEntry);
-                        $baseName = $parts[1];
-                        $parts = explode(".", $baseName);
-                        $component = $parts[0];
-                        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-                        echo "<tr>";
-                        echo "$line";
-                        echo "</tr>";
-                        $hasNotes = true;
-                }
-        }
-	$aDirectory.closedir();
-        if (!$hasNotes) {
-                echo "<br>There are no build notes for this build.";
-        }
+$hasNotes = false;
+$aDirectory = dir("buildnotes");
+while ($anEntry = $aDirectory->read()) {
+    if ($anEntry != "." && $anEntry != "..") {
+        //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];
+
+        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
+        echo "<tr>";
+        echo "$line";
+        echo "</tr>";
+        $hasNotes = true;
+
+    }
+}
+$aDirectory.closedir();
+if (!$hasNotes) {
+    echo "<br>There are no build notes for this build.";
+}
 ?>
 
 </table>
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/componentxmls.php b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/componentxmls.php
deleted file mode 100644
index 73c5443..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/componentxmls.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<html>
-<head>
-<?php
-  function find_component_xml($directory)
-  {
-    $count = 0;
-    $dir = dir($directory);
-    while ($anEntry = $dir->read())
-    {
-      if ($anEntry != "." && $anEntry != "..")
-      {
-        $anEntry = $directory."/".$anEntry;
-        if (stristr($anEntry, '.source') === FALSE)
-        {
-          if (is_dir($anEntry))
-          {
-            find_component_xml($anEntry);
-          }
-          else
-          {
-            echo "<tr><td><a href=\"$anEntry\">";
-            echo substr($anEntry, 22);
-            echo "</a></td>";
-          }
-        }
-      }
-    }
-  }
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">component.xml</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">
-	   component.xml files for <?php echo "$buildType $buildName"; ?></font></b></td>
-  </tr>
-</table>
-
-<table border="1" width="100%">
-  <tr>
-    <th>component.xml</th>
-  </tr>
-<?php
-  find_component_xml("apitools/componentxmls");
-?>
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/consoleLogs.php
index acdce53..f0016f0 100644
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/consoleLogs.php
@@ -1,91 +1,92 @@
 <html>
 <head>
 <?php
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
+$parts = explode("/", getcwd());
+$parts2 = explode("-", $parts[count($parts) - 1]);
+$buildName = $parts2[1];
 
-        echo "<title>Test Console Output for $buildName </title>";
+echo "<title>Test Console Output for $buildName </title>";
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.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 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++;
-                        }
-                }
+$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.closedir();
+    }
+}
+$aDirectory.closedir();
 
 
-        sort($entries);
-        sort($direntries);
+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");
+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");
 
 
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
+    $level = 0;
+    if ($logsize > 20000) {
+        $level = 2;
+    }
+    else if ($logsize > 2000) {
+        $level = 1;
+    }
 
-                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>";
-                }
+    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>";
+    }
 
 
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
+    echo "<tr>";
+    echo "$line";
+    echo "</tr>";
+    $hasNotes = true;
+}
 
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
+if (!$hasNotes) {
+    echo "<br>There are no test logs for this build.";
+}
 ?>
 
 </table>
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/download.php b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/download.php
deleted file mode 100644
index cfeab0a..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/download.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<html>
-<head>
-<title>Eclipse WTP Download Click Through</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<?php
-	$parts = explode("-", $dropFile);
-	$clickFile = "clickThroughs/";
-	for ($i =0; $i<count($parts); $i++) {
-		if ($i != 2) {
-			$clickFile = $clickFile.$parts[$i];
-		    if ($i < count($parts) - 1) {
-        	    $clickFile = $clickFile."-";
-            }
- 		}
-	}
-	$clickFile = $clickFile.".txt";
-
-	if (file_exists($clickFile)) {
-		$fileHandle = fopen($clickFile, "r");
-		while (!feof($fileHandle)) {
-			$aLine = fgets($fileHandle, 4096);
-			$result = $result.$aLine;
-		}
-		fclose($fileHandle);
-	} else {
-		echo '<META HTTP-EQUIV="Refresh" CONTENT="0;URL='.$dropFile.'">';
-		echo '<b><font size "+4">Downloading: '.$dropFile.'</font></b>';
-		echo '<BR>';
-		echo '<BR>';
-		echo 'If your download does not begin automatically click <a href="'.$dropFile.'">here</a>.';
-	}
-?>
-</head>
-
-<body bgcolor="#FFFFFF" text="#000000">
-  <?php
-	if (file_exists($clickFile)) {
-	 echo '<p><b><font size="+4">Important Notes<BR>';
-	 echo $dropFile;
-	 echo '</font></b></font></p>
-	<p>It is very important to read the following notes in order to run this version 
-	  of Eclipse. Once you have read the notes you can click on the Download link 
-	  to download the drop.</p>
-	';
-	  echo '<textarea name="textfield" cols="80" rows="20" wrap="PHYSICAL">'.$result;
-	  echo '</textarea>';
-	  echo '<BR>';
-	  echo '<BR>';
-	  echo '<a href="'.$dropFile.'">Download</a>';
-	}
-?>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/pii.php b/releng.wtpbuilder/distribution/patches.site/staticDropFiles/pii.php
deleted file mode 100644
index e3ed59b..0000000
--- a/releng.wtpbuilder/distribution/patches.site/staticDropFiles/pii.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<html>
-<head>
-<?php
-  function write_unused_property($directory)
-  {
-    $count = 0;
-    $dir = dir($directory);
-    while ($anEntry = $dir->read())
-    {
-      if ($anEntry != "." && $anEntry != "..")
-      {
-        $anEntry = $directory."/".$anEntry;
-        if (is_dir($anEntry))
-        {
-          write_unused_property($anEntry);
-        }
-        else
-        {
-          echo "<tr><td><a href=\"$anEntry\">";
-          echo substr($anEntry, 16);
-          echo "</a></td>";
-          $lines = file($anEntry);
-          $count = count($lines);
-          echo "<td>$count</td></tr>";
-        }
-      }
-    }
-  }
-?>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-</head>
-<body>
-
-<p><b><font face="Verdana" size="+3">Unused property messages</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">
-	   Unused property messages for <?php echo "$buildType $buildName"; ?></font></b></td>
-  </tr>
-</table>
-
-<table border="1">
-  <tr>
-    <th>Properties file</th>
-    <th>Unused strings</th>
-  </tr>
-<?php
-  write_unused_property("piitools");
-?>
-</table>
-</body>
-</html>
diff --git a/releng.wtpbuilder/distribution/patches.site/templateFiles/buildresult.xml.template b/releng.wtpbuilder/distribution/patches.site/templateFiles/buildresult.xml.template
deleted file mode 100644
index 6f0d3b0..0000000
--- a/releng.wtpbuilder/distribution/patches.site/templateFiles/buildresult.xml.template
+++ /dev/null
@@ -1,2 +0,0 @@
-<eclipsebuild buildlabel="@buildlabel@">

-</eclipsebuild>

diff --git a/releng.wtpbuilder/distribution/patches.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/patches.site/templateFiles/index.html.template.php
index 53a368d..197587f 100644
--- a/releng.wtpbuilder/distribution/patches.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/patches.site/templateFiles/index.html.template.php
@@ -1,20 +1,102 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+
+<title>WTP Downloads</title>
+
+
 <?php
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
 
-//todo: compute downloadprefix based on host server, and stage of declaration
-$downloadprefix="./";
+$buildBranch="@buildBranch@";
+$build="@build@";
+$type="@type@";
+$builddate="@date@";
 
-include './miscUtil.php';
+$eclipseMirrorPrefixuri="@eclipse.mirror.prefixuri@";
+$eclipsefilelinux="@eclipsefilelinux@";
+$eclipsefilewindows="@eclipsefilewindows@";
+$eclipsefilemacosx="@eclipsefilemacos@";
+
+$eclipseURL="@eclipseURL@";
+$eclipseFile="@eclipseFile@";
+$eclipseBuildURL="@eclipseBuildURL@";
+$eclipseBuildHome="@eclipseBuildHome@";
+$testURL="@testURL@";
+$testFile="@testFile@";
+
+
+$gefURL="@gefURL@";
+$gefFile="@gefFile@";
+$gefMirrorPrefixuri="@gef.mirror.prefixuri@";
+$gefBuildHome="@gefBuildHome@";
+
+$emfURL="@emfURL@";
+$emfFile="@emfFile@";
+$emfMirrorPrefixuri="@emf.mirror.prefixuri@";
+$emfBuildHome="@emfBuildHome@";
+
+$dtpURL="@dtpURL@";
+$dtpFile="@dtpFile@";
+$dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
+$dtpBuildHome="@dtpBuildHome@";
+
+
+$eclipserelengFile="@eclipserelengFile@";
+$eclipserelengURL="@eclipserelengURL@";
+$orbitthirdpartyzipFile="@orbitthirdpartyzipFile@";
+$orbitthirdpartyzipURL="@orbitthirdpartyzipURL@";
+$orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
+$orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
+
+
+
+
+include("miscUtil.php");
+
+
+
+//ini_set("display_errors", "true");
+//error_reporting (E_ALL);
+
+
+$debugScript = false;
+$debugFunctions = false;
+
+$defaultMirrorScript="";
+$defaultWTPMirrorPrefix="./";
+
+$eclipseMirrorScript="http://www.eclipse.org/downloads/download.php?file=";
+
+// TODO: improve so this hard coding isn't required.
+// This depends on the declare script changing webtools/committers to webtools/downloads
+// And, the logic is such that if it is not mirrored, this URI is not used at all, just
+// a relative reference only
+$eclipseWTPMirrorPrefix="/webtools/committers/drops/$buildBranch/$build/";
+
+
+$mirrorScript=$defaultMirrorScript;
+$downloadprefix=$defaultWTPMirrorPrefix;
+
+
+$keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtp-sdk-$build.zip";
+if (isMirrored($keytestMirrorString) ) {
+    $mirrorScript=$eclipseMirrorScript;
+    $downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
+}
+
+if ($debugScript)  {
+    echo "inferred platform: " . getPlatform();
+}
+
 
 // our summary results handling requires php 5 (for simple xml file loading)
 // so, if not php 5, just don't display any summary results
 // This was found to be required, since some mirror our whole site (e.g. IBM)
 // and not all mirrors use PHP 5
-$displayTestSummary = false;
+$displayTestSummary=false;
 if (phpversion() >= 5) {
-    $displayTestSummary = true;
-    
+
+    $displayTestSummary=true;
     // expecting grandTotalErrors and grandTotalTests
     $filename = "unitTestsSummary.xml";
     if (file_exists($filename)) {
@@ -41,47 +123,52 @@
     }
 
     $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);
-        }
-    }
-    else {
-        $test_totalErrors = 0;
-        $test_totalWarnings = 0;
-        $test_totalBundles = 0;
-        $test_totalforbiddenAccessWarningCount = 0;
-        $test_totaldiscouragedAccessWarningCount = 0;
+    $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);
     }
 }
 
 
-
 ?>
 
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 
-<title>WTP Patches</title>
 </head>
 
 <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>
+          <p>
+          Reminder: this is <font color="#FF0000">' . 
+    $serverName .
+    '</font>
+          See also 
+          <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
+          </p>
+          <hr />
+          </center>';
+
+}
+?>
 <table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
 	<tr>
-		<td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b>@type@
-		Build: @build@</b></font></td>
+		<td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
+		Build: <?php echo "$build";?></b></font></td>
 	
 	
 	<tr>
-		<td><font size="-1">@date@</font></td>
+		<td><font size="-1"><?php echo "$builddate";?></font></td>
 	</tr>
 	<tr>
 		<td>
@@ -97,37 +184,87 @@
 	<tr>
 		<td align="left" valign="top" bgcolor="#0080C0"><font
 			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Required
-		Prerequisites</font></td>
+		Prerequisites and Handy Extras</font></td>
 	</tr>
 	<tr>
-		<td>These are the prerequisites project packages used while building
-		and testing these patches.</td>
+		<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 developmnet
+		environmnets, 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>
+		</td>
 	</tr>
 	<tr>
 		<td>
 		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
 			<tr valign="top">
-				<td width="10%" />
-				
-				
-				<td>Eclipse Platform (Platform, JDT, PDE)</td>
-				<td align="right"><a href="@eclipseURL@">@eclipseFile@</a> or <a
-					href=@eclipseBuildURL@>other platform</a></td>
+				<td width="10%"></td>
+				<td width="55%">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" width="35%"><?php
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile);
+				echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
+				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+				?>
+			
 			</tr>
 			<tr valign="top">
-				<td width="10%" />
-				
-				
+				<td width="10%"></td>
 				<td>Eclipse Modeling Framework (EMF, XSD InfoSet, SDO)</td>
-				<td align="right"><a href="@emfURL@">@emfFile@</a></td>
+				<td align="right"><?php
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile);
+				echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
+				?>
+			
 			</tr>
+
 			<tr valign="top">
-				<td width="10%" />
-				
-				
+				<td width="10%"></td>
 				<td>Graphical Editing Framework (GEF)</td>
-				<td align="right"><a href="@gefURL@">@gefFile@</a></td>
+				<td align="right"><?php
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile);
+				echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></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);
+				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);
+				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+				?>
+			
+			</tr>
+
+
 		</table>
 		</td>
 	</tr>
@@ -175,6 +312,11 @@
 </table>
 
 
+
+
+
+
+
 <!-- ***********  Build Status **************  -->
 <table border=0 cellspacing=2 cellpadding=2 width="100%">
 	<tr>
@@ -225,9 +367,9 @@
 				    echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
 				}
 
+				?> <br />
 
-				echo "<br />";
-
+				<?php
 				if (file_exists("versioningReportName.php")) {
 				    include "versioningReportName.php";
 				    $fname="${versionReportFilename}.html";
@@ -235,7 +377,7 @@
 				        echo "<br /> <a href='$fname'>Versioning Information</a>";
 				    }
 }
-
+?> <?php
 echo "<br />";
 if (file_exists("./apiresults/api-progress.html"))
 {
@@ -269,7 +411,7 @@
 {
     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 />";
diff --git a/releng.wtpbuilder/distribution/patches.site/templateFiles/performance.template b/releng.wtpbuilder/distribution/patches.site/templateFiles/performance.template
deleted file mode 100644
index 7db36a7..0000000
--- a/releng.wtpbuilder/distribution/patches.site/templateFiles/performance.template
+++ /dev/null
@@ -1,62 +0,0 @@
-<P>

-  <A NAME="unit"></A>

-  * Missing reference data. Build used for comparison specified in ending parenthesis.

-  <BR>green: faster, less memory

-  <BR>red: slower, more memory

-  <BR>x axis: difference between current value and baseline value as percentage

-  <BR>

-</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">

-      Detailed performance data grouped by scenario prefix

-    </font></b></td>

-  </tr>

-</table>

-

-<?php

-  $dir = dir(".");

-  while ($anEntry = $dir->read())

-  {

-    if ($anEntry != "global.php" && substr($anEntry, strlen($anEntry) - 4) == ".php")

-    {

-      echo "<a href=\"$anEntry\">$anEntry</a><br>";

-    }

-  }

-?>

-

-<table border=0 cellspacing=5 cellpadding=2 width="100%" >

-  <tr> 

-    <td>&nbsp;</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">

-      Performance JUnit test results for <?php echo "$buildType $buildName"; ?>

-    </font></b></td>

-  </tr>

-</table>

-

-<font color="#FFFFFF" face="Arial,Helvetica">

-<table border=1" width="100%">

-  <tr>

-    <td width="100%"><b>Tests Performed</b></td>

-  </tr>

-  <?php

-    $xmlDir = dir("../xml");

-    while ($xmlEntry = $xmlDir->read())

-    {

-      if ($xmlEntry != "." && $xmlEntry != "..")

-      {

-        $htmlEntry = substr($xmlEntry, 0, strlen($xmlEntry) - 3) . "html";

-        echo "<tr>";

-        echo "<td><a href=\"../html/$htmlEntry\">$htmlEntry</a></td>";

-        echo "</tr>";

-      }

-    }

-  ?>

-</table>

-</html>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.tests/build.xml b/releng.wtpbuilder/distribution/patches.tests/build.xml
index ae5c4b8..e1844ab 100644
--- a/releng.wtpbuilder/distribution/patches.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches.tests/build.xml
@@ -1,231 +1,303 @@
-<project name="Build specific targets and properties"
-	default="runTest">
+<project
+    name="Build specific targets and properties"
+    default="runTest">
 
-	<!-- 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" />
+    <!-- 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" />
 
-	<fail message="testRoot must be set for this task"
-		unless="testRoot" />
+    <fail
+        message="testRoot must be set for this task"
+        unless="testRoot" />
 
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the build is done. -->
-	<!-- ===================================================================== -->
-	<target name="test">
-		<dirname file="${ant.file}" property="currentDirectory" />
-		<ant antfile="${ant.file}" target="runTest"
-			dir="${currentDirectory}" />
-	</target>
+    <!-- ===================================================================== -->
+    <!-- Steps to do after the build is done. -->
+    <!-- ===================================================================== -->
+    <target name="test">
+        <dirname
+            file="${ant.file}"
+            property="currentDirectory" />
+        <ant
+            antfile="${ant.file}"
+            target="runTest"
+            dir="${currentDirectory}" />
+    </target>
 
-	<!-- ===================================================================== -->
-	<!-- Steps to do to test the build results -->
-	<!-- ===================================================================== -->
-	<target name="runTest">
+    <!-- ===================================================================== -->
+    <!-- Steps to do to test the build results -->
+    <!-- ===================================================================== -->
+    <target name="runTest">
 
-		<dirname file="${ant.file}" property="test.component.dir" />
-		<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-		<property file="${buildDirectory}/label.properties" />
-		<property file="${wtp.builder.home}/build.properties" />
+        <dirname
+            file="${ant.file}"
+            property="test.component.dir" />
+        <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
+        <property file="${buildDirectory}/label.properties" />
+        <property file="${wtp.builder.home}/build.properties" />
 
-		<fail message="testRoot must be set for this task"
-			unless="testRoot" />
-		<mkdir dir="${testRoot}" />
+        <fail
+            message="testRoot must be set for this task"
+            unless="testRoot" />
+        <mkdir dir="${testRoot}" />
 
-		<!-- if results already exist, delete them -->
-		<delete dir="${testRoot}/results" failOnError="false" />
-		<mkdir dir="${testRoot}/results" />
+        <!-- if results already exist, delete them -->
+        <delete
+            dir="${testRoot}/results"
+            failOnError="false" />
+        <mkdir dir="${testRoot}/results" />
 
-		<mkdir dir="${testRoot}/results/consolelogs" />
-		<mkdir dir="${testRoot}/results/consolelogs/metadata-logs" />
-		<mkdir dir="${testRoot}/results/consolelogs/configuration-logs" />
+        <mkdir dir="${testRoot}/results/consolelogs" />
+        <mkdir dir="${testRoot}/results/consolelogs/metadata-logs" />
+        <mkdir dir="${testRoot}/results/consolelogs/configuration-logs" />
 
-		<copy todir="${testRoot}" overwrite="true">
-			<fileset dir="${test.component.dir}/testScripts"></fileset>
-		</copy>
+        <copy
+            todir="${testRoot}"
+            overwrite="true">
+            <fileset dir="${test.component.dir}/testScripts"></fileset>
+        </copy>
 
-		<echo
-			message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} " />
+        <echo
+            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} " />
 
-		<ant antfile="${test.component.dir}/testdependency.xml"
-			target="get">
-			<property name="dependency.properties"
-				value="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties" />
-			<property name="base.install.dir" value="${testRoot}" />
-		</ant>
+        <ant
+            antfile="${test.component.dir}/testdependency.xml"
+            target="get">
+            <property
+                name="dependency.properties"
+                value="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties" />
+            <property
+                name="base.install.dir"
+                value="${testRoot}" />
+        </ant>
 
-		<antcall target="unzipTests" />
+        <antcall target="unzipTests" />
 
-		<antcall target="runTestEclipse">
-			<param name="testTarget" value="all" />
-		</antcall>
-		<antcall target="postRunTestEclipse">
-			<param name="testTarget" value="all" />
-		</antcall>
+        <antcall target="runTestEclipse">
+            <param
+                name="testTarget"
+                value="all" />
+        </antcall>
+        <antcall target="postRunTestEclipse">
+            <param
+                name="testTarget"
+                value="all" />
+        </antcall>
+    </target>
 
-	</target>
+    <target name="unzipTests">
 
-  	<target name="unzipTests">
+        <!--unzip the builds and junit tests
+            we use 'unzip' here, so we can continue on error
+            (such as if zip was not created, due to other failures or options).
+        -->
+        <exec
+            dir="${buildDirectory}/${buildLabel}"
+            executable="unzip"
+            failonerror="false">
+            <arg line="-o -qq wtp-${buildLabel}.zip -d ${testRoot}" />
+        </exec>
+        <exec
+            dir="${buildDirectory}/${buildLabel}"
+            executable="unzip"
+            failonerror="false">
+            <arg
+                line="-o -qq wtp-patches-tests-${buildLabel}.zip -d ${testRoot}" />
+        </exec>
 
-  		<!--unzip the builds and junit tests
-  			we use 'unzip' here, so we can continue on error
-  			(such as if zip was not created, due to other failures or options).
-  		-->
-  		<exec dir="${buildDirectory}/${buildLabel}" executable="unzip"
-  			failonerror="false">
-  			<arg line="-o -qq wtp-${buildLabel}.zip -d ${testRoot}" />
-  		</exec>
+    </target>
 
-  	</target>
+    <!-- time out may need to be set/adjust for api or performance tests?
+        This testTimeLimit is the whole, overall limit on tests. There's a shorter 
+        one for individual suites.
+        
+        some common values, of milliseconds to more recognizable units:
+        7200000: 2 hours
+        3600000: 1 hour
+        1800000: 30 minutes
+        600000: 10 minutes
+    -->
 
-	<!-- time out may need to be set/adjust for api or performance tests?
-		This testTimeLimit is the whole, overall limit on tests. There's a shorter 
-		one for individual suites.
-		
-		some common values, of milliseconds to more recognizable units:
-		7200000: 2 hours
-		3600000: 1 hour
-		1800000: 30 minutes
-		600000: 10 minutes
-	-->
+    <property
+        name="testTimeLimit"
+        value="7200000" />
+    <property
+        name="testFailOnError"
+        value="false" />
 
-	<property name="testTimeLimit" value="7200000" />
-	<property name="testFailOnError" value="false" />
-
-	<target name="runTestEclipse"
-		description="Run our JUnit's within an instance of antRunner">
+    <target
+        name="runTestEclipse"
+        description="Run our JUnit's within an instance of antRunner">
 
 
-		<property name="test-vm" value="${env.JAVA_5_HOME}/bin/java" />
-		<property name="plugin-path"
-			value="${testRoot}/eclipse/plugins" />
-		<property name="vmargs"
-			value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dosgi.clean=true -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}" />
+        <property
+            name="test-vm"
+            value="${env.JAVA_5_HOME}/bin/java" />
+        <property
+            name="plugin-path"
+            value="${testRoot}/eclipse/plugins" />
+        <property
+            name="vmargs"
+            value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dosgi.clean=true -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}" />
 
 
-		<!-- set path to eclipse folder. If local folder, use '.'; otherwise, use c:\path\to\eclipse or /path/to/eclipse/ -->
-		<property name="eclipse.home" value="${testRoot}" />
+        <!-- set path to eclipse folder. If local folder, use '.'; otherwise, use c:\path\to\eclipse or /path/to/eclipse/ -->
+        <property
+            name="eclipse.home"
+            value="${testRoot}" />
 
-		<echo message="Running junits" />
+        <echo message="Running junits" />
 
-		<!-- If there is not exactly one launcher in the stack, 
-			we'd best fail fast, since we are not expecting that, 
-			and may indicate an installation that would produce unpredictable
-			results -->
-		<!-- requires ant 1.7, and at this point, we're running 1.6 from 
-		eclipse ... 
-		
-		<condition property="expectedNumberOfLaunchers">
-			<resourcecount when="equal" count="1" >
-				<fileset dir="${testRoot}/eclipse/plugins">
-					<include name="org.eclipse.equinox.launcher_*.jar" />
-				</fileset>		
-			</resourcecount>
-		</condition>
-		<fail message="Did not find expected number of launcher jars. Check installation." unless="expectedNumberOfLaunchers" />
-		-->
-		<!-- 
-			Remember: using -debug for org.eclipse.ant.core.antRunner 
-			produces ant debug info to be output ... which is a TON of stuff 
-		-->
-	  <echo message="eclipse.launcher: ${eclipse.launcher}"/>
-		<java jar="${eclipse.launcher}"
-		    taskname="unit-test-masterprocess" 
-		    fork="true"
-			resultProperty="wtpmasterjunitresult" 
-			failonerror="false"
-			timeout="${testTimeLimit}" 
-			dir="${testRoot}/eclipse"
-			jvm="${env.JAVA_5_HOME}/bin/java"> 
-			
-			<jvmarg value="-Xms256m"/>
-			<jvmarg value="-Xmx512m" />
-			
-		  <jvmarg value="-Declipse.launcher=${testRoot}/eclipse/startup.jar" />  
-		    
-			<jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-			<jvmarg value="-Dosgi.os=${env.BASEOS}" />
-			<jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-			<jvmarg value="-Dws=${env.BASEWS}" />
-			<jvmarg value="-Dos=${env.BASEOS}" />
-			<jvmarg value="-Darch=${env.BASEARCH}" />
-			
-			<jvmarg value="-Dosgi.clean=true" />
-			<jvmarg value="-Dnoclean=true" />
-			<jvmarg value="-DbuildBranch=${buildBranch}" />
-			<jvmarg value="-DbuildType=${buildType}" />
-			<jvmarg value="-DbuildId=${buildId}" />
+        <!-- If there is not exactly one launcher in the stack, 
+            we'd best fail fast, since we are not expecting that, 
+            and may indicate an installation that would produce unpredictable
+            results -->
+        <!-- requires ant 1.7, and at this point, we're running 1.6 from 
+            eclipse ... 
+            
+            <condition property="expectedNumberOfLaunchers">
+            <resourcecount when="equal" count="1" >
+            <fileset dir="${testRoot}/eclipse/plugins">
+            <include name="org.eclipse.equinox.launcher_*.jar" />
+            </fileset>		
+            </resourcecount>
+            </condition>
+            <fail message="Did not find expected number of launcher jars. Check installation." unless="expectedNumberOfLaunchers" />
+        -->
+        <!-- 
+            Remember: using -debug for org.eclipse.ant.core.antRunner 
+            produces ant debug info to be output ... which is a TON of stuff 
+        -->
+        <echo message="eclipse.launcher: ${eclipse.launcher}" />
+        <java
+            jar="${eclipse.launcher}"
+            taskname="unit-test-masterprocess"
+            fork="true"
+            resultProperty="wtpmasterjunitresult"
+            failonerror="false"
+            timeout="${testTimeLimit}"
+            dir="${testRoot}/eclipse"
+            jvm="${env.JAVA_5_HOME}/bin/java">
 
-			<arg value="-nosplash" />
-			<arg value="-consolelog" />
-			
-			<arg value="-data" />
-			<arg value="${testRoot}/overallTestWorkspace" />
-			<arg value="-application" />
-			<arg value="org.eclipse.ant.core.antRunner" />
-			<arg value="-file" />
-			<arg value="${testRoot}/test.xml" />
-			<arg value="-logger" />
-			<arg value="org.apache.tools.ant.DefaultLogger" />
-			<env key="DISPLAY" value="${env.DISPLAY}" />
-			<redirector 
-				output="${testRoot}/results/fullOutput.txt"
-				error="${testRoot}/results/fullErrorLog.txt"/>
-			<sysproperty key="build.home" value="${env.BUILD_HOME}" />
-			<sysproperty key="buildDirectory" value="${buildDirectory}" />
-			<sysproperty key="buildLabel" value="${buildLabel}" />
-			<sysproperty key="baseLocation" value="${baseLocation}" />
-			<sysproperty key="testRoot" value="${testRoot}" />
-			<sysproperty key="testDir" value="${testRoot}" />
-			<sysproperty key="perf.buildId"
-				value="${buildType}${date}-${time}" />
-			<sysproperty key="eclipseBuilderDirectory"
-				value="${pde.builder.path}" />
-			<sysproperty key="buildLabel" value="${buildLabel}" />
-		</java>
+            <jvmarg value="-Xms256m" />
+            <jvmarg value="-Xmx512m" />
 
-		<echo message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
-	</target>
+            <jvmarg
+                value="-Declipse.launcher=${testRoot}/eclipse/startup.jar" />
+
+            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
+            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
+            <jvmarg value="-Dws=${env.BASEWS}" />
+            <jvmarg value="-Dos=${env.BASEOS}" />
+            <jvmarg value="-Darch=${env.BASEARCH}" />
+
+            <jvmarg value="-Dosgi.debug='false'" />
+
+            <jvmarg value="-Dosgi.clean=true" />
+
+            <jvmarg value="-DbuildBranch=${buildBranch}" />
+            <jvmarg value="-DbuildType=${buildType}" />
+            <jvmarg value="-DbuildId=${buildId}" />
+
+            <arg value="-nosplash" />
+            <arg value="-consolelog" />
+
+            <arg value="-data" />
+            <arg value="${testRoot}/overallTestWorkspace" />
+            <arg value="-application" />
+            <arg value="org.eclipse.ant.core.antRunner" />
+            <arg value="-file" />
+            <arg value="${testRoot}/test.xml" />
+            <arg value="-logger" />
+            <arg value="org.apache.tools.ant.DefaultLogger" />
+            <env
+                key="DISPLAY"
+                value="${env.DISPLAY}" />
+            <redirector
+                output="${testRoot}/results/fullOutput.txt"
+                error="${testRoot}/results/fullErrorLog.txt" />
+            <sysproperty
+                key="build.home"
+                value="${env.BUILD_HOME}" />
+            <sysproperty
+                key="buildDirectory"
+                value="${buildDirectory}" />
+            <sysproperty
+                key="buildLabel"
+                value="${buildLabel}" />
+            <sysproperty
+                key="baseLocation"
+                value="${baseLocation}" />
+            <sysproperty
+                key="testRoot"
+                value="${testRoot}" />
+            <sysproperty
+                key="testDir"
+                value="${testRoot}" />
+            <sysproperty
+                key="perf.buildId"
+                value="${buildType}${date}-${time}" />
+            <sysproperty
+                key="eclipseBuilderDirectory"
+                value="${pde.builder.path}" />
+            <sysproperty
+                key="buildLabel"
+                value="${buildLabel}" />
+        </java>
+
+        <echo message="wtpmasterjunitresult ${wtpmasterjunitresult}" />
+    </target>
 
 
-	<target name="postRunTestEclipse">
-		<copy
-			todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
-			overwrite="true" failonerror="false">
-			<fileset dir="${testRoot}/results">
-				<include name="*output.txt" />
-			</fileset>
-		</copy>
-		<copy
-			todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
-			overwrite="true" failonerror="false">
-			<fileset dir="${testRoot}/results">
-				<include name="*error.txt" />
-			</fileset>
-		</copy>
-		<copy file="${testRoot}/results/fullOutput.txt"
-			toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-			overwrite="true" failonerror="false">
-		</copy>
-		<copy file="${testRoot}/results/fullErrorLog.txt"
-			toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
-			overwrite="true" failonerror="false">
-		</copy>
+    <target name="postRunTestEclipse">
+        <copy
+            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
+            overwrite="true"
+            failonerror="false">
+            <fileset dir="${testRoot}/results">
+                <include name="*output.txt" />
+            </fileset>
+        </copy>
+        <copy
+            todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
+            overwrite="true"
+            failonerror="false">
+            <fileset dir="${testRoot}/results">
+                <include name="*error.txt" />
+            </fileset>
+        </copy>
+        <copy
+            file="${testRoot}/results/fullOutput.txt"
+            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
+            overwrite="true"
+            failonerror="false">
+        </copy>
+        <copy
+            file="${testRoot}/results/fullErrorLog.txt"
+            toDir="${buildDirectory}/${buildLabel}/testResults/consolelogs/full"
+            overwrite="true"
+            failonerror="false">
+        </copy>
 
-		<copy todir="${buildDirectory}/${buildLabel}/testResults/xml"
-			overwrite="true" failonerror="false">
-			<fileset dir="${testRoot}/results/xml">
-				<include name="*.xml" />
-			</fileset>
-		</copy>
-		<copy todir="${buildDirectory}/${buildLabel}/testResults/html"
-			overwrite="true" failonerror="false">
-			<fileset dir="${testRoot}/results/html">
-				<include name="*.html" />
-			</fileset>
-		</copy>
-	</target>
+        <copy
+            todir="${buildDirectory}/${buildLabel}/testResults/xml"
+            overwrite="true"
+            failonerror="false">
+            <fileset dir="${testRoot}/results/xml">
+                <include name="*.xml" />
+            </fileset>
+        </copy>
+        <copy
+            todir="${buildDirectory}/${buildLabel}/testResults/html"
+            overwrite="true"
+            failonerror="false">
+            <fileset dir="${testRoot}/results/html">
+                <include name="*.html" />
+            </fileset>
+        </copy>
+    </target>
 
 
 </project>
diff --git a/releng.wtpbuilder/distribution/patches.tests/testdependency.xml b/releng.wtpbuilder/distribution/patches.tests/testdependency.xml
index be7fa59..4eedd98 100644
--- a/releng.wtpbuilder/distribution/patches.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/patches.tests/testdependency.xml
@@ -46,14 +46,7 @@
 			<param name="groupId" value="wtp-jst-test" />
 		</antcall>
 
-    	<!-- for patch builds remove bundles to work around limitations -->
-		<property name="testPluginsDir" value="${base.install.dir}/eclipse/plugins" />
-    	<echo message="remove duplicates from ${testPluginsDir}"/>
-    	<delete>
-			<fileset dir="${testPluginsDir}">
-	    		<include name="org.eclipse.wst.rdb.core*/**"/>
-			</fileset>
-		</delete>
+
 		
 	</target>