diff --git a/releng.wtpbuilder/buildtemplates/build.xml b/releng.wtpbuilder/buildtemplates/build.xml
index 525818c..33da708 100644
--- a/releng.wtpbuilder/buildtemplates/build.xml
+++ b/releng.wtpbuilder/buildtemplates/build.xml
@@ -1,95 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== 
-
-##########################################################################
-# Copyright (c) 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-##########################################################################
-
-
-     Jan 12, 2009 4:01:53 AM                                                        
-
-     buildtemplates    
-     
-     Some simple "get started" scripts to 
-     build files for simple cases.
-     
-     These algorithms/heuristics assume there's only one 
-     feature being worked with per component
-
-     Note: 
-      Nothing is done for "dependancies". 
-               
-     Note: 
-      In components, the build.properties and dependency.xml files can stay as they are in templates
-      (they differ, very slightly from each other). 
-
-     Note: 
-      foldername pattern:
-
-      component/%shortname%
-      component/%shortname%_sdk
-      component/%shortname%_tests
-      distribution/%shortname%.build
-      distribution/%shortname%.site
-      distribution/%shortname%.tests          
-                   
-     davidw                                                                
-     ====================================================================== -->
-<project name="project" default="default">
-	<description>
-            script to create new component build
-    </description>
-
-	<property name="componentpropertyfile" value="xmlsec.properties" />
-
-
-	<target name="default" depends="replaceTokens">
-		<property file="${componentpropertyfile}" />
-		<echo message="  Creating build files for ${shortname}" />
-
-		<move todir="../components/${shortname}">
-			<fileset dir="../temp/components/template" />
-		</move>
-		<move todir="../components/${shortname}_sdk">
-			<fileset dir="../temp/components/template_sdk" />
-		</move>
-		<move todir="../components/${shortname}_tests">
-			<fileset dir="../temp/components/template_tests" />
-		</move>
-		<move todir="../distribution/${shortname}.build">
-			<fileset dir="../temp/distribution/template.build" />
-		</move>
-		<move todir="../distribution/${shortname}.site">
-			<fileset dir="../temp/distribution/template.site" />
-		</move>
-		<move todir="../distribution/${shortname}.tests">
-			<fileset dir="../temp/distribution/template.tests" />
-		</move>
-	</target>
-
-	<target name="replaceTokens" depends="copyToTemp" description="replaces tokens based on property file">
-		<replace dir="../temp" value="error-no-value-specified" propertyFile="${componentpropertyfile}">
-			<replacefilter token="@featurename@" property="featurename" />
-			<replacefilter token="@zipprefix@" property="zipprefix" />
-			<replacefilter token="@relengmapsenv@" property="relengmapsenv" />
-			<replacefilter token="@shortname@" property="shortname" />
-			<replacefilter token="@longdescription@" property="longdescription" />
-			<replacefilter token="@testplugin@" property="testplugin" />
-		</replace>
-
-	</target>
-
-	<target name="copyToTemp">
-		<copy todir="../temp" overwrite="true">
-			<fileset dir="../buildtemplates" excludes="build.xml, variables.txt, *.properties" />
-		</copy>
-	</target>
-
-</project>
+    <!--
+        Copyright (c) 2009 IBM Corporation and others. All rights
+        reserved. This program and the accompanying materials are made
+        available under the terms of the Eclipse Public License v1.0
+        which accompanies this distribution, and is available at
+        http://www.eclipse.org/legal/epl-v10.html Contributors: IBM
+        Corporation - initial API and implementation
+    -->
+<project
+    name="project"
+    default="default">
+    <description>script to create a new build component, based on values
+        in property file</description>
+    <property
+        name="componentpropertyfile"
+        value="jaxws.properties"/>
+    <!--
+        Some simple "get started" scripts to build files for simple
+        build cases. See an existing property file for description of
+        values required. These algorithms/heuristics assume there's only
+        one feature being worked with per component Note: Nothing is
+        done for "dependancies". Note: Pattern of directories created:
+        component/%shortname% component/%shortname%_sdk
+        component/%shortname%_tests distribution/%shortname%.build
+        distribution/%shortname%.site distribution/%shortname%.tests
+    -->
+    <target
+        name="default"
+        depends="replaceTokens">
+        <property
+            file="${componentpropertyfile}"/>
+        <echo
+            message="  Creating build files for ${shortname}"/>
+        <move
+            todir="../components/${shortname}">
+            <fileset
+                dir="../temp/components/template"/>
+        </move>
+        <move
+            todir="../components/${shortname}_sdk">
+            <fileset
+                dir="../temp/components/template_sdk"/>
+        </move>
+        <move
+            todir="../components/${shortname}_tests">
+            <fileset
+                dir="../temp/components/template_tests"/>
+        </move>
+        <move
+            todir="../distribution/${shortname}.build">
+            <fileset
+                dir="../temp/distribution/template.build"/>
+        </move>
+        <move
+            todir="../distribution/${shortname}.site">
+            <fileset
+                dir="../temp/distribution/template.site"/>
+        </move>
+        <move
+            todir="../distribution/${shortname}.tests">
+            <fileset
+                dir="../temp/distribution/template.tests"/>
+        </move>
+    </target>
+    <target
+        name="replaceTokens"
+        depends="copyToTemp"
+        description="replaces tokens based on property file">
+        <replace
+            dir="../temp"
+            value="error-no-value-specified"
+            propertyFile="${componentpropertyfile}">
+            <replacefilter
+                token="@featurename@"
+                property="featurename"/>
+            <replacefilter
+                token="@basicprereq@"
+                property="basicprereq"/>
+            <replacefilter
+                token="@zipprefix@"
+                property="zipprefix"/>
+            <replacefilter
+                token="@relengmapsenv@"
+                property="relengmapsenv"/>
+            <replacefilter
+                token="@shortname@"
+                property="shortname"/>
+            <replacefilter
+                token="@longdescription@"
+                property="longdescription"/>
+            <replacefilter
+                token="@testplugin@"
+                property="testplugin"/>
+        </replace>
+    </target>
+    <target
+        name="copyToTemp">
+        <copy
+            todir="../temp"
+            overwrite="true">
+            <fileset
+                dir="../buildtemplates"
+                excludes="build.xml, variables.txt, *.properties"/>
+        </copy>
+    </target>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
index 8710ae7..186aba5 100644
--- a/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template/dependency.xml
@@ -41,17 +41,15 @@
                 name="groupId"
                 value="eclipse"/>
         </antcall>
+        <!--
+            <antcall target="getAndInstall"> <param name="groupId"
+            value="dtp"/> </antcall>
+        -->
         <antcall
             target="getAndInstall">
             <param
                 name="groupId"
-                value="dtp"/>
-        </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
+                value="@basicprereq@"/>
         </antcall>
     </target>
     <target
diff --git a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
index 364e5bc..1a5dca3 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_sdk/dependency.xml
@@ -31,19 +31,16 @@
                 name="groupId"
                 value="eclipse"/>
         </antcall>
+        <!--
+            <antcall target="getAndInstall"> <param name="groupId"
+            value="dtp"/> </antcall>
+        -->
         <antcall
             target="getAndInstall">
             <param
                 name="groupId"
-                value="dtp"/>
+                value="@basicprereq@"/>
         </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-
     </target>
     <target
         name="getAndInstall"
diff --git a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
index 1f45cda..6daa757 100644
--- a/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
+++ b/releng.wtpbuilder/buildtemplates/components/template_tests/dependency.xml
@@ -37,19 +37,16 @@
                 name="groupId"
                 value="eclipseTestFramework"/>
         </antcall>
+        <!--
+            <antcall target="getAndInstall"> <param name="groupId"
+            value="dtp"/> </antcall>
+        -->
         <antcall
             target="getAndInstall">
             <param
                 name="groupId"
-                value="dtp"/>
+                value="@basicprereq@"/>
         </antcall>
-        <antcall
-            target="getAndInstall">
-            <param
-                name="groupId"
-                value="wtp"/>
-        </antcall>
-
     </target>
     <target
         name="getAndInstall"
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
index c4b55e5..b105fbf 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
@@ -14,8 +14,10 @@
         <property
             name="buildTargets"
             value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
-
-        <!-- for this distribution, dependencies come from project's releng map project-->
+        <!--
+            for this distribution, dependencies come from project's
+            releng map project
+        -->
         <property
             name="dependency.properties"
             value="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties"/>
@@ -23,11 +25,9 @@
         <!-- calling label.xml to createg label.properties file -->
         <ant
             antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-
         <echo
             level="info"
             message="invoking buildTargets: ${buildTargets} to build for each component"/>
-
         <ant
             antfile="${buildTargets}">
             <property
@@ -49,7 +49,7 @@
                 name="eclipseBuildFailOnError"
                 value="false"/>
         </ant>
-        
+
         <!-- package -->
         <antcall
             target="package"/>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
index 00ecb30..1b3b037 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
@@ -2,150 +2,169 @@
     name="Build specific targets and properties"
     default="build"
     basedir=".">
-
-    <!-- Note to be cross-platform, "environment variables" are only appropriate for
-        some variables, e.g. ones we set, since properties are case sensitive, even if
-        the environment variables on your operating system are not, e.g. it will
-        be ${env.Path} not ${env.PATH} on Windows -->
-    <property environment="env" />
-    <!-- 
-        Let users override standard properties, if desired.
-        If directory, file, or some properties do not exist,  
-        then standard properties will be used.
+    <!--
+        Note to be cross-platform, "environment variables" are only
+        appropriate for some variables, e.g. ones we set, since
+        properties are case sensitive, even if the environment variables
+        on your operating system are not, e.g. it will be ${env.Path}
+        not ${env.PATH} on Windows
     -->
     <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+        environment="env"/>
+    <!--
+        Let users override standard properties, if desired. If
+        directory, file, or some properties do not exist, then standard
+        properties will be used.
+    -->
+    <property
+        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties"/>
 
     <!-- = = = end standard properties pattern = = = -->
-
-    <echo message="ant.file: ${ant.file}" />
-    <target name="build">
+    <echo
+        message="ant.file: ${ant.file}"/>
+    <target
+        name="build">
         <java
             jar="${eclipse.launcher}"
             fork="true"
             failonerror="true">
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg value="-Dbuild.donottagmaps=${build.donottagmaps}" />
-            <jvmarg value="-DbuildBranch=${buildBranch}" />
-            <jvmarg value="-DbuildType=${buildType}" />
-            <jvmarg value="-DbuildId=${buildId}" />
-            <jvmarg value="-DmapVersionTag=${mapVersionTag}" />
-            <jvmarg value="-Dbuild.distribution=${build.distribution}" />
-            <jvmarg value="-DbuildDirectory=${buildDirectory}" />
-            <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
-            <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
             <jvmarg
-                value="-Dprojectname=${projectname}" />
-          <jvmarg
-              value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
-          <jvmarg
-              value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log"/>
-        	
-            <arg value="-data" />
-            <arg value="${basedir}/workspace" />
-            <arg value="-application" />
-            <arg value="org.eclipse.ant.core.antRunner" />
-            <arg value="-buildfile" />
-            <arg value="${ant.file}" />
-            <arg value="publish" />
+                value="-Dosgi.ws=${env.BASEWS}"/>
+            <jvmarg
+                value="-Dosgi.os=${env.BASEOS}"/>
+            <jvmarg
+                value="-Dosgi.arch=${env.BASEARCH}"/>
+            <jvmarg
+                value="-Dbuild.donottagmaps=${build.donottagmaps}"/>
+            <jvmarg
+                value="-DbuildBranch=${buildBranch}"/>
+            <jvmarg
+                value="-DbuildType=${buildType}"/>
+            <jvmarg
+                value="-DbuildId=${buildId}"/>
+            <jvmarg
+                value="-DmapVersionTag=${mapVersionTag}"/>
+            <jvmarg
+                value="-Dbuild.distribution=${build.distribution}"/>
+            <jvmarg
+                value="-DbuildDirectory=${buildDirectory}"/>
+            <jvmarg
+                value="-Dwtp.builder.home=${wtp.builder.home}"/>
+            <jvmarg
+                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
+            <jvmarg
+                value="-Dprojectname=${projectname}"/>
+            <jvmarg
+                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
+            <jvmarg
+                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromsitebuild.log"/>
+            <arg
+                value="-data"/>
+            <arg
+                value="${basedir}/workspace"/>
+            <arg
+                value="-application"/>
+            <arg
+                value="org.eclipse.ant.core.antRunner"/>
+            <arg
+                value="-buildfile"/>
+            <arg
+                value="${ant.file}"/>
+            <arg
+                value="publish"/>
         </java>
     </target>
-
-    <!-- ===================================================================== -->
+    <!--
+        =====================================================================
+    -->
     <!-- Steps to do to publish the build results -->
-    <!-- ===================================================================== -->
-    <target name="publish">
+    <!--
+        =====================================================================
+    -->
+    <target
+        name="publish">
         <dirname
             file="${ant.file}"
-            property="component.dir" />
-        <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-        <property file="${buildDirectory}/label.properties" />
-
+            property="component.dir"/>
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
+        <property
+            file="${buildDirectory}/label.properties"/>
         <property
             name="publish.xml"
-            value="${component.dir}/publish.xml" />
-
+            value="${component.dir}/publish.xml"/>
         <property
             name="indexFileName"
-            value="index.php" />
+            value="index.php"/>
         <property
             name="result"
-            value="${buildDirectory}/${buildLabel}" />
+            value="${buildDirectory}/${buildLabel}"/>
         <property
             name="indexTemplateFilename"
-            value="index.html.template.php" />
-
+            value="index.html.template.php"/>
         <copy
             file="${wtp.builder.home}/distribution/wtp.site/templateFiles/${indexTemplateFilename}"
-            tofile="${buildDirectory}/${indexFileName}" />
-
+            tofile="${buildDirectory}/${indexFileName}"/>
         <condition
             property="isBuildTested"
             value="true">
             <available
-                file="${buildDirectory}/${buildLabel}/testResults/html" />
+                file="${buildDirectory}/${buildLabel}/testResults/html"/>
         </condition>
-
         <ant
             antfile="${publish.xml}"
             dir="${component.dir}">
             <property
                 name="dropTokenList"
-                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%" />
+                value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%"/>
             <property
                 name="webtoolsDownloadURL"
-                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops" />
-
+                value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
             <property
                 name="buildBranch"
-                value="${buildBranch}" />
+                value="${buildBranch}"/>
             <property
                 name="isBuildTested"
-                value="${isBuildTested}" />
+                value="${isBuildTested}"/>
             <property
                 name="indexTemplateFilename"
-                value="${indexTemplateFilename}" />
+                value="${indexTemplateFilename}"/>
         </ant>
 
         <!--  Get the build map over for the results to point to. -->
         <copy
             file="${buildDirectory}/directory.txt"
-            tofile="${result}/directory.txt" />
+            tofile="${result}/directory.txt"/>
 
         <!-- Copy info for build identification -->
         <copy
             file="${buildDirectory}/buildmachineinfo.properties"
-            tofile="${result}/buildmachineinfo.properties" />
+            tofile="${result}/buildmachineinfo.properties"/>
 
-      <!-- http access logs -->
-      <copy
-          todir="${result}/"
-          failonerror="false">
-          <fileset
-              dir="${buildDirectory}"
-              includes="*.log"/>
-      </copy>
+        <!-- http access logs -->
+        <copy
+            todir="${result}/"
+            failonerror="false">
+            <fileset
+                dir="${buildDirectory}"
+                includes="*.log"/>
+        </copy>
 
-      <!-- ant build log, from control directory -->
-      <copy
-          todir="${result}/"
-          failonerror="false">
-          <fileset
-              dir="${env.ANT_WORKING}/${projectname}"
-              includes="antBuilderOutput.log"/>
-      </copy>
+        <!-- ant build log, from control directory -->
+        <copy
+            todir="${result}/"
+            failonerror="false">
+            <fileset
+                dir="${env.ANT_WORKING}/${projectname}"
+                includes="antBuilderOutput.log"/>
+        </copy>
 
 
-    	
+
         <!-- final count files -->
         <countBuildFiles
             sourceDirectory="${buildDirectory}/${buildLabel}"
             filterString=".zip,.tar.gz"
-            outputFile="${buildDirectory}/${buildLabel}/files.count" />
-
+            outputFile="${buildDirectory}/${buildLabel}/files.count"/>
     </target>
-
-
-</project>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/compilerXMLOutputToHTML.xsl b/releng.wtpbuilder/buildtemplates/distribution/template.site/compilerXMLOutputToHTML.xsl
index 4f6809e..ffc7905 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/compilerXMLOutputToHTML.xsl
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/compilerXMLOutputToHTML.xsl
@@ -2,65 +2,67 @@
 <xsl:stylesheet
     version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
     <xsl:output
         method="html"
-        indent="yes" />
-
-    <xsl:template match="/">
+        indent="yes"/>
+    <xsl:template
+        match="/">
         <html>
             <body>
-                <xsl:apply-templates select="compiler" />
+                <xsl:apply-templates
+                    select="compiler"/>
             </body>
         </html>
     </xsl:template>
-
-    <xsl:template match="compiler">
+    <xsl:template
+        match="compiler">
         <h2>Compiler Report</h2>
         <p>
             Compiler:
-            <xsl:value-of select="@name" />
+            <xsl:value-of
+                select="@name"/>
             <xsl:text>   </xsl:text>
             Version:
-            <xsl:value-of select="@version" />
+            <xsl:value-of
+                select="@version"/>
         </p>
-
-        <xsl:apply-templates select="stats" />
-
-        <xsl:apply-templates select="sources" />
+        <xsl:apply-templates
+            select="stats"/>
+        <xsl:apply-templates
+            select="sources"/>
     </xsl:template>
-
     <xsl:template
         name="stats"
         match="stats">
-
         <p>
             Number of source files:
-            <xsl:value-of select="count(..//source)" />
+            <xsl:value-of
+                select="count(..//source)"/>
             Number of classfiles:
-            <xsl:value-of select="number_of_classfiles/@value" />
+            <xsl:value-of
+                select="number_of_classfiles/@value"/>
         </p>
         <p>
             Problems:
-            <xsl:value-of select="problem_summary/@problems" />
+            <xsl:value-of
+                select="problem_summary/@problems"/>
             (Errors:
-            <xsl:value-of select="problem_summary/@errors" />
+            <xsl:value-of
+                select="problem_summary/@errors"/>
             Warnings:
-            <xsl:value-of select="problem_summary/@warnings" />
+            <xsl:value-of
+                select="problem_summary/@warnings"/>
             )
         </p>
     </xsl:template>
-
-
     <xsl:template
         name="sources"
         match="sources">
-
-        <xsl:if test="count(source) > 0">
-
+        <xsl:if
+            test="count(source) > 0">
             <dl>
-                <xsl:for-each select="source">
-
+                <xsl:for-each
+                    select="source">
                     <xsl:variable
                         name="package"
                         select="normalize-space(@package)">
@@ -73,48 +75,61 @@
                         name="classname"
                         select="substring-after($path, $package)">
                     </xsl:variable>
-                    <xsl:if test="count(problems) > 0">
-                        <dt style="font-weight: bold; color: black">
+                    <xsl:if
+                        test="count(problems) > 0">
+                        <dt
+                            style="font-weight: bold; color: black">
                             Source File:
-                            <xsl:value-of select="$package" />
-                            <xsl:value-of select="$classname" />
+                            <xsl:value-of
+                                select="$package"/>
+                            <xsl:value-of
+                                select="$classname"/>
                         </dt>
-                        <xsl:apply-templates select="problems">
-                            <xsl:with-param name="classname">
-                                <xsl:value-of select="$classname" />
+                        <xsl:apply-templates
+                            select="problems">
+                            <xsl:with-param
+                                name="classname">
+                                <xsl:value-of
+                                    select="$classname"/>
                             </xsl:with-param>
                         </xsl:apply-templates>
                     </xsl:if>
                 </xsl:for-each>
             </dl>
-
         </xsl:if>
-
     </xsl:template>
-
-    <xsl:template match="problems">
-        <xsl:param name="classname" />
-        <xsl:for-each select="problem">
-
-            <dd style="font-weight: normal; color: black">
-                <xsl:value-of select="position()" />
+    <xsl:template
+        match="problems">
+        <xsl:param
+            name="classname"/>
+        <xsl:for-each
+            select="problem">
+            <dd
+                style="font-weight: normal; color: black">
+                <xsl:value-of
+                    select="position()"/>
                 <xsl:text>.  </xsl:text>
-                <xsl:value-of select="@severity" />
+                <xsl:value-of
+                    select="@severity"/>
                 <xsl:text>:  </xsl:text>
-                <xsl:value-of select="@id" />
+                <xsl:value-of
+                    select="@id"/>
                 <xsl:variable
                     name="lineNumber"
                     select="@line">
                 </xsl:variable>
-                <xsl:for-each select="message">
+                <xsl:for-each
+                    select="message">
                     <p
                         style="margin-left: +.5in; font-size: -1; margin-top: 0;margin-bottom:0;">
                         <small>
-                            <xsl:value-of select="@value" />
+                            <xsl:value-of
+                                select="@value"/>
                         </small>
                     </p>
                 </xsl:for-each>
-                <xsl:for-each select="source_context">
+                <xsl:for-each
+                    select="source_context">
                     <xsl:variable
                         name="pre"
                         select="substring(@value,0,(@sourceStart + 1))">
@@ -127,29 +142,30 @@
                         name="end"
                         select="substring(@value,(@sourceEnd + 2))">
                     </xsl:variable>
-
                     <p
                         style="margin-left: +.5in; font-size: -2; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of select="substring($classname,2)" />
+                        <xsl:value-of
+                            select="substring($classname,2)"/>
                         :
                     </p>
                     <p
                         style="margin-left: +.5in; font-size: -2;font-family: monospace; margin-top: 0;margin-bottom:0;">
-                        <xsl:value-of select="$lineNumber" />
+                        <xsl:value-of
+                            select="$lineNumber"/>
                         :
-                        <xsl:value-of select="$pre" />
+                        <xsl:value-of
+                            select="$pre"/>
                         <b>
                             <u>
-                                <xsl:value-of select="$main" />
+                                <xsl:value-of
+                                    select="$main"/>
                             </u>
                         </b>
-                        <xsl:value-of select="$end" />
+                        <xsl:value-of
+                            select="$end"/>
                     </p>
                 </xsl:for-each>
             </dd>
         </xsl:for-each>
-
-
     </xsl:template>
-
 </xsl:stylesheet>
\ 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 5f6697c..a1cc160 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
@@ -2,86 +2,89 @@
     name="Publish Build"
     default="default"
     basedir=".">
-
-	<!-- Properties that must be passed to this script:
-        buildDirectory: Path to perform the build in.  (A working directory)
-        buildType:		Type of build (nightly, integration etc.)
-        buildId:		Build name
-        buildLabel:		<buildType>-<buildName>-<timestamp>
+    <!--
+        Properties that must be passed to this script: buildDirectory:
+        Path to perform the build in. (A working directory) buildType:
+        Type of build (nightly, integration etc.) buildId: Build name
+        buildLabel: <buildType>-<buildName>-<timestamp>
     -->
-
-    <property environment="env" />
-
+    <property
+        environment="env"/>
     <property
         name="resultDir"
-        value="${buildDirectory}/${buildLabel}" />
-	<!--name of generated index page-->
+        value="${buildDirectory}/${buildLabel}"/>
+    <!--name of generated index page-->
     <property
         name="indexFileName"
-        value="index.php" />
+        value="index.php"/>
     <property
         name="templateDir"
-        value="${wtp.builder.home}/distribution/${build.distribution}.site" />
+        value="${wtp.builder.home}/distribution/${build.distribution}.site"/>
     <property
         name="resultingIndex"
-        value="${resultDir}/${indexFileName}" />
+        value="${resultDir}/${indexFileName}"/>
     <echo
         level="debug"
-        message="resultDir: ${resultDir}" />
+        message="resultDir: ${resultDir}"/>
     <echo
         level="debug"
-        message="templateDir: ${templateDir}" />
+        message="templateDir: ${templateDir}"/>
     <echo
         level="debug"
-        message="resultingIndex: ${resultingIndex}" />
-
-
-
-    <target name="default">
+        message="resultingIndex: ${resultingIndex}"/>
+    <target
+        name="default">
         <copy
             overwrite="true"
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/${indexTemplateFilename}"
-            tofile="${resultingIndex}" />
-        <antcall target="countFiles" />
-        <antcall target="generateCompileIndex" />
-        <antcall target="generateJUnitTestsIndex" />
-        <antcall target="getStaticFiles" />
+            tofile="${resultingIndex}"/>
+        <antcall
+            target="countFiles"/>
+        <antcall
+            target="generateCompileIndex"/>
+        <antcall
+            target="generateJUnitTestsIndex"/>
+        <antcall
+            target="getStaticFiles"/>
     </target>
-
-    <target name="generateCompileIndex">
-
-
-		<!--
-            <taskdef name="indexResults" classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator" />
+    <target
+        name="generateCompileIndex">
+        <!--
+            <taskdef name="indexResults"
+            classname="org.eclipse.wtp.releng.tools.ResultsSummaryGenerator"
+            />
         -->
-
-		<!--
-            isBuildTested:  true|false  should JUnit plugin test results be used to generate index page
-            dropTokenList:  comma separated list of strings which should be replaced by the fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName:  path to directory containing JUnit plugin test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result of the build.
-            testResultsTemplateFileName:  path to template file used to generate page with links to JUnit test results	
-            testResultsHtmlFileName:  name of file which will be generated with links to JUnit test results
-            dropHtmlFileName:  name of generated index page
-            hrefTestResultsTargetPath:  relative path from index page to directory containing JUnit html test results
-            hrefCompileLogsTargetPath:  relative path from index page directory containing compilelogs
-            testManifestFileName:	name of xml file containing descriptions of zip types and log files
-            
-            
-            
+        <!--
+            isBuildTested: true|false should JUnit plugin test results
+            be used to generate index page dropTokenList: comma
+            separated list of strings which should be replaced by the
+            fileName attribute settings in the testManifest.xml.
+            xmlDirectoryName: path to directory containing JUnit plugin
+            test results in xml format (see doc is org.eclipse.test).
+            dropDirectoryName: path to directory containing the result
+            of the build. testResultsTemplateFileName: path to template
+            file used to generate page with links to JUnit test results
+            testResultsHtmlFileName: name of file which will be
+            generated with links to JUnit test results dropHtmlFileName:
+            name of generated index page hrefTestResultsTargetPath:
+            relative path from index page to directory containing JUnit
+            html test results hrefCompileLogsTargetPath: relative path
+            from index page directory containing compilelogs
+            testManifestFileName: name of xml file containing
+            descriptions of zip types and log files
         -->
         <property
-            file="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties" />
+            file="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties"/>
 
-		<!-- create tables of test plugin compiles first -->
+        <!-- create tables of test plugin compiles first -->
         <antcall
             target="generateCompileOutput">
             <param
                 name="outputDirectory"
-                value="${resultDir}/testcompilelogs" />
+                value="${resultDir}/testcompilelogs"/>
         </antcall>
 
-		<!-- create table of code plugins compiles -->
+        <!-- create table of code plugins compiles -->
         <summarizeResults
             isBuildTested="false"
             includeAll="true"
@@ -92,29 +95,31 @@
             testResultsHtmlFileName="compileResults.php"
             hrefTestResultsTargetPath="testResults/html"
             hrefCompileLogsTargetPath="compilelogs"
-            compileLogsDirectoryName="${resultDir}/compilelogs" />
+            compileLogsDirectoryName="${resultDir}/compilelogs"/>
         <xslt
             basedir="${resultDir}/compilelogs"
             destdir="${resultDir}/compilelogs"
             includes="**/*.bin.xml"
             scanincludeddirectories="true"
             style="compilerXMLOutputToHTML.xsl"
-            force="true" />
+            force="true"/>
         <tstamp>
             <format
                 property="TODAY"
-                pattern="MMMM d, yyyy" />
+                pattern="MMMM d, yyyy"/>
         </tstamp>
 
-		<!--  Insert Build Type descriptor  -->
+        <!--  Insert Build Type descriptor  -->
         <antcall
-            target="${buildType}" />
+            target="${buildType}"/>
         <antcall
-            target="writeData" />
-
-		<!--  Update timestamp on file to permit overwrite through Ant copy task  -->
+            target="writeData"/>
+        <!--
+            Update timestamp on file to permit overwrite through Ant
+            copy task
+        -->
         <touch
-            file="${resultingIndex}" />
+            file="${resultingIndex}"/>
     </target>
     <target
         name="generateCompileOutput"
@@ -130,40 +135,43 @@
             testResultsHtmlFileName="testCompileResults.php"
             hrefTestResultsTargetPath=""
             hrefCompileLogsTargetPath="testcompilelogs"
-            compileLogsDirectoryName="${outputDirectory}" />
+            compileLogsDirectoryName="${outputDirectory}"/>
         <xslt
             basedir="${outputDirectory}"
             destdir="${outputDirectory}"
             includes="**/*.bin.xml"
             scanincludeddirectories="true"
             style="compilerXMLOutputToHTML.xsl"
-            force="true" />
+            force="true"/>
     </target>
     <target
         name="generateJUnitTestsIndex"
         depends="checkIfTested"
         if="doTests">
-
-		<!--
-            isBuildTested:  true|false  should JUnit plugin test results be used to generate index page
-            dropTokenList:  comma separated list of strings which should be replaced by the fileName attribute settings in the testManifest.xml.
-            xmlDirectoryName:  path to directory containing JUnit plugin test results in xml format (see doc is org.eclipse.test).
-            dropDirectoryName: path to directory containing the result of the build.
-            testResultsTemplateFileName:  path to template file used to generate page with links to JUnit test results	
-            testResultsHtmlFileName:  name of file which will be generated with links to JUnit test results
-            dropHtmlFileName:  name of generated index page
-            hrefTestResultsTargetPath:  relative path from index page to directory containing JUnit html test results
-            hrefCompileLogsTargetPath:  relative path from index page directory containing compilelogs
-            testManifestFileName:	name of xml file containing descriptions of zip types and log files
-            
-            
-            
+        <!--
+            isBuildTested: true|false should JUnit plugin test results
+            be used to generate index page dropTokenList: comma
+            separated list of strings which should be replaced by the
+            fileName attribute settings in the testManifest.xml.
+            xmlDirectoryName: path to directory containing JUnit plugin
+            test results in xml format (see doc is org.eclipse.test).
+            dropDirectoryName: path to directory containing the result
+            of the build. testResultsTemplateFileName: path to template
+            file used to generate page with links to JUnit test results
+            testResultsHtmlFileName: name of file which will be
+            generated with links to JUnit test results dropHtmlFileName:
+            name of generated index page hrefTestResultsTargetPath:
+            relative path from index page to directory containing JUnit
+            html test results hrefCompileLogsTargetPath: relative path
+            from index page directory containing compilelogs
+            testManifestFileName: name of xml file containing
+            descriptions of zip types and log files
         -->
         <property
-            file="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties" />
+            file="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties"/>
 
-		<!-- create table of test plugin compiles first -->
-		<!-- set isBuildTested to true for the "compile only" results -->
+        <!-- create table of test plugin compiles first -->
+        <!-- set isBuildTested to true for the "compile only" results -->
         <summarizeResults
             isBuildTested="true"
             dropTokenList="${dropTokenList}"
@@ -172,193 +180,199 @@
             testResultsTemplateFileName="${templateDir}/templateFiles/testResults.php.template"
             testResultsHtmlFileName="testResults.php"
             hrefTestResultsTargetPath="testResults/html"
-            compileLogsDirectoryName="" />
+            compileLogsDirectoryName=""/>
         <tstamp>
             <format
                 property="TODAY"
-                pattern="MMMM d, yyyy" />
+                pattern="MMMM d, yyyy"/>
         </tstamp>
 
-		<!--  Insert Build Type descriptor  -->
+        <!--  Insert Build Type descriptor  -->
         <antcall
-            target="${buildType}" />
+            target="${buildType}"/>
         <antcall
-            target="writeData" />
-
-		<!--  Update timestamp on file to permit overwrite through Ant copy task  -->
+            target="writeData"/>
+        <!--
+            Update timestamp on file to permit overwrite through Ant
+            copy task
+        -->
         <touch
-            file="${resultingIndex}" />
+            file="${resultingIndex}"/>
     </target>
     <target
         name="getStaticFiles">
-		<!--get static files required in the buildLabel directory-->
+        <!--get static files required in the buildLabel directory-->
         <copy
             todir="${resultDir}">
             <fileset
-                dir="${templateDir}/staticDropFiles" />
+                dir="${templateDir}/staticDropFiles"/>
         </copy>
 
-		<!--copy buildnotes from plugin directories-->
+        <!--copy buildnotes from plugin directories-->
         <mkdir
-            dir="${resultDir}/buildnotes" />
+            dir="${resultDir}/buildnotes"/>
         <copy
             todir="${resultDir}/buildnotes"
             flatten="true">
             <fileset
                 dir="${buildDirectory}/plugins"
-                includes="**/buildnotes_*.html" />
+                includes="**/buildnotes_*.html"/>
             <fileset
                 dir="${buildDirectory}/features"
-                includes="**/buildnotes_*.html" />
+                includes="**/buildnotes_*.html"/>
         </copy>
         <copy
             file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php" />
+            tofile="${resultDir}/testResults/consolelogs/full/logIndex.php"/>
         <copy
             file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php" />
+            tofile="${resultDir}/testResults/consolelogs/testLogs/logIndex.php"/>
         <copy
             file="${templateDir}/staticDropFiles/logIndex.php"
-            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php" />
+            tofile="${resultDir}/testResults/consolelogs/testSysErrorLogs/logIndex.php"/>
     </target>
     <target
         name="updateSite">
 
 
-		<!-- get our authored, tokenized site.xml file -->
+        <!-- get our authored, tokenized site.xml file -->
         <copy
             file="${wtp.builder.home}/distribution/${build.distribution}.site/templateFiles/siteWTP.xml"
             tofile="${buildDirectory}/${buildLabel}/updateSite/site.xml"
             overwrite="true"
-            failonerror="true" />
-		<!-- get the ${buildDirectory}/finalPluginsVersions.properties, and 
-            read as properties -->
-		<!-- substitute property value for tokens -->
+            failonerror="true"/>
+        <!--
+            get the ${buildDirectory}/finalPluginsVersions.properties,
+            and read as properties
+        -->
+        <!-- substitute property value for tokens -->
         <replace
             file="${buildDirectory}/${buildLabel}/updateSite/site.xml"
             propertyfile="${buildDirectory}/finalFeaturesVersions.properties">
             <replacefilter
                 token="@org.eclipse.wst@"
-                property="org.eclipse.wst" />
+                property="org.eclipse.wst"/>
             <replacefilter
                 token="@org.eclipse.wst.sdk@"
-                property="org.eclipse.wst.sdk" />
+                property="org.eclipse.wst.sdk"/>
             <replacefilter
                 token="@org.eclipse.jst@"
-                property="org.eclipse.jst" />
+                property="org.eclipse.jst"/>
             <replacefilter
                 token="@org.eclipse.jst.sdk@"
-                property="org.eclipse.jst.sdk" />
+                property="org.eclipse.jst.sdk"/>
             <replacefilter
                 token="@org.eclipse.jpt.feature@"
-                property="org.eclipse.jpt.feature" />
+                property="org.eclipse.jpt.feature"/>
             <replacefilter
                 token="@org.eclipse.jpt_sdk.feature@"
-                property="org.eclipse.jpt_sdk.feature" />
+                property="org.eclipse.jpt_sdk.feature"/>
         </replace>
     </target>
     <target
         name="countFiles">
-		<!--	
-            files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
-            It is required to generate a link to the build on the downloads page.
+        <!--
+            files.count is a file that should exist in the drop
+            directory with a count of the zip files in the same
+            directory. It is required to generate a link to the build on
+            the downloads page.
         -->
         <countBuildFiles
             sourceDirectory="${resultDir}"
             filterString=".zip,.tar.gz"
-            outputFile="${resultDir}/files.count" />
+            outputFile="${resultDir}/files.count"/>
     </target>
 
-	<!--Build type descriptors-->
+    <!--Build type descriptors-->
     <target
         name="I">
         <replace
             file="${resultingIndex}"
             token="%wtpandprereqs%"
-            value=" " />
+            value=" "/>
         <replace
             file="${resultingIndex}"
             token="@type@"
-            value="Integration" />
+            value="Integration"/>
     </target>
     <target
         name="S">
         <replace
             file="${resultingIndex}"
             token="%wtpandprereqs%"
-            value=" " />
+            value=" "/>
         <replace
             file="${resultingIndex}"
             token="@type@"
-            value="Stable" />
+            value="Stable"/>
     </target>
     <target
         name="N">
         <replace
             file="${resultingIndex}"
             token="%wtpandprereqs%"
-            value=" " />
+            value=" "/>
         <replace
             file="${resultingIndex}"
             token="@type@"
-            value="Nightly" />
+            value="Nightly"/>
     </target>
     <target
         name="M">
         <replace
             file="${resultingIndex}"
             token="%wtpandprereqs%"
-            value=" " />
+            value=" "/>
         <replace
             file="${resultingIndex}"
             token="@type@"
-            value="Maintenance" />
+            value="Maintenance"/>
     </target>
     <target
         name="R">
         <replace
             file="${resultingIndex}"
             token="%wtpandprereqs%"
-            value=" " />
+            value=" "/>
         <replace
             file="${resultingIndex}"
             token="@type@"
-            value="Release" />
+            value="Release"/>
     </target>
     <target
         name="T">
         <replace
             file="${resultingIndex}"
             token="%wtpandprereqs%"
-            value=" " />
+            value=" "/>
         <replace
             file="${resultingIndex}"
             token="@type@"
-            value="Test" />
+            value="Test"/>
     </target>
     <target
         name="P">
         <replace
             file="${resultingIndex}"
             token="%wtpandprereqs%"
-            value=" " />
+            value=" "/>
         <replace
             file="${resultingIndex}"
             token="@type@"
-            value="Patches" />
+            value="Patches"/>
     </target>
     <target
         name="checkIfTested">
         <echo
             level="debug"
-            message="isBuildTested: ${isBuildTested}" />
+            message="isBuildTested: ${isBuildTested}"/>
         <condition
             property="doTests">
             <equals
                 arg1="${isBuildTested}"
                 arg2="true"
                 trim="true"
-                casesensitive="false" />
+                casesensitive="false"/>
         </condition>
     </target>
     <target
@@ -366,183 +380,183 @@
         <condition
             property="doCompileLogs">
             <available
-                file="${outputDirectory}" />
+                file="${outputDirectory}"/>
         </condition>
     </target>
     <target
         name="writeData">
-		<!--  Insert Build Date  -->
+        <!--  Insert Build Date  -->
         <replace
             file="${resultingIndex}"
             token="@date@"
-            value="${TODAY}" />
+            value="${TODAY}"/>
 
-		<!--  Insert Build Name  -->
+        <!--  Insert Build Name  -->
         <replace
             file="${resultingIndex}"
             token="@build@"
-            value="${buildLabel}" />
+            value="${buildLabel}"/>
         <replace
             file="${resultingIndex}"
             token="@buildBranch@"
-            value="${buildBranch}" />
+            value="${buildBranch}"/>
 
-		<!--  Insert PreRequsites  -->
+        <!--  Insert PreRequsites  -->
         <replace
             file="${resultingIndex}"
             token="@eclipseFile@"
-            value="${eclipse.file.linux-gtk-x86}" />
+            value="${eclipse.file.linux-gtk-x86}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipseURL@"
-            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}" />
+            value="${eclipse.url}/${eclipse.file.linux-gtk-x86}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipseBuildURL@"
-            value="${eclipse.url}" />
+            value="${eclipse.url}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipsefilelinux@"
-            value="${eclipse.file.linux-gtk-x86}" />
+            value="${eclipse.file.linux-gtk-x86}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipsefilewindows@"
-            value="${eclipse.file.win32-win32-x86}" />
+            value="${eclipse.file.win32-win32-x86}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipsefilemacos@"
-            value="${eclipse.file.macosx-carbon-ppc}" />
+            value="${eclipse.file.macosx-carbon-ppc}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipseBuildHome@"
-            value="${eclipse.build.home}" />
+            value="${eclipse.build.home}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipse.mirror.prefixuri@"
-            value="${eclipse.mirror.prefixuri}" />
+            value="${eclipse.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipse.fspath.prefix@"
-            value="${eclipse.fspath.prefix}" />
+            value="${eclipse.fspath.prefix}"/>
         <replace
             file="${resultingIndex}"
             token="@testURL@"
-            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}" />
+            value="${eclipseTestFramework.url}/${eclipseTestFramework.file}"/>
         <replace
             file="${resultingIndex}"
             token="@testFile@"
-            value="${eclipseTestFramework.file}" />
+            value="${eclipseTestFramework.file}"/>
         <replace
             file="${resultingIndex}"
             token="@emfFile@"
-            value="${emf.file}" />
+            value="${emf.file}"/>
         <replace
             file="${resultingIndex}"
             token="@emfURL@"
-            value="${emf.url}/${emf.file}" />
+            value="${emf.url}/${emf.file}"/>
         <replace
             file="${resultingIndex}"
             token="@emfBuildHome@"
-            value="${emf.build.home}" />
+            value="${emf.build.home}"/>
         <replace
             file="${resultingIndex}"
             token="@emf.mirror.prefixuri@"
-            value="${emf.mirror.prefixuri}" />
+            value="${emf.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
             token="@wstFile@"
-            value="${wst.file}" />
+            value="${wst.file}"/>
         <replace
             file="${resultingIndex}"
             token="@wstURL@"
-            value="${wst.url}/${wst.file}" />
+            value="${wst.url}/${wst.file}"/>
         <replace
             file="${resultingIndex}"
             token="@wstBuildHome@"
-            value="${wst.build.home}" />
+            value="${wst.build.home}"/>
         <replace
             file="${resultingIndex}"
             token="@wst.mirror.prefixuri@"
-            value="${wst.mirror.prefixuri}" />
+            value="${wst.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
             token="@gefFile@"
-            value="${gef.file}" />
+            value="${gef.file}"/>
         <replace
             file="${resultingIndex}"
             token="@gefURL@"
-            value="${gef.url}/${gef.file}" />
+            value="${gef.url}/${gef.file}"/>
         <replace
             file="${resultingIndex}"
             token="@gefBuildHome@"
-            value="${gef.build.home}" />
+            value="${gef.build.home}"/>
         <replace
             file="${resultingIndex}"
             token="@gef.mirror.prefixuri@"
-            value="${gef.mirror.prefixuri}" />
+            value="${gef.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipserelengFile@"
-            value="${eclipsereleng.file}" />
+            value="${eclipsereleng.file}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipserelengURL@"
-            value="${eclipsereleng.url}/${eclipsereleng.file}" />
+            value="${eclipsereleng.url}/${eclipsereleng.file}"/>
         <replace
             file="${resultingIndex}"
             token="@orbitthirdpartyzipFile@"
-            value="${orbitthirdpartyzip.file}" />
+            value="${orbitthirdpartyzip.file}"/>
         <replace
             file="${resultingIndex}"
             token="@orbitthirdpartyzipURL@"
-            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}" />
+            value="${orbitthirdpartyzip.url}/${orbitthirdpartyzip.file}"/>
         <replace
             file="${resultingIndex}"
             token="@orbitthirdpartyzipBuildHome@"
-            value="${orbitthirdpartyzip.build.home}" />
+            value="${orbitthirdpartyzip.build.home}"/>
         <replace
             file="${resultingIndex}"
             token="@orbitthirdpartyzip.mirror.prefixuri@"
-            value="${orbitthirdpartyzip.mirror.prefixuri}" />
+            value="${orbitthirdpartyzip.mirror.prefixuri}"/>
 
 
-		<!-- no longer used. Post 1.5.5 -->
+        <!-- no longer used. Post 1.5.5 -->
         <replace
             file="${resultingIndex}"
             token="@jemFile@"
-            value="${jem.file}" />
+            value="${jem.file}"/>
         <replace
             file="${resultingIndex}"
             token="@jemURL@"
-            value="${jem.url}/${jem.file}" />
+            value="${jem.url}/${jem.file}"/>
         <replace
             file="${resultingIndex}"
             token="@jemBuildHome@"
-            value="${jem.build.home}" />
+            value="${jem.build.home}"/>
         <replace
             file="${resultingIndex}"
             token="@jem.mirror.prefixuri@"
-            value="${jem.mirror.prefixuri}" />
-		<!-- 
-            these token/s should not exist in maintenance stream, but 
-            do no harm done, so in the interests of keeping builder 
-            streams in sync, we'll leave them here as place hold
+            value="${jem.mirror.prefixuri}"/>
+        <!--
+            these token/s should not exist in maintenance stream, but do
+            no harm done, so in the interests of keeping builder streams
+            in sync, we'll leave them here as place hold
         -->
         <replace
             file="${resultingIndex}"
             token="@dtpFile@"
-            value="${dtp.file}" />
+            value="${dtp.file}"/>
         <replace
             file="${resultingIndex}"
             token="@dtpURL@"
-            value="${dtp.url}/${dtp.file}" />
+            value="${dtp.url}/${dtp.file}"/>
         <replace
             file="${resultingIndex}"
             token="@dtpBuildHome@"
-            value="${dtp.build.home}" />
+            value="${dtp.build.home}"/>
         <replace
             file="${resultingIndex}"
             token="@dtp.mirror.prefixuri@"
-            value="${dtp.mirror.prefixuri}" />
+            value="${dtp.mirror.prefixuri}"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteEnablingFeatures.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteEnablingFeatures.xml
index e4ace4d..cc3ed81 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteEnablingFeatures.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteEnablingFeatures.xml
@@ -1,26 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-
-    <description>
-        The update site contains the enabling features.
-    </description>
-
-
-
-
-
-
-
+    <description> The update site contains the enabling features. </description>
     <category-def
         name="Enabling Features"
         label="Enabling Features">
-        <description>
-            This category contains features used by several projects
-            that enable some functionality, but which by themselves are
-            not very interesting.
-        </description>
+        <description> This category contains features used by several
+            projects that enable some functionality, but which by
+            themselves are not very interesting. </description>
     </category-def>
-
-
-
-</site>
+</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteWTP.xml
index e3a86fa..f94e83f 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteWTP.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/templateFiles/siteWTP.xml
@@ -3,67 +3,55 @@
     pack200="true"
     mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/webtools/testUpdates/site.xml&amp;format=xml"
     digestURL="http://download.eclipse.org/webtools/testUpdates/">
-
     <description
-        url="http://download.eclipse.org/webtools/declaredUpdates/index.html">
-        The update site contains the features of the of Eclipse Web
-        Tools Project (WTP)
-    </description>
-
+        url="http://download.eclipse.org/webtools/declaredUpdates/index.html"> The update site contains the features of the of Eclipse Web
+        Tools Project (WTP) </description>
     <feature
         url="features/org.eclipse.wst_@org.eclipse.wst@.jar"
         id="org.eclipse.wst"
         version="@org.eclipse.wst@">
-        <category name="Web Tools Platform (WTP)" />
+        <category
+            name="Web Tools Platform (WTP)"/>
     </feature>
-
     <feature
         url="features/org.eclipse.wst.sdk_@org.eclipse.wst.sdk@.jar"
         id="org.eclipse.wst.sdk"
         version="@org.eclipse.wst.sdk@">
-        <category name="Web Tools Platform (WTP)" />
+        <category
+            name="Web Tools Platform (WTP)"/>
     </feature>
-
     <feature
         url="features/org.eclipse.jst_@org.eclipse.jst@.jar"
         id="org.eclipse.jst"
         version="@org.eclipse.jst@">
-        <category name="Web Tools Platform (WTP)" />
+        <category
+            name="Web Tools Platform (WTP)"/>
     </feature>
-
     <feature
         url="features/org.eclipse.jst.sdk_@org.eclipse.jst.sdk@.jar"
         id="org.eclipse.jst.sdk"
         version="@org.eclipse.jst.sdk@">
-        <category name="Web Tools Platform (WTP)" />
+        <category
+            name="Web Tools Platform (WTP)"/>
     </feature>
-
-
-
-
     <feature
         url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar"
         id="org.eclipse.jpt.feature"
         version="@org.eclipse.jpt.feature@">
-        <category name="Web Tools Platform (WTP)" />
+        <category
+            name="Web Tools Platform (WTP)"/>
     </feature>
-
     <feature
         url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar"
         id="org.eclipse.jpt_sdk.feature"
         version="@org.eclipse.jpt_sdk.feature@">
-        <category name="Web Tools Platform (WTP)" />
+        <category
+            name="Web Tools Platform (WTP)"/>
     </feature>
-
-
     <category-def
         name="Web Tools Platform (WTP)"
         label="Web Tools Platform (WTP)">
-        <description>
-            This category contains the features of the Eclipse Web Tools
-            Project (WTP).
-        </description>
+        <description> This category contains the features of the Eclipse
+            Web Tools Project (WTP). </description>
     </category-def>
-
-
-</site>
+</site>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/transformReportToHTML.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/transformReportToHTML.xml
index f5a70cd..9231345 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/transformReportToHTML.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/transformReportToHTML.xml
@@ -3,7 +3,6 @@
     name="xsl-conversion"
     default="main"
     basedir=".">
-
     <target
         name="main"
         description="example.bin.xml to produce example.html">
@@ -13,6 +12,6 @@
             includes="*.bin.xml"
             scanincludeddirectories="true"
             style="compilerXMLOutputToHTML.xsl"
-            force="true" />
+            force="true"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
index c417b75..f48f2dc 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
@@ -1,173 +1,175 @@
 <project
     name="Build specific targets and properties"
     default="runTest">
-
-	<!-- Note to be cross-platform, "environment variables" are only appropriate for
-        some variables, e.g. ones we set, since properties are case sensitive, even if
-        the environment variables on your operating system are not, e.g. it will
-        be ${env.Path} not ${env.PATH} on Windows -->
+    <!--
+        Note to be cross-platform, "environment variables" are only
+        appropriate for some variables, e.g. ones we set, since
+        properties are case sensitive, even if the environment variables
+        on your operating system are not, e.g. it will be ${env.Path}
+        not ${env.PATH} on Windows
+    -->
     <property
-        environment="env" />
+        environment="env"/>
     <fail
         message="testRoot must be set for this task"
-        unless="testRoot" />
-  <!-- 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}" />
-        
+        unless="testRoot"/>
+    <!-- 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}"/>
 
-	<!-- 
+
+    <!-- 
 	   Steps to do after the build is done. 
 	 -->
     <target
         name="test">
         <dirname
             file="${ant.file}"
-            property="currentDirectory" />
+            property="currentDirectory"/>
         <ant
             antfile="${ant.file}"
             target="runTest"
-            dir="${currentDirectory}" />
+            dir="${currentDirectory}"/>
     </target>
 
-	<!-- 
+    <!-- 
 	  Steps to do to test the build results
    -->
     <target
         name="runTest">
         <dirname
             file="${ant.file}"
-            property="test.component.dir" />
+            property="test.component.dir"/>
         <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml" />
+            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
         <property
-            file="${buildDirectory}/label.properties" />
+            file="${buildDirectory}/label.properties"/>
         <property
-            file="${wtp.builder.home}/build.properties" />
+            file="${wtp.builder.home}/build.properties"/>
         <fail
             message="testRoot must be set for this task"
-            unless="testRoot" />
+            unless="testRoot"/>
         <mkdir
-            dir="${testRoot}" />
+            dir="${testRoot}"/>
 
-		<!-- if results already exist, delete them -->
+        <!-- if results already exist, delete them -->
         <delete
             dir="${testRoot}/results"
-            failOnError="false" />
+            failOnError="false"/>
         <mkdir
-            dir="${testRoot}/results" />
+            dir="${testRoot}/results"/>
         <mkdir
-            dir="${testRoot}/results/consolelogs" />
+            dir="${testRoot}/results/consolelogs"/>
         <mkdir
-            dir="${testRoot}/results/consolelogs/metadata-logs" />
+            dir="${testRoot}/results/consolelogs/metadata-logs"/>
         <mkdir
-            dir="${testRoot}/results/consolelogs/configuration-logs" />
+            dir="${testRoot}/results/consolelogs/configuration-logs"/>
         <copy
             todir="${testRoot}"
             overwrite="true">
             <fileset
-                dir="${test.component.dir}/testScripts" />
+                dir="${test.component.dir}/testScripts"/>
         </copy>
         <echo
-            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} " />
+            message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
         <ant
             antfile="${test.component.dir}/testdependency.xml"
             target="get">
             <property
                 name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties" />
+                value="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties"/>
             <property
                 name="base.install.dir"
-                value="${testRoot}" />
+                value="${testRoot}"/>
         </ant>
         <antcall
-            target="unzipTests" />
+            target="unzipTests"/>
         <antcall
             target="runTestEclipse">
             <param
                 name="testTarget"
-                value="all" />
+                value="all"/>
         </antcall>
         <antcall
             target="postRunTestEclipse">
             <param
                 name="testTarget"
-                value="all" />
+                value="all"/>
         </antcall>
     </target>
     <target
         name="unzipTests">
-
-		<!--unzip the builds and junit tests
-            we use 'unzip' here, so we can continue on error, if desired.
-            (such as if zip was not created, due to other failures or options).
+        <!--
+            unzip the builds and junit tests we use 'unzip' here, so we
+            can continue on error, if desired. (such as if zip was not
+            created, due to other failures or options).
         -->
         <echo
-            message="installing sdk" />
+            message="installing sdk"/>
         <exec
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
             failonerror="true">
             <arg
-                line="-o -qq  @zipprefix@-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
+                line="-o -qq  @zipprefix@-sdk-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
         </exec>
         <echo
-            message="installing tests" />
+            message="installing tests"/>
         <exec
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
             failonerror="true">
             <arg
-                line="-o -qq @zipprefix@-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}" />
+                line="-o -qq @zipprefix@-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
         </exec>
     </target>
-
-	<!-- time out may need to be set/adjust for api or performance tests?
-        This testTimeLimit is the whole, overall limit on tests. There's a shorter 
-        one for individual suites.
-        
-        some common values, of milliseconds to more recognizable units:
-        7200000: 2 hours
-        3600000: 1 hour
-        1800000: 30 minutes
-        600000: 10 minutes
+    <!--
+        time out may need to be set/adjust for api or performance tests?
+        This testTimeLimit is the whole, overall limit on tests. There's
+        a shorter one for individual suites. some common values, of
+        milliseconds to more recognizable units: 7200000: 2 hours
+        3600000: 1 hour 1800000: 30 minutes 600000: 10 minutes
     -->
     <property
         name="testTimeLimit"
-        value="7200000" />
+        value="7200000"/>
     <property
         name="testFailOnError"
-        value="false" />
+        value="false"/>
     <target
         name="runTestEclipse"
         description="Run our JUnit's within an instance of antRunner">
         <property
             name="test-vm"
-            value="${env.JAVA_6_HOME}/bin/java" />
+            value="${env.JAVA_6_HOME}/bin/java"/>
         <property
             name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins" />
+            value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
         <property
             name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}" />
-
-
-		<!-- set path to eclipse folder. If local folder, use '.'; otherwise, use c:\path\to\eclipse or /path/to/eclipse/ -->
+            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
+        <!--
+            set path to eclipse folder. If local folder, use '.';
+            otherwise, use c:\path\to\eclipse or /path/to/eclipse/
+        -->
         <property
             name="eclipse.home"
-            value="${testRoot}" />
+            value="${testRoot}"/>
         <echo
-            message="Running junits" />
-
-		<!-- 
-            Remember: using -debug for org.eclipse.ant.core.antRunner 
-            produces ant debug info to be output ... which is a TON of stuff 
+            message="Running junits"/>
+        <!--
+            Remember: using -debug for org.eclipse.ant.core.antRunner
+            produces ant debug info to be output ... which is a TON of
+            stuff
         -->
         <echo
-            message="eclipse.launcher: ${eclipse.launcher}" />
+            message="eclipse.launcher: ${eclipse.launcher}"/>
         <java
             taskname="unit-test-masterprocess"
             fork="true"
@@ -181,92 +183,91 @@
                 <fileset
                     dir="${testRoot}/eclipse/plugins">
                     <include
-                        name="org.eclipse.equinox.launcher_*.jar" />
+                        name="org.eclipse.equinox.launcher_*.jar"/>
                 </fileset>
             </classpath>
             <jvmarg
-                value="-Xmx512m" />
+                value="-Xmx512m"/>
             <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}" />
+                value="-Dosgi.ws=${env.BASEWS}"/>
             <jvmarg
-                value="-Dosgi.os=${env.BASEOS}" />
+                value="-Dosgi.os=${env.BASEOS}"/>
             <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}" />
+                value="-Dosgi.arch=${env.BASEARCH}"/>
             <jvmarg
-                value="-Dws=${env.BASEWS}" />
+                value="-Dws=${env.BASEWS}"/>
             <jvmarg
-                value="-Dos=${env.BASEOS}" />
+                value="-Dos=${env.BASEOS}"/>
             <jvmarg
-                value="-Darch=${env.BASEARCH}" />
-
+                value="-Darch=${env.BASEARCH}"/>
             <jvmarg
-                value="-Dnoclean=true" />
+                value="-Dnoclean=true"/>
             <jvmarg
-                value="-DbuildBranch=${buildBranch}" />
+                value="-DbuildBranch=${buildBranch}"/>
             <jvmarg
-                value="-DbuildType=${buildType}" />
+                value="-DbuildType=${buildType}"/>
             <jvmarg
-                value="-DbuildId=${buildId}" />
+                value="-DbuildId=${buildId}"/>
             <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
-                value="-Dprojectname=${projectname}" />
+                value="-Dprojectname=${projectname}"/>
             <arg
-                value="-nosplash" />
+                value="-nosplash"/>
             <arg
-                value="-consolelog" />
+                value="-consolelog"/>
             <arg
-                value="-data" />
+                value="-data"/>
             <arg
-                value="${testRoot}/overallTestWorkspace" />
+                value="${testRoot}/overallTestWorkspace"/>
             <arg
-                value="-application" />
+                value="-application"/>
             <arg
-                value="org.eclipse.ant.core.antRunner" />
+                value="org.eclipse.ant.core.antRunner"/>
             <arg
-                value="-file" />
+                value="-file"/>
             <arg
-                value="${testRoot}/test.xml" />
+                value="${testRoot}/test.xml"/>
             <arg
-                value="-logger" />
+                value="-logger"/>
             <arg
-                value="org.apache.tools.ant.DefaultLogger" />
+                value="org.apache.tools.ant.DefaultLogger"/>
             <env
                 key="DISPLAY"
-                value="${env.DISPLAY}" />
+                value="${env.DISPLAY}"/>
             <redirector
                 output="${testRoot}/results/fullOutput.txt"
-                error="${testRoot}/results/fullErrorLog.txt" />
+                error="${testRoot}/results/fullErrorLog.txt"/>
             <sysproperty
                 key="build.home"
-                value="${env.BUILD_HOME}" />
+                value="${env.BUILD_HOME}"/>
             <sysproperty
                 key="buildDirectory"
-                value="${buildDirectory}" />
+                value="${buildDirectory}"/>
             <sysproperty
                 key="buildLabel"
-                value="${buildLabel}" />
+                value="${buildLabel}"/>
             <sysproperty
                 key="baseLocation"
-                value="${baseLocation}" />
+                value="${baseLocation}"/>
             <sysproperty
                 key="testRoot"
-                value="${testRoot}" />
+                value="${testRoot}"/>
             <sysproperty
                 key="testDir"
-                value="${testRoot}" />
+                value="${testRoot}"/>
             <sysproperty
                 key="perf.buildId"
-                value="${buildType}${date}-${time}" />
+                value="${buildType}${date}-${time}"/>
             <sysproperty
                 key="eclipseBuilderDirectory"
-                value="${pde.builder.path}" />
+                value="${pde.builder.path}"/>
             <sysproperty
                 key="buildLabel"
-                value="${buildLabel}" />
+                value="${buildLabel}"/>
         </java>
         <echo
-            message="wtpmasterjunitresult ${wtpmasterjunitresult}" />
+            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
     </target>
     <target
         name="postRunTestEclipse">
@@ -277,7 +278,7 @@
             <fileset
                 dir="${testRoot}/results">
                 <include
-                    name="*output.txt" />
+                    name="*output.txt"/>
             </fileset>
         </copy>
         <copy
@@ -287,7 +288,7 @@
             <fileset
                 dir="${testRoot}/results">
                 <include
-                    name="*error.txt" />
+                    name="*error.txt"/>
             </fileset>
         </copy>
         <copy
@@ -309,7 +310,7 @@
             <fileset
                 dir="${testRoot}/results/xml">
                 <include
-                    name="*.xml" />
+                    name="*.xml"/>
             </fileset>
         </copy>
         <copy
@@ -319,7 +320,7 @@
             <fileset
                 dir="${testRoot}/results/html">
                 <include
-                    name="*.html" />
+                    name="*.html"/>
             </fileset>
         </copy>
     </target>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL
index f57faaa..30a407d 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL
@@ -3,16 +3,16 @@
     version="1.0">
     <xsl:output
         method="html"
-        indent="yes" />
+        indent="yes"/>
     <xsl:decimal-format
         decimal-separator="."
-        grouping-separator="," />
-
-    <xsl:template match="testsuites">
+        grouping-separator=","/>
+    <xsl:template
+        match="testsuites">
         <HTML>
             <HEAD>
-                <style type="text/css">
-                    body { font:normal 68% verdana,arial,helvetica;
+                <style
+                    type="text/css"> body { font:normal 68% verdana,arial,helvetica;
                     color:#000000; } table tr td, table tr th {
                     font-size: 68%; } table.details tr th{ font-weight:
                     bold; text-align:left; background:#a6caf0; }
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/test.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/test.xml
index ba1431e..81abafc 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/test.xml
@@ -3,78 +3,84 @@
     default="all"
     basedir=".">
     <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}" />
-              
+        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}"/>
     <echo
         level="info"
-        message="starting Automated Eclipse Testing" />
+        message="starting Automated Eclipse Testing"/>
     <echo
         level="debug"
-        message="basedir: ${basedir}" />
+        message="basedir: ${basedir}"/>
     <echo
         level="debug"
-        message="testRoot: ${testRoot}" />
+        message="testRoot: ${testRoot}"/>
     <fail
         message="testRoot must be set"
-        unless="testRoot" />
+        unless="testRoot"/>
 
     <!--properties file containing the build information-->
     <property
-        file="${buildDirectory}/label.properties" />
+        file="${buildDirectory}/label.properties"/>
 
     <!--default directory where test-eclipse will be installed-->
     <property
         name="install"
-        value="${testRoot}" />
-
-    <!--name that can be added to report name to identify which platform tests results come from-->
+        value="${testRoot}"/>
+    <!--
+        name that can be added to report name to identify which platform
+        tests results come from
+    -->
     <property
         name="platform"
-        value="" />
+        value=""/>
 
     <!-- The root of the eclipse installation -->
     <property
         name="eclipse-home"
-        value="${testRoot}${dropinsFolder}/eclipse/" />
-
-    <!-- The directory that will contain the xml and html results from the tests that are run -->
+        value="${testRoot}${dropinsFolder}/eclipse/"/>
+    <!--
+        The directory that will contain the xml and html results from
+        the tests that are run
+    -->
     <property
         name="results"
-        value="${testRoot}/results" />
+        value="${testRoot}/results"/>
     <target
         name="init">
         <antcall
-            target="computePluginVersion" />
+            target="computePluginVersion"/>
         <property
-            file="${testRoot}/test2.properties" />
+            file="${testRoot}/test2.properties"/>
     </target>
     <target
         name="runtests"
         description="Runs ant on the test.xml for a specified plugin.">
         <available
             file="${eclipse-home}/plugins/${testPlugin}/test.xml"
-            property="test.xml.exists" />
+            property="test.xml.exists"/>
         <antcall
-            target="runtests2" />
+            target="runtests2"/>
     </target>
     <target
         name="runtests2"
         if="test.xml.exists">
         <antcall
-            target="runtests-normal" />
+            target="runtests-normal"/>
         <copy
             file="${eclipse-home}/${report}.xml"
             tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false" />
+            failonerror="false"/>
         <antcall
-            target="genHtml" />
+            target="genHtml"/>
     </target>
     <target
         name="runtests-normal">
@@ -83,14 +89,14 @@
             dir="${eclipse-home}">
             <property
                 name="library-file"
-                value="${testRoot}/wtp-junit-tests.xml" />
+                value="${testRoot}/wtp-junit-tests.xml"/>
         </ant>
         <copy
             file="${eclipse-home}/${report}.xml"
             tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false" />
+            failonerror="false"/>
         <antcall
-            target="genHtml" />
+            target="genHtml"/>
     </target>
     <target
         name="@shortname@-tests"
@@ -99,52 +105,40 @@
             target="runtests">
             <param
                 name="testPlugin"
-                value="${@testplugin@}" />
+                value="${@testplugin@}"/>
             <param
                 name="report"
-                value="@testplugin@" />
+                value="@testplugin@"/>
         </antcall>
-          	
     </target>
 
-	
-	<!-- releng Tests -->
-  <!--
-    <target
-        name="releng-tests"
-        depends="init"
-        description="Runs the releng tests.">
-        <antcall target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.wtp.releng.tests}" />
-            <param
-                name="report"
-                value="org.eclipse.wtp.releng.tests" />
-        </antcall>
-    </target>
-   -->
+
+    <!-- releng Tests -->
+    <!--
+        <target name="releng-tests" depends="init" description="Runs the
+        releng tests."> <antcall target="runtests"> <param
+        name="testPlugin" value="${org.eclipse.wtp.releng.tests}" />
+        <param name="report" value="org.eclipse.wtp.releng.tests" />
+        </antcall> </target>
+    -->
     <target
         name="all"
         depends="init">
         <echo
             level="info"
-            message="Starting Unit Tests" />
-
-      <!--
+            message="Starting Unit Tests"/>
+        <!--
+            <echo level="info" message="Starting releng tests" />
+            <antcall target="releng-tests" />
+        -->
         <echo
             level="info"
-            message="Starting releng tests" />
-        <antcall target="releng-tests" />
-      -->
-        <echo
-            level="info"
-            message="Starting @shortname@ tests" />
+            message="Starting @shortname@ tests"/>
         <antcall
-            target="@shortname@-tests" />
+            target="@shortname@-tests"/>
         <echo
             level="info"
-            message="Ended Unit Tests" />
+            message="Ended Unit Tests"/>
     </target>
     <target
         name="genHtml"
@@ -153,7 +147,7 @@
         <xslt
             style="JUNIT.XSL"
             basedir="${results}/xml"
-            destdir="${results}/html" />
+            destdir="${results}/html"/>
     </target>
     <target
         name="computePluginVersion"
@@ -163,14 +157,14 @@
             classname="org.eclipse.wtp.releng.test.ComputePluginVersion">
             <classpath>
                 <pathelement
-                    location="ComputePluginVersion.jar" />
+                    location="ComputePluginVersion.jar"/>
             </classpath>
             <arg
-                value="${eclipse-home}/plugins" />
+                value="${eclipse-home}/plugins"/>
             <arg
-                value="${testRoot}/test2.properties" />
+                value="${testRoot}/test2.properties"/>
             <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
         </java>
     </target>
     <target
@@ -178,7 +172,7 @@
         <condition
             property="test2propertiesexists">
             <available
-                file="${testRoot}/test2.properties" />
+                file="${testRoot}/test2.properties"/>
         </condition>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
index 5108dad..112a224 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
@@ -3,127 +3,128 @@
     name="JUnit tests"
     basedir=".">
     <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}" />
-        
+        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}"/>
     <target
         name="init">
-    <!--
-            Parameters:
-            (Mandatory)
-            data-dir                - the workspace directory for Eclipse to write its data
-            plugin-name             - symboic name of the plugin to test
-            testPlugin        - directory name of plugin (with version suffix)
-            classname               - the name of the test class
-            
-            (Optional - overrides defaults set in script)
-            extraVMargs             - allows separate setting of VM args from separate caller.
-            timeout                 - overrides default test timeout value (in milliseconds).
+        <!--
+            Parameters: (Mandatory) data-dir - the workspace directory
+            for Eclipse to write its data plugin-name - symboic name of
+            the plugin to test testPlugin - directory name of plugin
+            (with version suffix) classname - the name of the test class
+            (Optional - overrides defaults set in script) extraVMargs -
+            allows separate setting of VM args from separate caller.
+            timeout - overrides default test timeout value (in
+            milliseconds).
         -->
         <property
             name="junit-report-output"
-            value="${testRoot}/results" />
+            value="${testRoot}/results"/>
         <mkdir
-            dir="${junit-report-output}/raw" />
-
-
-    <!-- if not otherwise set, be sure extraVMargs is at least empty string -->
+            dir="${junit-report-output}/raw"/>
+        <!--
+            if not otherwise set, be sure extraVMargs is at least empty
+            string
+        -->
         <property
             name="extraVMargs"
-            value="" />
+            value=""/>
 
-    <!-- if not otherwise set, use a unique workspace name -->
+        <!-- if not otherwise set, use a unique workspace name -->
         <property
             name="data-dir"
-            value="${testRoot}/junitworkspaces/workspace-${classname}" />
+            value="${testRoot}/junitworkspaces/workspace-${classname}"/>
         <property
             name="testRoot"
-            value="${testRoot}" />
+            value="${testRoot}"/>
         <property
             name="timeout"
-            value="1800000" />
+            value="1800000"/>
         <property
             name="junit-report-output"
-            value="${junit-report-output}" />
+            value="${junit-report-output}"/>
         <property
             name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}" />
+            value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}"/>
         <property
             name="formatter"
-            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
+            value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
         <property
             name="test-output"
-            value="${junit-report-output}/raw/${classname}.xml" />
+            value="${junit-report-output}/raw/${classname}.xml"/>
         <property
             name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java" />
+            value="${env.JAVA_6_HOME}/bin/java"/>
         <dirname
             file="${ant.file}"
-            property="currentDir" />
+            property="currentDir"/>
         <echo
             level="debug"
-            message="data-dir: ${data-dir}" />
+            message="data-dir: ${data-dir}"/>
         <echo
             level="debug"
-            message="plugin-name: ${plugin-name}" />
+            message="plugin-name: ${plugin-name}"/>
         <echo
             level="debug"
-            message="testPlugin: ${testPlugin}" />
+            message="testPlugin: ${testPlugin}"/>
         <echo
             level="debug"
-            message="classname: ${classname}" />
+            message="classname: ${classname}"/>
         <echo
             level="debug"
-            message="extraVMargs: ${extraVMargs}" />
+            message="extraVMargs: ${extraVMargs}"/>
         <echo
             level="debug"
-            message="timeout: ${timeout}" />
+            message="timeout: ${timeout}"/>
         <echo
             level="debug"
-            message="testRoot: ${testRoot}" />
+            message="testRoot: ${testRoot}"/>
         <echo
             level="debug"
-            message="basedir: ${basedir}" />
+            message="basedir: ${basedir}"/>
         <echo
             level="debug"
-            message="eclipse-home: ${eclipse-home}" />
+            message="eclipse-home: ${eclipse-home}"/>
         <echo
             level="debug"
-            message="plugin-path: ${plugin-path}" />
+            message="plugin-path: ${plugin-path}"/>
         <echo
             level="debug"
-            message="junit-report-output: ${junit-report-output}" />
+            message="junit-report-output: ${junit-report-output}"/>
         <echo
             level="debug"
-            message="test-output: ${test-output}" />
+            message="test-output: ${test-output}"/>
         <echo
             level="debug"
-            message="buildDirectory: ${buildDirectory}" />
+            message="buildDirectory: ${buildDirectory}"/>
         <echo
             level="debug"
-            message="buildLabel: ${buildLabel}" />
+            message="buildLabel: ${buildLabel}"/>
         <echo
             level="debug"
-            message="jvm: ${jvm}" />
+            message="jvm: ${jvm}"/>
     </target>
     <target
         name="core-test"
         depends="init">
         <echo
             level="info"
-            message="test-type: core-test" />
+            message="test-type: core-test"/>
         <ant
             antfile="${ant.file}"
             dir="${currentDir}"
             target="eclipse-test">
             <property
                 name="application"
-                value="org.eclipse.test.coretestapplication" />
+                value="org.eclipse.test.coretestapplication"/>
         </ant>
     </target>
     <target
@@ -131,14 +132,14 @@
         depends="init">
         <echo
             level="info"
-            message="test-type: ui-test" />
+            message="test-type: ui-test"/>
         <ant
             antfile="${ant.file}"
             dir="${currentDir}"
             target="eclipse-test">
             <property
                 name="application"
-                value="org.eclipse.test.uitestapplication" />
+                value="org.eclipse.test.uitestapplication"/>
         </ant>
     </target>
     <target
@@ -146,29 +147,27 @@
         description="Runs the specified classname as a plug-in test.">
         <echo
             level="info"
-            message="Running ${classname}" />
+            message="Running ${classname}"/>
         <echo
             level="debug"
-            message="Result file: ${junit-report-output}/${classname}.xml." />
+            message="Result file: ${junit-report-output}/${classname}.xml."/>
         <echo
             level="debug"
-            message="DISPLAY: ${env.DISPLAY}" />
-
-    <!-- If there is not exactly one launcher in the stack, 
-            we'd best fail fast, since we are not expecting that, 
-            and may indicate an installation that would produce unpredictable
-            results -->
-    <!-- requires ant 1.7, and at this point, we're running 1.6 from 
-            eclipse ... 
-            
-            <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" >
-            <fileset dir="${testRoot}/eclipse/plugins">
-            <include name="org.eclipse.equinox.launcher_*.jar" />
-            </fileset>    
-            </resourcecount>
-            </condition>
-            <fail message="Did not find expected number of launcher jars. Check installation." unless="expectedNumberOfLaunchers" />
+            message="DISPLAY: ${env.DISPLAY}"/>
+        <!--
+            If there is not exactly one launcher in the stack, we'd best
+            fail fast, since we are not expecting that, and may indicate
+            an installation that would produce unpredictable results
+        -->
+        <!--
+            requires ant 1.7, and at this point, we're running 1.6 from
+            eclipse ... <condition property="expectedNumberOfLaunchers">
+            <resourcecount when="equal" count="1" > <fileset
+            dir="${testRoot}/eclipse/plugins"> <include
+            name="org.eclipse.equinox.launcher_*.jar" /> </fileset>
+            </resourcecount> </condition> <fail message="Did not find
+            expected number of launcher jars. Check installation."
+            unless="expectedNumberOfLaunchers" />
         -->
         <java
             taskname="suiteUnitTest"
@@ -183,116 +182,121 @@
                 <fileset
                     dir="${testRoot}/eclipse/plugins">
                     <include
-                        name="org.eclipse.equinox.launcher_*.jar" />
+                        name="org.eclipse.equinox.launcher_*.jar"/>
                 </fileset>
             </classpath>
             <jvmarg
-                value="-Xmx512m" />
+                value="-Xmx512m"/>
             <jvmarg
-                value="-Dosgi.ws=${env.BASEWS}" />
+                value="-Dosgi.ws=${env.BASEWS}"/>
             <jvmarg
-                value="-Dosgi.os=${env.BASEOS}" />
+                value="-Dosgi.os=${env.BASEOS}"/>
             <jvmarg
-                value="-Dosgi.arch=${env.BASEARCH}" />
+                value="-Dosgi.arch=${env.BASEARCH}"/>
             <jvmarg
-                value="-DbuildLabel=${buildLabel}" />
+                value="-DbuildLabel=${buildLabel}"/>
             <jvmarg
-                value="-DbuildDirectory=${buildDirectory}" />
+                value="-DbuildDirectory=${buildDirectory}"/>
             <jvmarg
-                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol" />
+                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
             <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log" />
+                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
             <jvmarg
-                value="-Dwtp.autotest.noninteractive=true" />
+                value="-Dwtp.autotest.noninteractive=true"/>
             <jvmarg
-                value="-DPLUGIN_PATH=${plugin-path}" />
+                value="-DPLUGIN_PATH=${plugin-path}"/>
             <jvmarg
-                line="${extraVMargs}" />
+                line="${extraVMargs}"/>
             <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
-                value="-Dprojectname=${projectname}" />
+                value="-Dprojectname=${projectname}"/>
             <arg
-                value="-nosplash" />
+                value="-nosplash"/>
             <arg
-                value="-consolelog" />
+                value="-consolelog"/>
             <arg
-                value="-debug" />
+                value="-debug"/>
             <arg
-                value="-data" />
+                value="-data"/>
             <arg
-                value="${data-dir}" />
+                value="${data-dir}"/>
             <arg
-                value="-application" />
+                value="-application"/>
             <arg
-                value="${application}" />
+                value="${application}"/>
             <arg
-                value="formatter=${formatter},${test-output}" />
+                value="formatter=${formatter},${test-output}"/>
             <arg
-                value="-testPluginName" />
+                value="-testPluginName"/>
             <arg
-                value="${plugin-name}" />
+                value="${plugin-name}"/>
             <arg
-                value="-className" />
+                value="-className"/>
             <arg
-                value="${classname}" />
+                value="${classname}"/>
             <env
                 key="DISPLAY"
-                value="${env.DISPLAY}" />
+                value="${env.DISPLAY}"/>
             <redirector
                 output="${junit-report-output}/${classname}.output.txt"
-                error="${junit-report-output}/${classname}.error.txt" />
+                error="${junit-report-output}/${classname}.error.txt"/>
         </java>
         <echo
             level="info"
-            message="suitejunitresult: ${suitejunitresult}" />
+            message="suitejunitresult: ${suitejunitresult}"/>
         <antcall
-            target="summarizeFailure" />
+            target="summarizeFailure"/>
         <antcall
-            target="collect-results" />
+            target="collect-results"/>
     </target>
     <target
         name="collect-results">
         <dirname
             property="output-dir"
-            file="${test-output}" />
+            file="${test-output}"/>
         <basename
             property="output-file-name"
-            file="${test-output}" />
+            file="${test-output}"/>
         <mkdir
-            dir="${junit-report-output}/xml" />
+            dir="${junit-report-output}/xml"/>
         <junitreport
             todir="${junit-report-output}/xml"
             tofile="${classname}.xml">
             <fileset
                 dir="${output-dir}">
                 <include
-                    name="${output-file-name}" />
+                    name="${output-file-name}"/>
             </fileset>
         </junitreport>
         <mkdir
-            dir="${junit-report-output}/html" />
+            dir="${junit-report-output}/html"/>
         <xslt
             style="${testRoot}/JUNIT.XSL"
             basedir="${junit-report-output}"
             includes="${classname}.xml"
-            destdir="${junit-report-output}/html" />
+            destdir="${junit-report-output}/html"/>
         <copy
             file="${data-dir}/.metadata/.log"
             toFile="${testRoot}/results/consolelogs/metadata-logs/${classname}.workspace.log"
             overwrite="true"
-            failonError="false" />
-
-    <!-- todo: this, especially, should be concat (there could be more than one, in theory) -->
+            failonError="false"/>
+        <!--
+            todo: this, especially, should be concat (there could be
+            more than one, in theory)
+        -->
         <copy
             file="${testRoot}/eclipse/configuration/*.log"
             toFile="${testRoot}/results/consolelogs/configuration-logs/${classname}.config.log"
             overwrite="true"
-            failonError="false" />
+            failonError="false"/>
     </target>
     <target
         name="collect">
-    <!--  deprecated, each test.xml uses it, and we should remove, eventually -->
+        <!--
+            deprecated, each test.xml uses it, and we should remove,
+            eventually
+        -->
     </target>
     <target
         name="summarizeFailure"
@@ -310,7 +314,7 @@
                 <equals
                     arg1="${suitejunitresult}"
                     arg2="0"
-                    trim="true" />
+                    trim="true"/>
             </not>
         </condition>
     </target>
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
index f7a4b8a..2106485 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
@@ -1,109 +1,105 @@
 <?xml version="1.0"?>
-<!-- ====================================================================== 
-    Properties that must be passed to this script:
-    base.install.dir
-    dependencyTargets
-    local.cache.dir
-    dependency.properties
-    
-    ====================================================================== -->
+    <!--
+        ======================================================================
+        Properties that must be passed to this script: base.install.dir
+        dependencyTargets local.cache.dir dependency.properties
+        ======================================================================
+    -->
 <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}" />
-    <target name="get">
-        <antcall target="getAndInstallDropins">
+    <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}"/>
+    <target
+        name="get">
+        <antcall
+            target="getAndInstallDropins">
             <param
                 name="groupId"
-                value="emf" />
+                value="emf"/>
         </antcall>
-          <antcall target="getAndInstallDropins">
-              <param
-                  name="groupId"
-                  value="emfxsd" />
-          </antcall>                  
-            <antcall target="getAndInstallDropins">
+        <antcall
+            target="getAndInstallDropins">
             <param
                 name="groupId"
-                value="gef" />
+                value="emfxsd"/>
         </antcall>
-
-
-        <antcall target="getAndInstallBase">
+        <antcall
+            target="getAndInstallDropins">
             <param
                 name="groupId"
-                value="eclipse" />
+                value="gef"/>
         </antcall>
-        <antcall target="getAndInstallDropins">
+        <antcall
+            target="getAndInstallBase">
             <param
                 name="groupId"
-                value="eclipseTestFramework" />
+                value="eclipse"/>
         </antcall>
-      <antcall target="getAndInstallDropins">
-          <param
-              name="groupId"
-              value="dtp" />
-      </antcall>
-      
-        <antcall target="getAndInstallDropins">
+        <antcall
+            target="getAndInstallDropins">
             <param
                 name="groupId"
-                value="wtp" />
+                value="eclipseTestFramework"/>
         </antcall>
-
-
+        <!--
+            <antcall target="getAndInstall"> <param name="groupId"
+            value="dtp"/> </antcall>
+        -->
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="@basicprereq@"/>
+        </antcall>
     </target>
-
-
-    <target name="getAndInstallBase">
+    <target
+        name="getAndInstallBase">
         <ant
             antfile="${dependencyTargets}"
             target="checkDependency">
             <property
                 name="groupId"
-                value="${groupId}" />
+                value="${groupId}"/>
         </ant>
         <ant
             antfile="${dependencyTargets}"
             target="installDependency">
             <property
                 name="groupId"
-                value="${groupId}" />
+                value="${groupId}"/>
             <property
                 name="install.destination"
-                value="${base.install.dir}" />
+                value="${base.install.dir}"/>
         </ant>
     </target>
-
-    <target name="getAndInstallDropins">
+    <target
+        name="getAndInstallDropins">
         <ant
             antfile="${dependencyTargets}"
             target="checkDependency">
             <property
                 name="groupId"
-                value="${groupId}" />
+                value="${groupId}"/>
         </ant>
         <ant
             antfile="${dependencyTargets}"
             target="installDependency">
             <property
                 name="groupId"
-                value="${groupId}" />
+                value="${groupId}"/>
             <property
                 name="install.destination"
-                value="${base.install.dir}${dropinsFolder}" />
+                value="${base.install.dir}${dropinsFolder}"/>
         </ant>
     </target>
-
-
-
-
-</project>
-
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/jaxws.properties b/releng.wtpbuilder/buildtemplates/jaxws.properties
index 92fc683..6e965fc 100644
--- a/releng.wtpbuilder/buildtemplates/jaxws.properties
+++ b/releng.wtpbuilder/buildtemplates/jaxws.properties
@@ -18,6 +18,9 @@
 #  commonComputedVariables, such as RELENGXMLSEC
 relengmapsenv=RELENGJAXWS
 
+#  prereq is the basic prereq on top of platform, jdt, emf, gef
+#  (only realistic options for right now are wst, jst). 
+basicprereq=jst
 
 # These next three properties are mainly for distribution template files
 
diff --git a/releng.wtpbuilder/buildtemplates/xmlsec.properties b/releng.wtpbuilder/buildtemplates/xmlsec.properties
index 310ff5f..babb8d1 100644
--- a/releng.wtpbuilder/buildtemplates/xmlsec.properties
+++ b/releng.wtpbuilder/buildtemplates/xmlsec.properties
@@ -18,6 +18,9 @@
 #  commonComputedVariables, such as RELENGXMLSEC
 relengmapsenv=RELENGXMLSEC
 
+#  prereq is the basic prereq on top of platform, jdt, emf, gef
+#  (only realistic options for right now are wst, jst). 
+basicprereq=wst
 
 # These next three properties are mainly for distribution template files