change to 'repository'
diff --git a/releng.wtpbuilder/buildtemplates/build.xml b/releng.wtpbuilder/buildtemplates/build.xml
index 0e4b177..3cd0686 100644
--- a/releng.wtpbuilder/buildtemplates/build.xml
+++ b/releng.wtpbuilder/buildtemplates/build.xml
@@ -21,7 +21,7 @@
     -->
     <property
         name="componentpropertyfile"
-        value="xquery.properties"/>
+        value="jsdt.properties"/>
     <property
         file="${componentpropertyfile}"/>
     <!--
diff --git a/releng.wtpbuilder/buildtemplates/buildall.xml b/releng.wtpbuilder/buildtemplates/buildall.xml
index 0a4f860..a936198 100644
--- a/releng.wtpbuilder/buildtemplates/buildall.xml
+++ b/releng.wtpbuilder/buildtemplates/buildall.xml
@@ -4,11 +4,8 @@
     default="default">
     <target
         name="default">
-        <ant>
-            <property
-                name="componentpropertyfile"
-                value="xmlsec.properties"/>
-        </ant>
+        <!-- dali no quite standard, yet <ant> <property name="componentpropertyfile" 
+            value="xmlsec.properties"/> </ant> -->
         <ant>
             <property
                 name="componentpropertyfile"
@@ -17,27 +14,52 @@
         <ant>
             <property
                 name="componentpropertyfile"
-                value="vex.properties"/>
-        </ant>
-        <ant>
-            <property
-                name="componentpropertyfile"
-                value="pave.properties"/>
-        </ant>
-        <ant>
-            <property
-                name="componentpropertyfile"
                 value="jsdt.properties"/>
         </ant>
         <ant>
             <property
                 name="componentpropertyfile"
-                value="xml.properties"/>
+                value="pave.properties"/>
         </ant>
         <ant>
             <property
                 name="componentpropertyfile"
                 value="servadapt.properties"/>
         </ant>
+        <ant>
+            <property
+                name="componentpropertyfile"
+                value="vex.properties"/>
+        </ant>
+        <ant>
+            <property
+                name="componentpropertyfile"
+                value="wstfproj.properties"/>
+        </ant>
+        <ant>
+            <property
+                name="componentpropertyfile"
+                value="wtpcap.properties"/>
+        </ant>
+        <ant>
+            <property
+                name="componentpropertyfile"
+                value="wtpjee.properties"/>
+        </ant>
+        <ant>
+            <property
+                name="componentpropertyfile"
+                value="xml.properties"/>
+        </ant>
+        <ant>
+            <property
+                name="componentpropertyfile"
+                value="xmlsec.properties"/>
+        </ant>
+        <ant>
+            <property
+                name="componentpropertyfile"
+                value="xquery.properties"/>
+        </ant>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/dali.properties b/releng.wtpbuilder/buildtemplates/dali.properties
index 6334c82..0a20f3a 100644
--- a/releng.wtpbuilder/buildtemplates/dali.properties
+++ b/releng.wtpbuilder/buildtemplates/dali.properties
@@ -38,10 +38,11 @@
 # longdescription appears on the download webpage
 longdescription=The Zip file contains productized Dali Developer Tools
 
+# suffixes for base feature names
 featuresuffix=.assembly.feature
-
-# special case
 sdksuffix=_sdk.assebly.feature
+testsuffix=_tests.feature
+
 
 # omit (or set to true) for incubating projects for proper webpage
 incubating=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
index 49b7f04..fe3faf8 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
@@ -255,13 +255,13 @@
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
     <target
-        name="updateSite">
+        name="repository">
 
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true"/>
         <!--
@@ -270,7 +270,7 @@
         -->
         <!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wtp@"
diff --git a/releng.wtpbuilder/buildtemplates/jaxws.properties b/releng.wtpbuilder/buildtemplates/jaxws.properties
index bd5e430..39b5fe3 100644
--- a/releng.wtpbuilder/buildtemplates/jaxws.properties
+++ b/releng.wtpbuilder/buildtemplates/jaxws.properties
@@ -36,3 +36,6 @@
 # longdescription appears on the download webpage
 longdescription=The Zip files includes the features and plugins for the WTP Incubator JAX WS Component.
 
+# suffixes for base feature names
+
+testsuffix=_tests.feature
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/jsdt.properties b/releng.wtpbuilder/buildtemplates/jsdt.properties
index 44130fd..30625af 100644
--- a/releng.wtpbuilder/buildtemplates/jsdt.properties
+++ b/releng.wtpbuilder/buildtemplates/jsdt.properties
@@ -33,4 +33,7 @@
 
 
 # omit (or set to true) for incubating projects for proper webpage
-incubating=false
\ No newline at end of file
+incubating=false
+
+# suffixes for base feature names
+testsuffix=_tests.feature
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/pave.properties b/releng.wtpbuilder/buildtemplates/pave.properties
index 2346e0b..b0c46ec 100644
--- a/releng.wtpbuilder/buildtemplates/pave.properties
+++ b/releng.wtpbuilder/buildtemplates/pave.properties
@@ -37,3 +37,5 @@
 # longdescription appears on the download webpage
 longdescription=The Zip files includes the features and plugins for the WTP Incubator Pave Framework and reference implementation for Java EE patterns: CRUD, and CRUD Application.
 
+# suffixes for base feature names
+testsuffix=_tests.feature
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/servadapt.properties b/releng.wtpbuilder/buildtemplates/servadapt.properties
index b891deb..8c6fdd0 100644
--- a/releng.wtpbuilder/buildtemplates/servadapt.properties
+++ b/releng.wtpbuilder/buildtemplates/servadapt.properties
@@ -37,7 +37,8 @@
 longdescription=The Zip files includes the features and plugins for some Server Adapters. 
 
 
-# special case
+# suffixes for base feature names
+testsuffix=_tests.feature
 sdksuffix=.sdk.feature
 
 # omit (or set to true) for incubating projects for proper webpage
diff --git a/releng.wtpbuilder/buildtemplates/vex.properties b/releng.wtpbuilder/buildtemplates/vex.properties
index 2b2eafe..ac3ccb5 100644
--- a/releng.wtpbuilder/buildtemplates/vex.properties
+++ b/releng.wtpbuilder/buildtemplates/vex.properties
@@ -33,3 +33,6 @@
 
 # longdescription appears on the download webpage
 longdescription=The Zip files includes the features and plugins for the WTP Incubator VEX Component.
+
+# suffixes for base feature names
+testsuffix=_tests.feature
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/wstfproj.properties b/releng.wtpbuilder/buildtemplates/wstfproj.properties
index 24e8a1b..3bc7045 100644
--- a/releng.wtpbuilder/buildtemplates/wstfproj.properties
+++ b/releng.wtpbuilder/buildtemplates/wstfproj.properties
@@ -39,3 +39,6 @@
 
 # omit (or set to true) for incubating projects for proper webpage
 incubating=false
+
+# suffixes for base feature names
+testsuffix=_tests.feature
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/wtpcap.properties b/releng.wtpbuilder/buildtemplates/wtpcap.properties
index de2ebf8..de566d1 100644
--- a/releng.wtpbuilder/buildtemplates/wtpcap.properties
+++ b/releng.wtpbuilder/buildtemplates/wtpcap.properties
@@ -34,6 +34,8 @@
 
 # normally is '.feature', but if not, leave empty
 featuresuffix=
+# suffixes for base feature names
+testsuffix=_tests.feature
 
 # omit (or set to true) for incubating projects for proper webpage
 incubating=false
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/wtpjee.properties b/releng.wtpbuilder/buildtemplates/wtpjee.properties
index d8d63f0..3890a21 100644
--- a/releng.wtpbuilder/buildtemplates/wtpjee.properties
+++ b/releng.wtpbuilder/buildtemplates/wtpjee.properties
@@ -40,4 +40,7 @@
 
 
 # omit (or set to true) for incubating projects for proper webpage
-incubating=false
\ No newline at end of file
+incubating=false
+
+# suffixes for base feature names
+testsuffix=_tests.feature
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/xml.properties b/releng.wtpbuilder/buildtemplates/xml.properties
index 5542b24..f19201b 100644
--- a/releng.wtpbuilder/buildtemplates/xml.properties
+++ b/releng.wtpbuilder/buildtemplates/xml.properties
@@ -39,3 +39,6 @@
 incubating=false
 
 featuresuffix=_ui.feature
+
+# suffixes for base feature names
+testsuffix=_tests.feature
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/xmlsec.properties b/releng.wtpbuilder/buildtemplates/xmlsec.properties
index 24ec42c..88c4069 100644
--- a/releng.wtpbuilder/buildtemplates/xmlsec.properties
+++ b/releng.wtpbuilder/buildtemplates/xmlsec.properties
@@ -35,3 +35,5 @@
 # longdescription appears on the download webpage
 longdescription=The Zip files includes the features and plugins for the WTP Incubator XML Security Component.
 
+# suffixes for base feature names
+testsuffix=_tests.feature
\ No newline at end of file
diff --git a/releng.wtpbuilder/components/jaxws/customTargets.xml b/releng.wtpbuilder/components/jaxws/customTargets.xml
index 40d8d5f..9e886bf 100644
--- a/releng.wtpbuilder/components/jaxws/customTargets.xml
+++ b/releng.wtpbuilder/components/jaxws/customTargets.xml
@@ -159,7 +159,6 @@
         <!-- Get the dependencies -->
         <antcall
             target="getDependencies"/>
-    	
     </target>
     <!--
         =====================================================================
@@ -177,18 +176,6 @@
                 name="base.install.dir"
                 value="${buildRoot}"/>
         </ant>
-    	
-	<echo message="buildRoot: ${buildRoot}" />
-	
-       <delete>
-        <fileset dir="${buildRoot}">
-         <include name="**/org.eclipse.jst.ws.cxf*/**" />
-         <include name="**/org.eclipse.jst.ws.jaxws*/**" /> 
-         <include name="**/org.eclipse.jst.ws.jaxb*/**" /> 
-         <include name="**/org.eclipse.jst.ws.annotations.core*/**" />	
-        </fileset>
-     </delete>
-    	
     </target>
 
     <!--
@@ -232,7 +219,6 @@
             <include
                 name="**/about.mappings"/>
         </replace>
-    	
     </target>
     <!--
         Steps to do after running the build.xmls for the elements being
@@ -283,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.jst.ws.jaxws.assembly.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/jaxws/dependency.xml b/releng.wtpbuilder/components/jaxws/dependency.xml
index 352febe..77b6f1b 100644
--- a/releng.wtpbuilder/components/jaxws/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,7 +19,6 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
     <condition
         property="getprereq.eclipse">
         <istrue
@@ -70,6 +69,11 @@
         <istrue
             value="true"/>
     </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -99,6 +103,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
     </target>
     <target
         name="prereq.eclipse"
@@ -201,6 +207,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml b/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml
index 0cca52c..a1495e5 100644
--- a/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jaxws_sdk/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.jst.ws.jaxws.assembly_sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/jaxws_sdk/dependency.xml b/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
index fc244c0..77b6f1b 100644
--- a/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws_sdk/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,58 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	            	
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -100,6 +103,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
     </target>
     <target
         name="prereq.eclipse"
@@ -202,6 +207,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/jaxws_tests/customTargets.xml b/releng.wtpbuilder/components/jaxws_tests/customTargets.xml
index 3b66c3d..3ab0cae 100644
--- a/releng.wtpbuilder/components/jaxws_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jaxws_tests/customTargets.xml
@@ -176,7 +176,6 @@
                 name="base.install.dir"
                 value="${buildRoot}"/>
         </ant>
-
     </target>
 
     <!--
diff --git a/releng.wtpbuilder/components/jaxws_tests/dependency.xml b/releng.wtpbuilder/components/jaxws_tests/dependency.xml
index 1e02cb5..29f8846 100644
--- a/releng.wtpbuilder/components/jaxws_tests/dependency.xml
+++ b/releng.wtpbuilder/components/jaxws_tests/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,57 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -99,12 +103,12 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="eclipseTestFramework"/>
+        </antcall>
     </target>
     <target
         name="prereq.eclipse"
@@ -207,6 +211,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/jsdt/customTargets.xml b/releng.wtpbuilder/components/jsdt/customTargets.xml
index b9f1b92..1daba63 100644
--- a/releng.wtpbuilder/components/jsdt/customTargets.xml
+++ b/releng.wtpbuilder/components/jsdt/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.jsdt.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/jsdt/dependency.xml b/releng.wtpbuilder/components/jsdt/dependency.xml
index 53b2560..2391451 100644
--- a/releng.wtpbuilder/components/jsdt/dependency.xml
+++ b/releng.wtpbuilder/components/jsdt/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,7 +19,6 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
     <condition
         property="getprereq.eclipse">
         <istrue
@@ -70,6 +69,11 @@
         <istrue
             value="false"/>
     </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -99,6 +103,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
     </target>
     <target
         name="prereq.eclipse"
@@ -201,6 +207,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml b/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml
index 134e548..b7826c6 100644
--- a/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/jsdt_sdk/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.jsdt_sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/jsdt_sdk/dependency.xml b/releng.wtpbuilder/components/jsdt_sdk/dependency.xml
index c3f0161..2391451 100644
--- a/releng.wtpbuilder/components/jsdt_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jsdt_sdk/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,58 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	            	
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -100,6 +103,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
     </target>
     <target
         name="prereq.eclipse"
@@ -202,6 +207,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/jsdt_tests/customTargets.xml b/releng.wtpbuilder/components/jsdt_tests/customTargets.xml
index 9d6651f..6c44694 100644
--- a/releng.wtpbuilder/components/jsdt_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/jsdt_tests/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
+    <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
+        <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
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.jsdt_tests.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/jsdt_tests/dependency.xml b/releng.wtpbuilder/components/jsdt_tests/dependency.xml
index 73f8a7e..3510e5b 100644
--- a/releng.wtpbuilder/components/jsdt_tests/dependency.xml
+++ b/releng.wtpbuilder/components/jsdt_tests/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,57 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -99,12 +103,12 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="eclipseTestFramework"/>
+        </antcall>
     </target>
     <target
         name="prereq.eclipse"
@@ -207,6 +211,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/pave/customTargets.xml b/releng.wtpbuilder/components/pave/customTargets.xml
index 3bb6aea..5bf57ee 100644
--- a/releng.wtpbuilder/components/pave/customTargets.xml
+++ b/releng.wtpbuilder/components/pave/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.pave.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/pave/dependency.xml b/releng.wtpbuilder/components/pave/dependency.xml
index fe961cb..12017cd 100644
--- a/releng.wtpbuilder/components/pave/dependency.xml
+++ b/releng.wtpbuilder/components/pave/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,7 +19,6 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
     <condition
         property="getprereq.eclipse">
         <istrue
@@ -70,6 +69,11 @@
         <istrue
             value="true"/>
     </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -99,6 +103,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
     </target>
     <target
         name="prereq.eclipse"
@@ -201,6 +207,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/pave_sdk/customTargets.xml b/releng.wtpbuilder/components/pave_sdk/customTargets.xml
index 1a2aefd..a7e81cc 100644
--- a/releng.wtpbuilder/components/pave_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/pave_sdk/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.pave_sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/pave_sdk/dependency.xml b/releng.wtpbuilder/components/pave_sdk/dependency.xml
index ce8708f..12017cd 100644
--- a/releng.wtpbuilder/components/pave_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/pave_sdk/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,58 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	            	
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -100,6 +103,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
     </target>
     <target
         name="prereq.eclipse"
@@ -202,6 +207,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/pave_tests/customTargets.xml b/releng.wtpbuilder/components/pave_tests/customTargets.xml
index 0cd8929..8b9b371 100644
--- a/releng.wtpbuilder/components/pave_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/pave_tests/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
+    <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
+        <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
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.pave_tests.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/pave_tests/dependency.xml b/releng.wtpbuilder/components/pave_tests/dependency.xml
index 12ba4e8..1827b0f 100644
--- a/releng.wtpbuilder/components/pave_tests/dependency.xml
+++ b/releng.wtpbuilder/components/pave_tests/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,57 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -99,12 +103,12 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="eclipseTestFramework"/>
+        </antcall>
     </target>
     <target
         name="prereq.eclipse"
@@ -207,6 +211,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/servadapt/customTargets.xml b/releng.wtpbuilder/components/servadapt/customTargets.xml
index 6588249..c012d76 100644
--- a/releng.wtpbuilder/components/servadapt/customTargets.xml
+++ b/releng.wtpbuilder/components/servadapt/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.jst.server_adapters.ext.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/servadapt/dependency.xml b/releng.wtpbuilder/components/servadapt/dependency.xml
index 56cba88..10f8b2d 100644
--- a/releng.wtpbuilder/components/servadapt/dependency.xml
+++ b/releng.wtpbuilder/components/servadapt/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,7 +19,6 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
     <condition
         property="getprereq.eclipse">
         <istrue
@@ -70,11 +69,11 @@
         <istrue
             value="false"/>
     </condition>
-	    <condition
-	        property="getprereq.dltk">
-	        <istrue
-	            value="false"/>
-	    </condition>	
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -104,9 +103,9 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
-       <antcall
-           target="prereq.dltk"/>    
-  </target>
+        <antcall
+            target="prereq.dltk"/>
+    </target>
     <target
         name="prereq.eclipse"
         if="getprereq.eclipse">
@@ -207,16 +206,16 @@
                 value="wtp"/>
         </antcall>
     </target>
-	    <target
-	        name="prereq.dltk"
-	        if="getprereq.dltk">
-	        <antcall
-	            target="getAndInstall">
-	            <param
-	                name="groupId"
-	                value="dltk"/>
-	        </antcall>
-	    </target>
+    <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
     <target
         name="getAndInstall"
         if="${groupId}.url">
diff --git a/releng.wtpbuilder/components/servadapt_sdk/customTargets.xml b/releng.wtpbuilder/components/servadapt_sdk/customTargets.xml
index 81a71e2..c4aece3 100644
--- a/releng.wtpbuilder/components/servadapt_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/servadapt_sdk/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.jst.server_adapters.ext.sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/servadapt_sdk/dependency.xml b/releng.wtpbuilder/components/servadapt_sdk/dependency.xml
index 6bb9d87..10f8b2d 100644
--- a/releng.wtpbuilder/components/servadapt_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/servadapt_sdk/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,62 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	              <condition
-	                  property="getprereq.dltk">
-	                  <istrue
-	                      value="false"/>
-	              </condition>	            	
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -104,8 +103,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
-              <antcall
-                  target="prereq.dltk"/>        	
+        <antcall
+            target="prereq.dltk"/>
     </target>
     <target
         name="prereq.eclipse"
@@ -207,16 +206,16 @@
                 value="wtp"/>
         </antcall>
     </target>
-                	    <target
-                	        name="prereq.dltk"
-                	        if="getprereq.dltk">
-                	        <antcall
-                	            target="getAndInstall">
-                	            <param
-                	                name="groupId"
-                	                value="dltk"/>
-                	        </antcall>
-                	    </target>                	
+    <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
     <target
         name="getAndInstall"
         if="${groupId}.url">
diff --git a/releng.wtpbuilder/components/servadapt_tests/customTargets.xml b/releng.wtpbuilder/components/servadapt_tests/customTargets.xml
index 143042c..d949e72 100644
--- a/releng.wtpbuilder/components/servadapt_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/servadapt_tests/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
+    <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
+        <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
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.jst.server_adapters.ext_tests.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/servadapt_tests/dependency.xml b/releng.wtpbuilder/components/servadapt_tests/dependency.xml
index f500940..cb20f5a 100644
--- a/releng.wtpbuilder/components/servadapt_tests/dependency.xml
+++ b/releng.wtpbuilder/components/servadapt_tests/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,62 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	              <condition
-	                  property="getprereq.dltk">
-	                  <istrue
-	                      value="false"/>
-	              </condition>	            	
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -104,12 +103,12 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="eclipseTestFramework"/>
+        </antcall>
     </target>
     <target
         name="prereq.eclipse"
@@ -211,16 +210,16 @@
                 value="wtp"/>
         </antcall>
     </target>
-              <target
-                  name="prereq.dltk"
-                  if="getprereq.dltk">
-                  <antcall
-                      target="getAndInstall">
-                      <param
-                          name="groupId"
-                          value="dltk"/>
-                  </antcall>
-              </target>            	
+    <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
     <target
         name="getAndInstall"
         if="${groupId}.url">
diff --git a/releng.wtpbuilder/components/vex/customTargets.xml b/releng.wtpbuilder/components/vex/customTargets.xml
index 7f897b1..4675cba 100644
--- a/releng.wtpbuilder/components/vex/customTargets.xml
+++ b/releng.wtpbuilder/components/vex/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.xml.vex.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/vex/dependency.xml b/releng.wtpbuilder/components/vex/dependency.xml
index caafe1f..3870f49 100644
--- a/releng.wtpbuilder/components/vex/dependency.xml
+++ b/releng.wtpbuilder/components/vex/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,7 +19,6 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
     <condition
         property="getprereq.eclipse">
         <istrue
@@ -70,6 +69,11 @@
         <istrue
             value="false"/>
     </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -99,6 +103,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
     </target>
     <target
         name="prereq.eclipse"
@@ -201,6 +207,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/vex_sdk/customTargets.xml b/releng.wtpbuilder/components/vex_sdk/customTargets.xml
index 546386b..b1200e9 100644
--- a/releng.wtpbuilder/components/vex_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/vex_sdk/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.xml.vex_sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/vex_sdk/dependency.xml b/releng.wtpbuilder/components/vex_sdk/dependency.xml
index 20bc365..3870f49 100644
--- a/releng.wtpbuilder/components/vex_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/vex_sdk/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,58 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	            	
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -100,6 +103,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
     </target>
     <target
         name="prereq.eclipse"
@@ -202,6 +207,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/vex_tests/customTargets.xml b/releng.wtpbuilder/components/vex_tests/customTargets.xml
index f307af1..e081b5a 100644
--- a/releng.wtpbuilder/components/vex_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/vex_tests/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
+    <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
+        <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
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.xml.vex_tests.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/vex_tests/dependency.xml b/releng.wtpbuilder/components/vex_tests/dependency.xml
index 2b856ef..eeb5870 100644
--- a/releng.wtpbuilder/components/vex_tests/dependency.xml
+++ b/releng.wtpbuilder/components/vex_tests/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,57 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -99,12 +103,12 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="eclipseTestFramework"/>
+        </antcall>
     </target>
     <target
         name="prereq.eclipse"
@@ -207,6 +211,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/wstfproj/build.properties b/releng.wtpbuilder/components/wstfproj/build.properties
index 1232026..5bed879 100644
--- a/releng.wtpbuilder/components/wstfproj/build.properties
+++ b/releng.wtpbuilder/components/wstfproj/build.properties
@@ -43,3 +43,5 @@
 
 flattenDependencies=true
 parallelCompilation=true
+
+
diff --git a/releng.wtpbuilder/components/wstfproj/customTargets.xml b/releng.wtpbuilder/components/wstfproj/customTargets.xml
index 253bb35..bc0851e 100644
--- a/releng.wtpbuilder/components/wstfproj/customTargets.xml
+++ b/releng.wtpbuilder/components/wstfproj/customTargets.xml
@@ -295,6 +295,42 @@
                     name="**/*.log.zip"/>
             </fileset>
         </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
     </target>
     <target
         name="clean"
diff --git a/releng.wtpbuilder/components/wstfproj/dependency.xml b/releng.wtpbuilder/components/wstfproj/dependency.xml
index 350dbac..c942bb3 100644
--- a/releng.wtpbuilder/components/wstfproj/dependency.xml
+++ b/releng.wtpbuilder/components/wstfproj/dependency.xml
@@ -8,6 +8,72 @@
 <project
     name="test"
     default="get">
+    <property
+        environment="env"/>
+    <!-- required to get proper value of dropinsFolder -->
+    <property
+        name="keyCfgFile"
+        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
+    <echo
+        level="debug"
+        message="keyCfgFile: ${keyCfgFile}"/>
+    <property
+        file="${keyCfgFile}"/>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -18,38 +84,136 @@
         <property
             file="${dependency.properties}"/>
         <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
+            target="prereq.eclipse"/>
         <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
+            target="prereq.eclipseplatform"/>
         <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
+            target="prereq.emf"/>
+        <antcall
+            target="prereq.emfxsd"/>
+        <antcall
+            target="prereq.emfvalidation"/>
+        <antcall
+            target="prereq.gef"/>
+        <antcall
+            target="prereq.dtp"/>
+        <antcall
+            target="prereq.wst"/>
+        <antcall
+            target="prereq.jst"/>
+        <antcall
+            target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
+    </target>
+    <target
+        name="prereq.eclipse"
+        if="getprereq.eclipse">
         <antcall
             target="getAndInstall">
             <param
                 name="groupId"
                 value="eclipse"/>
         </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
+    </target>
+    <target
+        name="prereq.eclipseplatform"
+        if="getprereq.eclipseplatform">
         <antcall
             target="getAndInstall">
             <param
                 name="groupId"
-                value=""/>
+                value="eclipseplatform"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.emf"
+        if="getprereq.emf">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="emf"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.emfxsd"
+        if="getprereq.emfxsd">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="emfxsd"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.emfvalidation"
+        if="getprereq.emfvalidation">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="emfvalidation"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.gef"
+        if="getprereq.gef">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="gef"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.dtp"
+        if="getprereq.dtp">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dtp"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.wst"
+        if="getprereq.wst">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="wst"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.jst"
+        if="getprereq.jst">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="jst"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.wtp"
+        if="getprereq.wtp">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="wtp"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
         </antcall>
     </target>
     <target
diff --git a/releng.wtpbuilder/components/wstfproj_sdk/build.properties b/releng.wtpbuilder/components/wstfproj_sdk/build.properties
index fef57d7..5bed879 100644
--- a/releng.wtpbuilder/components/wstfproj_sdk/build.properties
+++ b/releng.wtpbuilder/components/wstfproj_sdk/build.properties
@@ -42,4 +42,6 @@
 # http://aniefer.blogspot.com/2008/10/sorting-bundles-and-parallel.html
 
 flattenDependencies=true
-parallelCompilation=true
\ No newline at end of file
+parallelCompilation=true
+
+
diff --git a/releng.wtpbuilder/components/wstfproj_sdk/customTargets.xml b/releng.wtpbuilder/components/wstfproj_sdk/customTargets.xml
index 1245350..a1b4cb8 100644
--- a/releng.wtpbuilder/components/wstfproj_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/wstfproj_sdk/customTargets.xml
@@ -295,6 +295,42 @@
                     name="**/*.log.zip"/>
             </fileset>
         </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
     </target>
     <target
         name="clean"
diff --git a/releng.wtpbuilder/components/wstfproj_sdk/dependency.xml b/releng.wtpbuilder/components/wstfproj_sdk/dependency.xml
index ed8fe66..c942bb3 100644
--- a/releng.wtpbuilder/components/wstfproj_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/wstfproj_sdk/dependency.xml
@@ -8,38 +8,212 @@
 <project
     name="test"
     default="get">
+    <property
+        environment="env"/>
+    <!-- required to get proper value of dropinsFolder -->
+    <property
+        name="keyCfgFile"
+        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
+    <echo
+        level="debug"
+        message="keyCfgFile: ${keyCfgFile}"/>
+    <property
+        file="${keyCfgFile}"/>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
             read in this properties, just so we can make sure our
-            requested pre-reqs are defined
+            requested pre-reqs are defined, which we do later with
+            statements such if="${groupId}.url"
         -->
         <property
             file="${dependency.properties}"/>
         <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="orbitthirdpartymap"/>
-            <param
-                name="base.install.dir"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/"/>
-        </antcall>
+            target="prereq.eclipse"/>
+        <antcall
+            target="prereq.eclipseplatform"/>
+        <antcall
+            target="prereq.emf"/>
+        <antcall
+            target="prereq.emfxsd"/>
+        <antcall
+            target="prereq.emfvalidation"/>
+        <antcall
+            target="prereq.gef"/>
+        <antcall
+            target="prereq.dtp"/>
+        <antcall
+            target="prereq.wst"/>
+        <antcall
+            target="prereq.jst"/>
+        <antcall
+            target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
+    </target>
+    <target
+        name="prereq.eclipse"
+        if="getprereq.eclipse">
         <antcall
             target="getAndInstall">
             <param
                 name="groupId"
                 value="eclipse"/>
         </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
+    </target>
+    <target
+        name="prereq.eclipseplatform"
+        if="getprereq.eclipseplatform">
         <antcall
             target="getAndInstall">
             <param
                 name="groupId"
-                value=""/>
+                value="eclipseplatform"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.emf"
+        if="getprereq.emf">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="emf"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.emfxsd"
+        if="getprereq.emfxsd">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="emfxsd"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.emfvalidation"
+        if="getprereq.emfvalidation">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="emfvalidation"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.gef"
+        if="getprereq.gef">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="gef"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.dtp"
+        if="getprereq.dtp">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dtp"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.wst"
+        if="getprereq.wst">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="wst"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.jst"
+        if="getprereq.jst">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="jst"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.wtp"
+        if="getprereq.wtp">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="wtp"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
         </antcall>
     </target>
     <target
diff --git a/releng.wtpbuilder/components/wtpcap/build.properties b/releng.wtpbuilder/components/wtpcap/build.properties
index 1232026..5bed879 100644
--- a/releng.wtpbuilder/components/wtpcap/build.properties
+++ b/releng.wtpbuilder/components/wtpcap/build.properties
@@ -43,3 +43,5 @@
 
 flattenDependencies=true
 parallelCompilation=true
+
+
diff --git a/releng.wtpbuilder/components/wtpcap/customTargets.xml b/releng.wtpbuilder/components/wtpcap/customTargets.xml
index ef0eaaa..660d6c8 100644
--- a/releng.wtpbuilder/components/wtpcap/customTargets.xml
+++ b/releng.wtpbuilder/components/wtpcap/customTargets.xml
@@ -295,6 +295,42 @@
                     name="**/*.log.zip"/>
             </fileset>
         </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
     </target>
     <target
         name="clean"
diff --git a/releng.wtpbuilder/components/wtpcap/dependency.xml b/releng.wtpbuilder/components/wtpcap/dependency.xml
index 11ce1ec..c942bb3 100644
--- a/releng.wtpbuilder/components/wtpcap/dependency.xml
+++ b/releng.wtpbuilder/components/wtpcap/dependency.xml
@@ -8,6 +8,72 @@
 <project
     name="test"
     default="get">
+    <property
+        environment="env"/>
+    <!-- required to get proper value of dropinsFolder -->
+    <property
+        name="keyCfgFile"
+        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
+    <echo
+        level="debug"
+        message="keyCfgFile: ${keyCfgFile}"/>
+    <property
+        file="${keyCfgFile}"/>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -18,33 +84,101 @@
         <property
             file="${dependency.properties}"/>
         <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
+            target="prereq.eclipse"/>
         <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
+            target="prereq.eclipseplatform"/>
         <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
+            target="prereq.emf"/>
+        <antcall
+            target="prereq.emfxsd"/>
+        <antcall
+            target="prereq.emfvalidation"/>
+        <antcall
+            target="prereq.gef"/>
+        <antcall
+            target="prereq.dtp"/>
+        <antcall
+            target="prereq.wst"/>
+        <antcall
+            target="prereq.jst"/>
+        <antcall
+            target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
+    </target>
+    <target
+        name="prereq.eclipse"
+        if="getprereq.eclipse">
         <antcall
             target="getAndInstall">
             <param
                 name="groupId"
                 value="eclipse"/>
         </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
+    </target>
+    <target
+        name="prereq.eclipseplatform"
+        if="getprereq.eclipseplatform">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="eclipseplatform"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.emf"
+        if="getprereq.emf">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="emf"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.emfxsd"
+        if="getprereq.emfxsd">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="emfxsd"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.emfvalidation"
+        if="getprereq.emfvalidation">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="emfvalidation"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.gef"
+        if="getprereq.gef">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="gef"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.dtp"
+        if="getprereq.dtp">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dtp"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.wst"
+        if="getprereq.wst">
         <antcall
             target="getAndInstall">
             <param
@@ -53,6 +187,36 @@
         </antcall>
     </target>
     <target
+        name="prereq.jst"
+        if="getprereq.jst">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="jst"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.wtp"
+        if="getprereq.wtp">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="wtp"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/wtpjee/build.properties b/releng.wtpbuilder/components/wtpjee/build.properties
index 1232026..5bed879 100644
--- a/releng.wtpbuilder/components/wtpjee/build.properties
+++ b/releng.wtpbuilder/components/wtpjee/build.properties
@@ -43,3 +43,5 @@
 
 flattenDependencies=true
 parallelCompilation=true
+
+
diff --git a/releng.wtpbuilder/components/wtpjee/customTargets.xml b/releng.wtpbuilder/components/wtpjee/customTargets.xml
index 396ad88..bcbfee5 100644
--- a/releng.wtpbuilder/components/wtpjee/customTargets.xml
+++ b/releng.wtpbuilder/components/wtpjee/customTargets.xml
@@ -295,6 +295,42 @@
                     name="**/*.log.zip"/>
             </fileset>
         </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
     </target>
     <target
         name="clean"
diff --git a/releng.wtpbuilder/components/wtpjee/dependency.xml b/releng.wtpbuilder/components/wtpjee/dependency.xml
index 350dbac..00b2f88 100644
--- a/releng.wtpbuilder/components/wtpjee/dependency.xml
+++ b/releng.wtpbuilder/components/wtpjee/dependency.xml
@@ -8,6 +8,72 @@
 <project
     name="test"
     default="get">
+    <property
+        environment="env"/>
+    <!-- required to get proper value of dropinsFolder -->
+    <property
+        name="keyCfgFile"
+        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
+    <echo
+        level="debug"
+        message="keyCfgFile: ${keyCfgFile}"/>
+    <property
+        file="${keyCfgFile}"/>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -18,38 +84,136 @@
         <property
             file="${dependency.properties}"/>
         <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emf"/>
-        </antcall>
+            target="prereq.eclipse"/>
         <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="emfxsd"/>
-        </antcall>
+            target="prereq.eclipseplatform"/>
         <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="gef"/>
-        </antcall>
+            target="prereq.emf"/>
+        <antcall
+            target="prereq.emfxsd"/>
+        <antcall
+            target="prereq.emfvalidation"/>
+        <antcall
+            target="prereq.gef"/>
+        <antcall
+            target="prereq.dtp"/>
+        <antcall
+            target="prereq.wst"/>
+        <antcall
+            target="prereq.jst"/>
+        <antcall
+            target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
+    </target>
+    <target
+        name="prereq.eclipse"
+        if="getprereq.eclipse">
         <antcall
             target="getAndInstall">
             <param
                 name="groupId"
                 value="eclipse"/>
         </antcall>
-        <!--
-            <antcall target="getAndInstall"> <param name="groupId"
-            value="dtp"/> </antcall>
-        -->
+    </target>
+    <target
+        name="prereq.eclipseplatform"
+        if="getprereq.eclipseplatform">
         <antcall
             target="getAndInstall">
             <param
                 name="groupId"
-                value=""/>
+                value="eclipseplatform"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.emf"
+        if="getprereq.emf">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="emf"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.emfxsd"
+        if="getprereq.emfxsd">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="emfxsd"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.emfvalidation"
+        if="getprereq.emfvalidation">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="emfvalidation"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.gef"
+        if="getprereq.gef">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="gef"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.dtp"
+        if="getprereq.dtp">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dtp"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.wst"
+        if="getprereq.wst">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="wst"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.jst"
+        if="getprereq.jst">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="jst"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.wtp"
+        if="getprereq.wtp">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="wtp"/>
+        </antcall>
+    </target>
+    <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
         </antcall>
     </target>
     <target
diff --git a/releng.wtpbuilder/components/xml/customTargets.xml b/releng.wtpbuilder/components/xml/customTargets.xml
index 32116ae..098c3cd 100644
--- a/releng.wtpbuilder/components/xml/customTargets.xml
+++ b/releng.wtpbuilder/components/xml/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.xml_ui.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/xml/dependency.xml b/releng.wtpbuilder/components/xml/dependency.xml
index 6a3c909..d9306a5 100644
--- a/releng.wtpbuilder/components/xml/dependency.xml
+++ b/releng.wtpbuilder/components/xml/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,7 +19,6 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
     <condition
         property="getprereq.eclipse">
         <istrue
@@ -70,6 +69,11 @@
         <istrue
             value="false"/>
     </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -99,6 +103,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
     </target>
     <target
         name="prereq.eclipse"
@@ -201,6 +207,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/xml_sdk/customTargets.xml b/releng.wtpbuilder/components/xml_sdk/customTargets.xml
index 4f29c6d..8f86518 100644
--- a/releng.wtpbuilder/components/xml_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/xml_sdk/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.xml_sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/xml_sdk/dependency.xml b/releng.wtpbuilder/components/xml_sdk/dependency.xml
index 3bd8587..d9306a5 100644
--- a/releng.wtpbuilder/components/xml_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/xml_sdk/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,58 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	            	
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -100,6 +103,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
     </target>
     <target
         name="prereq.eclipse"
@@ -202,6 +207,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/xml_tests/customTargets.xml b/releng.wtpbuilder/components/xml_tests/customTargets.xml
index 63deb40..104f530 100644
--- a/releng.wtpbuilder/components/xml_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/xml_tests/customTargets.xml
@@ -67,7 +67,7 @@
                 value="feature"/>
             <property
                 name="id"
-                value="org.eclipse.wst.xml_tests_ui.feature"/>
+                value="org.eclipse.wst.xml_tests.feature"/>
         </ant>
     </target>
     <!--
@@ -78,7 +78,7 @@
         each configuration
     -->
     <target
-        name="assemble.org.eclipse.wst.xml_tests_ui.feature">
+        name="assemble.org.eclipse.wst.xml_tests.feature">
         <property
             name="archiveName"
             value="wtp-xml-tests-${buildLabel}.zip"/>
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
+    <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
+        <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/org.eclipse.wst.xml_tests_ui.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+            <fileset
+                dir="${buildDirectory}/features/org.eclipse.wst.xml_tests.feature">
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/xml_tests/dependency.xml b/releng.wtpbuilder/components/xml_tests/dependency.xml
index 3c7e543..2f25f02 100644
--- a/releng.wtpbuilder/components/xml_tests/dependency.xml
+++ b/releng.wtpbuilder/components/xml_tests/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,57 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -99,12 +103,12 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="eclipseTestFramework"/>
+        </antcall>
     </target>
     <target
         name="prereq.eclipse"
@@ -207,6 +211,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/xmlsec/customTargets.xml b/releng.wtpbuilder/components/xmlsec/customTargets.xml
index 8ffb65a..1a04d20 100644
--- a/releng.wtpbuilder/components/xmlsec/customTargets.xml
+++ b/releng.wtpbuilder/components/xmlsec/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.xml.security.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/xmlsec/dependency.xml b/releng.wtpbuilder/components/xmlsec/dependency.xml
index caafe1f..3870f49 100644
--- a/releng.wtpbuilder/components/xmlsec/dependency.xml
+++ b/releng.wtpbuilder/components/xmlsec/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,7 +19,6 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
     <condition
         property="getprereq.eclipse">
         <istrue
@@ -70,6 +69,11 @@
         <istrue
             value="false"/>
     </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -99,6 +103,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
     </target>
     <target
         name="prereq.eclipse"
@@ -201,6 +207,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/xmlsec_sdk/customTargets.xml b/releng.wtpbuilder/components/xmlsec_sdk/customTargets.xml
index d09f1b8..e61d564 100644
--- a/releng.wtpbuilder/components/xmlsec_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/xmlsec_sdk/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
-	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-	        <echo
-	            level="debug"
-	            message="logExtension: ${logExtension}"/>
-	        <antcall
-	            target="allElements">
-	            <param
-	                name="target"
-	                value="gatherLogs"/>
-	            <param
-	                name="logExtension"
-	                value="${logExtension}"/>
-	        </antcall>
-	        <unzip
-	            dest="${buildDirectory}/${buildLabel}/compilelogs"
-	            overwrite="true">
-	            <fileset
+    <target
+        name="gatherLogs"
+        if="logsAvailable">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+        <echo
+            level="debug"
+            message="logExtension: ${logExtension}"/>
+        <antcall
+            target="allElements">
+            <param
+                name="target"
+                value="gatherLogs"/>
+            <param
+                name="logExtension"
+                value="${logExtension}"/>
+        </antcall>
+        <unzip
+            dest="${buildDirectory}/${buildLabel}/compilelogs"
+            overwrite="true">
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.xml.security_sdk.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml b/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml
index 20bc365..3870f49 100644
--- a/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/xmlsec_sdk/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,58 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	            	
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -100,6 +103,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+        <antcall
+            target="prereq.dltk"/>
     </target>
     <target
         name="prereq.eclipse"
@@ -202,6 +207,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/components/xmlsec_tests/customTargets.xml b/releng.wtpbuilder/components/xmlsec_tests/customTargets.xml
index d1d4683..14264c7 100644
--- a/releng.wtpbuilder/components/xmlsec_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/xmlsec_tests/customTargets.xml
@@ -269,70 +269,69 @@
     <!--
       Helper targets
     -->
-	    <target
-	        name="gatherLogs"
-	        if="logsAvailable">
-	        <mkdir
+    <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
+        <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
+            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.xml.security_tests.feature">
-	                <include
-	                    name="**/*.log.zip"/>
-	            </fileset>
-	        </unzip>
-	        <!--
-	            TODO: it is unclear if the above "gather" and unzip do
-	            anything constructive. I think not and should be removed
-	            (after experimental run, of course.
-	        -->
-	        <!--
-	            workaround: see
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
-	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
-	        -->
-	        <copy
-	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
-	            overwrite="true">
-	            <!--
-	                we want all @dot.xml files, but assumes a certain
-	                structure, to include directory for name of plugin
-	            -->
-	            <fileset
-	                dir="${buildDirectory}/features/">
-	                <include
-	                    name="**/feature.temp.folder/"/>
-	                <exclude
-	                    name="**/*tests*feature*/feature.temp.folder/" />
-	                     
-	            </fileset>
-	            <compositemapper>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/@dot.xml"
-	                    to="/\2/@dot.xml"/>
-	                <mapper
-	                    type="regexp"
-	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
-	                    to="/\2/\3bin.xml"/>
-	            </compositemapper>
-	        </copy>
-	    </target>
+                <include
+                    name="**/*.log.zip"/>
+            </fileset>
+        </unzip>
+        <!--
+            TODO: it is unclear if the above "gather" and unzip do
+            anything constructive. I think not and should be removed
+            (after experimental run, of course.
+        -->
+        <!--
+            workaround: see
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+        -->
+        <copy
+            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
+            overwrite="true">
+            <!--
+                we want all @dot.xml files, but assumes a certain
+                structure, to include directory for name of plugin
+            -->
+            <fileset
+                dir="${buildDirectory}/features/">
+                <include
+                    name="**/feature.temp.folder/"/>
+                <exclude
+                    name="**/*tests*feature*/feature.temp.folder/"/>
+            </fileset>
+            <compositemapper>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/@dot.xml"
+                    to="/\2/@dot.xml"/>
+                <mapper
+                    type="regexp"
+                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+                    to="/\2/\3bin.xml"/>
+            </compositemapper>
+        </copy>
+    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/xmlsec_tests/dependency.xml b/releng.wtpbuilder/components/xmlsec_tests/dependency.xml
index 2b856ef..eeb5870 100644
--- a/releng.wtpbuilder/components/xmlsec_tests/dependency.xml
+++ b/releng.wtpbuilder/components/xmlsec_tests/dependency.xml
@@ -8,7 +8,7 @@
 <project
     name="test"
     default="get">
-        <property
+    <property
         environment="env"/>
     <!-- required to get proper value of dropinsFolder -->
     <property
@@ -19,57 +19,61 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -99,12 +103,12 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
-       <antcall
-           target="getAndInstall">
-           <param
-               name="groupId"
-               value="eclipseTestFramework"/>    
-       	</antcall>
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="eclipseTestFramework"/>
+        </antcall>
     </target>
     <target
         name="prereq.eclipse"
@@ -207,6 +211,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstall"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/distribution/dali.site/publish.xml b/releng.wtpbuilder/distribution/dali.site/publish.xml
index 6ce8920..56249f6 100644
--- a/releng.wtpbuilder/distribution/dali.site/publish.xml
+++ b/releng.wtpbuilder/distribution/dali.site/publish.xml
@@ -222,20 +222,20 @@
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php" />
     </target>
     <target
-        name="updateSite">
+        name="repository">
 
 
 		<!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true" />
 		<!-- get the ${buildDirectory}/finalPluginsVersions.properties, and 
             read as properties -->
 		<!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wst@"
diff --git a/releng.wtpbuilder/distribution/jaxws.site/build.xml b/releng.wtpbuilder/distribution/jaxws.site/build.xml
index b226b12..195353b 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/build.xml
+++ b/releng.wtpbuilder/distribution/jaxws.site/build.xml
@@ -24,7 +24,8 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
diff --git a/releng.wtpbuilder/distribution/jaxws.site/publish.xml b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
index 71afb65..fe3faf8 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
@@ -255,13 +255,13 @@
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
     <target
-        name="updateSite">
+        name="repository">
 
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true"/>
         <!--
@@ -270,7 +270,7 @@
         -->
         <!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wtp@"
@@ -788,11 +788,6 @@
             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@"
@@ -817,5 +812,29 @@
             file="${resultingIndex}"
             token="@dtpDescription@"
             value="${dtp.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkFile@"
+            value="${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkURL@"
+            value="${dltk.url}/${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkBuildHome@"
+            value="${dltk.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltk.mirror.prefixuri@"
+            value="${dltk.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkName@"
+            value="${dltk.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkDescription@"
+            value="${dltk.description}"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
index 2df61b0..5a1e011 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
@@ -124,6 +124,12 @@
 $dtpName="@dtpName@";
 $dtpDescription="@dtpDescription@";
 
+$dltkURL="@dltkURL@";
+$dltkFile="@dltkFile@";
+$dltkMirrorPrefixuri="@dltk.mirror.prefixuri@";
+$dltkBuildHome="@dltkBuildHome@";
+$dltkName="@dltkName@";
+$dltkDescription="@dltkDescription@";
 
 $eclipserelengFile="@eclipserelengFile@";
 $eclipserelengURL="@eclipserelengURL@";
@@ -143,6 +149,7 @@
 $prereq_wst="false";
 $prereq_jst="false";
 $prereq_wtp="true";
+$prereq_dltk="false";
 
 
 include("miscUtil.php");
@@ -548,6 +555,23 @@
 			echo " </tr>";
 		}
 		?>
+              <?php
+              if ("true" === $prereq_dltk) {
+                     echo "<tr valign=\"top\">";
+                     echo "<td width=\"10%\"></td>";
+                     echo "<td>";
+
+                     echo $dltkName . "&nbsp;" . $dltkDescription;
+
+                     echo "</td>";
+                     echo "<td align=\"right\">";
+
+                     echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
+                     echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
+
+                     echo " </tr>";
+              }
+              ?>		
 			<tr valign="middle">
 				<td width="10%"></td>
 				<td colspan="2">
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml b/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
index 0201e19..1890bd2 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
@@ -78,6 +78,11 @@
         <istrue
             value="true"/>
     </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -103,6 +108,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+    	 <antcall
+    	     target="prereq.dltk"/>
         <antcall
             target="getAndInstallBase">
             <param
@@ -217,6 +224,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstallDropins">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstallBase"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/distribution/jsdt.site/build.xml b/releng.wtpbuilder/distribution/jsdt.site/build.xml
index b226b12..195353b 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/build.xml
@@ -24,7 +24,8 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
diff --git a/releng.wtpbuilder/distribution/jsdt.site/publish.xml b/releng.wtpbuilder/distribution/jsdt.site/publish.xml
index 71afb65..fe3faf8 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/publish.xml
@@ -255,13 +255,13 @@
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
     <target
-        name="updateSite">
+        name="repository">
 
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true"/>
         <!--
@@ -270,7 +270,7 @@
         -->
         <!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wtp@"
@@ -788,11 +788,6 @@
             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@"
@@ -817,5 +812,29 @@
             file="${resultingIndex}"
             token="@dtpDescription@"
             value="${dtp.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkFile@"
+            value="${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkURL@"
+            value="${dltk.url}/${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkBuildHome@"
+            value="${dltk.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltk.mirror.prefixuri@"
+            value="${dltk.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkName@"
+            value="${dltk.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkDescription@"
+            value="${dltk.description}"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
index 3e93c3d..66f6303 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/jsdt.site/templateFiles/index.html.template.php
@@ -124,6 +124,12 @@
 $dtpName="@dtpName@";
 $dtpDescription="@dtpDescription@";
 
+$dltkURL="@dltkURL@";
+$dltkFile="@dltkFile@";
+$dltkMirrorPrefixuri="@dltk.mirror.prefixuri@";
+$dltkBuildHome="@dltkBuildHome@";
+$dltkName="@dltkName@";
+$dltkDescription="@dltkDescription@";
 
 $eclipserelengFile="@eclipserelengFile@";
 $eclipserelengURL="@eclipserelengURL@";
@@ -143,6 +149,7 @@
 $prereq_wst="false";
 $prereq_jst="false";
 $prereq_wtp="false";
+$prereq_dltk="false";
 
 
 include("miscUtil.php");
@@ -548,6 +555,23 @@
 			echo " </tr>";
 		}
 		?>
+              <?php
+              if ("true" === $prereq_dltk) {
+                     echo "<tr valign=\"top\">";
+                     echo "<td width=\"10%\"></td>";
+                     echo "<td>";
+
+                     echo $dltkName . "&nbsp;" . $dltkDescription;
+
+                     echo "</td>";
+                     echo "<td align=\"right\">";
+
+                     echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
+                     echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
+
+                     echo " </tr>";
+              }
+              ?>		
 			<tr valign="middle">
 				<td width="10%"></td>
 				<td colspan="2">
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml b/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml
index c113d4c..19fa41a 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml
@@ -78,6 +78,11 @@
         <istrue
             value="false"/>
     </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -103,6 +108,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+    	 <antcall
+    	     target="prereq.dltk"/>
         <antcall
             target="getAndInstallBase">
             <param
@@ -217,6 +224,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstallDropins">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstallBase"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/distribution/patches.site/publish.xml b/releng.wtpbuilder/distribution/patches.site/publish.xml
index 52fd152..8e0417b 100644
--- a/releng.wtpbuilder/distribution/patches.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches.site/publish.xml
@@ -235,13 +235,13 @@
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
     <target
-        name="updateSite">
+        name="repository">
 
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true"/>
         <!--
@@ -250,7 +250,7 @@
         -->
         <!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wst@"
diff --git a/releng.wtpbuilder/distribution/patches2.site/publish.xml b/releng.wtpbuilder/distribution/patches2.site/publish.xml
index f6abb0a..95bdf2e 100644
--- a/releng.wtpbuilder/distribution/patches2.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches2.site/publish.xml
@@ -219,20 +219,20 @@
 
     </target>
 
-    <target name="updateSite">
+    <target name="repository">
 
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true" />
         <!-- get the ${buildDirectory}/finalPluginsVersions.properties, and 
             read as properties -->
         <!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wst@"
diff --git a/releng.wtpbuilder/distribution/patches3.site/publish.xml b/releng.wtpbuilder/distribution/patches3.site/publish.xml
index 52fd152..8e0417b 100644
--- a/releng.wtpbuilder/distribution/patches3.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches3.site/publish.xml
@@ -235,13 +235,13 @@
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
     <target
-        name="updateSite">
+        name="repository">
 
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true"/>
         <!--
@@ -250,7 +250,7 @@
         -->
         <!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wst@"
diff --git a/releng.wtpbuilder/distribution/pave.site/build.xml b/releng.wtpbuilder/distribution/pave.site/build.xml
index b226b12..195353b 100644
--- a/releng.wtpbuilder/distribution/pave.site/build.xml
+++ b/releng.wtpbuilder/distribution/pave.site/build.xml
@@ -24,7 +24,8 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
diff --git a/releng.wtpbuilder/distribution/pave.site/publish.xml b/releng.wtpbuilder/distribution/pave.site/publish.xml
index 71afb65..fe3faf8 100644
--- a/releng.wtpbuilder/distribution/pave.site/publish.xml
+++ b/releng.wtpbuilder/distribution/pave.site/publish.xml
@@ -255,13 +255,13 @@
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
     <target
-        name="updateSite">
+        name="repository">
 
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true"/>
         <!--
@@ -270,7 +270,7 @@
         -->
         <!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wtp@"
@@ -788,11 +788,6 @@
             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@"
@@ -817,5 +812,29 @@
             file="${resultingIndex}"
             token="@dtpDescription@"
             value="${dtp.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkFile@"
+            value="${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkURL@"
+            value="${dltk.url}/${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkBuildHome@"
+            value="${dltk.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltk.mirror.prefixuri@"
+            value="${dltk.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkName@"
+            value="${dltk.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkDescription@"
+            value="${dltk.description}"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php
index 04b16bd..0ed49fd 100644
--- a/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php
@@ -124,6 +124,12 @@
 $dtpName="@dtpName@";
 $dtpDescription="@dtpDescription@";
 
+$dltkURL="@dltkURL@";
+$dltkFile="@dltkFile@";
+$dltkMirrorPrefixuri="@dltk.mirror.prefixuri@";
+$dltkBuildHome="@dltkBuildHome@";
+$dltkName="@dltkName@";
+$dltkDescription="@dltkDescription@";
 
 $eclipserelengFile="@eclipserelengFile@";
 $eclipserelengURL="@eclipserelengURL@";
@@ -143,6 +149,7 @@
 $prereq_wst="false";
 $prereq_jst="false";
 $prereq_wtp="true";
+$prereq_dltk="false";
 
 
 include("miscUtil.php");
@@ -548,6 +555,23 @@
 			echo " </tr>";
 		}
 		?>
+              <?php
+              if ("true" === $prereq_dltk) {
+                     echo "<tr valign=\"top\">";
+                     echo "<td width=\"10%\"></td>";
+                     echo "<td>";
+
+                     echo $dltkName . "&nbsp;" . $dltkDescription;
+
+                     echo "</td>";
+                     echo "<td align=\"right\">";
+
+                     echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
+                     echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
+
+                     echo " </tr>";
+              }
+              ?>		
 			<tr valign="middle">
 				<td width="10%"></td>
 				<td colspan="2">
diff --git a/releng.wtpbuilder/distribution/pave.tests/testdependency.xml b/releng.wtpbuilder/distribution/pave.tests/testdependency.xml
index 0547e57..596a82e 100644
--- a/releng.wtpbuilder/distribution/pave.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/pave.tests/testdependency.xml
@@ -78,6 +78,11 @@
         <istrue
             value="true"/>
     </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -103,6 +108,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+    	 <antcall
+    	     target="prereq.dltk"/>
         <antcall
             target="getAndInstallBase">
             <param
@@ -217,6 +224,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstallDropins">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstallBase"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/distribution/servadapt.site/build.xml b/releng.wtpbuilder/distribution/servadapt.site/build.xml
index b226b12..195353b 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/build.xml
+++ b/releng.wtpbuilder/distribution/servadapt.site/build.xml
@@ -24,7 +24,8 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
diff --git a/releng.wtpbuilder/distribution/servadapt.site/publish.xml b/releng.wtpbuilder/distribution/servadapt.site/publish.xml
index 3ef8e14..fe3faf8 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/publish.xml
+++ b/releng.wtpbuilder/distribution/servadapt.site/publish.xml
@@ -255,13 +255,13 @@
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
     <target
-        name="updateSite">
+        name="repository">
 
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true"/>
         <!--
@@ -270,7 +270,7 @@
         -->
         <!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wtp@"
@@ -788,7 +788,6 @@
             file="${resultingIndex}"
             token="@jem.mirror.prefixuri@"
             value="${jem.mirror.prefixuri}"/>
-
         <replace
             file="${resultingIndex}"
             token="@dtpFile@"
@@ -813,31 +812,29 @@
             file="${resultingIndex}"
             token="@dtpDescription@"
             value="${dtp.description}"/>
-    	
-       <replace
-           file="${resultingIndex}"
-           token="@dltkFile@"
-           value="${dltk.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@dltkURL@"
-           value="${dltk.url}/${dltk.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@dltkBuildHome@"
-           value="${dltk.build.home}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@dltk.mirror.prefixuri@"
-           value="${dltk.mirror.prefixuri}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@dltkName@"
-           value="${dltk.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@dltkDescription@"
-           value="${dltk.description}"/>
-    	
+        <replace
+            file="${resultingIndex}"
+            token="@dltkFile@"
+            value="${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkURL@"
+            value="${dltk.url}/${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkBuildHome@"
+            value="${dltk.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltk.mirror.prefixuri@"
+            value="${dltk.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkName@"
+            value="${dltk.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkDescription@"
+            value="${dltk.description}"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml b/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml
index d9c8d31..b5c201f 100644
--- a/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml
@@ -78,12 +78,12 @@
         <istrue
             value="false"/>
     </condition>
-	    <condition
-	        property="getprereq.dltk">
-	        <istrue
-	            value="false"/>
-	    </condition>
-   <target
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
+    <target
         name="get">
         <!--
             read in this properties, just so we can make sure our
@@ -108,6 +108,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+    	 <antcall
+    	     target="prereq.dltk"/>
         <antcall
             target="getAndInstallBase">
             <param
@@ -221,16 +223,16 @@
                 value="wtp"/>
         </antcall>
     </target>
-       <target
-            name="prereq.dltk"
-            if="getprereq.dltk">
-            <antcall
-                target="getAndInstallDropins">
-                <param
-                    name="groupId"
-                    value="dltk"/>
-            </antcall>
-        </target>
+    <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstallDropins">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
     <target
         name="getAndInstallBase"
         if="${groupId}.url">
diff --git a/releng.wtpbuilder/distribution/vex.site/build.xml b/releng.wtpbuilder/distribution/vex.site/build.xml
index b226b12..195353b 100644
--- a/releng.wtpbuilder/distribution/vex.site/build.xml
+++ b/releng.wtpbuilder/distribution/vex.site/build.xml
@@ -24,7 +24,8 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
diff --git a/releng.wtpbuilder/distribution/vex.site/publish.xml b/releng.wtpbuilder/distribution/vex.site/publish.xml
index 71afb65..fe3faf8 100644
--- a/releng.wtpbuilder/distribution/vex.site/publish.xml
+++ b/releng.wtpbuilder/distribution/vex.site/publish.xml
@@ -255,13 +255,13 @@
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
     <target
-        name="updateSite">
+        name="repository">
 
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true"/>
         <!--
@@ -270,7 +270,7 @@
         -->
         <!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wtp@"
@@ -788,11 +788,6 @@
             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@"
@@ -817,5 +812,29 @@
             file="${resultingIndex}"
             token="@dtpDescription@"
             value="${dtp.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkFile@"
+            value="${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkURL@"
+            value="${dltk.url}/${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkBuildHome@"
+            value="${dltk.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltk.mirror.prefixuri@"
+            value="${dltk.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkName@"
+            value="${dltk.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkDescription@"
+            value="${dltk.description}"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php
index bf628ac..be48af3 100644
--- a/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php
@@ -124,6 +124,12 @@
 $dtpName="@dtpName@";
 $dtpDescription="@dtpDescription@";
 
+$dltkURL="@dltkURL@";
+$dltkFile="@dltkFile@";
+$dltkMirrorPrefixuri="@dltk.mirror.prefixuri@";
+$dltkBuildHome="@dltkBuildHome@";
+$dltkName="@dltkName@";
+$dltkDescription="@dltkDescription@";
 
 $eclipserelengFile="@eclipserelengFile@";
 $eclipserelengURL="@eclipserelengURL@";
@@ -143,6 +149,7 @@
 $prereq_wst="true";
 $prereq_jst="false";
 $prereq_wtp="false";
+$prereq_dltk="false";
 
 
 include("miscUtil.php");
@@ -548,6 +555,23 @@
 			echo " </tr>";
 		}
 		?>
+              <?php
+              if ("true" === $prereq_dltk) {
+                     echo "<tr valign=\"top\">";
+                     echo "<td width=\"10%\"></td>";
+                     echo "<td>";
+
+                     echo $dltkName . "&nbsp;" . $dltkDescription;
+
+                     echo "</td>";
+                     echo "<td align=\"right\">";
+
+                     echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
+                     echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
+
+                     echo " </tr>";
+              }
+              ?>		
 			<tr valign="middle">
 				<td width="10%"></td>
 				<td colspan="2">
diff --git a/releng.wtpbuilder/distribution/vex.tests/testdependency.xml b/releng.wtpbuilder/distribution/vex.tests/testdependency.xml
index f2fa436..50e1524 100644
--- a/releng.wtpbuilder/distribution/vex.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/vex.tests/testdependency.xml
@@ -78,6 +78,11 @@
         <istrue
             value="false"/>
     </condition>
+    <condition
+        property="getprereq.dltk">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
@@ -103,6 +108,8 @@
             target="prereq.jst"/>
         <antcall
             target="prereq.wtp"/>
+    	 <antcall
+    	     target="prereq.dltk"/>
         <antcall
             target="getAndInstallBase">
             <param
@@ -217,6 +224,16 @@
         </antcall>
     </target>
     <target
+        name="prereq.dltk"
+        if="getprereq.dltk">
+        <antcall
+            target="getAndInstallDropins">
+            <param
+                name="groupId"
+                value="dltk"/>
+        </antcall>
+    </target>
+    <target
         name="getAndInstallBase"
         if="${groupId}.url">
         <ant
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/build.xml b/releng.wtpbuilder/distribution/wstfproj.site/build.xml
index 1b3b037..195353b 100644
--- a/releng.wtpbuilder/distribution/wstfproj.site/build.xml
+++ b/releng.wtpbuilder/distribution/wstfproj.site/build.xml
@@ -24,6 +24,8 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
@@ -57,7 +59,7 @@
             <jvmarg
                 value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
             <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log"/>
+                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromsitebuild.log"/>
             <arg
                 value="-data"/>
             <arg
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/publish.xml b/releng.wtpbuilder/distribution/wstfproj.site/publish.xml
index 0f35d8d..fe3faf8 100644
--- a/releng.wtpbuilder/distribution/wstfproj.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wstfproj.site/publish.xml
@@ -255,13 +255,13 @@
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
     <target
-        name="updateSite">
+        name="repository">
 
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true"/>
         <!--
@@ -270,7 +270,7 @@
         -->
         <!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wtp@"
@@ -427,6 +427,42 @@
         <!--  Insert PreRequsites  -->
         <replace
             file="${resultingIndex}"
+            token="@eclipseplatformFile@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformURL@"
+            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildURL@"
+            value="${eclipseplatform.url}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilelinux@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilewindows@"
+            value="${eclipseplatform.file.win32-win32-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilemacos@"
+            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildHome@"
+            value="${eclipseplatform.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.mirror.prefixuri@"
+            value="${eclipseplatform.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.fspath.prefix@"
+            value="${eclipseplatform.fspath.prefix}"/>
+        <replace
+            file="${resultingIndex}"
             token="@eclipseFile@"
             value="${eclipse.file.linux-gtk-x86}"/>
         <replace
@@ -495,6 +531,54 @@
             value="${emf.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@emfsourceURL@"
+            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceFile@"
+            value="${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceName@"
+            value="${emfsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceDescription@"
+            value="${emfsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceBuildHome@"
+            value="${emfsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsource.mirror.prefixuri@"
+            value="${emfsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceURL@"
+            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceFile@"
+            value="${emfxsdsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceName@"
+            value="${emfxsdsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceDescription@"
+            value="${emfxsdsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceBuildHome@"
+            value="${emfxsdsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsource.mirror.prefixuri@"
+            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
             token="@emfxsdFile@"
             value="${emfxsd.file}"/>
         <replace
@@ -519,6 +603,62 @@
             value="${emfxsd.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@emfvalidationFile@"
+            value="${emfvalidation.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationURL@"
+            value="${emfvalidation.url}/${emfvalidation.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationBuildHome@"
+            value="${emfvalidation.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidation.mirror.prefixuri@"
+            value="${emfvalidation.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationName@"
+            value="${emfvalidation.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationDescription@"
+            value="${emfvalidation.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceFile@"
+            value="${emfvalidationsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceURL@"
+            value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceBuildHome@"
+            value="${emfvalidationsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsource.mirror.prefixuri@"
+            value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceName@"
+            value="${emfvalidationsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceDescription@"
+            value="${emfvalidationsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstName@"
+            value="${wst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstDescription@"
+            value="${wst.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@wstFile@"
             value="${wst.file}"/>
         <replace
@@ -535,6 +675,14 @@
             value="${wst.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@jstName@"
+            value="${jst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstDescription@"
+            value="${jst.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@jstFile@"
             value="${jst.file}"/>
         <replace
@@ -551,6 +699,14 @@
             value="${jst.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@wtpName@"
+            value="${wtp.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpDescription@"
+            value="${wtp.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@wtpFile@"
             value="${wtp.file}"/>
         <replace
@@ -583,6 +739,14 @@
             value="${gef.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@gefName@"
+            value="${gef.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@gefDescription@"
+            value="${gef.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@eclipserelengFile@"
             value="${eclipsereleng.file}"/>
         <replace
@@ -624,11 +788,6 @@
             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@"
@@ -645,5 +804,37 @@
             file="${resultingIndex}"
             token="@dtp.mirror.prefixuri@"
             value="${dtp.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dtpName@"
+            value="${dtp.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dtpDescription@"
+            value="${dtp.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkFile@"
+            value="${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkURL@"
+            value="${dltk.url}/${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkBuildHome@"
+            value="${dltk.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltk.mirror.prefixuri@"
+            value="${dltk.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkName@"
+            value="${dltk.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkDescription@"
+            value="${dltk.description}"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/buildNotes.php
index e843ecf..f666887 100644
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/buildNotes.php
@@ -27,34 +27,34 @@
 $hasNotes = false;
 $aDirectory = dir("buildnotes");
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
+	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 />";
+		$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];
+		$component = $matches[1];
 
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
+		$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.";
+	echo "<br>There are no build notes for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/consoleLogs.php
index 7dd5f42..2ee3c36 100644
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/consoleLogs.php
@@ -32,15 +32,15 @@
 $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++;
-        }
-    }
+	if ($anEntry != "." && $anEntry != "..") {
+		if (is_file("$rootDir/$anEntry")) {
+			$entries[$index] = $anEntry;
+			$index++;
+		} else if (is_dir("$rootDir/$anEntry")) {
+			$direntries[$dirindex] = $anEntry;
+			$dirindex++;
+		}
+	}
 }
 $aDirectory->close();
 
@@ -49,43 +49,43 @@
 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>";
+	$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");
+	$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.";
+	echo "<br>There are no test logs for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/logIndex.php
index 0b36334..721ca00 100644
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/logIndex.php
@@ -4,79 +4,80 @@
 
 function endsWith( $str, $sub ) {
 
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
 }
 
-        $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
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
+$hasNotes = false;
+$aDirectory = dir(".");
+$index = 0;
+while ($anEntry = $aDirectory->read()) {
+	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+		$entries[$index] = $anEntry;
+		$index++;
+	}
+}
+aDirectory.closedir();
 
 
-        sort($entries);
+sort($entries);
 
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
+for ($i = 0; $i < $index; $i++) {
+	$anEntry = $entries[$i];
+	$logsize = filesize("$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=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
+	if ($level == 0) {
+		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-                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/wstfproj.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/miscUtil.php
index 966ed48..5001f38 100644
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/miscUtil.php
@@ -16,19 +16,19 @@
 	$criteria = 10 * $onemeg;
 	$scaleChar = "M";
 	if (file_exists($filename)) {
-      	$zipfilesize=filesize($filename);
-      	if ($zipfilesize > $criteria) {
-      		$zipfilesize=round($zipfilesize/$onemeg, 0);
-      		$scaleChar = "M";
-      	}
-      	else {
-      		$zipfilesize=round($zipfilesize/$onekilo, 0);
-      		$scaleChar = "K";
-      	}
-  	} 
-  	else {
-  	   $zipfilesize = 0;
-  	}
+		$zipfilesize=filesize($filename);
+		if ($zipfilesize > $criteria) {
+			$zipfilesize=round($zipfilesize/$onemeg, 0);
+			$scaleChar = "M";
+		}
+		else {
+			$zipfilesize=round($zipfilesize/$onekilo, 0);
+			$scaleChar = "K";
+		}
+	}
+	else {
+		$zipfilesize = 0;
+	}
 	$result =  "(" . $zipfilesize . $scaleChar . ")";
 	return $result;
 }
@@ -57,10 +57,10 @@
 	else {
 		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
 		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
+		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+		if (file_exists($wholePath)) {
+			$result = true;
+		}
 	}
 	return $result;
 }
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/report2.php
index 52d2284..cb68e7b 100644
--- a/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/report2.php
+++ b/releng.wtpbuilder/distribution/wstfproj.site/staticDropFiles/report2.php
@@ -1,42 +1,42 @@
 
-        <?php
+<?php
 
 function parse_testResults($filename)
 {
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
+	$junitFailures = 0;
+	if (is_file($filename)) {
+		$handle = @fopen($filename, "r");
+		if ($handle)
+		{
+			$size = filesize($filename);
+			$content = fread($handle, $size);
+			fclose($handle);
+			$junitStart = strpos($content, "Errors &amp; Failures");
+			$junitEnd = strpos($content, "</table>", $junitStart);
+			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
+			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
+			while ($start !== false)
+			{
+				$start += 29;
+				$stop = strpos($junitInfo, "</font></b></td>", $start);
+				if ($stop !== false)
+				{
+					$result = substr($junitInfo, $start, $stop - $start);
+					if (is_numeric($result))
+					{
+						$junitFailures += $result;
+					}
+					else if (strcmp($result, "DNF") == 0)
+					{
+						$junitFailures++;
+					}
+				}
+				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
+			}
+			$results = array($junitFailures);
+			return $results;
+		}
+	}
 }
 
 
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/index.html.template.php
index fd5039f..443d009 100644
--- a/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/wstfproj.site/templateFiles/index.html.template.php
@@ -2,11 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 
-<title>WTP Incubator Downloads</title>
-
-
 <?php
 
+ini_set("display_errors", "true");
+error_reporting (E_ALL);
+
+
 $buildBranch="@buildBranch@";
 $build="@build@";
 $type="@type@";
@@ -23,6 +24,23 @@
 $eclipseFile="@eclipseFile@";
 $eclipseBuildURL="@eclipseBuildURL@";
 $eclipseBuildHome="@eclipseBuildHome@";
+$eclipseName="@eclipseName@";
+$eclipseDescription="@eclipseDescription@";
+
+$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
+$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
+
+$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
+$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
+$eclipseplatformfilemacosx="@eclipseplatformfilemacos@";
+
+$eclipseplatformURL="@eclipseplatformURL@";
+$eclipseplatformFile="@eclipseplatformFile@";
+$eclipseplatformBuildURL="@eclipseplatformBuildURL@";
+$eclipseplatformBuildHome="@eclipseplatformBuildHome@";
+$eclipseplatformName="@eclipseplatformName@";
+$eclipseplatformDescription="@eclipseplatformDescription@";
+
 $testURL="@testURL@";
 $testFile="@testFile@";
 
@@ -30,21 +48,29 @@
 $wstFile="@wstFile@";
 $wstMirrorPrefixuri="@wst.mirror.prefixuri@";
 $wstBuildHome="@wstBuildHome@";
+$wstName="@wstName@";
+$wstDescription="@wstDescription@";
 
 $jstURL="@jstURL@";
 $jstFile="@jstFile@";
 $jstMirrorPrefixuri="@jst.mirror.prefixuri@";
 $jstBuildHome="@jstBuildHome@";
+$jstName="@jstName@";
+$jstDescription="@jstDescription@";
 
 $wtpURL="@wtpURL@";
 $wtpFile="@wtpFile@";
 $wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
 $wtpBuildHome="@wtpBuildHome@";
+$wtpName="@wtpName@";
+$wtpDescription="@wtpDescription@";
 
 $gefURL="@gefURL@";
 $gefFile="@gefFile@";
 $gefMirrorPrefixuri="@gef.mirror.prefixuri@";
 $gefBuildHome="@gefBuildHome@";
+$gefName="@getName@";
+$gefDescription="@gefDescription@";
 
 $emfURL="@emfURL@";
 $emfFile="@emfFile@";
@@ -76,11 +102,34 @@
 $emfxsdsourceDescription="@emfxsdsourceDescription@";
 
 
+$emfvalidationURL="@emfvalidationURL@";
+$emfvalidationFile="@emfvalidationFile@";
+$emfvalidationMirrorPrefixuri="@emfvalidation.mirror.prefixuri@";
+$emfvalidationBuildHome="@emfvalidationBuildHome@";
+$emfvalidationName="@emfvalidationName@";
+$emfvalidationDescription="@emfvalidationDescription@";
+
+$emfvalidationsourceURL="@emfvalidationsourceURL@";
+$emfvalidationsourceFile="@emfvalidationsourceFile@";
+$emfvalidationsourceMirrorPrefixuri="@emfvalidationsource.mirror.prefixuri@";
+$emfvalidationsourceBuildHome="@emfvalidationsourceBuildHome@";
+$emfvalidationsourceName="@emfvalidationsourceName@";
+$emfvalidationsourceDescription="@emfvalidationsourceDescription@";
+
+
 $dtpURL="@dtpURL@";
 $dtpFile="@dtpFile@";
 $dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
 $dtpBuildHome="@dtpBuildHome@";
+$dtpName="@dtpName@";
+$dtpDescription="@dtpDescription@";
 
+$dltkURL="@dltkURL@";
+$dltkFile="@dltkFile@";
+$dltkMirrorPrefixuri="@dltk.mirror.prefixuri@";
+$dltkBuildHome="@dltkBuildHome@";
+$dltkName="@dltkName@";
+$dltkDescription="@dltkDescription@";
 
 $eclipserelengFile="@eclipserelengFile@";
 $eclipserelengURL="@eclipserelengURL@";
@@ -89,16 +138,24 @@
 $orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
 $orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
 
-$incubating="false";
+
+$prereq_eclipse="true";
+$prereq_eclipseplatform="false";
+$prereq_emf="false";
+$prereq_emfxsd="false";
+$prereq_emfvalidation="false";
+$prereq_gef="false";
+$prereq_dtp="false";
+$prereq_wst="false";
+$prereq_jst="false";
+$prereq_wtp="false";
+$prereq_dltk="false";
 
 
 include("miscUtil.php");
 
 
 
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
 
 $debugScript = false;
 $debugFunctions = false;
@@ -121,12 +178,12 @@
 
 $keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wst-common-fproj-sdk-$build.zip";
 if (isMirrored($keytestMirrorString) ) {
-        $mirrorScript=$eclipseMirrorScript;
-        $downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
+	$mirrorScript=$eclipseMirrorScript;
+	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
 }
 
 if ($debugScript)  {
-        echo "inferred platform: " . getPlatform();
+	echo "inferred platform: " . getPlatform();
 }
 
 
@@ -137,59 +194,70 @@
 $displayTestSummary=false;
 if (phpversion() >= 5) {
 
-        $code_totalBundles=0;
-        $code_totalErrors=0;
-        $code_totalWarnings=0;
-        $code_totalforbiddenAccessWarningCount=0;
-        $code_totaldiscouragedAccessWarningCount=0;
-        
-        $test_totalBundles=0;
-        $test_totalErrors=0;
-        $test_totalWarnings=0;
-        $test_totalforbiddenAccessWarningCount=0;
-        $test_totaldiscouragedAccessWarningCount=0;
+	$code_totalBundles=0;
+	$code_totalErrors=0;
+	$code_totalWarnings=0;
+	$code_totalforbiddenAccessWarningCount=0;
+	$code_totaldiscouragedAccessWarningCount=0;
+
+	$test_totalBundles=0;
+	$test_totalErrors=0;
+	$test_totalWarnings=0;
+	$test_totalforbiddenAccessWarningCount=0;
+	$test_totaldiscouragedAccessWarningCount=0;
 
 
-        $displayTestSummary=true;
-        // expecting grandTotalErrors and grandTotalTests
-        $filename = "unitTestsSummary.xml";
-        if (file_exists($filename)) {
-                $prefix = "unitTests_";
-                $unitTestsSummary = simplexml_load_file($filename);
-                foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-                        $name = $summaryItem->name;
-                        $value = $summaryItem->value;
-                        $code= "\$" . $prefix . $name . " = " . $value . ";";
-                        //echo "<br />code: " . $code;
-                        eval($code);
-                }
-        }
+	$displayTestSummary=true;
+	// expecting grandTotalErrors and grandTotalTests
+	$filename = "unitTestsSummary.xml";
+	if (file_exists($filename)) {
+		$prefix = "unitTests_";
+		$unitTestsSummary = simplexml_load_file($filename);
+		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
+			$name = $summaryItem->name;
+			$value = $summaryItem->value;
+			$code= "\$" . $prefix . $name . " = " . $value . ";";
+			//echo "<br />code: " . $code;
+			eval($code);
+		}
+	}
 
-        $filename = "compilelogsSummary.xml";
-        if (file_exists($filename)) {
-          $prefix = "code_";
-          $compileSummary = simplexml_load_file($filename);
-          foreach ($compileSummary->summaryItem as $summaryItem) {
-                  $name = $summaryItem->name;
-                  $value = $summaryItem->value;
-                  $code= "\$" . $prefix . $name . " = " . $value . ";";
-                  //echo "<br />code: " . $code;
-                  eval($code);
-          }
-        }
+	$filename = "compilelogsSummary.xml";
+	if (file_exists($filename)) {
+		$prefix = "code_";
+		$compileSummary = simplexml_load_file($filename);
+		foreach ($compileSummary->summaryItem as $summaryItem) {
+			$name = $summaryItem->name;
+			$value = $summaryItem->value;
+			$code= "\$" . $prefix . $name . " = " . $value . ";";
+			//echo "<br />code: " . $code;
+			eval($code);
+		}
+	}
 
-        $filename = "testcompilelogsSummary.xml";
-        if (file_exists($filename)) {
-          $prefix = "test_";
-          $compileSummary = simplexml_load_file($filename);
-          foreach ($compileSummary->summaryItem as $summaryItem) {
-                  $name = $summaryItem->name;
-                  $value = $summaryItem->value;
-                  $code= "\$" . $prefix . $name . " = " . $value . ";";
-                  //echo "<br />code: " . $code;
-                  eval($code);
-          }
-        }
+	$filename = "testcompilelogsSummary.xml";
+	if (file_exists($filename)) {
+		$prefix = "test_";
+		$compileSummary = simplexml_load_file($filename);
+		foreach ($compileSummary->summaryItem as $summaryItem) {
+			$name = $summaryItem->name;
+			$value = $summaryItem->value;
+			$code= "\$" . $prefix . $name . " = " . $value . ";";
+			//echo "<br />code: " . $code;
+			eval($code);
+		}
+	}
+}
+
+$incubating="false";
+
+
+
+if ($incubating) {
+	echo '<title>WTP Incubator Downloads</title>';
+}
+else {
+	echo '<title>WTP Downloads</title>';
 }
 
 
@@ -207,10 +275,10 @@
 $serverName = $_SERVER["SERVER_NAME"];
 
 if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-        echo '<center>
+	echo '<center>
           <p>
           Reminder: this is <font color="#FF0000">' .
-        $serverName .
+	$serverName .
         '</font>
           See also
           <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
@@ -221,257 +289,446 @@
 }
 ?>
 
-<?php if ($incubating) { ?>
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-        <tr>
-                <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-                Build: <?php echo "$build";?></b></font></td>
-           <td align="right" rowspan="3"><a
-  href="http://www.eclipse.org/projects/what-is-incubation.php"><img
-  src="http://www.eclipse.org/images/egg-incubation.png" alt="Incubation"
-  align="middle" border="0"></a></td>
+<?php if ("true" === $incubating) {
+	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
+	echo "	<tr>";
+	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
+	echo "        Build: $build</b></font></td>";
+	echo "		<td align=\"right\" rowspan=\"3\"><a";
+	echo "			href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
+	echo "			src=\"http://www.eclipse.org/images/egg-incubation.png\"";
+	echo "			alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
 
-        <tr valign="top">
-                <td><font size="-1"><?php echo "$builddate";?></font></td>
-        </tr>
-        <tr valign="top">
-                <td>
-                <p>The Eclipse Web Tools Platform (WTP) Incubator Project provides
-                tools for development that are just getting started, or are
-                experimental in some fashion.</p>
-                </td>
-        </tr>
-</table>
 
-<?php } else { ?>
+	echo "	<tr valign=\"top\">";
+	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
+	echo "	</tr>";
+	echo "	<tr valign=\"top\">";
+	echo "		<td>";
+	echo "		<p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
+	echo "		tools for development that are just getting started, or are";
+	echo "		experimental in some fashion.</p>";
+	echo "		</td>";
+	echo "	</tr>";
+	echo "</table>";
 
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-        <tr>
-                <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-                Build: <?php echo "$build";?></b></font></td>
-           
+} else {
 
-        <tr valign="top">
-                <td><font size="-1"><?php echo "$builddate";?></font></td>
-        </tr>
-        <tr valign="top">
-                <td>
-                <p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>
-                </td>
-        </tr>
-</table>
+	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
+	echo "	<tr>";
+	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
+	echo "		Build: " . $build . "</b></font></td>";
 
-<?php } ?>
+	echo "	<tr valign=\"top\">";
+	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
+	echo "	</tr>";
+	echo "	<tr valign=\"top\">";
+	echo "		<td>";
+	echo "		<p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>";
+	echo "		</td>";
+	echo "	</tr>";
+	echo "</table>";
+
+} ?>
 
 <!-- ***********  Prerequisites **************  -->
 <table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align="left" valign="top" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites and Handy Extras</font></td>
-        </tr>
-        <tr>
-                <td>
-                <p>These are the prerequisites to build or run these packages. 
-                Also listed are some frequently needed links for
-                committer-required packages when creating new development
-                environments, or targets to run against.</p>
-                <p>Note that WTP requires Java 5 or higher (and, for some things,
-                actually requires a JDK rather than only a JRE) even though many other
-                <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-                run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-                JRE levels</a>.</p><p></p>
-                </td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td width="40%">Eclipse Platform (Platform, JDT)</td>
-                                <?php
-                                //customize page depending on user's browser/platform, if we can detect it
-                                $usersPlatform = getPlatform();
-                                // assume windows by default, since likely most frequent, even for cases where
-                                // platform is "unknown". I've noticed Opera reports 'unknown' :(
-                                $recommendedFile=$eclipsefilewindows;
-                                if (strcmp($usersPlatform,"linux")== 0) {
-                                        $recommendedFile=$eclipsefilelinux;
-                                } else if (strcmp($usersPlatform,"mac") == 0) {
-                                        $recommendedFile=$eclipsefilemacosx;
-                                }
-                                ?>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
+	<tr>
+		<td align="left" valign="top" bgcolor="#0080C0"><font
+			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
+		and Handy Extras</font></td>
+	</tr>
+	<tr>
+		<td>
+		<p>These are the prerequisites to build or run these packages. All are
+		not necessarily required, but instead some subset. Also listed are
+		some frequently needed links for committer-required packages when
+		creating new development environments, or targets to run against.</p>
+		<p>Note that WTP requires Java 5 or higher (and, for some things,
+		actually requires a JDK rather than only a JRE) even though many other
+		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
+		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
+		JRE levels</a>.</p>
+		<p></p>
+		</td>
+	</tr>
+	<tr>
+		<td>
+		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
 
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>
-                                <?php 
-                                echo $emfName . "&nbsp;" . $emfDescription ; 
-                                ?>
-                                </td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-                                ?>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>
-                                <?php 
-                                echo $emfxsdName . "&nbsp;" . $emfxsdDescription ; 
-                                ?>
-                                </td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-                                ?>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Graphical Editing Framework (GEF)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="middle">
-                                <td width="10%"></td>
-                                <td colspan="2">
-                                <hr />
-                                </td>
-                        </tr>
+		<?php
+		if ("true" === $prereq_eclipseplatform) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td width=\"40%\">Eclipse Platform</td>";
 
 
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Web Tools Platform portion</td>
-                                <td align="right"><?php
-                                // debug
-                                // echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $wstMirrorPrefixuri . "/" . $wstFile;
-                                $prereqReferenceOrName=getPrereqReferenceOrName($eclipseMirrorScript, $MirrorPrefixuri, $URL, $File, $eclipseFSpathPrefix);
-                                echo $prereqReferenceOrName;
-                                echo " or <a href=\"" . $BuildHome . "\">equivalent</a></td>";
-                                ?>
+			//customize page depending on user's browser/platform, if we can detect it
+			$usersPlatform = getPlatform();
+			// assume windows by default, since likely most frequent, even for cases where
+			// platform is "unknown". I've noticed Opera reports 'unknown' :(
+			$recommendedFile=$eclipseplatformfilewindows;
+			if (strcmp($usersPlatform,"linux")== 0) {
+				$recommendedFile=$eclipseplatformfilelinux;
+			} else if (strcmp($usersPlatform,"mac") == 0) {
+				$recommendedFile=$eclipseplatformfilemacosx;
+			}
 
-                        </tr>
-                        <tr valign="middle">
-                                <td width="10%"></td>
-                                <td colspan="2">
-                                <hr />
-                                </td>
-                        </tr>
+			echo "<td align=\"right\">";
 
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+			echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
 
-                        </tr>
 
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Eclipse releng tool (required only for committers to more easily
-                                "release" code to a build)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
+			echo " </tr>";
+		}
+		?>
 
-                        </tr>
+		<?php
+		if ("true" === $prereq_eclipse) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
 
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Third Party code from Orbit (currently much more than needed
-                                for WTP, but some committers like having the whole heap in their
-                                target)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-                                ?>
 
-                        </tr>
+			//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;
+			}
 
-                </table>
-                </td>
-        </tr>
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
+			echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_emf) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $emfName . "&nbsp;" . $emfDescription ;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
+			echo " </tr>";
+		}
+		?>
+
+
+		<?php
+		if ("true" === $prereq_emfxsd) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_emfvalidation) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_gef) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $gefName  . "&nbsp;" . $gefDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_dtp) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $dtpName . "&nbsp;" . $dtpDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_wst) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $wstName . "&nbsp;" . $wstDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_jst) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $jstName . "&nbsp;" . $jstDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+		<?php
+		if ("true" === $prereq_wtp) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $wtpName . "&nbsp;" . $wtpDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+              <?php
+              if ("true" === $prereq_dltk) {
+                     echo "<tr valign=\"top\">";
+                     echo "<td width=\"10%\"></td>";
+                     echo "<td>";
+
+                     echo $dltkName . "&nbsp;" . $dltkDescription;
+
+                     echo "</td>";
+                     echo "<td align=\"right\">";
+
+                     echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
+                     echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
+
+                     echo " </tr>";
+              }
+              ?>		
+			<tr valign="middle">
+				<td width="10%"></td>
+				<td colspan="2">
+				<hr />
+				</td>
+			</tr>
+
+
+
+			<?php
+			if ("true" === $prereq_emf) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+			<?php
+			if ("true" === $prereq_emfxsd) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+
+			<?php
+			if ("true" === $prereq_emfvalidation) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfvalidationsourceName . "&nbsp;" . $emfvalidationsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+
+			<?php
+			if (true) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo "Eclipse Test Framework (required only for Automated JUnit tests)";
+				echo "</td> ";
+				echo "<td align=\"right\">";
+
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+
+
+			<tr valign="top">
+				<td width="10%"></td>
+				<td>Eclipse releng tool (required only for committers to more easily
+				"release" code to a build)</td>
+				<td align="right"><?php
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+				?>
+			
+			</tr>
+
+			<tr valign="top">
+				<td width="10%"></td>
+				<td>Third Party code from Orbit. Not required and is currently much
+				more than needed for WTP, but some committers like using to create a
+				PDE target.</td>
+				<td align="right"><?php
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
+				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
+				?>
+			
+			</tr>
+
+		</table>
+		</td>
+	</tr>
 </table>
 
 <!-- ***********  WTP **************  -->
 <table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools Platform 
-               Components</font></td>
-        </tr>
+	<tr>
+		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
+			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
+		Platform</font></td>
+	</tr>
 
-        <tr>
-                <td align="left" valign="top" colspan="5">
-                <p>The Zip files includes the features and plugins for non-java Faceted Projects </p>
-                </td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+	<tr>
+		<td align="left" valign="top" colspan="5">
+		<p>The Zip files includes the features and plugins for non-java Faceted Projects </p>
+		</td>
+	</tr>
+	<tr>
+		<td>
+		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
 
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Minimal</b></td>
-                                <td align="left" valign="top">
-                                <p>Executable code only.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wst-common-fproj-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wstfproj";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
+			<tr>
+				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
+				<td align="left" valign="top">
+				<p>Executable code only.</p>
+				</td>
+				<?php
+				$zipfilename="wst-common-fproj-${build}";
+				$filename=$zipfilename.".zip";
+				$zipfilesize=fileSizeForDisplay($filename);
+				$fileShortDescription="wstfproj";
+				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+				?>
+			</tr>
 
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>SDK</b></td>
-                                <td align="left" valign="top">
-                                <p>Executable code and source code.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wst-common-fproj-sdk-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wstfproj sdk";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Tests</b></td>
-                                <td align="left" valign="top">
-                                <p>Unit tests.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wst-common-fproj-tests-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wstfproj tests";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-                </table>
-                </td>
-
-
-        <tr>
+			<tr>
+				<td align="left" valign="top" width="10%"><b>SDK</b></td>
+				<td align="left" valign="top">
+				<p>Executable code and source code.</p>
+				</td>
+				<?php
+				$zipfilename="wst-common-fproj-sdk-${build}";
+				$filename=$zipfilename.".zip";
+				$zipfilesize=fileSizeForDisplay($filename);
+				$fileShortDescription="wstfproj sdk";
+				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+				?>
+			</tr>
+			<tr>
+				<td align="left" valign="top" width="10%"><b>Tests</b></td>
+				<td align="left" valign="top">
+				<p>Unit tests.</p>
+				</td>
+				<?php
+				$zipfilename="wst-common-fproj-tests-${build}";
+				$filename=$zipfilename.".zip";
+				$zipfilesize=fileSizeForDisplay($filename);
+				$fileShortDescription="wstfproj tests";
+				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+				?>
+			</tr>
+		</table>
+		</td>
+	
+	
+	<tr>
 
 </table>
 
@@ -483,114 +740,117 @@
 
 <!-- ***********  Build Status **************  -->
 <table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-                and other interesting details</font></td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+	<tr>
+		<td align=left valign=top bgcolor="#0080C0"><font
+			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
+		and other interesting details</font></td>
+	</tr>
+	<tr>
+		<td>
+		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-                        <tr>
-                                <td><a href="buildNotes.php">Build notes</a> <br />
-                                <a href="directory.txt">map files</a> <br />
-                                <?php
+			<tr>
+				<td><!-- 
+				Its silly to always display 'Build notes', but hard to 
+				compute if required or not. 
+				<a href="buildNotes.php">Build notes</a> <br /> 
+				--> <a href="directory.txt">map files</a> <br />
+				<?php
 
-                                if ($displayTestSummary) {
+				if ($displayTestSummary) {
 
 
-                                        if (isset($unitTests_grandTotalErrors)) {
-                                                $errorColor="green";
-                                                if ($unitTests_grandTotalErrors > 0) {
-                                                        $errorColor="red";
-                                                }
-                                                echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-                                                echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-                                        }
-                                        else {
-                                               // we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.  
-                                               echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-                                               //&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-                                        }
+					if (isset($unitTests_grandTotalErrors)) {
+						$errorColor="green";
+						if ($unitTests_grandTotalErrors > 0) {
+							$errorColor="red";
+						}
+						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
+						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
+					}
+					else {
+						// we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.
+						echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
+						//&nbsp;&nbsp;<img src=\"pending.gif\"/>";
+					}
 
-                                        echo "<br />";
-                                        echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
+					echo "<br />";
+					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
 
-                                        echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-                                        echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-                                        echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-                                        echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-                                        echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
+					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
+					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
+					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
+					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
+					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
 
-                                        echo "<br />";
-                                        echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
+					echo "<br />";
+					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
 
-                                        echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-                                        echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-                                        echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-                                        echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-                                        echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-                                }
+					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
+					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
+					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
+					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
+					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
+				}
 
-                                ?> <br />
+				?> <br />
 
-                                <?php
-                                if (file_exists("versioningReportName.php")) {
-                                        include "versioningReportName.php";
-                                        $fname="${versionReportFilename}.html";
-                                        if (file_exists($fname)) {
-                                                echo "<br /> <a href='$fname'>Versioning Information</a>";
-                                        }
+				<?php
+				if (file_exists("versioningReportName.php")) {
+					include "versioningReportName.php";
+					$fname="${versionReportFilename}.html";
+					if (file_exists($fname)) {
+						echo "<br /> <a href='$fname'>Versioning Information</a>";
+					}
 }
 ?> <?php
 echo "<br />";
 if (file_exists("./apiresults/api-progress.html"))
 {
-        echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
+	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
 }
 if (file_exists("./apiresults/api-info-summary.html"))
 {
-        echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
+	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
 }
 if (file_exists("./apiresults/api-ref-compatibility.html"))
 {
-        echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
+	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
 }
 if (file_exists("./apiresults/api-violation-summary.html"))
 {
-        echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
+	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
 }
 if (file_exists("./apiresults/component-api-violation-all.html"))
 {
-        echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
+	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
 }
 if (file_exists("./apiresults/api-tc-summary.html"))
 {
-        echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
+	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
 }
 if (file_exists("./apiresults/api-javadoc-summary.html"))
 {
-        echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
+	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
 }
 if (file_exists("./apiresults/api-tc-summary.html"))
 {
-        echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
+	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
 }
 ?> <?php
 if (file_exists("./perfresults/graph/performance.php"))
 {
-        echo "<br />";
-        echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-        echo "<br />";
+	echo "<br />";
+	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
+	echo "<br />";
 }
 ?></td>
-                        </tr>
+			</tr>
 
 
-                </table>
-                </td>
-        </tr>
+		</table>
+		</td>
+	</tr>
 </table>
 
 
@@ -599,12 +859,12 @@
 <center>
 <hr>
 <p>All downloads are provided under the terms and conditions of the <a
-        href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
+	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
 User Agreement</a> unless otherwise specified.</p>
 
 <p>If you have problems downloading the drops, contact the <font
-        face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-        href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
+	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
+	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
 
 </center>
 <!-- end footer -->
diff --git a/releng.wtpbuilder/distribution/wstfproj.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/wstfproj.site/transformReportToHTML.xml
index 3e9f35b..b72f6cd 100644
--- a/releng.wtpbuilder/distribution/wstfproj.site/transformReportToHTML.xml
+++ b/releng.wtpbuilder/distribution/wstfproj.site/transformReportToHTML.xml
@@ -6,12 +6,14 @@
     <target
         name="main"
         description="example.@dot.xml to produce example.@dot.html">
-      <xslt
-          destdir="${resultDir}/compilelogs"
-          scanincludeddirectories="true"
-          style="compilerXMLOutputToHTML.xsl"
-          force="true" >
-            <fileset dir="${resultDir}/compilelogs" includes="**/*.xml" />
-      </xslt>
+        <xslt
+            destdir="${resultDir}/compilelogs"
+            scanincludeddirectories="true"
+            style="compilerXMLOutputToHTML.xsl"
+            force="true">
+            <fileset
+                dir="${resultDir}/compilelogs"
+                includes="**/*.xml"/>
+        </xslt>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.build/create311zips.xml b/releng.wtpbuilder/distribution/wtp.build/create311zips.xml
index 71fa8fb..a0dd049 100644
--- a/releng.wtpbuilder/distribution/wtp.build/create311zips.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/create311zips.xml
@@ -62,7 +62,7 @@
             antfile="ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
-            source="${buildDirectory}/${buildLabel}/updateSite"
+            source="${buildDirectory}/${buildLabel}/repository"
             destination="${tempRepo}"
             log="mirrorlog-${buildDirectory}/${buildLabel}/${newarchiveName}.log"
             verbose="true">
@@ -111,7 +111,7 @@
             antfile="ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
-            source="${buildDirectory}/${buildLabel}/updateSite"
+            source="${buildDirectory}/${buildLabel}/repository"
             destination="${tempRepo}"
             log="mirrorlog-${buildDirectory}/${buildLabel}/${newarchiveName}.log"
             verbose="true">
diff --git a/releng.wtpbuilder/distribution/wtp.build/createnoopzips.xml b/releng.wtpbuilder/distribution/wtp.build/createnoopzips.xml
index 0d6928c..f7b0dfc 100644
--- a/releng.wtpbuilder/distribution/wtp.build/createnoopzips.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/createnoopzips.xml
@@ -66,7 +66,7 @@
             antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
-            source="${buildDirectory}/${buildLabel}/updateSite"
+            source="${buildDirectory}/${buildLabel}/repository"
             destination="${tempRepo}"
             log="mirrorlog-${buildDirectory}/${buildLabel}/${newarchiveName}.log"
             verbose="true">
@@ -109,7 +109,7 @@
             antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
-            source="${buildDirectory}/${buildLabel}/updateSite"
+            source="${buildDirectory}/${buildLabel}/repository"
             destination="${tempRepo}"
             log="mirrorlog-${buildDirectory}/${buildLabel}/${newarchiveName}.log"
             verbose="true">
@@ -152,7 +152,7 @@
             antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
-            source="${buildDirectory}/${buildLabel}/updateSite"
+            source="${buildDirectory}/${buildLabel}/repository"
             destination="${tempRepo}"
             log="mirrorlog-${buildDirectory}/${buildLabel}/${newarchiveName}.log"
             verbose="true">
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index e9210f2..39fe525 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -303,13 +303,13 @@
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
     <target
-        name="updateSite">
+        name="repository">
 
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true"/>
         <!--
@@ -318,7 +318,7 @@
         -->
         <!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wst@"
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/build.xml b/releng.wtpbuilder/distribution/wtpcap.site/build.xml
index 1b3b037..195353b 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.site/build.xml
@@ -24,6 +24,8 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
@@ -57,7 +59,7 @@
             <jvmarg
                 value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
             <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log"/>
+                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromsitebuild.log"/>
             <arg
                 value="-data"/>
             <arg
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/publish.xml b/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
index 0f35d8d..fe3faf8 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.site/publish.xml
@@ -255,13 +255,13 @@
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
     <target
-        name="updateSite">
+        name="repository">
 
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true"/>
         <!--
@@ -270,7 +270,7 @@
         -->
         <!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wtp@"
@@ -427,6 +427,42 @@
         <!--  Insert PreRequsites  -->
         <replace
             file="${resultingIndex}"
+            token="@eclipseplatformFile@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformURL@"
+            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildURL@"
+            value="${eclipseplatform.url}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilelinux@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilewindows@"
+            value="${eclipseplatform.file.win32-win32-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilemacos@"
+            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildHome@"
+            value="${eclipseplatform.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.mirror.prefixuri@"
+            value="${eclipseplatform.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.fspath.prefix@"
+            value="${eclipseplatform.fspath.prefix}"/>
+        <replace
+            file="${resultingIndex}"
             token="@eclipseFile@"
             value="${eclipse.file.linux-gtk-x86}"/>
         <replace
@@ -495,6 +531,54 @@
             value="${emf.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@emfsourceURL@"
+            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceFile@"
+            value="${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceName@"
+            value="${emfsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceDescription@"
+            value="${emfsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceBuildHome@"
+            value="${emfsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsource.mirror.prefixuri@"
+            value="${emfsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceURL@"
+            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceFile@"
+            value="${emfxsdsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceName@"
+            value="${emfxsdsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceDescription@"
+            value="${emfxsdsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceBuildHome@"
+            value="${emfxsdsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsource.mirror.prefixuri@"
+            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
             token="@emfxsdFile@"
             value="${emfxsd.file}"/>
         <replace
@@ -519,6 +603,62 @@
             value="${emfxsd.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@emfvalidationFile@"
+            value="${emfvalidation.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationURL@"
+            value="${emfvalidation.url}/${emfvalidation.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationBuildHome@"
+            value="${emfvalidation.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidation.mirror.prefixuri@"
+            value="${emfvalidation.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationName@"
+            value="${emfvalidation.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationDescription@"
+            value="${emfvalidation.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceFile@"
+            value="${emfvalidationsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceURL@"
+            value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceBuildHome@"
+            value="${emfvalidationsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsource.mirror.prefixuri@"
+            value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceName@"
+            value="${emfvalidationsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceDescription@"
+            value="${emfvalidationsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstName@"
+            value="${wst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstDescription@"
+            value="${wst.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@wstFile@"
             value="${wst.file}"/>
         <replace
@@ -535,6 +675,14 @@
             value="${wst.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@jstName@"
+            value="${jst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstDescription@"
+            value="${jst.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@jstFile@"
             value="${jst.file}"/>
         <replace
@@ -551,6 +699,14 @@
             value="${jst.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@wtpName@"
+            value="${wtp.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpDescription@"
+            value="${wtp.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@wtpFile@"
             value="${wtp.file}"/>
         <replace
@@ -583,6 +739,14 @@
             value="${gef.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@gefName@"
+            value="${gef.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@gefDescription@"
+            value="${gef.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@eclipserelengFile@"
             value="${eclipsereleng.file}"/>
         <replace
@@ -624,11 +788,6 @@
             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@"
@@ -645,5 +804,37 @@
             file="${resultingIndex}"
             token="@dtp.mirror.prefixuri@"
             value="${dtp.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dtpName@"
+            value="${dtp.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dtpDescription@"
+            value="${dtp.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkFile@"
+            value="${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkURL@"
+            value="${dltk.url}/${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkBuildHome@"
+            value="${dltk.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltk.mirror.prefixuri@"
+            value="${dltk.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkName@"
+            value="${dltk.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkDescription@"
+            value="${dltk.description}"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/buildNotes.php
index e843ecf..f666887 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/buildNotes.php
@@ -27,34 +27,34 @@
 $hasNotes = false;
 $aDirectory = dir("buildnotes");
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
+	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 />";
+		$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];
+		$component = $matches[1];
 
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
+		$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.";
+	echo "<br>There are no build notes for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/consoleLogs.php
index 7dd5f42..2ee3c36 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/consoleLogs.php
@@ -32,15 +32,15 @@
 $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++;
-        }
-    }
+	if ($anEntry != "." && $anEntry != "..") {
+		if (is_file("$rootDir/$anEntry")) {
+			$entries[$index] = $anEntry;
+			$index++;
+		} else if (is_dir("$rootDir/$anEntry")) {
+			$direntries[$dirindex] = $anEntry;
+			$dirindex++;
+		}
+	}
 }
 $aDirectory->close();
 
@@ -49,43 +49,43 @@
 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>";
+	$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");
+	$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.";
+	echo "<br>There are no test logs for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/logIndex.php
index 0b36334..721ca00 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/logIndex.php
@@ -4,79 +4,80 @@
 
 function endsWith( $str, $sub ) {
 
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
 }
 
-        $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
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
+$hasNotes = false;
+$aDirectory = dir(".");
+$index = 0;
+while ($anEntry = $aDirectory->read()) {
+	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+		$entries[$index] = $anEntry;
+		$index++;
+	}
+}
+aDirectory.closedir();
 
 
-        sort($entries);
+sort($entries);
 
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
+for ($i = 0; $i < $index; $i++) {
+	$anEntry = $entries[$i];
+	$logsize = filesize("$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=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
+	if ($level == 0) {
+		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-                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/wtpcap.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/miscUtil.php
index 966ed48..5001f38 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/miscUtil.php
@@ -16,19 +16,19 @@
 	$criteria = 10 * $onemeg;
 	$scaleChar = "M";
 	if (file_exists($filename)) {
-      	$zipfilesize=filesize($filename);
-      	if ($zipfilesize > $criteria) {
-      		$zipfilesize=round($zipfilesize/$onemeg, 0);
-      		$scaleChar = "M";
-      	}
-      	else {
-      		$zipfilesize=round($zipfilesize/$onekilo, 0);
-      		$scaleChar = "K";
-      	}
-  	} 
-  	else {
-  	   $zipfilesize = 0;
-  	}
+		$zipfilesize=filesize($filename);
+		if ($zipfilesize > $criteria) {
+			$zipfilesize=round($zipfilesize/$onemeg, 0);
+			$scaleChar = "M";
+		}
+		else {
+			$zipfilesize=round($zipfilesize/$onekilo, 0);
+			$scaleChar = "K";
+		}
+	}
+	else {
+		$zipfilesize = 0;
+	}
 	$result =  "(" . $zipfilesize . $scaleChar . ")";
 	return $result;
 }
@@ -57,10 +57,10 @@
 	else {
 		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
 		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
+		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+		if (file_exists($wholePath)) {
+			$result = true;
+		}
 	}
 	return $result;
 }
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/report2.php
index 52d2284..cb68e7b 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/report2.php
+++ b/releng.wtpbuilder/distribution/wtpcap.site/staticDropFiles/report2.php
@@ -1,42 +1,42 @@
 
-        <?php
+<?php
 
 function parse_testResults($filename)
 {
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
+	$junitFailures = 0;
+	if (is_file($filename)) {
+		$handle = @fopen($filename, "r");
+		if ($handle)
+		{
+			$size = filesize($filename);
+			$content = fread($handle, $size);
+			fclose($handle);
+			$junitStart = strpos($content, "Errors &amp; Failures");
+			$junitEnd = strpos($content, "</table>", $junitStart);
+			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
+			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
+			while ($start !== false)
+			{
+				$start += 29;
+				$stop = strpos($junitInfo, "</font></b></td>", $start);
+				if ($stop !== false)
+				{
+					$result = substr($junitInfo, $start, $stop - $start);
+					if (is_numeric($result))
+					{
+						$junitFailures += $result;
+					}
+					else if (strcmp($result, "DNF") == 0)
+					{
+						$junitFailures++;
+					}
+				}
+				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
+			}
+			$results = array($junitFailures);
+			return $results;
+		}
+	}
 }
 
 
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/index.html.template.php
index 31dbec1..d91a467 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/wtpcap.site/templateFiles/index.html.template.php
@@ -2,11 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 
-<title>WTP Incubator Downloads</title>
-
-
 <?php
 
+ini_set("display_errors", "true");
+error_reporting (E_ALL);
+
+
 $buildBranch="@buildBranch@";
 $build="@build@";
 $type="@type@";
@@ -23,6 +24,23 @@
 $eclipseFile="@eclipseFile@";
 $eclipseBuildURL="@eclipseBuildURL@";
 $eclipseBuildHome="@eclipseBuildHome@";
+$eclipseName="@eclipseName@";
+$eclipseDescription="@eclipseDescription@";
+
+$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
+$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
+
+$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
+$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
+$eclipseplatformfilemacosx="@eclipseplatformfilemacos@";
+
+$eclipseplatformURL="@eclipseplatformURL@";
+$eclipseplatformFile="@eclipseplatformFile@";
+$eclipseplatformBuildURL="@eclipseplatformBuildURL@";
+$eclipseplatformBuildHome="@eclipseplatformBuildHome@";
+$eclipseplatformName="@eclipseplatformName@";
+$eclipseplatformDescription="@eclipseplatformDescription@";
+
 $testURL="@testURL@";
 $testFile="@testFile@";
 
@@ -30,21 +48,29 @@
 $wstFile="@wstFile@";
 $wstMirrorPrefixuri="@wst.mirror.prefixuri@";
 $wstBuildHome="@wstBuildHome@";
+$wstName="@wstName@";
+$wstDescription="@wstDescription@";
 
 $jstURL="@jstURL@";
 $jstFile="@jstFile@";
 $jstMirrorPrefixuri="@jst.mirror.prefixuri@";
 $jstBuildHome="@jstBuildHome@";
+$jstName="@jstName@";
+$jstDescription="@jstDescription@";
 
 $wtpURL="@wtpURL@";
 $wtpFile="@wtpFile@";
 $wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
 $wtpBuildHome="@wtpBuildHome@";
+$wtpName="@wtpName@";
+$wtpDescription="@wtpDescription@";
 
 $gefURL="@gefURL@";
 $gefFile="@gefFile@";
 $gefMirrorPrefixuri="@gef.mirror.prefixuri@";
 $gefBuildHome="@gefBuildHome@";
+$gefName="@getName@";
+$gefDescription="@gefDescription@";
 
 $emfURL="@emfURL@";
 $emfFile="@emfFile@";
@@ -76,11 +102,34 @@
 $emfxsdsourceDescription="@emfxsdsourceDescription@";
 
 
+$emfvalidationURL="@emfvalidationURL@";
+$emfvalidationFile="@emfvalidationFile@";
+$emfvalidationMirrorPrefixuri="@emfvalidation.mirror.prefixuri@";
+$emfvalidationBuildHome="@emfvalidationBuildHome@";
+$emfvalidationName="@emfvalidationName@";
+$emfvalidationDescription="@emfvalidationDescription@";
+
+$emfvalidationsourceURL="@emfvalidationsourceURL@";
+$emfvalidationsourceFile="@emfvalidationsourceFile@";
+$emfvalidationsourceMirrorPrefixuri="@emfvalidationsource.mirror.prefixuri@";
+$emfvalidationsourceBuildHome="@emfvalidationsourceBuildHome@";
+$emfvalidationsourceName="@emfvalidationsourceName@";
+$emfvalidationsourceDescription="@emfvalidationsourceDescription@";
+
+
 $dtpURL="@dtpURL@";
 $dtpFile="@dtpFile@";
 $dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
 $dtpBuildHome="@dtpBuildHome@";
+$dtpName="@dtpName@";
+$dtpDescription="@dtpDescription@";
 
+$dltkURL="@dltkURL@";
+$dltkFile="@dltkFile@";
+$dltkMirrorPrefixuri="@dltk.mirror.prefixuri@";
+$dltkBuildHome="@dltkBuildHome@";
+$dltkName="@dltkName@";
+$dltkDescription="@dltkDescription@";
 
 $eclipserelengFile="@eclipserelengFile@";
 $eclipserelengURL="@eclipserelengURL@";
@@ -89,16 +138,24 @@
 $orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
 $orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
 
-$incubating = true;
+
+$prereq_eclipse="true";
+$prereq_eclipseplatform="false";
+$prereq_emf="false";
+$prereq_emfxsd="false";
+$prereq_emfvalidation="false";
+$prereq_gef="false";
+$prereq_dtp="false";
+$prereq_wst="false";
+$prereq_jst="false";
+$prereq_wtp="false";
+$prereq_dltk="false";
 
 
 include("miscUtil.php");
 
 
 
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
 
 $debugScript = false;
 $debugFunctions = false;
@@ -121,12 +178,12 @@
 
 $keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtpcap-sdk-$build.zip";
 if (isMirrored($keytestMirrorString) ) {
-        $mirrorScript=$eclipseMirrorScript;
-        $downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
+	$mirrorScript=$eclipseMirrorScript;
+	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
 }
 
 if ($debugScript)  {
-        echo "inferred platform: " . getPlatform();
+	echo "inferred platform: " . getPlatform();
 }
 
 
@@ -137,59 +194,70 @@
 $displayTestSummary=false;
 if (phpversion() >= 5) {
 
-        $code_totalBundles=0;
-        $code_totalErrors=0;
-        $code_totalWarnings=0;
-        $code_totalforbiddenAccessWarningCount=0;
-        $code_totaldiscouragedAccessWarningCount=0;
-        
-        $test_totalBundles=0;
-        $test_totalErrors=0;
-        $test_totalWarnings=0;
-        $test_totalforbiddenAccessWarningCount=0;
-        $test_totaldiscouragedAccessWarningCount=0;
+	$code_totalBundles=0;
+	$code_totalErrors=0;
+	$code_totalWarnings=0;
+	$code_totalforbiddenAccessWarningCount=0;
+	$code_totaldiscouragedAccessWarningCount=0;
+
+	$test_totalBundles=0;
+	$test_totalErrors=0;
+	$test_totalWarnings=0;
+	$test_totalforbiddenAccessWarningCount=0;
+	$test_totaldiscouragedAccessWarningCount=0;
 
 
-        $displayTestSummary=true;
-        // expecting grandTotalErrors and grandTotalTests
-        $filename = "unitTestsSummary.xml";
-        if (file_exists($filename)) {
-                $prefix = "unitTests_";
-                $unitTestsSummary = simplexml_load_file($filename);
-                foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-                        $name = $summaryItem->name;
-                        $value = $summaryItem->value;
-                        $code= "\$" . $prefix . $name . " = " . $value . ";";
-                        //echo "<br />code: " . $code;
-                        eval($code);
-                }
-        }
+	$displayTestSummary=true;
+	// expecting grandTotalErrors and grandTotalTests
+	$filename = "unitTestsSummary.xml";
+	if (file_exists($filename)) {
+		$prefix = "unitTests_";
+		$unitTestsSummary = simplexml_load_file($filename);
+		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
+			$name = $summaryItem->name;
+			$value = $summaryItem->value;
+			$code= "\$" . $prefix . $name . " = " . $value . ";";
+			//echo "<br />code: " . $code;
+			eval($code);
+		}
+	}
 
-        $filename = "compilelogsSummary.xml";
-        if (file_exists($filename)) {
-          $prefix = "code_";
-          $compileSummary = simplexml_load_file($filename);
-          foreach ($compileSummary->summaryItem as $summaryItem) {
-                  $name = $summaryItem->name;
-                  $value = $summaryItem->value;
-                  $code= "\$" . $prefix . $name . " = " . $value . ";";
-                  //echo "<br />code: " . $code;
-                  eval($code);
-          }
-        }
+	$filename = "compilelogsSummary.xml";
+	if (file_exists($filename)) {
+		$prefix = "code_";
+		$compileSummary = simplexml_load_file($filename);
+		foreach ($compileSummary->summaryItem as $summaryItem) {
+			$name = $summaryItem->name;
+			$value = $summaryItem->value;
+			$code= "\$" . $prefix . $name . " = " . $value . ";";
+			//echo "<br />code: " . $code;
+			eval($code);
+		}
+	}
 
-        $filename = "testcompilelogsSummary.xml";
-        if (file_exists($filename)) {
-          $prefix = "test_";
-          $compileSummary = simplexml_load_file($filename);
-          foreach ($compileSummary->summaryItem as $summaryItem) {
-                  $name = $summaryItem->name;
-                  $value = $summaryItem->value;
-                  $code= "\$" . $prefix . $name . " = " . $value . ";";
-                  //echo "<br />code: " . $code;
-                  eval($code);
-          }
-        }
+	$filename = "testcompilelogsSummary.xml";
+	if (file_exists($filename)) {
+		$prefix = "test_";
+		$compileSummary = simplexml_load_file($filename);
+		foreach ($compileSummary->summaryItem as $summaryItem) {
+			$name = $summaryItem->name;
+			$value = $summaryItem->value;
+			$code= "\$" . $prefix . $name . " = " . $value . ";";
+			//echo "<br />code: " . $code;
+			eval($code);
+		}
+	}
+}
+
+$incubating="false";
+
+
+
+if ($incubating) {
+	echo '<title>WTP Incubator Downloads</title>';
+}
+else {
+	echo '<title>WTP Downloads</title>';
 }
 
 
@@ -207,10 +275,10 @@
 $serverName = $_SERVER["SERVER_NAME"];
 
 if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-        echo '<center>
+	echo '<center>
           <p>
           Reminder: this is <font color="#FF0000">' .
-        $serverName .
+	$serverName .
         '</font>
           See also
           <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
@@ -221,257 +289,446 @@
 }
 ?>
 
-<?php if ($incubating) { ?>
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-        <tr>
-                <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-                Build: <?php echo "$build";?></b></font></td>
-           <td align="right" rowspan="3"><a
-  href="http://www.eclipse.org/projects/what-is-incubation.php"><img
-  src="http://www.eclipse.org/images/egg-incubation.png" alt="Incubation"
-  align="middle" border="0"></a></td>
+<?php if ("true" === $incubating) {
+	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
+	echo "	<tr>";
+	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
+	echo "        Build: $build</b></font></td>";
+	echo "		<td align=\"right\" rowspan=\"3\"><a";
+	echo "			href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
+	echo "			src=\"http://www.eclipse.org/images/egg-incubation.png\"";
+	echo "			alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
 
-        <tr valign="top">
-                <td><font size="-1"><?php echo "$builddate";?></font></td>
-        </tr>
-        <tr valign="top">
-                <td>
-                <p>The Eclipse Web Tools Platform (WTP) Incubator Project provides
-                tools for development that are just getting started, or are
-                experimental in some fashion.</p>
-                </td>
-        </tr>
-</table>
 
-<?php } else { ?>
+	echo "	<tr valign=\"top\">";
+	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
+	echo "	</tr>";
+	echo "	<tr valign=\"top\">";
+	echo "		<td>";
+	echo "		<p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
+	echo "		tools for development that are just getting started, or are";
+	echo "		experimental in some fashion.</p>";
+	echo "		</td>";
+	echo "	</tr>";
+	echo "</table>";
 
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-        <tr>
-                <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-                Build: <?php echo "$build";?></b></font></td>
-           
+} else {
 
-        <tr valign="top">
-                <td><font size="-1"><?php echo "$builddate";?></font></td>
-        </tr>
-        <tr valign="top">
-                <td>
-                <p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>
-                </td>
-        </tr>
-</table>
+	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
+	echo "	<tr>";
+	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
+	echo "		Build: " . $build . "</b></font></td>";
 
-<?php } ?>
+	echo "	<tr valign=\"top\">";
+	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
+	echo "	</tr>";
+	echo "	<tr valign=\"top\">";
+	echo "		<td>";
+	echo "		<p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>";
+	echo "		</td>";
+	echo "	</tr>";
+	echo "</table>";
+
+} ?>
 
 <!-- ***********  Prerequisites **************  -->
 <table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align="left" valign="top" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites and Handy Extras</font></td>
-        </tr>
-        <tr>
-                <td>
-                <p>These are the prerequisites to build or run these packages. 
-                Also listed are some frequently needed links for
-                committer-required packages when creating new development
-                environments, or targets to run against.</p>
-                <p>Note that WTP requires Java 5 or higher (and, for some things,
-                actually requires a JDK rather than only a JRE) even though many other
-                <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-                run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-                JRE levels</a>.</p><p></p>
-                </td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td width="40%">Eclipse Platform (Platform, JDT)</td>
-                                <?php
-                                //customize page depending on user's browser/platform, if we can detect it
-                                $usersPlatform = getPlatform();
-                                // assume windows by default, since likely most frequent, even for cases where
-                                // platform is "unknown". I've noticed Opera reports 'unknown' :(
-                                $recommendedFile=$eclipsefilewindows;
-                                if (strcmp($usersPlatform,"linux")== 0) {
-                                        $recommendedFile=$eclipsefilelinux;
-                                } else if (strcmp($usersPlatform,"mac") == 0) {
-                                        $recommendedFile=$eclipsefilemacosx;
-                                }
-                                ?>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
+	<tr>
+		<td align="left" valign="top" bgcolor="#0080C0"><font
+			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
+		and Handy Extras</font></td>
+	</tr>
+	<tr>
+		<td>
+		<p>These are the prerequisites to build or run these packages. All are
+		not necessarily required, but instead some subset. Also listed are
+		some frequently needed links for committer-required packages when
+		creating new development environments, or targets to run against.</p>
+		<p>Note that WTP requires Java 5 or higher (and, for some things,
+		actually requires a JDK rather than only a JRE) even though many other
+		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
+		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
+		JRE levels</a>.</p>
+		<p></p>
+		</td>
+	</tr>
+	<tr>
+		<td>
+		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
 
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>
-                                <?php 
-                                echo $emfName . "&nbsp;" . $emfDescription ; 
-                                ?>
-                                </td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-                                ?>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>
-                                <?php 
-                                echo $emfxsdName . "&nbsp;" . $emfxsdDescription ; 
-                                ?>
-                                </td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-                                ?>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Graphical Editing Framework (GEF)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="middle">
-                                <td width="10%"></td>
-                                <td colspan="2">
-                                <hr />
-                                </td>
-                        </tr>
+		<?php
+		if ("true" === $prereq_eclipseplatform) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td width=\"40%\">Eclipse Platform</td>";
 
 
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Web Tools Platform portion</td>
-                                <td align="right"><?php
-                                // debug
-                                // echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $wstMirrorPrefixuri . "/" . $wstFile;
-                                
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
-                                ?>
+			//customize page depending on user's browser/platform, if we can detect it
+			$usersPlatform = getPlatform();
+			// assume windows by default, since likely most frequent, even for cases where
+			// platform is "unknown". I've noticed Opera reports 'unknown' :(
+			$recommendedFile=$eclipseplatformfilewindows;
+			if (strcmp($usersPlatform,"linux")== 0) {
+				$recommendedFile=$eclipseplatformfilelinux;
+			} else if (strcmp($usersPlatform,"mac") == 0) {
+				$recommendedFile=$eclipseplatformfilemacosx;
+			}
 
-                        </tr>
-                        <tr valign="middle">
-                                <td width="10%"></td>
-                                <td colspan="2">
-                                <hr />
-                                </td>
-                        </tr>
+			echo "<td align=\"right\">";
 
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+			echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
 
-                        </tr>
 
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Eclipse releng tool (required only for committers to more easily
-                                "release" code to a build)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
+			echo " </tr>";
+		}
+		?>
 
-                        </tr>
+		<?php
+		if ("true" === $prereq_eclipse) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
 
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Third Party code from Orbit (currently much more than needed
-                                for WTP, but some committers like having the whole heap in their
-                                target)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-                                ?>
 
-                        </tr>
+			//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;
+			}
 
-                </table>
-                </td>
-        </tr>
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
+			echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_emf) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $emfName . "&nbsp;" . $emfDescription ;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
+			echo " </tr>";
+		}
+		?>
+
+
+		<?php
+		if ("true" === $prereq_emfxsd) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_emfvalidation) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_gef) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $gefName  . "&nbsp;" . $gefDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_dtp) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $dtpName . "&nbsp;" . $dtpDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_wst) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $wstName . "&nbsp;" . $wstDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_jst) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $jstName . "&nbsp;" . $jstDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+		<?php
+		if ("true" === $prereq_wtp) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $wtpName . "&nbsp;" . $wtpDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+              <?php
+              if ("true" === $prereq_dltk) {
+                     echo "<tr valign=\"top\">";
+                     echo "<td width=\"10%\"></td>";
+                     echo "<td>";
+
+                     echo $dltkName . "&nbsp;" . $dltkDescription;
+
+                     echo "</td>";
+                     echo "<td align=\"right\">";
+
+                     echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
+                     echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
+
+                     echo " </tr>";
+              }
+              ?>		
+			<tr valign="middle">
+				<td width="10%"></td>
+				<td colspan="2">
+				<hr />
+				</td>
+			</tr>
+
+
+
+			<?php
+			if ("true" === $prereq_emf) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+			<?php
+			if ("true" === $prereq_emfxsd) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+
+			<?php
+			if ("true" === $prereq_emfvalidation) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfvalidationsourceName . "&nbsp;" . $emfvalidationsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+
+			<?php
+			if (true) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo "Eclipse Test Framework (required only for Automated JUnit tests)";
+				echo "</td> ";
+				echo "<td align=\"right\">";
+
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+
+
+			<tr valign="top">
+				<td width="10%"></td>
+				<td>Eclipse releng tool (required only for committers to more easily
+				"release" code to a build)</td>
+				<td align="right"><?php
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+				?>
+			
+			</tr>
+
+			<tr valign="top">
+				<td width="10%"></td>
+				<td>Third Party code from Orbit. Not required and is currently much
+				more than needed for WTP, but some committers like using to create a
+				PDE target.</td>
+				<td align="right"><?php
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
+				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
+				?>
+			
+			</tr>
+
+		</table>
+		</td>
+	</tr>
 </table>
 
 <!-- ***********  WTP **************  -->
 <table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools Platform 
-               Components</font></td>
-        </tr>
+	<tr>
+		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
+			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
+		Platform</font></td>
+	</tr>
 
-        <tr>
-                <td align="left" valign="top" colspan="5">
-                <p>The Zip file contains example capability definitions </p>
-                </td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+	<tr>
+		<td align="left" valign="top" colspan="5">
+		<p>The Zip file contains example capability definitions </p>
+		</td>
+	</tr>
+	<tr>
+		<td>
+		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
 
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Minimal</b></td>
-                                <td align="left" valign="top">
-                                <p>Executable code only.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wtpcap-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wtpcap";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
+			<tr>
+				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
+				<td align="left" valign="top">
+				<p>Executable code only.</p>
+				</td>
+				<?php
+				$zipfilename="wtpcap-${build}";
+				$filename=$zipfilename.".zip";
+				$zipfilesize=fileSizeForDisplay($filename);
+				$fileShortDescription="wtpcap";
+				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+				?>
+			</tr>
 
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>SDK</b></td>
-                                <td align="left" valign="top">
-                                <p>Executable code and source code.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wtpcap-sdk-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wtpcap sdk";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Tests</b></td>
-                                <td align="left" valign="top">
-                                <p>Unit tests.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wtpcap-tests-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wtpcap tests";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-                </table>
-                </td>
-
-
-        <tr>
+			<tr>
+				<td align="left" valign="top" width="10%"><b>SDK</b></td>
+				<td align="left" valign="top">
+				<p>Executable code and source code.</p>
+				</td>
+				<?php
+				$zipfilename="wtpcap-sdk-${build}";
+				$filename=$zipfilename.".zip";
+				$zipfilesize=fileSizeForDisplay($filename);
+				$fileShortDescription="wtpcap sdk";
+				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+				?>
+			</tr>
+			<tr>
+				<td align="left" valign="top" width="10%"><b>Tests</b></td>
+				<td align="left" valign="top">
+				<p>Unit tests.</p>
+				</td>
+				<?php
+				$zipfilename="wtpcap-tests-${build}";
+				$filename=$zipfilename.".zip";
+				$zipfilesize=fileSizeForDisplay($filename);
+				$fileShortDescription="wtpcap tests";
+				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+				?>
+			</tr>
+		</table>
+		</td>
+	
+	
+	<tr>
 
 </table>
 
@@ -483,114 +740,117 @@
 
 <!-- ***********  Build Status **************  -->
 <table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
-                and other interesting details</font></td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+	<tr>
+		<td align=left valign=top bgcolor="#0080C0"><font
+			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Status, tests
+		and other interesting details</font></td>
+	</tr>
+	<tr>
+		<td>
+		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-                        <tr>
-                                <td><a href="buildNotes.php">Build notes</a> <br />
-                                <a href="directory.txt">map files</a> <br />
-                                <?php
+			<tr>
+				<td><!-- 
+				Its silly to always display 'Build notes', but hard to 
+				compute if required or not. 
+				<a href="buildNotes.php">Build notes</a> <br /> 
+				--> <a href="directory.txt">map files</a> <br />
+				<?php
 
-                                if ($displayTestSummary) {
+				if ($displayTestSummary) {
 
 
-                                        if (isset($unitTests_grandTotalErrors)) {
-                                                $errorColor="green";
-                                                if ($unitTests_grandTotalErrors > 0) {
-                                                        $errorColor="red";
-                                                }
-                                                echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
-                                                echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
-                                        }
-                                        else {
-                                               // we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.  
-                                               echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
-                                               //&nbsp;&nbsp;<img src=\"pending.gif\"/>";
-                                        }
+					if (isset($unitTests_grandTotalErrors)) {
+						$errorColor="green";
+						if ($unitTests_grandTotalErrors > 0) {
+							$errorColor="red";
+						}
+						echo "<a href=\"testResults.php\">Unit test results</a>&nbsp;";
+						echo "<img src=\"junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
+					}
+					else {
+						// we hardly ever "pend" anymore ... abscense usually signifies no tests or a build error.
+						echo "<br /><font color=\"orange\">Unit tests don't exists, are pending, or there's a build error.</font>";
+						//&nbsp;&nbsp;<img src=\"pending.gif\"/>";
+					}
 
-                                        echo "<br />";
-                                        echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
+					echo "<br />";
+					echo "<a href=\"compileResults.php\">Compile logs: Code Bundles</a>";
 
-                                        echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
-                                        echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
-                                        echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
-                                        echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
-                                        echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
+					echo "&nbsp;&nbsp;($code_totalBundles)&nbsp;&nbsp;";
+					echo "<img src=\"compile_err.gif\"/><font color=red>$code_totalErrors</font>&nbsp;";
+					echo "<img src=\"compile_warn.gif\"/><font color=orange>$code_totalWarnings</font>&nbsp;";
+					echo "<img src=\"access_err.gif\"/><font color=red>$code_totalforbiddenAccessWarningCount</font>&nbsp;";
+					echo "<img src=\"access_warn.gif\"/><font color=orange>$code_totaldiscouragedAccessWarningCount</font>&nbsp;";
 
-                                        echo "<br />";
-                                        echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
+					echo "<br />";
+					echo "<a href=\"testCompileResults.php\">Compile logs: Test Bundles</a>";
 
-                                        echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
-                                        echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
-                                        echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
-                                        echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
-                                        echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
-                                }
+					echo "&nbsp;&nbsp;($test_totalBundles)&nbsp;&nbsp;";
+					echo "<img src=\"compile_err.gif\"/><font color=red>$test_totalErrors</font>&nbsp;";
+					echo "<img src=\"compile_warn.gif\"/><font color=orange>$test_totalWarnings</font>&nbsp;";
+					echo "<img src=\"access_err.gif\"/><font color=red>$test_totalforbiddenAccessWarningCount</font>&nbsp;";
+					echo "<img src=\"access_warn.gif\"/><font color=orange>$test_totaldiscouragedAccessWarningCount</font>&nbsp;";
+				}
 
-                                ?> <br />
+				?> <br />
 
-                                <?php
-                                if (file_exists("versioningReportName.php")) {
-                                        include "versioningReportName.php";
-                                        $fname="${versionReportFilename}.html";
-                                        if (file_exists($fname)) {
-                                                echo "<br /> <a href='$fname'>Versioning Information</a>";
-                                        }
+				<?php
+				if (file_exists("versioningReportName.php")) {
+					include "versioningReportName.php";
+					$fname="${versionReportFilename}.html";
+					if (file_exists($fname)) {
+						echo "<br /> <a href='$fname'>Versioning Information</a>";
+					}
 }
 ?> <?php
 echo "<br />";
 if (file_exists("./apiresults/api-progress.html"))
 {
-        echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
+	echo "<br /> <a href=\"apiresults/api-progress.html\">API Progress Report</a>";
 }
 if (file_exists("./apiresults/api-info-summary.html"))
 {
-        echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
+	echo "<br /> <a href=\"apiresults/api-info-summary.html\">APIs Defined by Each Component</a>";
 }
 if (file_exists("./apiresults/api-ref-compatibility.html"))
 {
-        echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
+	echo "<br /> <a href=\"apiresults/api-ref-compatibility.html\">Adopter Breakage Report</a>";
 }
 if (file_exists("./apiresults/api-violation-summary.html"))
 {
-        echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
+	echo "<br /> <a href=\"apiresults/api-violation-summary.html\">API Violations</a>";
 }
 if (file_exists("./apiresults/component-api-violation-all.html"))
 {
-        echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
+	echo "<br /> <a href=\"apiresults/component-api-violation-all.html\">Non-API dependencies</a>";
 }
 if (file_exists("./apiresults/api-tc-summary.html"))
 {
-        echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
+	echo "<br /> <a href=\"apiresults/api-tc-summary.html\">API Test Coverage</a>";
 }
 if (file_exists("./apiresults/api-javadoc-summary.html"))
 {
-        echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
+	echo "<br /> <a href=\"apiresults/api-javadoc-summary.html\">API Javadoc Coverage</a>";
 }
 if (file_exists("./apiresults/api-tc-summary.html"))
 {
-        echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
+	echo "<br /><br /> <a href=\"apiresults/full_test_coverage/api-tc-summary.html\">Test Coverage for All Classes and Methods</a>";
 }
 ?> <?php
 if (file_exists("./perfresults/graph/performance.php"))
 {
-        echo "<br />";
-        echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
-        echo "<br />";
+	echo "<br />";
+	echo "<br /> <a href=\"perfresults/graph/performance.php\">Performance Results</a>";
+	echo "<br />";
 }
 ?></td>
-                        </tr>
+			</tr>
 
 
-                </table>
-                </td>
-        </tr>
+		</table>
+		</td>
+	</tr>
 </table>
 
 
@@ -599,12 +859,12 @@
 <center>
 <hr>
 <p>All downloads are provided under the terms and conditions of the <a
-        href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
+	href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software
 User Agreement</a> unless otherwise specified.</p>
 
 <p>If you have problems downloading the drops, contact the <font
-        face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
-        href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
+	face="'Bitstream Vera',Helvetica,Arial" size="-1"><a
+	href="mailto:webmaster@eclipse.org">webmaster</a></font>.</p>
 
 </center>
 <!-- end footer -->
diff --git a/releng.wtpbuilder/distribution/wtpcap.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/wtpcap.site/transformReportToHTML.xml
index 3e9f35b..b72f6cd 100644
--- a/releng.wtpbuilder/distribution/wtpcap.site/transformReportToHTML.xml
+++ b/releng.wtpbuilder/distribution/wtpcap.site/transformReportToHTML.xml
@@ -6,12 +6,14 @@
     <target
         name="main"
         description="example.@dot.xml to produce example.@dot.html">
-      <xslt
-          destdir="${resultDir}/compilelogs"
-          scanincludeddirectories="true"
-          style="compilerXMLOutputToHTML.xsl"
-          force="true" >
-            <fileset dir="${resultDir}/compilelogs" includes="**/*.xml" />
-      </xslt>
+        <xslt
+            destdir="${resultDir}/compilelogs"
+            scanincludeddirectories="true"
+            style="compilerXMLOutputToHTML.xsl"
+            force="true">
+            <fileset
+                dir="${resultDir}/compilelogs"
+                includes="**/*.xml"/>
+        </xslt>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/build.xml b/releng.wtpbuilder/distribution/wtpjee.site/build.xml
index 1b3b037..195353b 100644
--- a/releng.wtpbuilder/distribution/wtpjee.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtpjee.site/build.xml
@@ -24,6 +24,8 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
@@ -57,7 +59,7 @@
             <jvmarg
                 value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
             <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log"/>
+                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/outgoinghttplogfromsitebuild.log"/>
             <arg
                 value="-data"/>
             <arg
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/publish.xml b/releng.wtpbuilder/distribution/wtpjee.site/publish.xml
index 0f35d8d..fe3faf8 100644
--- a/releng.wtpbuilder/distribution/wtpjee.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtpjee.site/publish.xml
@@ -255,13 +255,13 @@
             tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
     <target
-        name="updateSite">
+        name="repository">
 
 
         <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
-            tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            tofile="${buildDirectory}/${buildLabel}/repository/site.xml"
             overwrite="true"
             failonerror="true"/>
         <!--
@@ -270,7 +270,7 @@
         -->
         <!-- substitute property value for tokens -->
         <replace
-            file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
+            file="${buildDirectory}/${buildLabel}/repository/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wtp@"
@@ -427,6 +427,42 @@
         <!--  Insert PreRequsites  -->
         <replace
             file="${resultingIndex}"
+            token="@eclipseplatformFile@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformURL@"
+            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildURL@"
+            value="${eclipseplatform.url}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilelinux@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilewindows@"
+            value="${eclipseplatform.file.win32-win32-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilemacos@"
+            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildHome@"
+            value="${eclipseplatform.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.mirror.prefixuri@"
+            value="${eclipseplatform.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.fspath.prefix@"
+            value="${eclipseplatform.fspath.prefix}"/>
+        <replace
+            file="${resultingIndex}"
             token="@eclipseFile@"
             value="${eclipse.file.linux-gtk-x86}"/>
         <replace
@@ -495,6 +531,54 @@
             value="${emf.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@emfsourceURL@"
+            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceFile@"
+            value="${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceName@"
+            value="${emfsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceDescription@"
+            value="${emfsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceBuildHome@"
+            value="${emfsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsource.mirror.prefixuri@"
+            value="${emfsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceURL@"
+            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceFile@"
+            value="${emfxsdsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceName@"
+            value="${emfxsdsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceDescription@"
+            value="${emfxsdsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceBuildHome@"
+            value="${emfxsdsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsource.mirror.prefixuri@"
+            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
             token="@emfxsdFile@"
             value="${emfxsd.file}"/>
         <replace
@@ -519,6 +603,62 @@
             value="${emfxsd.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@emfvalidationFile@"
+            value="${emfvalidation.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationURL@"
+            value="${emfvalidation.url}/${emfvalidation.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationBuildHome@"
+            value="${emfvalidation.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidation.mirror.prefixuri@"
+            value="${emfvalidation.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationName@"
+            value="${emfvalidation.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationDescription@"
+            value="${emfvalidation.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceFile@"
+            value="${emfvalidationsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceURL@"
+            value="${emfvalidationsourcedoc.url}/${emfvalidationsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceBuildHome@"
+            value="${emfvalidationsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsource.mirror.prefixuri@"
+            value="${emfvalidationsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceName@"
+            value="${emfvalidationsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfvalidationsourceDescription@"
+            value="${emfvalidationsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstName@"
+            value="${wst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstDescription@"
+            value="${wst.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@wstFile@"
             value="${wst.file}"/>
         <replace
@@ -535,6 +675,14 @@
             value="${wst.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@jstName@"
+            value="${jst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstDescription@"
+            value="${jst.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@jstFile@"
             value="${jst.file}"/>
         <replace
@@ -551,6 +699,14 @@
             value="${jst.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@wtpName@"
+            value="${wtp.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpDescription@"
+            value="${wtp.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@wtpFile@"
             value="${wtp.file}"/>
         <replace
@@ -583,6 +739,14 @@
             value="${gef.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@gefName@"
+            value="${gef.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@gefDescription@"
+            value="${gef.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@eclipserelengFile@"
             value="${eclipsereleng.file}"/>
         <replace
@@ -624,11 +788,6 @@
             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@"
@@ -645,5 +804,37 @@
             file="${resultingIndex}"
             token="@dtp.mirror.prefixuri@"
             value="${dtp.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dtpName@"
+            value="${dtp.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dtpDescription@"
+            value="${dtp.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkFile@"
+            value="${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkURL@"
+            value="${dltk.url}/${dltk.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkBuildHome@"
+            value="${dltk.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltk.mirror.prefixuri@"
+            value="${dltk.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkName@"
+            value="${dltk.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@dltkDescription@"
+            value="${dltk.description}"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/buildNotes.php
index e843ecf..f666887 100644
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/buildNotes.php
@@ -27,34 +27,34 @@
 $hasNotes = false;
 $aDirectory = dir("buildnotes");
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
+	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 />";
+		$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];
+		$component = $matches[1];
 
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
+		$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.";
+	echo "<br>There are no build notes for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/consoleLogs.php
index 7dd5f42..2ee3c36 100644
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/consoleLogs.php
@@ -32,15 +32,15 @@
 $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++;
-        }
-    }
+	if ($anEntry != "." && $anEntry != "..") {
+		if (is_file("$rootDir/$anEntry")) {
+			$entries[$index] = $anEntry;
+			$index++;
+		} else if (is_dir("$rootDir/$anEntry")) {
+			$direntries[$dirindex] = $anEntry;
+			$dirindex++;
+		}
+	}
 }
 $aDirectory->close();
 
@@ -49,43 +49,43 @@
 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>";
+	$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");
+	$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.";
+	echo "<br>There are no test logs for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/logIndex.php
index 0b36334..721ca00 100644
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/logIndex.php
@@ -4,79 +4,80 @@
 
 function endsWith( $str, $sub ) {
 
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
 }
 
-        $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
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
+$hasNotes = false;
+$aDirectory = dir(".");
+$index = 0;
+while ($anEntry = $aDirectory->read()) {
+	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+		$entries[$index] = $anEntry;
+		$index++;
+	}
+}
+aDirectory.closedir();
 
 
-        sort($entries);
+sort($entries);
 
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
+for ($i = 0; $i < $index; $i++) {
+	$anEntry = $entries[$i];
+	$logsize = filesize("$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=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
+	if ($level == 0) {
+		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-                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/wtpjee.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/miscUtil.php
index 966ed48..5001f38 100644
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/miscUtil.php
@@ -16,19 +16,19 @@
 	$criteria = 10 * $onemeg;
 	$scaleChar = "M";
 	if (file_exists($filename)) {
-      	$zipfilesize=filesize($filename);
-      	if ($zipfilesize > $criteria) {
-      		$zipfilesize=round($zipfilesize/$onemeg, 0);
-      		$scaleChar = "M";
-      	}
-      	else {
-      		$zipfilesize=round($zipfilesize/$onekilo, 0);
-      		$scaleChar = "K";
-      	}
-  	} 
-  	else {
-  	   $zipfilesize = 0;
-  	}
+		$zipfilesize=filesize($filename);
+		if ($zipfilesize > $criteria) {
+			$zipfilesize=round($zipfilesize/$onemeg, 0);
+			$scaleChar = "M";
+		}
+		else {
+			$zipfilesize=round($zipfilesize/$onekilo, 0);
+			$scaleChar = "K";
+		}
+	}
+	else {
+		$zipfilesize = 0;
+	}
 	$result =  "(" . $zipfilesize . $scaleChar . ")";
 	return $result;
 }
@@ -57,10 +57,10 @@
 	else {
 		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
 		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
+		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+		if (file_exists($wholePath)) {
+			$result = true;
+		}
 	}
 	return $result;
 }
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/report2.php
index 52d2284..cb68e7b 100644
--- a/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/report2.php
+++ b/releng.wtpbuilder/distribution/wtpjee.site/staticDropFiles/report2.php
@@ -1,42 +1,42 @@
 
-        <?php
+<?php
 
 function parse_testResults($filename)
 {
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
+	$junitFailures = 0;
+	if (is_file($filename)) {
+		$handle = @fopen($filename, "r");
+		if ($handle)
+		{
+			$size = filesize($filename);
+			$content = fread($handle, $size);
+			fclose($handle);
+			$junitStart = strpos($content, "Errors &amp; Failures");
+			$junitEnd = strpos($content, "</table>", $junitStart);
+			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
+			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
+			while ($start !== false)
+			{
+				$start += 29;
+				$stop = strpos($junitInfo, "</font></b></td>", $start);
+				if ($stop !== false)
+				{
+					$result = substr($junitInfo, $start, $stop - $start);
+					if (is_numeric($result))
+					{
+						$junitFailures += $result;
+					}
+					else if (strcmp($result, "DNF") == 0)
+					{
+						$junitFailures++;
+					}
+				}
+				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
+			}
+			$results = array($junitFailures);
+			return $results;
+		}
+	}
 }
 
 
diff --git a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/index.html.template.php
index 7fa5f34..e0416f5 100644
--- a/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/wtpjee.site/templateFiles/index.html.template.php
@@ -2,11 +2,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 
-<title>WTP Incubator Downloads</title>
-
-
 <?php
 
+ini_set("display_errors", "true");
+error_reporting (E_ALL);
+
+
 $buildBranch="@buildBranch@";
 $build="@build@";
 $type="@type@";
@@ -23,6 +24,23 @@
 $eclipseFile="@eclipseFile@";
 $eclipseBuildURL="@eclipseBuildURL@";
 $eclipseBuildHome="@eclipseBuildHome@";
+$eclipseName="@eclipseName@";
+$eclipseDescription="@eclipseDescription@";
+
+$eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
+$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
+
+$eclipseplatformfilelinux="@eclipseplatformfilelinux@";
+$eclipseplatformfilewindows="@eclipseplatformfilewindows@";
+$eclipseplatformfilemacosx="@eclipseplatformfilemacos@";
+
+$eclipseplatformURL="@eclipseplatformURL@";
+$eclipseplatformFile="@eclipseplatformFile@";
+$eclipseplatformBuildURL="@eclipseplatformBuildURL@";
+$eclipseplatformBuildHome="@eclipseplatformBuildHome@";
+$eclipseplatformName="@eclipseplatformName@";
+$eclipseplatformDescription="@eclipseplatformDescription@";
+
 $testURL="@testURL@";
 $testFile="@testFile@";
 
@@ -30,21 +48,29 @@
 $wstFile="@wstFile@";
 $wstMirrorPrefixuri="@wst.mirror.prefixuri@";
 $wstBuildHome="@wstBuildHome@";
+$wstName="@wstName@";
+$wstDescription="@wstDescription@";
 
 $jstURL="@jstURL@";
 $jstFile="@jstFile@";
 $jstMirrorPrefixuri="@jst.mirror.prefixuri@";
 $jstBuildHome="@jstBuildHome@";
+$jstName="@jstName@";
+$jstDescription="@jstDescription@";
 
 $wtpURL="@wtpURL@";
 $wtpFile="@wtpFile@";
 $wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
 $wtpBuildHome="@wtpBuildHome@";
+$wtpName="@wtpName@";
+$wtpDescription="@wtpDescription@";
 
 $gefURL="@gefURL@";
 $gefFile="@gefFile@";
 $gefMirrorPrefixuri="@gef.mirror.prefixuri@";
 $gefBuildHome="@gefBuildHome@";
+$gefName="@getName@";
+$gefDescription="@gefDescription@";
 
 $emfURL="@emfURL@";
 $emfFile="@emfFile@";
@@ -76,11 +102,34 @@
 $emfxsdsourceDescription="@emfxsdsourceDescription@";
 
 
+$emfvalidationURL="@emfvalidationURL@";
+$emfvalidationFile="@emfvalidationFile@";
+$emfvalidationMirrorPrefixuri="@emfvalidation.mirror.prefixuri@";
+$emfvalidationBuildHome="@emfvalidationBuildHome@";
+$emfvalidationName="@emfvalidationName@";
+$emfvalidationDescription="@emfvalidationDescription@";
+
+$emfvalidationsourceURL="@emfvalidationsourceURL@";
+$emfvalidationsourceFile="@emfvalidationsourceFile@";
+$emfvalidationsourceMirrorPrefixuri="@emfvalidationsource.mirror.prefixuri@";
+$emfvalidationsourceBuildHome="@emfvalidationsourceBuildHome@";
+$emfvalidationsourceName="@emfvalidationsourceName@";
+$emfvalidationsourceDescription="@emfvalidationsourceDescription@";
+
+
 $dtpURL="@dtpURL@";
 $dtpFile="@dtpFile@";
 $dtpMirrorPrefixuri="@dtp.mirror.prefixuri@";
 $dtpBuildHome="@dtpBuildHome@";
+$dtpName="@dtpName@";
+$dtpDescription="@dtpDescription@";
 
+$dltkURL="@dltkURL@";
+$dltkFile="@dltkFile@";
+$dltkMirrorPrefixuri="@dltk.mirror.prefixuri@";
+$dltkBuildHome="@dltkBuildHome@";
+$dltkName="@dltkName@";
+$dltkDescription="@dltkDescription@";
 
 $eclipserelengFile="@eclipserelengFile@";
 $eclipserelengURL="@eclipserelengURL@";
@@ -89,16 +138,24 @@
 $orbitthirdpartyzipBuildHome="@orbitthirdpartyzipBuildHome@";
 $orbitthirdpartyzipMirrorPrefixuri="@orbitthirdpartyzip.mirror.prefixuri@";
 
-$incubating = false;
+
+$prereq_eclipse="true";
+$prereq_eclipseplatform="false";
+$prereq_emf="true";
+$prereq_emfxsd="true";
+$prereq_emfvalidation="true";
+$prereq_gef="true";
+$prereq_dtp="true";
+$prereq_wst="false";
+$prereq_jst="false";
+$prereq_wtp="false";
+$prereq_dltk="false";
 
 
 include("miscUtil.php");
 
 
 
-ini_set("display_errors", "true");
-error_reporting (E_ALL);
-
 
 $debugScript = false;
 $debugFunctions = false;
@@ -121,12 +178,12 @@
 
 $keytestMirrorString=$eclipseMirrorScript . "$eclipseWTPMirrorPrefix/wtpjee-sdk-$build.zip";
 if (isMirrored($keytestMirrorString) ) {
-        $mirrorScript=$eclipseMirrorScript;
-        $downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
+	$mirrorScript=$eclipseMirrorScript;
+	$downloadprefix="${mirrorScript}${eclipseWTPMirrorPrefix}";
 }
 
 if ($debugScript)  {
-        echo "inferred platform: " . getPlatform();
+	echo "inferred platform: " . getPlatform();
 }
 
 
@@ -137,59 +194,70 @@
 $displayTestSummary=false;
 if (phpversion() >= 5) {
 
-        $code_totalBundles=0;
-        $code_totalErrors=0;
-        $code_totalWarnings=0;
-        $code_totalforbiddenAccessWarningCount=0;
-        $code_totaldiscouragedAccessWarningCount=0;
-        
-        $test_totalBundles=0;
-        $test_totalErrors=0;
-        $test_totalWarnings=0;
-        $test_totalforbiddenAccessWarningCount=0;
-        $test_totaldiscouragedAccessWarningCount=0;
+	$code_totalBundles=0;
+	$code_totalErrors=0;
+	$code_totalWarnings=0;
+	$code_totalforbiddenAccessWarningCount=0;
+	$code_totaldiscouragedAccessWarningCount=0;
+
+	$test_totalBundles=0;
+	$test_totalErrors=0;
+	$test_totalWarnings=0;
+	$test_totalforbiddenAccessWarningCount=0;
+	$test_totaldiscouragedAccessWarningCount=0;
 
 
-        $displayTestSummary=true;
-        // expecting grandTotalErrors and grandTotalTests
-        $filename = "unitTestsSummary.xml";
-        if (file_exists($filename)) {
-                $prefix = "unitTests_";
-                $unitTestsSummary = simplexml_load_file($filename);
-                foreach ($unitTestsSummary->summaryItem as $summaryItem) {
-                        $name = $summaryItem->name;
-                        $value = $summaryItem->value;
-                        $code= "\$" . $prefix . $name . " = " . $value . ";";
-                        //echo "<br />code: " . $code;
-                        eval($code);
-                }
-        }
+	$displayTestSummary=true;
+	// expecting grandTotalErrors and grandTotalTests
+	$filename = "unitTestsSummary.xml";
+	if (file_exists($filename)) {
+		$prefix = "unitTests_";
+		$unitTestsSummary = simplexml_load_file($filename);
+		foreach ($unitTestsSummary->summaryItem as $summaryItem) {
+			$name = $summaryItem->name;
+			$value = $summaryItem->value;
+			$code= "\$" . $prefix . $name . " = " . $value . ";";
+			//echo "<br />code: " . $code;
+			eval($code);
+		}
+	}
 
-        $filename = "compilelogsSummary.xml";
-        if (file_exists($filename)) {
-          $prefix = "code_";
-          $compileSummary = simplexml_load_file($filename);
-          foreach ($compileSummary->summaryItem as $summaryItem) {
-                  $name = $summaryItem->name;
-                  $value = $summaryItem->value;
-                  $code= "\$" . $prefix . $name . " = " . $value . ";";
-                  //echo "<br />code: " . $code;
-                  eval($code);
-          }
-        }
+	$filename = "compilelogsSummary.xml";
+	if (file_exists($filename)) {
+		$prefix = "code_";
+		$compileSummary = simplexml_load_file($filename);
+		foreach ($compileSummary->summaryItem as $summaryItem) {
+			$name = $summaryItem->name;
+			$value = $summaryItem->value;
+			$code= "\$" . $prefix . $name . " = " . $value . ";";
+			//echo "<br />code: " . $code;
+			eval($code);
+		}
+	}
 
-        $filename = "testcompilelogsSummary.xml";
-        if (file_exists($filename)) {
-          $prefix = "test_";
-          $compileSummary = simplexml_load_file($filename);
-          foreach ($compileSummary->summaryItem as $summaryItem) {
-                  $name = $summaryItem->name;
-                  $value = $summaryItem->value;
-                  $code= "\$" . $prefix . $name . " = " . $value . ";";
-                  //echo "<br />code: " . $code;
-                  eval($code);
-          }
-        }
+	$filename = "testcompilelogsSummary.xml";
+	if (file_exists($filename)) {
+		$prefix = "test_";
+		$compileSummary = simplexml_load_file($filename);
+		foreach ($compileSummary->summaryItem as $summaryItem) {
+			$name = $summaryItem->name;
+			$value = $summaryItem->value;
+			$code= "\$" . $prefix . $name . " = " . $value . ";";
+			//echo "<br />code: " . $code;
+			eval($code);
+		}
+	}
+}
+
+$incubating="false";
+
+
+
+if ($incubating) {
+	echo '<title>WTP Incubator Downloads</title>';
+}
+else {
+	echo '<title>WTP Downloads</title>';
 }
 
 
@@ -207,10 +275,10 @@
 $serverName = $_SERVER["SERVER_NAME"];
 
 if (!stristr($serverName, "eclipse.org") && !stristr($serverName,"you.are.at.eclipsecon.org")) {
-        echo '<center>
+	echo '<center>
           <p>
           Reminder: this is <font color="#FF0000">' .
-        $serverName .
+	$serverName .
         '</font>
           See also
           <a href="http://download.eclipse.org/webtools/downloads" target="_top">the live public Eclipse site</a>.
@@ -221,257 +289,446 @@
 }
 ?>
 
-<?php if ($incubating) { ?>
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-        <tr>
-                <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-                Build: <?php echo "$build";?></b></font></td>
-           <td align="right" rowspan="3"><a
-  href="http://www.eclipse.org/projects/what-is-incubation.php"><img
-  src="http://www.eclipse.org/images/egg-incubation.png" alt="Incubation"
-  align="middle" border="0"></a></td>
+<?php if ("true" === $incubating) {
+	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
+	echo "	<tr>";
+	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b><?php echo \"$type\";?>";
+	echo "        Build: $build</b></font></td>";
+	echo "		<td align=\"right\" rowspan=\"3\"><a";
+	echo "			href=\"http://www.eclipse.org/projects/what-is-incubation.php\"><img";
+	echo "			src=\"http://www.eclipse.org/images/egg-incubation.png\"";
+	echo "			alt=\"Incubation\" align=\"middle\" border=\"0\"></a></td>";
 
-        <tr valign="top">
-                <td><font size="-1"><?php echo "$builddate";?></font></td>
-        </tr>
-        <tr valign="top">
-                <td>
-                <p>The Eclipse Web Tools Platform (WTP) Incubator Project provides
-                tools for development that are just getting started, or are
-                experimental in some fashion.</p>
-                </td>
-        </tr>
-</table>
 
-<?php } else { ?>
+	echo "	<tr valign=\"top\">";
+	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
+	echo "	</tr>";
+	echo "	<tr valign=\"top\">";
+	echo "		<td>";
+	echo "		<p>The Eclipse Web Tools Platform (WTP) Incubator Project provides";
+	echo "		tools for development that are just getting started, or are";
+	echo "		experimental in some fashion.</p>";
+	echo "		</td>";
+	echo "	</tr>";
+	echo "</table>";
 
-<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH="100%">
-        <tr>
-                <td ALIGN=left><font face="'Bitstream Vera',Helvetica,Arial" size="+2"><b><?php echo "$type";?>
-                Build: <?php echo "$build";?></b></font></td>
-           
+} else {
 
-        <tr valign="top">
-                <td><font size="-1"><?php echo "$builddate";?></font></td>
-        </tr>
-        <tr valign="top">
-                <td>
-                <p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>
-                </td>
-        </tr>
-</table>
+	echo "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%\">";
+	echo "	<tr>";
+	echo "		<td ALIGN=left><font face=\"'Bitstream Vera',Helvetica,Arial\" size=\"+2\"><b>$type";
+	echo "		Build: " . $build . "</b></font></td>";
 
-<?php } ?>
+	echo "	<tr valign=\"top\">";
+	echo "		<td><font size=\"-1\">" . $builddate . "</font></td>";
+	echo "	</tr>";
+	echo "	<tr valign=\"top\">";
+	echo "		<td>";
+	echo "		<p>Component build from the Eclipse Web Tools Platform (WTP) Project.</p>";
+	echo "		</td>";
+	echo "	</tr>";
+	echo "</table>";
+
+} ?>
 
 <!-- ***********  Prerequisites **************  -->
 <table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align="left" valign="top" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites and Handy Extras</font></td>
-        </tr>
-        <tr>
-                <td>
-                <p>These are the prerequisites to build or run these packages. 
-                Also listed are some frequently needed links for
-                committer-required packages when creating new development
-                environments, or targets to run against.</p>
-                <p>Note that WTP requires Java 5 or higher (and, for some things,
-                actually requires a JDK rather than only a JRE) even though many other
-                <a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
-                run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
-                JRE levels</a>.</p><p></p>
-                </td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td width="40%">Eclipse Platform (Platform, JDT)</td>
-                                <?php
-                                //customize page depending on user's browser/platform, if we can detect it
-                                $usersPlatform = getPlatform();
-                                // assume windows by default, since likely most frequent, even for cases where
-                                // platform is "unknown". I've noticed Opera reports 'unknown' :(
-                                $recommendedFile=$eclipsefilewindows;
-                                if (strcmp($usersPlatform,"linux")== 0) {
-                                        $recommendedFile=$eclipsefilelinux;
-                                } else if (strcmp($usersPlatform,"mac") == 0) {
-                                        $recommendedFile=$eclipsefilemacosx;
-                                }
-                                ?>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
+	<tr>
+		<td align="left" valign="top" bgcolor="#0080C0"><font
+			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF">Prerequisites
+		and Handy Extras</font></td>
+	</tr>
+	<tr>
+		<td>
+		<p>These are the prerequisites to build or run these packages. All are
+		not necessarily required, but instead some subset. Also listed are
+		some frequently needed links for committer-required packages when
+		creating new development environments, or targets to run against.</p>
+		<p>Note that WTP requires Java 5 or higher (and, for some things,
+		actually requires a JDK rather than only a JRE) even though many other
+		<a href="http://www.eclipse.org/downloads/">Eclipse Projects</a> can
+		run with <a href="http://www.eclipse.org/downloads/moreinfo/jre.php">other
+		JRE levels</a>.</p>
+		<p></p>
+		</td>
+	</tr>
+	<tr>
+		<td>
+		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
 
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>
-                                <?php 
-                                echo $emfName . "&nbsp;" . $emfDescription ; 
-                                ?>
-                                </td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
-                                ?>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>
-                                <?php 
-                                echo $emfxsdName . "&nbsp;" . $emfxsdDescription ; 
-                                ?>
-                                </td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
-                                ?>
-                        </tr>
-
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Graphical Editing Framework (GEF)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
-                                ?>
-
-                        </tr>
-
-                        <tr valign="middle">
-                                <td width="10%"></td>
-                                <td colspan="2">
-                                <hr />
-                                </td>
-                        </tr>
+		<?php
+		if ("true" === $prereq_eclipseplatform) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td width=\"40%\">Eclipse Platform</td>";
 
 
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Web Tools Platform portion</td>
-                                <td align="right"><?php
-                                // debug
-                                // echo "debug: full path: " . $eclipseFSpathPrefix . "/" . $wstMirrorPrefixuri . "/" . $wstFile;
-                                
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $MirrorPrefixuri, $URL, $File, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $BuildHome . "\">equivalent</a></td>";
-                                ?>
+			//customize page depending on user's browser/platform, if we can detect it
+			$usersPlatform = getPlatform();
+			// assume windows by default, since likely most frequent, even for cases where
+			// platform is "unknown". I've noticed Opera reports 'unknown' :(
+			$recommendedFile=$eclipseplatformfilewindows;
+			if (strcmp($usersPlatform,"linux")== 0) {
+				$recommendedFile=$eclipseplatformfilelinux;
+			} else if (strcmp($usersPlatform,"mac") == 0) {
+				$recommendedFile=$eclipseplatformfilemacosx;
+			}
 
-                        </tr>
-                        <tr valign="middle">
-                                <td width="10%"></td>
-                                <td colspan="2">
-                                <hr />
-                                </td>
-                        </tr>
+			echo "<td align=\"right\">";
 
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Eclipse Test Framework (required only for Automated JUnit tests)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+			echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
 
-                        </tr>
 
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Eclipse releng tool (required only for committers to more easily
-                                "release" code to a build)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
-                                ?>
+			echo " </tr>";
+		}
+		?>
 
-                        </tr>
+		<?php
+		if ("true" === $prereq_eclipse) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td width=\"40%\">Eclipse SDK (Platform, JDT)</td>";
 
-                        <tr valign="top">
-                                <td width="10%"></td>
-                                <td>Third Party code from Orbit (currently much more than needed
-                                for WTP, but some committers like having the whole heap in their
-                                target)</td>
-                                <td align="right"><?php
-                                echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
-                                echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
-                                ?>
 
-                        </tr>
+			//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;
+			}
 
-                </table>
-                </td>
-        </tr>
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $eclipseBuildURL . "\">appropriate platform</a>";
+			echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_emf) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $emfName . "&nbsp;" . $emfDescription ;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfMirrorPrefixuri, $emfURL, $emfFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $emfBuildHome . "\">equivalent</a></td>";
+			echo " </tr>";
+		}
+		?>
+
+
+		<?php
+		if ("true" === $prereq_emfxsd) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $emfxsdName . "&nbsp;" . $emfxsdDescription ;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdMirrorPrefixuri, $emfxsdURL, $emfxsdFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $emfxsdBuildHome . "\">equivalent</a></td>";
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_emfvalidation) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $emfvalidationName  . "&nbsp;" . $emfvalidationDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationMirrorPrefixuri, $emfvalidationURL, $emfvalidationFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $emfvalidationBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_gef) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $gefName  . "&nbsp;" . $gefDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $gefMirrorPrefixuri, $gefURL, $gefFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $gefBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_dtp) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $dtpName . "&nbsp;" . $dtpDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $dtpMirrorPrefixuri, $dtpURL, $dtpFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $dtpBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_wst) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $wstName . "&nbsp;" . $wstDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_jst) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $jstName . "&nbsp;" . $jstDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+		<?php
+		if ("true" === $prereq_wtp) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $wtpName . "&nbsp;" . $wtpDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+              <?php
+              if ("true" === $prereq_dltk) {
+                     echo "<tr valign=\"top\">";
+                     echo "<td width=\"10%\"></td>";
+                     echo "<td>";
+
+                     echo $dltkName . "&nbsp;" . $dltkDescription;
+
+                     echo "</td>";
+                     echo "<td align=\"right\">";
+
+                     echo getPrereqReferenceOrName($eclipseMirrorScript, $dltkMirrorPrefixuri, $dltkURL, $dltkFile, $eclipseFSpathPrefix);
+                     echo " or <a href=\"" . $dltkBuildHome . "\">equivalent</a></td>";
+
+                     echo " </tr>";
+              }
+              ?>		
+			<tr valign="middle">
+				<td width="10%"></td>
+				<td colspan="2">
+				<hr />
+				</td>
+			</tr>
+
+
+
+			<?php
+			if ("true" === $prereq_emf) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+			<?php
+			if ("true" === $prereq_emfxsd) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+
+			<?php
+			if ("true" === $prereq_emfvalidation) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfvalidationsourceName . "&nbsp;" . $emfvalidationsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfvalidationsourceMirrorPrefixuri, $emfvalidationsourceURL, $emfvalidationsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfvalidationsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+
+			<?php
+			if (true) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo "Eclipse Test Framework (required only for Automated JUnit tests)";
+				echo "</td> ";
+				echo "<td align=\"right\">";
+
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $testURL, $testFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+
+
+			<tr valign="top">
+				<td width="10%"></td>
+				<td>Eclipse releng tool (required only for committers to more easily
+				"release" code to a build)</td>
+				<td align="right"><?php
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipserelengURL, $eclipserelengFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $eclipseBuildHome . "\">equivalent</a></td>";
+				?>
+			
+			</tr>
+
+			<tr valign="top">
+				<td width="10%"></td>
+				<td>Third Party code from Orbit. Not required and is currently much
+				more than needed for WTP, but some committers like using to create a
+				PDE target.</td>
+				<td align="right"><?php
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $orbitthirdpartyzipMirrorPrefixuri, $orbitthirdpartyzipURL, $orbitthirdpartyzipFile,$eclipseFSpathPrefix);
+				echo " or <a href=\"" . $orbitthirdpartyzipBuildHome . "\">equivalent</a></td>";
+				?>
+			
+			</tr>
+
+		</table>
+		</td>
+	</tr>
 </table>
 
 <!-- ***********  WTP **************  -->
 <table border=0 cellspacing=2 cellpadding=2 width="100%">
-        <tr>
-                <td align=left valign=top colspan="5" bgcolor="#0080C0"><font
-                        face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools Platform 
-               Components</font></td>
-        </tr>
+	<tr>
+		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
+			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
+		Platform</font></td>
+	</tr>
 
-        <tr>
-                <td align="left" valign="top" colspan="5">
-                <p>The Zip file contains productized Java EE Developer Tools</p>
-                </td>
-        </tr>
-        <tr>
-                <td>
-                <table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
+	<tr>
+		<td align="left" valign="top" colspan="5">
+		<p>The Zip file contains productized Java EE Developer Tools</p>
+		</td>
+	</tr>
+	<tr>
+		<td>
+		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
 
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Minimal</b></td>
-                                <td align="left" valign="top">
-                                <p>Executable code only.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wtpjee-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wtpjee";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
+			<tr>
+				<td align="left" valign="top" width="10%"><b>Minimal</b></td>
+				<td align="left" valign="top">
+				<p>Executable code only.</p>
+				</td>
+				<?php
+				$zipfilename="wtpjee-${build}";
+				$filename=$zipfilename.".zip";
+				$zipfilesize=fileSizeForDisplay($filename);
+				$fileShortDescription="wtpjee";
+				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+				?>
+			</tr>
 
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>SDK</b></td>
-                                <td align="left" valign="top">
-                                <p>Executable code and source code.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wtpjee-sdk-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wtpjee sdk";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-                        <tr>
-                                <td align="left" valign="top" width="10%"><b>Tests</b></td>
-                                <td align="left" valign="top">
-                                <p>Unit tests.</p>
-                                </td>
-                                <?php
-                                $zipfilename="wtpjee-tests-${build}";
-                                $filename=$zipfilename.".zip";
-                                $zipfilesize=fileSizeForDisplay($filename);
-                                $fileShortDescription="wtpjee tests";
-                                displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
-                                ?>
-                        </tr>
-                </table>
-                </td>
-
-
-        <tr>
+			<tr>
+				<td align="left" valign="top" width="10%"><b>SDK</b></td>
+				<td align="left" valign="top">
+				<p>Executable code and source code.</p>
+				</td>
+				<?php
+				$zipfilename="wtpjee-sdk-${build}";
+				$filename=$zipfilename.".zip";
+				$zipfilesize=fileSizeForDisplay($filename);
+				$fileShortDescription="wtpjee sdk";
+				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+				?>
+			</tr>
+			<tr>
+				<td align="left" valign="top" width="10%"><b>Tests</b></td>
+				<td align="left" valign="top">
+				<p>Unit tests.</p>
+				</td>
+				<?php
+				$zipfilename="wtpjee-tests-${build}";
+				$filename=$zipfilename.".zip";
+				$zipfilesize=fileSizeForDisplay($filename);
+				$fileShortDescription="wtpjee tests";
+				displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription);
+				?>
+			</tr>
+		</table>
+		</td>
+	
+	
+	<tr>