295668 allow xulrunner location to be specified for unit tests
diff --git a/releng.wtpbuilder/distribution/patches.build/build.xml b/releng.wtpbuilder/distribution/patches.build/build.xml
index 3e9e1f2..b96fe3c 100644
--- a/releng.wtpbuilder/distribution/patches.build/build.xml
+++ b/releng.wtpbuilder/distribution/patches.build/build.xml
@@ -1,19 +1,49 @@
 <project
     default="build"
     basedir=".">
+    <fail
+        unless="wtp.builder.home"/>
+    <property
+        file="${wtp.builder.home}/build.properties"/>
 
+    <property
+        environment="env"/>
+
+    <!-- required to get proper value of doCreateFprojZips -->
+    <property
+        name="keyCfgFile"
+        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
+    <echo
+        level="debug"
+        message="keyCfgFile: ${keyCfgFile}"/>
+    <property
+        file="${keyCfgFile}"/>
+
+    <!-- main -->
     <target
         name="build"
         depends="getBaseBuilder">
         <dirname
             file="${ant.file}"
             property="distribution.wtp.build.dir" />
-        <property file="${wtp.builder.home}/build.properties" />
         <property
             name="buildTargets"
             value="${wtp.builder.home}/scripts/build/runbuild.xml" />
 
-        <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
+        
+        <!-- for this distribution, dependencies come from releng -->
+        <property
+            name="dependency.properties"
+            value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
+
+        <!-- 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
                 name="component"
diff --git a/releng.wtpbuilder/distribution/patches.site/publish.xml b/releng.wtpbuilder/distribution/patches.site/publish.xml
index f6abb0a..0bb3d2b 100644
--- a/releng.wtpbuilder/distribution/patches.site/publish.xml
+++ b/releng.wtpbuilder/distribution/patches.site/publish.xml
@@ -348,6 +348,16 @@
             token="@type@"
             value="Patches" />
     </target>
+  <target name="U">
+      <replace
+          file="${resultingIndex}"
+          token="%wtpandprereqs%"
+          value=" " />
+      <replace
+          file="${resultingIndex}"
+          token="@type@"
+          value="Updates" />
+  </target>
 
     <target name="checkIfTested">
         <echo
diff --git a/releng.wtpbuilder/distribution/patches.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/patches.site/templateFiles/index.html.template.php
index 2ad4d14..f020709 100644
--- a/releng.wtpbuilder/distribution/patches.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/patches.site/templateFiles/index.html.template.php
@@ -283,7 +283,7 @@
 	<tr>
 		<td align=left valign=top colspan="5" bgcolor="#0080C0"><font
 			face="'Bitstream Vera',Helvetica,Arial" color="#FFFFFF"> Web Tools
-		Platform Patches for WTP 1.5.5</font></td>
+		Platform Patches</font></td>
 	</tr>
 
 	<tr>
diff --git a/releng.wtpbuilder/distribution/patches.tests/build.xml b/releng.wtpbuilder/distribution/patches.tests/build.xml
index 4351340..a86868a 100644
--- a/releng.wtpbuilder/distribution/patches.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches.tests/build.xml
@@ -1,173 +1,178 @@
 <project
     name="Build specific targets and properties"
     default="runTest">
-
-    <!-- Note to be cross-platform, "environment variables" are only appropriate for
-        some variables, e.g. ones we set, since properties are case sensitive, even if
-        the environment variables on your operating system are not, e.g. it will
-        be ${env.Path} not ${env.PATH} on Windows -->
-    <property environment="env" />
-
+    <!--
+        Note to be cross-platform, "environment variables" are only
+        appropriate for some variables, e.g. ones we set, since
+        properties are case sensitive, even if the environment variables
+        on your operating system are not, e.g. it will be ${env.Path}
+        not ${env.PATH} on Windows
+    -->
+    <property
+        environment="env"/>
     <fail
         message="testRoot must be set for this task"
-        unless="testRoot" />
-
-    <!-- ===================================================================== -->
+        unless="testRoot"/>
+    <!--
+        =====================================================================
+    -->
     <!-- Steps to do after the build is done. -->
-    <!-- ===================================================================== -->
-    <target name="test">
+    <!--
+        =====================================================================
+    -->
+    <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">
-
+    <!--
+        =====================================================================
+    -->
+    <target
+        name="runTest">
         <dirname
             file="${ant.file}"
-            property="test.component.dir" />
-        <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-        <property file="${buildDirectory}/label.properties" />
-        <property file="${wtp.builder.home}/build.properties" />
-
+            property="test.component.dir"/>
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
+        <property
+            file="${buildDirectory}/label.properties"/>
+        <property
+            file="${wtp.builder.home}/build.properties"/>
         <fail
             message="testRoot must be set for this task"
-            unless="testRoot" />
-        <mkdir dir="${testRoot}" />
+            unless="testRoot"/>
+        <mkdir
+            dir="${testRoot}"/>
 
         <!-- if results already exist, delete them -->
         <delete
             dir="${testRoot}/results"
-            failOnError="false" />
-        <mkdir dir="${testRoot}/results" />
-
-        <mkdir dir="${testRoot}/results/consolelogs" />
-
+            failOnError="false"/>
+        <mkdir
+            dir="${testRoot}/results"/>
+        <mkdir
+            dir="${testRoot}/results/consolelogs"/>
         <copy
             todir="${testRoot}"
             overwrite="true">
-            <fileset dir="${test.component.dir}/testScripts"></fileset>
+            <fileset
+                dir="${test.component.dir}/testScripts"></fileset>
         </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}${env.DEP_DIR}/maps/dependencies.properties" />
+                value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
             <property
                 name="base.install.dir"
-                value="${testRoot}" />
+                value="${testRoot}"/>
         </ant>
-
-        <antcall target="unzipTests" />
-
-        <antcall target="runTestEclipse">
+        <antcall
+            target="unzipTests"/>
+        <antcall
+            target="runTestEclipse">
             <param
                 name="testTarget"
-                value="all" />
+                value="all"/>
         </antcall>
-        <antcall target="postRunTestEclipse">
+        <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
-            (such as if zip was not created, due to other failures or options).
+    <target
+        name="unzipTests">
+        <!--
+            unzip the builds and junit tests we use 'unzip' here, so we
+            can continue on error (such as if zip was not created, due
+            to other failures or options).
         -->
         <exec
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
             failonerror="false">
-            <arg line="-o -qq wtp-${buildLabel}.zip -d ${testRoot}" />
+            <arg
+                line="-o -qq wtp-${buildLabel}.zip -d ${testRoot}"/>
         </exec>
         <exec
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
             failonerror="false">
             <arg
-                line="-o -qq wtp-patches-tests-${buildLabel}.zip -d ${testRoot}" />
+                line="-o -qq wtp-patches-tests-${buildLabel}.zip -d ${testRoot}"/>
         </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_5_HOME}/bin/java" />
+            value="${env.JAVA_5_HOME}/bin/java"/>
         <property
             name="plugin-path"
-            value="${testRoot}/eclipse/plugins" />
+            value="${testRoot}/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}" />
-
-        <echo message="Running junits" />
-
-        <!-- If there is not exactly one launcher in the stack, 
-            we'd best fail fast, since we are not expecting that, 
-            and may indicate an installation that would produce unpredictable
-            results -->
-        <!-- requires ant 1.7, and at this point, we're running 1.6 from 
-            eclipse ... 
-            
-            <condition property="expectedNumberOfLaunchers">
-            <resourcecount when="equal" count="1" >
-            <fileset dir="${testRoot}/eclipse/plugins">
-            <include name="org.eclipse.equinox.launcher_*.jar" />
-            </fileset>		
-            </resourcecount>
-            </condition>
-            <fail message="Did not find expected number of launcher jars. Check installation." unless="expectedNumberOfLaunchers" />
+            value="${testRoot}"/>
+        <echo
+            message="Running junits"/>
+        <!--
+            If there is not exactly one launcher in the stack, we'd best
+            fail fast, since we are not expecting that, and may indicate
+            an installation that would produce unpredictable results
         -->
-        <!-- 
-            Remember: using -debug for org.eclipse.ant.core.antRunner 
-            produces ant debug info to be output ... which is a TON of stuff 
+        <!--
+            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" />
         -->
-        <echo message="eclipse.launcher: ${eclipse.launcher}" />
+        <!--
+            Remember: using -debug for org.eclipse.ant.core.antRunner
+            produces ant debug info to be output ... which is a TON of
+            stuff
+        -->
+        <echo
+            message="eclipse.launcher: ${eclipse.launcher}"/>
         <java
             jar="${eclipse.launcher}"
             taskname="unit-test-masterprocess"
@@ -177,92 +182,111 @@
             timeout="${testTimeLimit}"
             dir="${testRoot}/eclipse"
             jvm="${env.JAVA_5_HOME}/bin/java">
-
-            <jvmarg value="-Xmx512m" />
-
             <jvmarg
-                value="-Declipse.launcher=${testRoot}/eclipse/startup.jar" />
-
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg value="-Dws=${env.BASEWS}" />
-            <jvmarg value="-Dos=${env.BASEOS}" />
-            <jvmarg value="-Darch=${env.BASEARCH}" />
-
-            <jvmarg value="-Dosgi.debug" />
-
-            <jvmarg value="-DbuildBranch=${buildBranch}" />
-            <jvmarg value="-DbuildType=${buildType}" />
-            <jvmarg value="-DbuildId=${buildId}" />
-            <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+                value="-Xmx512m"/>
             <jvmarg
-                value="-Dprojectname=${projectname}" />
-            <arg value="-nosplash" />
-            <arg value="-consolelog" />
-
-            <arg value="-data" />
-            <arg value="${testRoot}/overallTestWorkspace" />
-            <arg value="-application" />
-            <arg value="org.eclipse.ant.core.antRunner" />
-            <arg value="-file" />
-            <arg value="${testRoot}/test.xml" />
-            <arg value="-logger" />
-            <arg value="org.apache.tools.ant.DefaultLogger" />
+                value="-Declipse.launcher=${testRoot}/eclipse/startup.jar"/>
+            <jvmarg
+                value="-Dosgi.ws=${env.BASEWS}"/>
+            <jvmarg
+                value="-Dosgi.os=${env.BASEOS}"/>
+            <jvmarg
+                value="-Dosgi.arch=${env.BASEARCH}"/>
+            <jvmarg
+                value="-Dws=${env.BASEWS}"/>
+            <jvmarg
+                value="-Dos=${env.BASEOS}"/>
+            <jvmarg
+                value="-Darch=${env.BASEARCH}"/>
+            <jvmarg
+                value="-Dosgi.debug"/>
+            <jvmarg
+                value="-DbuildBranch=${buildBranch}"/>
+            <jvmarg
+                value="-DbuildType=${buildType}"/>
+            <jvmarg
+                value="-DbuildId=${buildId}"/>
+            <jvmarg
+                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
+            <jvmarg
+                value="-Dprojectname=${projectname}"/>
+            <arg
+                value="-nosplash"/>
+            <arg
+                value="-consolelog"/>
+            <arg
+                value="-data"/>
+            <arg
+                value="${testRoot}/overallTestWorkspace"/>
+            <arg
+                value="-application"/>
+            <arg
+                value="org.eclipse.ant.core.antRunner"/>
+            <arg
+                value="-file"/>
+            <arg
+                value="${testRoot}/test.xml"/>
+            <arg
+                value="-logger"/>
+            <arg
+                value="org.apache.tools.ant.DefaultLogger"/>
             <env
                 key="DISPLAY"
-                value="${env.DISPLAY}" />
+                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}" />
+        <echo
+            message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
     </target>
-
-
-    <target name="postRunTestEclipse">
+    <target
+        name="postRunTestEclipse">
         <copy
             todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
             overwrite="true"
             failonerror="false">
-            <fileset dir="${testRoot}/results">
-                <include name="*output.txt" />
+            <fileset
+                dir="${testRoot}/results">
+                <include
+                    name="*output.txt"/>
             </fileset>
         </copy>
         <copy
             todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
             overwrite="true"
             failonerror="false">
-            <fileset dir="${testRoot}/results">
-                <include name="*error.txt" />
+            <fileset
+                dir="${testRoot}/results">
+                <include
+                    name="*error.txt"/>
             </fileset>
         </copy>
         <copy
@@ -277,24 +301,25 @@
             overwrite="true"
             failonerror="false">
         </copy>
-
         <copy
             todir="${buildDirectory}/${buildLabel}/testResults/xml"
             overwrite="true"
             failonerror="false">
-            <fileset dir="${testRoot}/results/xml">
-                <include name="*.xml" />
+            <fileset
+                dir="${testRoot}/results/xml">
+                <include
+                    name="*.xml"/>
             </fileset>
         </copy>
         <copy
             todir="${buildDirectory}/${buildLabel}/testResults/html"
             overwrite="true"
             failonerror="false">
-            <fileset dir="${testRoot}/results/html">
-                <include name="*.html" />
+            <fileset
+                dir="${testRoot}/results/html">
+                <include
+                    name="*.html"/>
             </fileset>
         </copy>
     </target>
-
-
-</project>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.tests/standaloneTest.xml b/releng.wtpbuilder/distribution/patches.tests/standaloneTest.xml
deleted file mode 100644
index d58ed46..0000000
--- a/releng.wtpbuilder/distribution/patches.tests/standaloneTest.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<project
-    default="main"
-    basedir=".">
-
-    <!--
-        Required inputs:
-        
-        build.home
-        buildType
-        buildId
-        timestamp
-        build.stream [optional]
-        build.committers [optional]
-        testTarget [optional]
-    -->
-
-    <property environment="env" />
-
-    <target name="main">
-        <property
-            file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
-        <property
-            name="local.cache.dir"
-            value="${env.LOCAL_PREREQS_CACHE}" />
-        <property
-            name="testRoot"
-            value="${build.home}/testRoot" />
-        <delete
-            dir="${testRoot}"
-            failonerror="false" />
-        <mkdir dir="${testRoot}" />
-        <antcall target="getReleng" />
-        <property
-            file="${testRoot}/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
-        <antcall target="getDependencies" />
-        <condition
-            property="wtp-sdk"
-            value="wtp-sdk-${buildId}.zip"
-            else="wtp-sdk-${buildType}-${buildId}-${timestamp}.zip">
-            <available file="${local.cache.dir}/wtp-sdk-${buildId}.zip" />
-        </condition>
-        <condition
-            property="wtp-wst-tests"
-            value="wtp-wst-Automated-Tests-${buildId}.zip"
-            else="wtp-wst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip">
-            <available
-                file="${local.cache.dir}/wtp-wst-Automated-Tests-${buildId}.zip" />
-        </condition>
-        <condition
-            property="wtp-jst-tests"
-            value="wtp-jst-Automated-Tests-${buildId}.zip"
-            else="wtp-jst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip">
-            <available
-                file="${local.cache.dir}/wtp-jst-Automated-Tests-${buildId}.zip" />
-        </condition>
-        <antcall target="run" />
-    </target>
-
-    <target name="getReleng">
-        <property
-            name="releng.tag"
-            value="v${buildType}${timestamp}" />
-        <cvs
-            cvsRoot=":pserver:anonymous@dev.eclipse.org:/cvsroot/webtools"
-            package="${env.RELENG}"
-            dest="${testRoot}"
-            command="export"
-            tag="${releng.tag}"
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}" />
-    </target>
-
-    <target name="getDependencies">
-        <ant
-            antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testdependency.xml">
-            <property
-                name="base.install.dir"
-                value="${testRoot}" />
-            <property
-                name="dependencyTargets"
-                value="${build.home}/${env.RELENG_BUILDER}/scripts/dependency/build.xml" />
-        </ant>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-sdk-${buildId}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-sdk-${buildType}-${buildId}-${timestamp}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-wst-Automated-Tests-${buildId}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-wst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-jst-Automated-Tests-${buildId}.zip" />
-        </antcall>
-        <antcall target="getAndInstallWTP">
-            <param
-                name="file"
-                value="wtp-jst-Automated-Tests-${buildType}-${buildId}-${timestamp}.zip" />
-        </antcall>
-    </target>
-
-    <target name="getAndInstallWTP">
-        <available
-            file="${local.cache.dir}/${file}"
-            property="file.exists" />
-        <antcall target="getWTP" />
-        <available
-            file="${local.cache.dir}/${file}"
-            property="file.exists" />
-        <antcall target="installWTP" />
-    </target>
-
-    <target name="getWTP">
-        <condition
-            property="file.url.1"
-            value="http://download.eclipse.org/webtools/committers"
-            else="http://download.eclipse.org/webtools/downloads">
-            <isset property="build.committers" />
-        </condition>
-        <condition
-            property="file.url"
-            value="${file.url.1}/drops/${build.stream}/${buildType}-${buildId}-${timestamp}"
-            else="${file.url.1}/drops/${buildType}-${buildId}-${timestamp}">
-            <isset property="build.stream" />
-        </condition>
-        <antcall target="getWTP2" />
-    </target>
-
-    <target
-        name="getWTP2"
-        unless="file.exists">
-        <property
-            name="file.url"
-            value="http://download.eclipse.org/webtools/downloads/drops/${build.stream}/${buildType}-${buildId}-${timestamp}" />
-        <get
-            dest="${local.cache.dir}/${file}"
-            src="${file.url}/${file}"
-            ignoreerrors="true" />
-    </target>
-
-    <target
-        name="installWTP"
-        if="file.exists">
-        <unzip
-            src="${local.cache.dir}/${file}"
-            dest="${testRoot}"
-            overwrite="true" />
-    </target>
-
-    <target name="run">
-        <mkdir dir="${testRoot}/results/consolelogs" />
-        <copy
-            todir="${testRoot}"
-            flatten="true"
-            overwrite="true">
-            <fileset
-                dir="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/testScripts" />
-        </copy>
-        <ant
-            antfile="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/build.xml"
-            target="runTestEclipse">
-            <property
-                name="testRoot"
-                value="${testRoot}" />
-            <property
-                name="testTarget"
-                value="all" />
-        </ant>
-        <copy
-            file="${build.home}/${env.RELENG_BUILDER}/distribution/wtp.tests/templateFiles/index.php"
-            todir="${testRoot}/results"
-            overwrite="true" />
-    </target>
-
-    <target
-        name="upload"
-        if="login">
-        <mkdir dir="${build.home}/archives" />
-        <zip
-            destfile="${build.home}/archives/${buildType}-${buildId}-${timestamp}.zip"
-            basedir="${build.home}/testRoot/results" />
-        <condition
-            property="upload.path.1"
-            else="~/downloads/webtools/downloads"
-            value="~/downloads/webtools/committers">
-            <isset property="build.committers" />
-        </condition>
-        <condition
-            property="upload.path"
-            else="${upload.path.1}/drops/${buildType}-${buildId}-${timestamp}/testResults/${config}"
-            value="${upload.path.1}/drops/${build.stream}/${buildType}-${buildId}-${timestamp}/testResults/${config}">
-            <isset property="build.stream" />
-        </condition>
-        <exec
-            executable="ssh"
-            dir="${build.home}">
-            <arg
-                line="${login}@download1.eclipse.org rm -rf ${upload.path}" />
-        </exec>
-        <exec
-            executable="ssh"
-            dir="${build.home}">
-            <arg
-                line="${login}@download1.eclipse.org mkdir ${upload.path}" />
-        </exec>
-        <exec
-            executable="scp"
-            dir="${build.home}">
-            <arg
-                line="-r ./testRoot/results ${login}@download1.eclipse.org:${upload.path}" />
-        </exec>
-    </target>
-
-    <target
-        name="clean"
-        if="clean">
-        <property
-            file="${build.home}/${env.RELENG_BUILDER}/build.properties" />
-        <property
-            name="local.cache.dir"
-            value="${env.LOCAL_PREREQS_CACHE}" />
-        <property
-            name="testRoot"
-            value="${build.home}/testRoot" />
-        <delete
-            dir="${testRoot}"
-            failonerror="false" />
-        <delete failonerror="false">
-            <fileset
-                dir="${local.cache.dir}"
-                includes="wtp-*" />
-        </delete>
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/patches.tests/templateFiles/index.php
index 8d23693..a42c883 100644
--- a/releng.wtpbuilder/distribution/patches.tests/templateFiles/index.php
+++ b/releng.wtpbuilder/distribution/patches.tests/templateFiles/index.php
@@ -2,78 +2,83 @@
 <head>
 
 <?php
-    $parts = explode("/", realpath(".."));
-    $label = $parts[count($parts) - 1];
+$parts = explode("/", realpath(".."));
+$label = $parts[count($parts) - 1];
 ?>
 
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
+	type="text/css">
 </head>
 <body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
-    <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Unit 
-      Test Results for <?php echo "$label"; ?> </font></b></td>
-  </tr>
+<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+	<tr>
+		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+			color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$label"; ?>
+		</font></b></td>
+	</tr>
 </table>
-<p></p><table border="0">
+<p></p>
+<table border="0">
 </table>
 
 <table width="77%" border="1">
-  <tr> 
-    <td width="81%"><b>Tests Performed</b></td>
-    <td width="19%"><b>Errors &amp; Failures</b></td>
-  </tr>
+	<tr>
+		<td width="81%"><b>Tests Performed</b></td>
+		<td width="19%"><b>Errors &amp; Failures</b></td>
+	</tr>
 
-  <?
-    $dir = dir("html");
-    while ($anEntry = $dir->read())
-    {
-      if ($anEntry != "." && $anEntry != "..")
-      {
-        $link = "html/".$anEntry;
-        $xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-        $count = 0;
-        $fileHandle = fopen($xml, "r");
-        while (!feof($fileHandle))
-        {
-          $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-          $count = $count + substr_count($aLine, '<error');
-        }
-        fclose($fileHandle);
-        if ($count > 0)
-        {
-          echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-          echo "$anEntry";
-          echo "</font></b></a></td>";
-          echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-        }
-        else
-        {
-          echo "<tr><td><a href=\"$link\">";
-          echo "$anEntry";
-          echo "</a></td>";
-          echo "<td>$count</td></tr>";
-        }
-      }
-    }
-  ?>
-  
+	<?
+	$dir = dir("html");
+	while ($anEntry = $dir->read())
+	{
+		if ($anEntry != "." && $anEntry != "..")
+		{
+			$link = "html/".$anEntry;
+			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
+			$count = 0;
+			$fileHandle = fopen($xml, "r");
+			while (!feof($fileHandle))
+			{
+				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
+				$count = $count + substr_count($aLine, '<error');
+			}
+			fclose($fileHandle);
+			if ($count > 0)
+			{
+				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
+				echo "$anEntry";
+				echo "</font></b></a></td>";
+				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
+			}
+			else
+			{
+				echo "<tr><td><a href=\"$link\">";
+				echo "$anEntry";
+				echo "</a></td>";
+				echo "<td>$count</td></tr>";
+			}
+		}
+	}
+	?>
+
 </table>
 <p></p>
 <br>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
-    <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica"> 
-      Console output logs 
-      <?php echo "$label"; ?>
-      </font></b></td>
-  </tr>
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+	<tr>
+		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+			color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$label"; ?>
+		</font></b></td>
+	</tr>
 </table>
 <br>
-These <a href="consolelogs/wtptestlog.txt">logs</a> contain the console output captured while 
-running the JUnit automated tests. <br>
+These
+<a href="consolelogs/wtptestlog.txt">logs</a>
+contain the console output captured while running the JUnit automated
+tests.
+<br>
 <br>
 
 </body>
diff --git a/releng.wtpbuilder/distribution/patches.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/patches.tests/testScripts/JUNIT.XSL
index f57faaa..0810ae5 100644
--- a/releng.wtpbuilder/distribution/patches.tests/testScripts/JUNIT.XSL
+++ b/releng.wtpbuilder/distribution/patches.tests/testScripts/JUNIT.XSL
@@ -3,43 +3,45 @@
     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;
-                    color:#000000; } table tr td, table tr th {
-                    font-size: 68%; } table.details tr th{ font-weight:
-                    bold; text-align:left; background:#a6caf0; }
-                    table.details tr td{ background:#eeeee0; }
-
-                    p { line-height:1.5em; margin-top:0.5em;
-                    margin-bottom:1.0em; } h1 { margin: 0px 0px 5px;
-                    font: 165% verdana,arial,helvetica } h2 {
-                    margin-top: 1em; margin-bottom: 0.5em; font: bold
-                    125% verdana,arial,helvetica } h3 { margin-bottom:
-                    0.5em; font: bold 115% verdana,arial,helvetica } h4
-                    { margin-bottom: 0.5em; font: bold 100%
+                <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; } table.details tr td{
+                    background:#eeeee0; } p { line-height:1.5em;
+                    margin-top:0.5em; margin-bottom:1.0em; } h1 {
+                    margin: 0px 0px 5px; font: 165%
+                    verdana,arial,helvetica } h2 { margin-top: 1em;
+                    margin-bottom: 0.5em; font: bold 125%
+                    verdana,arial,helvetica } h3 { margin-bottom: 0.5em;
+                    font: bold 115% verdana,arial,helvetica } h4 {
+                    margin-bottom: 0.5em; font: bold 100%
                     verdana,arial,helvetica } h5 { margin-bottom: 0.5em;
                     font: bold 100% verdana,arial,helvetica } h6 {
                     margin-bottom: 0.5em; font: bold 100%
                     verdana,arial,helvetica } .Error { font-weight:bold;
                     color:red; } .Failure { font-weight:bold;
-                    color:purple; } .Properties { text-align:right; }
-                </style>
-                <script language="JavaScript">
+                    color:purple; } .Properties { text-align:right; } </style>
+                <script
+                    language="JavaScript">
                     var TestCases = new Array(); var cur;
-                    <xsl:for-each select="./testsuite">
-                        <xsl:apply-templates select="properties" />
+                    <xsl:for-each
+                        select="./testsuite">
+                        <xsl:apply-templates
+                            select="properties"/>
                     </xsl:for-each>
-
                 </script>
-                <script language="JavaScript"><![CDATA[
+                <script
+                    language="JavaScript"><![CDATA[
         function displayProperties (name) {
           var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
           var doc = win.document.open();
@@ -69,44 +71,55 @@
                 </script>
             </HEAD>
             <body>
-                <a name="top"></a>
-                <xsl:call-template name="pageHeader" />
+                <a
+                    name="top"></a>
+                <xsl:call-template
+                    name="pageHeader"/>
 
                 <!-- Summary part -->
-                <xsl:call-template name="summary" />
+                <xsl:call-template
+                    name="summary"/>
                 <hr
                     size="1"
                     width="95%"
-                    align="left" />
+                    align="left"/>
 
                 <!-- Package List part -->
-                <xsl:call-template name="packagelist" />
+                <xsl:call-template
+                    name="packagelist"/>
                 <hr
                     size="1"
                     width="95%"
-                    align="left" />
+                    align="left"/>
 
                 <!-- For each package create its part -->
-                <xsl:call-template name="packages" />
+                <xsl:call-template
+                    name="packages"/>
                 <hr
                     size="1"
                     width="95%"
-                    align="left" />
+                    align="left"/>
 
                 <!-- For each class create the  part -->
-                <xsl:call-template name="classes" />
-
+                <xsl:call-template
+                    name="classes"/>
             </body>
         </HTML>
     </xsl:template>
-
-
-
-    <!-- ================================================================== -->
-    <!-- Write a list of all packages with an hyperlink to the anchor of    -->
-    <!-- of the package name.                                               -->
-    <!-- ================================================================== -->
-    <xsl:template name="packagelist">
+    <!--
+        ==================================================================
+    -->
+    <!--
+        Write a list of all packages with an hyperlink to the anchor of
+    -->
+    <!--
+        of the package name.
+    -->
+    <!--
+        ==================================================================
+    -->
+    <xsl:template
+        name="packagelist">
         <h2>Packages</h2>
         Note: package statistics are not computed recursively, they only
         sum up all of its testsuites numbers.
@@ -116,212 +129,256 @@
             cellpadding="5"
             cellspacing="2"
             width="95%">
-            <xsl:call-template name="testsuite.test.header" />
+            <xsl:call-template
+                name="testsuite.test.header"/>
             <!-- list all packages recursively -->
             <xsl:for-each
                 select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-                <xsl:sort select="@package" />
+                <xsl:sort
+                    select="@package"/>
                 <xsl:variable
                     name="testsuites-in-package"
-                    select="/testsuites/testsuite[./@package = current()/@package]" />
+                    select="/testsuites/testsuite[./@package = current()/@package]"/>
                 <xsl:variable
                     name="testCount"
-                    select="sum($testsuites-in-package/@tests)" />
+                    select="sum($testsuites-in-package/@tests)"/>
                 <xsl:variable
                     name="errorCount"
-                    select="sum($testsuites-in-package/@errors)" />
+                    select="sum($testsuites-in-package/@errors)"/>
                 <xsl:variable
                     name="failureCount"
-                    select="sum($testsuites-in-package/@failures)" />
+                    select="sum($testsuites-in-package/@failures)"/>
                 <xsl:variable
                     name="timeCount"
-                    select="sum($testsuites-in-package/@time)" />
+                    select="sum($testsuites-in-package/@time)"/>
 
                 <!-- write a summary for the package -->
-                <tr valign="top">
+                <tr
+                    valign="top">
                     <!-- set a nice color depending if there is an error/failure -->
-                    <xsl:attribute name="class">
+                    <xsl:attribute
+                        name="class">
 						<xsl:choose>
-							<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
-							<xsl:when test="$errorCount &gt; 0">Error</xsl:when>
+							<xsl:when
+                        test="$failureCount &gt; 0">Failure</xsl:when>
+							<xsl:when
+                        test="$errorCount &gt; 0">Error</xsl:when>
 						</xsl:choose>
 					</xsl:attribute>
                     <td>
-                        <a href="#{@package}">
-                            <xsl:value-of select="@package" />
+                        <a
+                            href="#{@package}">
+                            <xsl:value-of
+                                select="@package"/>
                         </a>
                     </td>
                     <td>
-                        <xsl:value-of select="$testCount" />
+                        <xsl:value-of
+                            select="$testCount"/>
                     </td>
                     <td>
-                        <xsl:value-of select="$errorCount" />
+                        <xsl:value-of
+                            select="$errorCount"/>
                     </td>
                     <td>
-                        <xsl:value-of select="$failureCount" />
+                        <xsl:value-of
+                            select="$failureCount"/>
                     </td>
                     <td>
-                        <xsl:call-template name="display-time">
+                        <xsl:call-template
+                            name="display-time">
                             <xsl:with-param
                                 name="value"
-                                select="$timeCount" />
+                                select="$timeCount"/>
                         </xsl:call-template>
                     </td>
                 </tr>
             </xsl:for-each>
         </table>
     </xsl:template>
-
-
-    <!-- ================================================================== -->
-    <!-- Write a package level report                                       -->
-    <!-- It creates a table with values from the document:                  -->
-    <!-- Name | Tests | Errors | Failures | Time                            -->
-    <!-- ================================================================== -->
-    <xsl:template name="packages">
+    <!--
+        ==================================================================
+    -->
+    <!--
+        Write a package level report
+    -->
+    <!--
+        It creates a table with values from the document:
+    -->
+    <!--
+        Name | Tests | Errors | Failures | Time
+    -->
+    <!--
+        ==================================================================
+    -->
+    <xsl:template
+        name="packages">
         <!-- create an anchor to this package name -->
         <xsl:for-each
             select="/testsuites/testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
-            <xsl:sort select="@package" />
-            <a name="{@package}"></a>
+            <xsl:sort
+                select="@package"/>
+            <a
+                name="{@package}"></a>
             <h3>
                 Package
-                <xsl:value-of select="@package" />
+                <xsl:value-of
+                    select="@package"/>
             </h3>
-
             <table
                 class="details"
                 border="0"
                 cellpadding="5"
                 cellspacing="2"
                 width="95%">
-                <xsl:call-template name="testsuite.test.header" />
+                <xsl:call-template
+                    name="testsuite.test.header"/>
 
                 <!-- match the testsuites of this package -->
                 <xsl:apply-templates
                     select="/testsuites/testsuite[./@package = current()/@package]"
-                    mode="print.test" />
+                    mode="print.test"/>
             </table>
-            <a href="#top">Back to top</a>
-            <p />
-            <p />
+            <a
+                href="#top">Back to top</a>
+            <p/>
+            <p/>
         </xsl:for-each>
     </xsl:template>
-
-    <xsl:template name="classes">
-        <xsl:for-each select="testsuite">
-            <xsl:sort select="@name" />
+    <xsl:template
+        name="classes">
+        <xsl:for-each
+            select="testsuite">
+            <xsl:sort
+                select="@name"/>
             <!-- create an anchor to this class name -->
-            <a name="{@name}"></a>
+            <a
+                name="{@name}"></a>
             <h3>
                 TestCase
-                <xsl:value-of select="@name" />
+                <xsl:value-of
+                    select="@name"/>
             </h3>
-
             <table
                 class="details"
                 border="0"
                 cellpadding="5"
                 cellspacing="2"
                 width="95%">
-                <xsl:call-template name="testcase.test.header" />
+                <xsl:call-template
+                    name="testcase.test.header"/>
                 <!--
-                    test can even not be started at all (failure to load the class)
-                    so report the error directly
+                    test can even not be started at all (failure to load
+                    the class) so report the error directly
                 -->
-                <xsl:if test="./error">
-                    <tr class="Error">
-                        <td colspan="4">
-                            <xsl:apply-templates select="./error" />
+                <xsl:if
+                    test="./error">
+                    <tr
+                        class="Error">
+                        <td
+                            colspan="4">
+                            <xsl:apply-templates
+                                select="./error"/>
                         </td>
                     </tr>
                 </xsl:if>
                 <xsl:apply-templates
                     select="./testcase"
-                    mode="print.test" />
+                    mode="print.test"/>
             </table>
-            <div class="Properties">
+            <div
+                class="Properties">
                 <a>
-                    <xsl:attribute name="href">javascript:displayProperties('<xsl:value-of
-                            select="@package" />.<xsl:value-of
-                            select="@name" />');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
+                    <xsl:attribute
+                        name="href">javascript:displayProperties('<xsl:value-of
+                        select="@package"/>.<xsl:value-of
+                        select="@name"/>');</xsl:attribute>
+                    Properties &gt;&gt; </a>
             </div>
-            <p />
-
-            <a href="#top">Back to top</a>
+            <p/>
+            <a
+                href="#top">Back to top</a>
         </xsl:for-each>
     </xsl:template>
-
-    <xsl:template name="summary">
+    <xsl:template
+        name="summary">
         <h2>Summary</h2>
         <xsl:variable
             name="testCount"
-            select="sum(testsuite/@tests)" />
+            select="sum(testsuite/@tests)"/>
         <xsl:variable
             name="errorCount"
-            select="sum(testsuite/@errors)" />
+            select="sum(testsuite/@errors)"/>
         <xsl:variable
             name="failureCount"
-            select="sum(testsuite/@failures)" />
+            select="sum(testsuite/@failures)"/>
         <xsl:variable
             name="timeCount"
-            select="sum(testsuite/@time)" />
+            select="sum(testsuite/@time)"/>
         <xsl:variable
             name="successRate"
-            select="($testCount - $failureCount - $errorCount) div $testCount" />
+            select="($testCount - $failureCount - $errorCount) div $testCount"/>
         <table
             class="details"
             border="0"
             cellpadding="5"
             cellspacing="2"
             width="95%">
-            <tr valign="top">
+            <tr
+                valign="top">
                 <th>Tests</th>
                 <th>Failures</th>
                 <th>Errors</th>
                 <th>Success rate</th>
                 <th>Time</th>
             </tr>
-            <tr valign="top">
-                <xsl:attribute name="class">
+            <tr
+                valign="top">
+                <xsl:attribute
+                    name="class">
 				<xsl:choose>
-					<xsl:when test="$failureCount &gt; 0">Failure</xsl:when>
-					<xsl:when test="$errorCount &gt; 0">Error</xsl:when>
+					<xsl:when
+                    test="$failureCount &gt; 0">Failure</xsl:when>
+					<xsl:when
+                    test="$errorCount &gt; 0">Error</xsl:when>
 				</xsl:choose>
 			</xsl:attribute>
                 <td>
-                    <xsl:value-of select="$testCount" />
+                    <xsl:value-of
+                        select="$testCount"/>
                 </td>
                 <td>
-                    <xsl:value-of select="$failureCount" />
+                    <xsl:value-of
+                        select="$failureCount"/>
                 </td>
                 <td>
-                    <xsl:value-of select="$errorCount" />
+                    <xsl:value-of
+                        select="$errorCount"/>
                 </td>
                 <td>
-                    <xsl:call-template name="display-percent">
+                    <xsl:call-template
+                        name="display-percent">
                         <xsl:with-param
                             name="value"
-                            select="$successRate" />
+                            select="$successRate"/>
                     </xsl:call-template>
                 </td>
                 <td>
-                    <xsl:call-template name="display-time">
+                    <xsl:call-template
+                        name="display-time">
                         <xsl:with-param
                             name="value"
-                            select="$timeCount" />
+                            select="$timeCount"/>
                     </xsl:call-template>
                 </td>
-
             </tr>
         </table>
         <table
             border="0"
             width="95%">
             <tr>
-                <td style="text-align: justify;">
+                <td
+                    style="text-align: justify;">
                     Note:
                     <i>failures</i>
                     are anticipated and checked for with assertions
@@ -332,79 +389,102 @@
             </tr>
         </table>
     </xsl:template>
-
     <!--
-        Write properties into a JavaScript data structure.
-        This is based on the original idea by Erik Hatcher (erik@hatcher.net)
+        Write properties into a JavaScript data structure. This is based
+        on the original idea by Erik Hatcher (erik@hatcher.net)
     -->
-    <xsl:template match="properties">
+    <xsl:template
+        match="properties">
         cur = TestCases['
-        <xsl:value-of select="../@package" />
+        <xsl:value-of
+            select="../@package"/>
         .
-        <xsl:value-of select="../@name" />
+        <xsl:value-of
+            select="../@name"/>
         '] = new Array();
-        <xsl:for-each select="property">
-            <xsl:sort select="@name" />
+        <xsl:for-each
+            select="property">
+            <xsl:sort
+                select="@name"/>
             cur['
-            <xsl:value-of select="@name" />
+            <xsl:value-of
+                select="@name"/>
             '] = '
-            <xsl:call-template name="JS-escape">
+            <xsl:call-template
+                name="JS-escape">
                 <xsl:with-param
                     name="string"
-                    select="@value" />
+                    select="@value"/>
             </xsl:call-template>
             ';
         </xsl:for-each>
     </xsl:template>
 
     <!-- Page HEADER -->
-    <xsl:template name="pageHeader">
+    <xsl:template
+        name="pageHeader">
         <h1>Unit Test Results</h1>
-        <table width="100%">
+        <table
+            width="100%">
             <tr>
-                <td align="left"></td>
-                <td align="right">
+                <td
+                    align="left"></td>
+                <td
+                    align="right">
                     Designed for use with
-                    <a href='http://www.junit.org'>JUnit</a>
+                    <a
+                        href='http://www.junit.org'>JUnit</a>
                     and
-                    <a href='http://jakarta.apache.org/ant'>Ant</a>
+                    <a
+                        href='http://jakarta.apache.org/ant'>Ant</a>
                     .
                 </td>
             </tr>
         </table>
-        <hr size="1" />
+        <hr
+            size="1"/>
     </xsl:template>
-
     <xsl:template
         match="testsuite"
         mode="header">
-        <tr valign="top">
-            <th width="80%">Name</th>
+        <tr
+            valign="top">
+            <th
+                width="80%">Name</th>
             <th>Tests</th>
             <th>Errors</th>
             <th>Failures</th>
-            <th nowrap="nowrap">Time(s)</th>
+            <th
+                nowrap="nowrap">Time(s)</th>
         </tr>
     </xsl:template>
 
     <!-- class header -->
-    <xsl:template name="testsuite.test.header">
-        <tr valign="top">
-            <th width="80%">Name</th>
+    <xsl:template
+        name="testsuite.test.header">
+        <tr
+            valign="top">
+            <th
+                width="80%">Name</th>
             <th>Tests</th>
             <th>Errors</th>
             <th>Failures</th>
-            <th nowrap="nowrap">Time(s)</th>
+            <th
+                nowrap="nowrap">Time(s)</th>
         </tr>
     </xsl:template>
 
     <!-- method header -->
-    <xsl:template name="testcase.test.header">
-        <tr valign="top">
+    <xsl:template
+        name="testcase.test.header">
+        <tr
+            valign="top">
             <th>Name</th>
             <th>Status</th>
-            <th width="80%">Type</th>
-            <th nowrap="nowrap">Time(s)</th>
+            <th
+                width="80%">Type</th>
+            <th
+                nowrap="nowrap">Time(s)</th>
         </tr>
     </xsl:template>
 
@@ -413,63 +493,80 @@
     <xsl:template
         match="testsuite"
         mode="print.test">
-        <tr valign="top">
+        <tr
+            valign="top">
             <!-- set a nice color depending if there is an error/failure -->
-            <xsl:attribute name="class">
+            <xsl:attribute
+                name="class">
 			<xsl:choose>
-				<xsl:when test="@failures[.&gt; 0]">Failure</xsl:when>
-				<xsl:when test="@errors[.&gt; 0]">Error</xsl:when>
+				<xsl:when
+                test="@failures[.&gt; 0]">Failure</xsl:when>
+				<xsl:when
+                test="@errors[.&gt; 0]">Error</xsl:when>
 			</xsl:choose>
 		</xsl:attribute>
 
             <!-- print testsuite information -->
             <td>
-                <a href="#{@name}">
-                    <xsl:value-of select="@name" />
+                <a
+                    href="#{@name}">
+                    <xsl:value-of
+                        select="@name"/>
                 </a>
             </td>
             <td>
-                <xsl:value-of select="@tests" />
+                <xsl:value-of
+                    select="@tests"/>
             </td>
             <td>
-                <xsl:value-of select="@errors" />
+                <xsl:value-of
+                    select="@errors"/>
             </td>
             <td>
-                <xsl:value-of select="@failures" />
+                <xsl:value-of
+                    select="@failures"/>
             </td>
             <td>
-                <xsl:call-template name="display-time">
+                <xsl:call-template
+                    name="display-time">
                     <xsl:with-param
                         name="value"
-                        select="@time" />
+                        select="@time"/>
                 </xsl:call-template>
             </td>
         </tr>
     </xsl:template>
-
     <xsl:template
         match="testcase"
         mode="print.test">
-        <tr valign="top">
-            <xsl:attribute name="class">
+        <tr
+            valign="top">
+            <xsl:attribute
+                name="class">
 			<xsl:choose>
-				<xsl:when test="failure | error">Error</xsl:when>
+				<xsl:when
+                test="failure | error">Error</xsl:when>
 			</xsl:choose>
 		</xsl:attribute>
             <td>
-                <xsl:value-of select="@name" />
+                <xsl:value-of
+                    select="@name"/>
             </td>
             <xsl:choose>
-                <xsl:when test="failure">
+                <xsl:when
+                    test="failure">
                     <td>Failure</td>
                     <td>
-                        <xsl:apply-templates select="failure" />
+                        <xsl:apply-templates
+                            select="failure"/>
                     </td>
                 </xsl:when>
-                <xsl:when test="error">
+                <xsl:when
+                    test="error">
                     <td>Error</td>
                     <td>
-                        <xsl:apply-templates select="error" />
+                        <xsl:apply-templates
+                            select="error"/>
                     </td>
                 </xsl:when>
                 <xsl:otherwise>
@@ -478,103 +575,128 @@
                 </xsl:otherwise>
             </xsl:choose>
             <td>
-                <xsl:call-template name="display-time">
+                <xsl:call-template
+                    name="display-time">
                     <xsl:with-param
                         name="value"
-                        select="@time" />
+                        select="@time"/>
                 </xsl:call-template>
             </td>
         </tr>
     </xsl:template>
-
-
-    <xsl:template match="failure">
-        <xsl:call-template name="display-failures" />
+    <xsl:template
+        match="failure">
+        <xsl:call-template
+            name="display-failures"/>
     </xsl:template>
-
-    <xsl:template match="error">
-        <xsl:call-template name="display-failures" />
+    <xsl:template
+        match="error">
+        <xsl:call-template
+            name="display-failures"/>
     </xsl:template>
 
     <!-- Style for the error and failure in the tescase template -->
-    <xsl:template name="display-failures">
+    <xsl:template
+        name="display-failures">
         <xsl:choose>
-            <xsl:when test="not(@message)">N/A</xsl:when>
+            <xsl:when
+                test="not(@message)">
+                N/A
+            </xsl:when>
             <xsl:otherwise>
-                <xsl:value-of select="@message" />
+                <xsl:value-of
+                    select="@message"/>
             </xsl:otherwise>
         </xsl:choose>
         <!-- display the stacktrace -->
         <code>
-            <p />
-            <xsl:call-template name="br-replace">
+            <p/>
+            <xsl:call-template
+                name="br-replace">
                 <xsl:with-param
                     name="word"
-                    select="." />
+                    select="."/>
             </xsl:call-template>
         </code>
-        <!-- the later is better but might be problematic for non-21" monitors... -->
+        <!--
+            the later is better but might be problematic for non-21"
+            monitors...
+        -->
         <!--pre><xsl:value-of select="."/></pre-->
     </xsl:template>
-
-    <xsl:template name="JS-escape">
-        <xsl:param name="string" />
+    <xsl:template
+        name="JS-escape">
+        <xsl:param
+            name="string"/>
         <xsl:choose>
-            <!-- something isn't right here, basically all single quotes need to be replaced with backslash-single-quote
+            <!--
+                something isn't right here, basically all single quotes
+                need to be replaced with backslash-single-quote
                 <xsl:when test="contains($string,'&apos;')">
-                <xsl:value-of select="substring-before($string,'&apos;')"/>
-                \&apos;
-                <xsl:call-template name="JS-escape">
-                <xsl:with-param name="string" select="substring-after($string,'&apos;')"/>
-                </xsl:call-template>
-                </xsl:when> -->
-            <xsl:when test="contains($string,'\')">
-                <xsl:value-of select="substring-before($string,'\')" />
+                <xsl:value-of
+                select="substring-before($string,'&apos;')"/> \&apos;
+                <xsl:call-template name="JS-escape"> <xsl:with-param
+                name="string"
+                select="substring-after($string,'&apos;')"/>
+                </xsl:call-template> </xsl:when>
+            -->
+            <xsl:when
+                test="contains($string,'\')">
+                <xsl:value-of
+                    select="substring-before($string,'\')"/>
                 \\
-                <xsl:call-template name="JS-escape">
+                <xsl:call-template
+                    name="JS-escape">
                     <xsl:with-param
                         name="string"
-                        select="substring-after($string,'\')" />
+                        select="substring-after($string,'\')"/>
                 </xsl:call-template>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:value-of select="$string" />
+                <xsl:value-of
+                    select="$string"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
-
-
     <!--
         template that will convert a carriage return into a br tag
         @param word the text from which to convert CR to BR tag
     -->
-    <xsl:template name="br-replace">
-        <xsl:param name="word" />
+    <xsl:template
+        name="br-replace">
+        <xsl:param
+            name="word"/>
         <xsl:choose>
-            <xsl:when test="contains($word,'&#xA;')">
-                <xsl:value-of select="substring-before($word,'&#xA;')" />
-                <br />
-                <xsl:call-template name="br-replace">
+            <xsl:when
+                test="contains($word,'&#xA;')">
+                <xsl:value-of
+                    select="substring-before($word,'&#xA;')"/>
+                <br/>
+                <xsl:call-template
+                    name="br-replace">
                     <xsl:with-param
                         name="word"
-                        select="substring-after($word,'&#xA;')" />
+                        select="substring-after($word,'&#xA;')"/>
                 </xsl:call-template>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:value-of select="$word" />
+                <xsl:value-of
+                    select="$word"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
-
-    <xsl:template name="display-time">
-        <xsl:param name="value" />
-        <xsl:value-of select="format-number($value,'0.000')" />
+    <xsl:template
+        name="display-time">
+        <xsl:param
+            name="value"/>
+        <xsl:value-of
+            select="format-number($value,'0.000')"/>
     </xsl:template>
-
-    <xsl:template name="display-percent">
-        <xsl:param name="value" />
-        <xsl:value-of select="format-number($value,'0.00%')" />
+    <xsl:template
+        name="display-percent">
+        <xsl:param
+            name="value"/>
+        <xsl:value-of
+            select="format-number($value,'0.00%')"/>
     </xsl:template>
-
-</xsl:stylesheet>
-
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/patches.tests/testScripts/test.xml
index dc10e2a..b0e3470 100644
--- a/releng.wtpbuilder/distribution/patches.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/patches.tests/testScripts/test.xml
@@ -2,371 +2,406 @@
     name="Automated Eclipse Testing"
     default="all"
     basedir=".">
-      <property environment="env" />
-
+    <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}"/>
     <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 some server name properties -->
-    <property file="${testRoot}/testServer.properties" />
+    <property
+        file="${testRoot}/testServer.properties"/>
 
     <!--properties file containing the build information-->
-    <property file="${buildDirectory}/label.properties" />
-
+    <property
+        file="${buildDirectory}/label.properties"/>
+    <!-- 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}"/>
     <!--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}/eclipse" />
-
-    <!-- The directory that will contain the xml and html results from the tests that are run -->
+        value="${testRoot}/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"/>
+    <property
+        name="library-file"
+        value="${testRoot}/wtp-junit-tests.xml"/>
 
     <!-- jonas install directory -->
+    <!-- TODO: why do this twice? Here and in init? -->
     <property
         name="jonas432Dir"
-        value="${testRoot}/${jonas432DirName}" />
-
-    <target name="init">
-        <antcall target="setPropertyJOnAS432Dir" />
-        <antcall target="computePluginVersion" />
-        <property file="${testRoot}/test2.properties" />
+        value="${testRoot}/${jonas432DirName}"/>
+    <target
+        name="init">
+        <antcall
+            target="setPropertyJOnAS432Dir"/>
+        <antcall
+            target="computePluginVersion"/>
+        <property
+            file="${testRoot}/test2.properties"/>
     </target>
-
     <target
         name="setPropertyJOnAS432Dir"
         unless="jonas432Dir">
         <property
             name="jonas432Dir"
-            value="${testRoot}/${jonas432DirName}" />
+            value="${testRoot}/${jonas432DirName}"/>
     </target>
-
     <target
         name="setup"
         if="clean"
         description="Reinstall the test Eclipse installation if specified by user">
-        <delete dir="${install}" />
-        <mkdir dir="${install}" />
-        <exec
-            dir="."
-            executable="unzip">
-            <arg line="-o -qq ../downloads/*.zip -d ${install}" />
-        </exec>
-
+        <delete
+            dir="${install}"/>
+        <mkdir
+            dir="${install}"/>
         <exec
             dir="."
             executable="unzip">
             <arg
-                line="-o -qq  wtp-wst-tests-feature*.zip -d ${install}" />
+                line="-o -qq ../downloads/*.zip -d ${install}"/>
         </exec>
-
+        <exec
+            dir="."
+            executable="unzip">
+            <arg
+                line="-o -qq  wtp-wst-tests-feature*.zip -d ${install}"/>
+        </exec>
     </target>
-
     <target
         name="runapitests"
         depends="setup">
-        <antcall target="runtests" />
+        <antcall
+            target="runtests"/>
     </target>
-
     <target
         name="runtests"
         depends="setup"
         description="Runs ant on the test.xml for a specified plugin.">
         <available
             file="${eclipse-home}/plugins/${testPlugin}/test.xml"
-            property="test.xml.exists" />
-        <antcall target="runtests2" />
+            property="test.xml.exists"/>
+        <antcall
+            target="runtests2"/>
     </target>
-
     <target
         name="runtests2"
         if="test.xml.exists">
-        <antcall target="runtests-normal" />
+        <antcall
+            target="runtests-normal"/>
         <copy
             file="${eclipse-home}/${report}.xml"
             tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false" />
-        <antcall target="genHtml" />
+            failonerror="false"/>
+        <antcall
+            target="genHtml"/>
     </target>
-
-    <target name="runtests-normal">
+    <target
+        name="runtests-normal">
         <ant
             antfile="${eclipse-home}/plugins/${testPlugin}/test.xml"
             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" />
-        <antcall target="genHtml" />
+            failonerror="false"/>
+        <antcall
+            target="genHtml"/>
     </target>
-
     <target
         name="wst-server-tests"
         depends="init"
         description="Runs the org.eclipse.wst.server.*.tests test.xml">
-        <antcall target="runapitests">
+        <antcall
+            target="runapitests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.server.core.tests}" />
+                value="${org.eclipse.wst.server.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.server.core.tests" />
+                value="org.eclipse.wst.server.core.tests"/>
             <param
                 name="package.includes"
-                value="org.eclipse.wst.server" />
+                value="org.eclipse.wst.server"/>
         </antcall>
-        <antcall target="runapitests">
+        <antcall
+            target="runapitests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.server.ui.tests}" />
+                value="${org.eclipse.wst.server.ui.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.server.ui.tests" />
+                value="org.eclipse.wst.server.ui.tests"/>
             <param
                 name="package.includes"
-                value="org.eclipse.wst.server" />
+                value="org.eclipse.wst.server"/>
         </antcall>
     </target>
-
     <target
         name="wst-monitor-tests"
         depends="init"
         description="Runs the org.eclipse.wst.internet.monitor.*.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.internet.monitor.core.tests}" />
+                value="${org.eclipse.wst.internet.monitor.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.internet.monitor.core.tests" />
+                value="org.eclipse.wst.internet.monitor.core.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.internet.monitor.ui.tests}" />
+                value="${org.eclipse.wst.internet.monitor.ui.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.internet.monitor.ui.tests" />
+                value="org.eclipse.wst.internet.monitor.ui.tests"/>
         </antcall>
     </target>
-
     <target
         name="wst-cache-tests"
         depends="init"
         description="Runs the org.eclipse.wst.internet.cache.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.internet.cache.tests}" />
+                value="${org.eclipse.wst.internet.cache.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.internet.cache.tests" />
+                value="org.eclipse.wst.internet.cache.tests"/>
         </antcall>
     </target>
-
     <target
         name="jst-server-tests"
         depends="init"
         description="Runs the org.eclipse.jst.server.*.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.server.core.tests}" />
+                value="${org.eclipse.jst.server.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.server.core.tests" />
+                value="org.eclipse.jst.server.core.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.server.ui.tests}" />
+                value="${org.eclipse.jst.server.ui.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.server.ui.tests" />
+                value="org.eclipse.jst.server.ui.tests"/>
         </antcall>
     </target>
-
     <target
         name="jst-server-tomcat-tests"
         depends="init"
         description="Runs the org.eclipse.jst.server.tomcat.*.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.server.tomcat.core.tests}" />
+                value="${org.eclipse.jst.server.tomcat.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.server.tomcat.core.tests" />
+                value="org.eclipse.jst.server.tomcat.core.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.server.tomcat.ui.tests}" />
+                value="${org.eclipse.jst.server.tomcat.ui.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.server.tomcat.ui.tests" />
+                value="org.eclipse.jst.server.tomcat.ui.tests"/>
         </antcall>
     </target>
-
     <target
         name="jst-server-generic-tests"
         depends="init"
         description="Runs the org.eclipse.jst.server.generic.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.server.generic.tests}" />
+                value="${org.eclipse.jst.server.generic.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.server.generic.tests" />
+                value="org.eclipse.jst.server.generic.tests"/>
         </antcall>
     </target>
-
     <target
         name="jst-server-geronimo-tests"
         depends="init"
         description="Runs the org.eclipse.jst.server.geronimo.*.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.server.geronimo.core.tests}" />
+                value="${org.eclipse.jst.server.geronimo.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.server.geronimo.core.tests" />
+                value="org.eclipse.jst.server.geronimo.core.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.server.geronimo.ui.tests}" />
+                value="${org.eclipse.jst.server.geronimo.ui.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.server.geronimo.ui.tests" />
+                value="org.eclipse.jst.server.geronimo.ui.tests"/>
         </antcall>
     </target>
-
     <target
         name="jst-jem-tests"
         depends="init"
         description="Runs the org.eclipse.jem.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jem.tests}" />
+                value="${org.eclipse.jem.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jem.tests" />
+                value="org.eclipse.jem.tests"/>
         </antcall>
     </target>
-
     <target
         name="jst-j2ee-core-tests"
         depends="init"
         description="Runs the org.eclipse.jst.j2ee.core.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.j2ee.core.tests}" />
+                value="${org.eclipse.jst.j2ee.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.j2ee.core.tests" />
+                value="org.eclipse.jst.j2ee.core.tests"/>
         </antcall>
     </target>
-
     <target
         name="jst-j2ee-tests"
         depends="init"
         description="Runs the org.eclipse.jst.j2ee.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.j2ee.tests}" />
+                value="${org.eclipse.jst.j2ee.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.j2ee.tests" />
+                value="org.eclipse.jst.j2ee.tests"/>
         </antcall>
     </target>
-
     <target
         name="wst-common-tests"
         depends="init"
         description="Runs the org.eclipse.jst.j2ee.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.common.tests}" />
+                value="${org.eclipse.wst.common.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.common.tests" />
+                value="org.eclipse.wst.common.tests"/>
             <param
                 name="debug"
-                value="false" />
+                value="false"/>
         </antcall>
     </target>
-
     <target
         name="wst-common-snippets-tests"
         depends="init">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.common.snippets.tests}" />
+                value="${org.eclipse.wst.common.snippets.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.common.snippets.tests" />
+                value="org.eclipse.wst.common.snippets.tests"/>
         </antcall>
     </target>
-
     <target
         name="jst-servlet-tests"
         depends="init"
         description="Runs the org.eclipse.jst.servlet.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.servlet.tests}" />
+                value="${org.eclipse.jst.servlet.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.servlet.tests" />
+                value="org.eclipse.jst.servlet.tests"/>
         </antcall>
     </target>
-
     <target
         name="jst-validation-framework-tests"
         depends="init"
         description="Runs the org.eclipse.jst.validation.test test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.validation.test}" />
+                value="${org.eclipse.jst.validation.test}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.validation.test" />
+                value="org.eclipse.jst.validation.test"/>
         </antcall>
     </target>
 
@@ -375,29 +410,32 @@
         name="jst-jsp-tests"
         depends="init"
         description="Runs test.xml for JSP tests">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.jsp.core.tests}" />
+                value="${org.eclipse.jst.jsp.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.jsp.core.tests" />
+                value="org.eclipse.jst.jsp.core.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.jsp.ui.tests}" />
+                value="${org.eclipse.jst.jsp.ui.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.jsp.ui.tests" />
+                value="org.eclipse.jst.jsp.ui.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.jsp.tests.encoding}" />
+                value="${org.eclipse.jst.jsp.tests.encoding}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.jsp.tests.encoding" />
+                value="org.eclipse.jst.jsp.tests.encoding"/>
         </antcall>
     </target>
 
@@ -406,22 +444,23 @@
         name="wst-sse-tests"
         depends="init"
         description="Runs test.xml for SSE tests">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.sse.core.tests}" />
+                value="${org.eclipse.wst.sse.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.sse.core.tests" />
+                value="org.eclipse.wst.sse.core.tests"/>
         </antcall>
-
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.sse.ui.tests}" />
+                value="${org.eclipse.wst.sse.ui.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.sse.ui.tests" />
+                value="org.eclipse.wst.sse.ui.tests"/>
         </antcall>
     </target>
 
@@ -430,37 +469,41 @@
         name="wst-xml-tests"
         depends="init"
         description="Runs test.xml for XML tests">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.xml.core.tests}" />
+                value="${org.eclipse.wst.xml.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.xml.core.tests" />
+                value="org.eclipse.wst.xml.core.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.xml.ui.tests}" />
+                value="${org.eclipse.wst.xml.ui.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.xml.ui.tests" />
+                value="org.eclipse.wst.xml.ui.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.xml.tests.encoding}" />
+                value="${org.eclipse.wst.xml.tests.encoding}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.xml.tests.encoding" />
+                value="org.eclipse.wst.xml.tests.encoding"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.xml.validation.tests}" />
+                value="${org.eclipse.wst.xml.validation.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.xml.validation.tests" />
+                value="org.eclipse.wst.xml.validation.tests"/>
         </antcall>
     </target>
 
@@ -469,24 +512,26 @@
         name="wst-wsdl-tests"
         depends="init"
         description="Runs test.xml for WSDL ">
-        <antcall target="runapitests">
+        <antcall
+            target="runapitests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.wsdl.tests}" />
+                value="${org.eclipse.wst.wsdl.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.wsdl.tests" />
+                value="org.eclipse.wst.wsdl.tests"/>
             <param
                 name="package.includes"
-                value="org.eclipse.wst.wsdl" />
+                value="org.eclipse.wst.wsdl"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.wsdl.validation.tests}" />
+                value="${org.eclipse.wst.wsdl.validation.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.wsdl.validation.tests" />
+                value="org.eclipse.wst.wsdl.validation.tests"/>
         </antcall>
     </target>
 
@@ -495,13 +540,14 @@
         name="wst-wsi-tests"
         depends="init"
         description="Runs test.xml for WSI tests">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.wsi.tests}" />
+                value="${org.eclipse.wst.wsi.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.wsi.tests" />
+                value="org.eclipse.wst.wsi.tests"/>
         </antcall>
     </target>
 
@@ -510,13 +556,14 @@
         name="wst-xsd-tests"
         depends="init"
         description="Runs test.xml for XSD tests ">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.xsd.validation.tests}" />
+                value="${org.eclipse.wst.xsd.validation.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.xsd.validation.tests" />
+                value="org.eclipse.wst.xsd.validation.tests"/>
         </antcall>
     </target>
 
@@ -525,29 +572,32 @@
         name="wst-html-tests"
         depends="init"
         description="Runs test.xml for HTML tests">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.html.core.tests}" />
+                value="${org.eclipse.wst.html.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.html.core.tests" />
+                value="org.eclipse.wst.html.core.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.html.ui.tests}" />
+                value="${org.eclipse.wst.html.ui.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.html.ui.tests" />
+                value="org.eclipse.wst.html.ui.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.html.tests.encoding}" />
+                value="${org.eclipse.wst.html.tests.encoding}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.html.tests.encoding" />
+                value="org.eclipse.wst.html.tests.encoding"/>
         </antcall>
     </target>
 
@@ -555,13 +605,14 @@
     <target
         name="wst-dtd-tests"
         depends="init">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.dtd.ui.tests}" />
+                value="${org.eclipse.wst.dtd.ui.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.dtd.ui.tests" />
+                value="org.eclipse.wst.dtd.ui.tests"/>
         </antcall>
     </target>
 
@@ -573,29 +624,32 @@
                                                                                                 org.eclipse.wst.css.core.tests
                                                                                                 org.eclipse.wst.css.ui.tests
                                                                                                 org.eclipse.wst.css.tests.encoding">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.css.core.tests}" />
+                value="${org.eclipse.wst.css.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.css.core.tests" />
+                value="org.eclipse.wst.css.core.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.css.tests.encoding}" />
+                value="${org.eclipse.wst.css.tests.encoding}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.css.tests.encoding" />
+                value="org.eclipse.wst.css.tests.encoding"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.css.ui.tests}" />
+                value="${org.eclipse.wst.css.ui.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.css.ui.tests" />
+                value="org.eclipse.wst.css.ui.tests"/>
         </antcall>
     </target>
 
@@ -604,99 +658,105 @@
         name="jsf-tests"
         depends="init"
         description="Runs test.xml for org.eclipse.jst.jsf.core.tests, org.eclipse.jst.jsf.ui.tests">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.jsf.core.tests}" />
+                value="${org.eclipse.jst.jsf.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.jsf.core.tests" />
+                value="org.eclipse.jst.jsf.core.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.jsf.ui.tests}" />
+                value="${org.eclipse.jst.jsf.ui.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.jsf.ui.tests" />
+                value="org.eclipse.jst.jsf.ui.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.jsf.metadata.tests}" />
+                value="${org.eclipse.jst.jsf.metadata.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.jsf.metadata.tests" />
+                value="org.eclipse.jst.jsf.metadata.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.jsf.contentassist.tests}" />
+                value="${org.eclipse.jst.jsf.contentassist.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.jsf.contentassist.tests" />
+                value="org.eclipse.jst.jsf.contentassist.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.jsf.context.symbol.tests}" />
+                value="${org.eclipse.jst.jsf.context.symbol.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.jsf.context.symbol.tests" />
+                value="org.eclipse.jst.jsf.context.symbol.tests"/>
         </antcall>
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.jsf.designtime.tests}" />
+                value="${org.eclipse.jst.jsf.designtime.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.jsf.designtime.tests" />
+                value="org.eclipse.jst.jsf.designtime.tests"/>
         </antcall>
     </target>
 
     <!-- WS TESTS -->
-
     <target
         name="wst-ws-tests"
         depends="init"
         description="Runs the org.eclipse.wst.ws.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.ws.tests}" />
+                value="${org.eclipse.wst.ws.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.ws.tests" />
+                value="org.eclipse.wst.ws.tests"/>
         </antcall>
     </target>
-
     <target
         name="jst-ws-tests"
         depends="init"
         description="Runs the org.eclipse.jst.ws.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jst.ws.tests}" />
+                value="${org.eclipse.jst.ws.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jst.ws.tests" />
+                value="org.eclipse.jst.ws.tests"/>
         </antcall>
     </target>
 
     <!-- Faceted Project Framework Tests -->
-
     <target
         name="wst-facets-tests"
         depends="init"
         description="Runs the Faceted Project Framework tests.">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wst.common.project.facet.core.tests}" />
+                value="${org.eclipse.wst.common.project.facet.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wst.common.project.facet.core.tests" />
+                value="org.eclipse.wst.common.project.facet.core.tests"/>
         </antcall>
     </target>
 
@@ -705,219 +765,206 @@
         name="jpt-utility-tests"
         depends="init"
         description="Runs the org.eclipse.jpt.utility.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jpt.utility.tests}" />
+                value="${org.eclipse.jpt.utility.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jpt.utility.tests" />
+                value="org.eclipse.jpt.utility.tests"/>
         </antcall>
     </target>
     <target
         name="dali-core-tests"
         description="Runs the org.eclipse.jpt.core.tests test.xml">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.jpt.core.tests}" />
+                value="${org.eclipse.jpt.core.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.jpt.core.tests" />
+                value="org.eclipse.jpt.core.tests"/>
         </antcall>
     </target>
 
     <!-- releng Tests -->
-
     <target
         name="releng-tests"
         depends="init"
         description="Runs the releng tests.">
-        <antcall target="runtests">
+        <antcall
+            target="runtests">
             <param
                 name="testPlugin"
-                value="${org.eclipse.wtp.releng.tests}" />
+                value="${org.eclipse.wtp.releng.tests}"/>
             <param
                 name="report"
-                value="org.eclipse.wtp.releng.tests" />
+                value="org.eclipse.wtp.releng.tests"/>
         </antcall>
     </target>
-
     <target
         name="all"
         depends="init">
-
         <echo
             level="info"
-            message="Starting WTP Unit Tests" />
-
-
+            message="Starting WTP Unit Tests"/>
         <echo
             level="info"
-            message="Starting releng tests" />
-        <antcall target="releng-tests" />
-
-
+            message="Starting releng tests"/>
+        <antcall
+            target="releng-tests"/>
         <echo
             level="info"
-            message="Starting wst-server-tests" />
-        <antcall target="wst-server-tests" />
-
+            message="Starting wst-server-tests"/>
+        <antcall
+            target="wst-server-tests"/>
         <echo
             level="info"
-            message="Starting wst-monitor-tests" />
-        <antcall target="wst-monitor-tests" />
-
+            message="Starting wst-monitor-tests"/>
+        <antcall
+            target="wst-monitor-tests"/>
         <echo
             level="info"
-            message="Starting wst-cache-tests" />
-        <antcall target="wst-cache-tests" />
-
+            message="Starting wst-cache-tests"/>
+        <antcall
+            target="wst-cache-tests"/>
         <echo
             level="info"
-            message="Starting wst-common-tests" />
-        <antcall target="wst-common-tests" />
-
+            message="Starting wst-common-tests"/>
+        <antcall
+            target="wst-common-tests"/>
         <echo
             level="info"
-            message="Starting wst-common-snippets-tests" />
-        <antcall target="wst-common-snippets-tests" />
-
+            message="Starting wst-common-snippets-tests"/>
+        <antcall
+            target="wst-common-snippets-tests"/>
         <echo
             level="info"
-            message="Starting wst-sse-tests" />
-        <antcall target="wst-sse-tests" />
-
+            message="Starting wst-sse-tests"/>
+        <antcall
+            target="wst-sse-tests"/>
         <echo
             level="info"
-            message="Starting wst-xml-tests" />
-        <antcall target="wst-xml-tests" />
-
+            message="Starting wst-xml-tests"/>
+        <antcall
+            target="wst-xml-tests"/>
         <echo
             level="info"
-            message="Starting wst-wsdl-tests" />
-        <antcall target="wst-wsdl-tests" />
-
+            message="Starting wst-wsdl-tests"/>
+        <antcall
+            target="wst-wsdl-tests"/>
         <echo
             level="info"
-            message="Starting wst-wsi-tests" />
-        <antcall target="wst-wsi-tests" />
-
+            message="Starting wst-wsi-tests"/>
+        <antcall
+            target="wst-wsi-tests"/>
         <echo
             level="info"
-            message="Starting wst-xsd-tests" />
-        <antcall target="wst-xsd-tests" />
-
+            message="Starting wst-xsd-tests"/>
+        <antcall
+            target="wst-xsd-tests"/>
         <echo
             level="info"
-            message="Starting wst-html-tests" />
-        <antcall target="wst-html-tests" />
-
+            message="Starting wst-html-tests"/>
+        <antcall
+            target="wst-html-tests"/>
         <echo
             level="info"
-            message="Starting wst-dtd-tests" />
-        <antcall target="wst-dtd-tests" />
-
+            message="Starting wst-dtd-tests"/>
+        <antcall
+            target="wst-dtd-tests"/>
         <echo
             level="info"
-            message="Starting wst-css-tests" />
-        <antcall target="wst-css-tests" />
-
+            message="Starting wst-css-tests"/>
+        <antcall
+            target="wst-css-tests"/>
         <echo
             level="info"
-            message="Starting wst-ws-tests" />
-        <antcall target="wst-ws-tests" />
-
-
+            message="Starting wst-ws-tests"/>
+        <antcall
+            target="wst-ws-tests"/>
         <echo
             level="info"
-            message="Starting jst-server-tests" />
-        <antcall target="jst-server-tests" />
-
+            message="Starting jst-server-tests"/>
+        <antcall
+            target="jst-server-tests"/>
         <echo
             level="info"
-            message="Starting jst-server-tomcat-tests" />
-        <antcall target="jst-server-tomcat-tests" />
-
+            message="Starting jst-server-tomcat-tests"/>
+        <antcall
+            target="jst-server-tomcat-tests"/>
         <echo
             level="info"
-            message="Starting jst-server-geronimo-tests" />
-        <antcall target="jst-server-geronimo-tests" />
-
+            message="Starting jst-server-geronimo-tests"/>
+        <antcall
+            target="jst-server-geronimo-tests"/>
         <echo
             level="info"
-            message="Starting jst-server-generic-tests" />
-        <antcall target="jst-server-generic-tests" />
-
+            message="Starting jst-server-generic-tests"/>
+        <antcall
+            target="jst-server-generic-tests"/>
         <echo
             level="info"
-            message="Starting jst-jem-tests" />
-        <antcall target="jst-jem-tests" />
-
+            message="Starting jst-jem-tests"/>
+        <antcall
+            target="jst-jem-tests"/>
         <echo
             level="info"
-            message="Starting jst-j2ee-core-tests" />
-        <antcall target="jst-j2ee-core-tests" />
-
+            message="Starting jst-j2ee-core-tests"/>
+        <antcall
+            target="jst-j2ee-core-tests"/>
         <echo
             level="info"
-            message="Starting jst-j2ee-tests" />
-        <antcall target="jst-j2ee-tests" />
-
+            message="Starting jst-j2ee-tests"/>
+        <antcall
+            target="jst-j2ee-tests"/>
         <echo
             level="info"
-            message="Starting jst-validation-framework-tests" />
-        <antcall target="jst-validation-framework-tests" />
-
+            message="Starting jst-validation-framework-tests"/>
+        <antcall
+            target="jst-validation-framework-tests"/>
         <echo
             level="info"
-            message="Starting jst-jsp-tests" />
-        <antcall target="jst-jsp-tests" />
-
+            message="Starting jst-jsp-tests"/>
+        <antcall
+            target="jst-jsp-tests"/>
         <echo
             level="info"
-            message="Starting jst-ws-tests" />
-        <antcall target="jst-ws-tests" />
-
+            message="Starting jst-ws-tests"/>
+        <antcall
+            target="jst-ws-tests"/>
         <echo
             level="info"
-            message="Starting wst-facets-tests" />
-        <antcall target="wst-facets-tests" />
-
-
+            message="Starting wst-facets-tests"/>
+        <antcall
+            target="wst-facets-tests"/>
         <echo
             level="info"
-            message="Starting JPT Unit Tests" />
-
+            message="Starting JPT Unit Tests"/>
         <echo
             level="info"
-            message="Starting jpt-utility-tests" />
-        <antcall target="jpt-utility-tests" />
+            message="Starting jpt-utility-tests"/>
+        <antcall
+            target="jpt-utility-tests"/>
         <echo
             level="info"
-            message="Starting dali-core-tests" />
-        <antcall target="dali-core-tests" />
-
+            message="Starting dali-core-tests"/>
+        <antcall
+            target="dali-core-tests"/>
         <echo
             level="info"
-            message="Ended JPT Unit Tests" />
-
+            message="Ended JPT Unit Tests"/>
         <echo
             level="info"
-            message="Starting JSF Tests" />
-        <antcall target="jsf-tests" />
-
+            message="Starting JSF Tests"/>
+        <antcall
+            target="jsf-tests"/>
         <echo
             level="info"
-            message="Ended WTP Unit Tests" />
-
-
-
-
-
-
+            message="Ended WTP Unit Tests"/>
     </target>
-
     <target
         name="genHtml"
         description="Generates HTML results with provided JUNIT.XSL provided"
@@ -925,9 +972,8 @@
         <xslt
             style="JUNIT.XSL"
             basedir="${results}/xml"
-            destdir="${results}/html" />
+            destdir="${results}/html"/>
     </target>
-
     <target
         name="computePluginVersion"
         depends="test2properties"
@@ -935,17 +981,23 @@
         <java
             classname="org.eclipse.wtp.releng.test.ComputePluginVersion">
             <classpath>
-                <pathelement location="ComputePluginVersion.jar" />
+                <pathelement
+                    location="ComputePluginVersion.jar"/>
             </classpath>
-            <arg value="${testRoot}/eclipse/plugins" />
-            <arg value="${testRoot}/test2.properties" />
-            <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+            <arg
+                value="${eclipse-home}/plugins"/>
+            <arg
+                value="${testRoot}/test2.properties"/>
+            <jvmarg
+                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
         </java>
     </target>
-
-    <target name="test2properties">
-        <condition property="test2propertiesexists">
-            <available file="${testRoot}/test2.properties" />
+    <target
+        name="test2properties">
+        <condition
+            property="test2propertiesexists">
+            <available
+                file="${testRoot}/test2.properties"/>
         </condition>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.tests/testScripts/testServer.properties b/releng.wtpbuilder/distribution/patches.tests/testScripts/testServer.properties
index ea24038..be77c9b 100644
--- a/releng.wtpbuilder/distribution/patches.tests/testScripts/testServer.properties
+++ b/releng.wtpbuilder/distribution/patches.tests/testScripts/testServer.properties
@@ -8,4 +8,14 @@
 
 # SWT
 #swt.lib.path=org.eclipse.swt.motif_3.1.0/os/linux/x86
-swt.lib.path=org.eclipse.swt.win32_3.1.0/os/win32/x86
\ No newline at end of file
+swt.lib.path=org.eclipse.swt.win32_3.1.0/os/win32/x86
+
+# JSF Runtime Library directory
+jsf1.1Dir=myfaces-core-1.1.5/lib
+
+# JPT Persistence Runtime Library path
+jpt-persistence-jar=jpt/jpt-persistence-2.0-preview/lib/javax.persistence_2.0_preview.jar
+jpt-eclipselink-jar=jpt/jpt-eclipselink-2.0.0/lib/eclipselink.jar
+
+jpt-persistence10-jar=jpt/persistence-1.0/lib/persistence.jar
+jpt-eclipselink110-jar=jpt/eclipselink-1.1.0/lib/eclipselink.jar
diff --git a/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml
index f3532e7..74744d6 100644
--- a/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/patches.tests/testScripts/wtp-junit-tests.xml
@@ -2,184 +2,180 @@
 <project
     name="JUnit tests"
     basedir=".">
+    <property
+        environment="env"/>
 
-    <property environment="env" />
-
-    <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).
-        -->
-
+    <!-- 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">
         <property
             name="junit-report-output"
-            value="${testRoot}/results" />
-        <mkdir dir="${junit-report-output}/raw" />
-
-
-        <!-- if not otherwise set, be sure extraVMargs is at least empty string -->
+            value="${testRoot}/results"/>
+        <mkdir
+            dir="${junit-report-output}/raw"/>
+        <!--
+            if not otherwise set, be sure extraVMargs is at least some
+            string, even if unused string. Remember, though, extraVMArgs
+            can contain more than one extra arg, so much be passed to VM
+            as a "line", not "value".
+        -->
         <property
             name="extraVMargs"
-            value="" />
+            value="-DextraVMargsunused=notused"/>
 
         <!-- 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}"/>
+        <!--
+            Some common values, of milliseconds to more recognizable
+            units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
+            1800000: 30 minutes 600000: 10 minutes
+        -->
         <property
             name="timeout"
-            value="1800000" />
+            value="3600000"/>
         <property
             name="junit-report-output"
-            value="${junit-report-output}" />
-        <property
-            name="plugin-path"
-            value="${testRoot}/plugins/${testPlugin}" />
+            value="${junit-report-output}"/>
         <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_5_HOME}/bin/java" />
-
+            value="${env.JAVA_5_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="info"
+            message="extraVMargs: ${extraVMargs}"/>
         <echo
             level="debug"
-            message="extraVMargs: ${extraVMargs}" />
+            message="timeout: ${timeout}"/>
         <echo
             level="debug"
-            message="timeout: ${timeout}" />
+            message="testRoot: ${testRoot}"/>
         <echo
             level="debug"
-            message="testRoot: ${testRoot}" />
-
+            message="basedir: ${basedir}"/>
         <echo
             level="debug"
-            message="basedir: ${basedir}" />
+            message="eclipse-home: ${eclipse-home}"/>
         <echo
             level="debug"
-            message="eclipse-home: ${eclipse-home}" />
+            message="junit-report-output: ${junit-report-output}"/>
         <echo
             level="debug"
-            message="plugin-path: ${plugin-path}" />
+            message="test-output: ${test-output}"/>
         <echo
             level="debug"
-            message="junit-report-output: ${junit-report-output}" />
+            message="buildDirectory: ${buildDirectory}"/>
         <echo
             level="debug"
-            message="test-output: ${test-output}" />
+            message="buildLabel: ${buildLabel}"/>
         <echo
             level="debug"
-            message="buildDirectory: ${buildDirectory}" />
-        <echo
-            level="debug"
-            message="buildLabel: ${buildLabel}" />
-
-        <echo
-            level="debug"
-            message="jvm: ${env.JAVA_5_HOME}/bin/java" />
-
-
-
+            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
         name="ui-test"
         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
         name="eclipse-test"
         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}"/>
+        <mkdir
+            dir="${buildDirectory}/${buildLabel}/httplogstest"/>
+        <echo
+            message="http log messages to: ${buildDirectory}/${buildLabel}/httplogstest"/>
+        <condition
+            property="xulRunnerParam"
+            value="org.eclipse.swt.browser.XULRunnerPath"
+            else="XULRunnerPathNotSpecified">
+            <isset
+                property="env.WTP_XULRUNNER"/>
+        </condition>
+        <echo
+            message="xulRunnerParam: ${xulRunnerParam}"/>
+        <echo
+            message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"/>
+        <!--
+            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
         -->
-        <echo message="eclipse.launcher: ${eclipse.launcher}" />
+        <!--
+            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
             jar="${eclipse.launcher}"
             taskname="suiteUnitTest"
@@ -188,96 +184,126 @@
             failonerror="false"
             timeout="${timeout}"
             dir="${testRoot}/eclipse"
-            jvm="${env.JAVA_5_HOME}/bin/java">
-
-            <jvmarg value="-Xmx758m" />
-
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg value="-DbuildLabel=${buildLabel}" />
-            <jvmarg value="-DbuildDirectory=${buildDirectory}" />
-
-          <jvmarg value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol" />
-          <jvmarg value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log" />
-
-        	
-        	
-            <jvmarg value="-Dwtp.autotest.noninteractive=true" />
-            
-            <jvmarg value="-DPLUGIN_PATH=${plugin-path}" />
-            <jvmarg line="${extraVMargs}" />
-              <jvmarg value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />
+            jvm="${jvm}">
             <jvmarg
-                value="-Dprojectname=${projectname}" />
-            <arg value="-nosplash" />
-            <arg value="-consolelog" />
-            <arg value="-debug" />
-            <arg value="-data" />
-            <arg value="${data-dir}" />
-            <arg value="-application" />
-            <arg value="${application}" />
-            <arg value="formatter=${formatter},${test-output}" />
-            <arg value="-testPluginName" />
-            <arg value="${plugin-name}" />
-            <arg value="-className" />
-            <arg value="${classname}" />
+                value="-Xmx758m"/>
+            <jvmarg
+                value="-Dosgi.ws=${env.BASEWS}"/>
+            <jvmarg
+                value="-Dosgi.os=${env.BASEOS}"/>
+            <jvmarg
+                value="-Dosgi.arch=${env.BASEARCH}"/>
+            <jvmarg
+                value="-DbuildLabel=${buildLabel}"/>
+            <jvmarg
+                value="-DbuildDirectory=${buildDirectory}"/>
+            <jvmarg
+                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
+            <jvmarg
+                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
+            <jvmarg
+                value="-Dwtp.autotest.noninteractive=true"/>
+            <jvmarg
+                line="${extraVMargs}"/>
+            <jvmarg
+                value="-Declipse.consolelog=true"/>
+            <jvmarg
+                value="-Dosgi.debug"/>
+            <jvmarg
+                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
+            <jvmarg
+                value="-Dprojectname=${projectname}"/>
+            <jvmarg
+                value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
+            <arg
+                value="-nosplash"/>
+            <arg
+                value="-data"/>
+            <arg
+                value="${data-dir}"/>
+            <arg
+                value="-application"/>
+            <arg
+                value="${application}"/>
+            <arg
+                value="formatter=${formatter},${test-output}"/>
+            <arg
+                value="-testPluginName"/>
+            <arg
+                value="${plugin-name}"/>
+            <arg
+                value="-className"/>
+            <arg
+                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>
-
-
-
-
-
-
-
-
-
-        <antcall target="collect-results" />
-
         <echo
             level="info"
-            message="suitejunitresult: ${suitejunitresult}" />
-
+            message="suitejunitresult: ${suitejunitresult}"/>
+        <antcall
+            target="summarizeFailure"/>
+        <antcall
+            target="collect-results"/>
     </target>
-
-    <target name="collect-results">
+    <target
+        name="collect-results">
         <dirname
             property="output-dir"
-            file="${test-output}" />
+            file="${test-output}"/>
         <basename
             property="output-file-name"
-            file="${test-output}" />
-        <mkdir dir="${junit-report-output}/xml" />
+            file="${test-output}"/>
+        <mkdir
+            dir="${junit-report-output}/xml"/>
         <junitreport
             todir="${junit-report-output}/xml"
             tofile="${classname}.xml">
-            <fileset dir="${output-dir}">
-                <include name="${output-file-name}" />
+            <fileset
+                dir="${output-dir}">
+                <include
+                    name="${output-file-name}"/>
             </fileset>
         </junitreport>
-
-        <mkdir dir="${junit-report-output}/html" />
+        <mkdir
+            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"/>
     </target>
-
-    <target name="collect">
-        <!--  deprecated, each test.xml uses it, and we should remove, eventually -->
+    <target
+        name="collect">
+        <!--
+            deprecated, each test.xml uses it, and we should remove,
+            eventually
+        -->
+        <echo
+            message="Deprecated. There is no need to call the collect task. It no longer does anything. Please remove from your test.xml file"/>
     </target>
-
-
-
-
-
-</project>
+    <target
+        name="summarizeFailure"
+        depends="checkFailure"
+        if="doFailure">
+        <echo
+            append="true"
+            file="${buildDirectory}/junitFailureList.log">${plugin-name}${line.separator}</echo>
+    </target>
+    <target
+        name="checkFailure">
+        <condition
+            property="doFailure">
+            <not>
+                <equals
+                    arg1="${suitejunitresult}"
+                    arg2="0"
+                    trim="true"/>
+            </not>
+        </condition>
+    </target>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches.tests/testdependency.xml b/releng.wtpbuilder/distribution/patches.tests/testdependency.xml
index e362244..3996002 100644
--- a/releng.wtpbuilder/distribution/patches.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/patches.tests/testdependency.xml
@@ -1,107 +1,134 @@
 <?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">
-
-    <target name="get">
-        <antcall target="getAndInstall">
+    <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}"/>
+    <fail
+        message="Required property file does not exist: ${keyCfgFile}">
+        <condition>
+            <not>
+                <available
+                    file="${keyCfgFile}"/>
+            </not>
+        </condition>
+    </fail>
+    <property
+        file="${keyCfgFile}"/>
+    <target
+        name="get">
+        <!--
+            read in this properties, just so we can make sure our
+            requested pre-reqs are defined, which we do later with
+            statements such if="${groupId}.url"
+        -->
+        <property
+            file="${dependency.properties}"/>
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="emf" />
+                value="emf"/>
         </antcall>
-      <antcall target="getAndInstall">
-          <param
-              name="groupId"
-              value="emfxsd" />
-      </antcall>                  
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="gef" />
+                value="emfxsd"/>
         </antcall>
-
-
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="eclipse" />
+                value="gef"/>
         </antcall>
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="eclipseTestFramework" />
+                value="eclipse"/>
         </antcall>
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="tomcat.5" />
+                value="eclipseTestFramework"/>
         </antcall>
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="jonas.4" />
+                value="tomcat.5"/>
         </antcall>
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="oagis.release" />
+                value="jonas.4"/>
         </antcall>
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="oagis.wsdl" />
+                value="oagis.release"/>
         </antcall>
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="wtp" />
+                value="oagis.wsdl"/>
         </antcall>
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="wtp-wst-test" />
+                value="wtp"/>
         </antcall>
-        <antcall target="getAndInstall">
+        <antcall
+            target="getAndInstall">
             <param
                 name="groupId"
-                value="wtp-jst-test" />
+                value="wtp-wst-test"/>
         </antcall>
-
-
-
+        <antcall
+            target="getAndInstall">
+            <param
+                name="groupId"
+                value="wtp-jst-test"/>
+        </antcall>
     </target>
-
-
-    <target name="getAndInstall">
+    <target
+        name="getAndInstall"
+        if="${groupId}.url">
         <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>
-
-
-
-
-</project>
-
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches3.tests/build.xml b/releng.wtpbuilder/distribution/patches3.tests/build.xml
index 317e991..62d33ea 100644
--- a/releng.wtpbuilder/distribution/patches3.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches3.tests/build.xml
@@ -13,7 +13,7 @@
     <fail
         message="testRoot must be set for this task"
         unless="testRoot"/>
-  <!-- required to get proper value of dropinsFolder -->
+    <!-- required to get proper value of dropinsFolder -->
     <property
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
@@ -72,7 +72,6 @@
             dir="${testRoot}/results"/>
         <mkdir
             dir="${testRoot}/results/consolelogs"/>
-
         <copy
             todir="${testRoot}"
             overwrite="true">
@@ -139,7 +138,7 @@
             failonerror="true">
             <arg
                 line="-o -qq wtp-patches-tests-${buildLabel}.zip -d ${testRoot}${dropinsFolder}"/>
-        </exec>        
+        </exec>
     </target>
     <!--
         time out may need to be set/adjust for api or performance tests?
diff --git a/releng.wtpbuilder/distribution/patches3.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/patches3.tests/templateFiles/index.php
index bbc9072..a42c883 100644
--- a/releng.wtpbuilder/distribution/patches3.tests/templateFiles/index.php
+++ b/releng.wtpbuilder/distribution/patches3.tests/templateFiles/index.php
@@ -2,8 +2,8 @@
 <head>
 
 <?php
-    $parts = explode("/", realpath(".."));
-    $label = $parts[count($parts) - 1];
+$parts = explode("/", realpath(".."));
+$label = $parts[count($parts) - 1];
 ?>
 
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
@@ -11,67 +11,67 @@
 	type="text/css">
 </head>
 <body>
-<p><b><font face="Verdana" size="+3">Test Results</font></b> </p>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
+<p><b><font face="Verdana" size="+3">Test Results</font></b></p>
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+	<tr>
 		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
 			color="#FFFFFF" face="Arial,Helvetica">Unit Test Results for <?php echo "$label"; ?>
 		</font></b></td>
-  </tr>
+	</tr>
 </table>
 <p></p>
 <table border="0">
 </table>
 
 <table width="77%" border="1">
-  <tr> 
-    <td width="81%"><b>Tests Performed</b></td>
-    <td width="19%"><b>Errors &amp; Failures</b></td>
-  </tr>
+	<tr>
+		<td width="81%"><b>Tests Performed</b></td>
+		<td width="19%"><b>Errors &amp; Failures</b></td>
+	</tr>
 
-  <?
-    $dir = dir("html");
-    while ($anEntry = $dir->read())
-    {
-      if ($anEntry != "." && $anEntry != "..")
-      {
-        $link = "html/".$anEntry;
-        $xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
-        $count = 0;
-        $fileHandle = fopen($xml, "r");
-        while (!feof($fileHandle))
-        {
-          $aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
-          $count = $count + substr_count($aLine, '<error');
-        }
-        fclose($fileHandle);
-        if ($count > 0)
-        {
-          echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
-          echo "$anEntry";
-          echo "</font></b></a></td>";
-          echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
-        }
-        else
-        {
-          echo "<tr><td><a href=\"$link\">";
-          echo "$anEntry";
-          echo "</a></td>";
-          echo "<td>$count</td></tr>";
-        }
-      }
-    }
-  ?>
-  
+	<?
+	$dir = dir("html");
+	while ($anEntry = $dir->read())
+	{
+		if ($anEntry != "." && $anEntry != "..")
+		{
+			$link = "html/".$anEntry;
+			$xml = "xml/".substr($anEntry, 0, strlen($anEntry)-4)."xml";
+			$count = 0;
+			$fileHandle = fopen($xml, "r");
+			while (!feof($fileHandle))
+			{
+				$aLine = fgets($fileHandle, 4096); // Length parameter only optional after 4.2.0
+				$count = $count + substr_count($aLine, '<error');
+			}
+			fclose($fileHandle);
+			if ($count > 0)
+			{
+				echo "<tr><td><a href=\"$link\"><b><font color=\"red\">";
+				echo "$anEntry";
+				echo "</font></b></a></td>";
+				echo "<td><b><font color=\"red\">$count</font></b></td></tr>";
+			}
+			else
+			{
+				echo "<tr><td><a href=\"$link\">";
+				echo "$anEntry";
+				echo "</a></td>";
+				echo "<td>$count</td></tr>";
+			}
+		}
+	}
+	?>
+
 </table>
 <p></p>
 <br>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+	<tr>
 		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
 			color="#FFFFFF" face="Arial,Helvetica"> Console output logs <?php echo "$label"; ?>
-      </font></b></td>
-  </tr>
+		</font></b></td>
+	</tr>
 </table>
 <br>
 These
diff --git a/releng.wtpbuilder/distribution/patches3.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/patches3.tests/testScripts/JUNIT.XSL
index 9cdd80e..0810ae5 100644
--- a/releng.wtpbuilder/distribution/patches3.tests/testScripts/JUNIT.XSL
+++ b/releng.wtpbuilder/distribution/patches3.tests/testScripts/JUNIT.XSL
@@ -293,8 +293,7 @@
                         name="href">javascript:displayProperties('<xsl:value-of
                         select="@package"/>.<xsl:value-of
                         select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt;
-                </a>
+                    Properties &gt;&gt; </a>
             </div>
             <p/>
             <a
diff --git a/releng.wtpbuilder/distribution/patches3.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/patches3.tests/testScripts/test.xml
index bd030a2..9d4482b 100644
--- a/releng.wtpbuilder/distribution/patches3.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/patches3.tests/testScripts/test.xml
@@ -4,12 +4,12 @@
     basedir=".">
     <property
         environment="env"/>
-  <!-- required to get proper value of dropinsFolder -->
+    <!-- required to get proper value of dropinsFolder -->
     <property
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-    <echo 
-    	  level="debug"
+    <echo
+        level="debug"
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
@@ -90,8 +90,6 @@
             name="jonas432Dir"
             value="${testRoot}/${jonas432DirName}"/>
     </target>
-    
-    
     <target
         name="setup"
         if="clean"
@@ -119,8 +117,6 @@
         <antcall
             target="runtests"/>
     </target>
-
-    
     <target
         name="runtests"
         depends="setup"
@@ -892,7 +888,7 @@
         </antcall>
     </target>
 
-	
+
     <!-- releng Tests -->
     <target
         name="releng-tests"
diff --git a/releng.wtpbuilder/distribution/patches3.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/patches3.tests/testScripts/wtp-junit-tests.xml
index 4603a37..be57468 100644
--- a/releng.wtpbuilder/distribution/patches3.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/patches3.tests/testScripts/wtp-junit-tests.xml
@@ -5,12 +5,12 @@
     <property
         environment="env"/>
 
-  <!-- required to get proper value of dropinsFolder -->
+    <!-- required to get proper value of dropinsFolder -->
     <property
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
     <echo
-	      level="debug"
+        level="debug"
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
@@ -23,31 +23,26 @@
             dir="${junit-report-output}/raw"/>
         <!--
             if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
+            string, even if unused string. Remember, though, extraVMArgs
+            can contain more than one extra arg, so much be passed to VM
+            as a "line", not "value".
         -->
         <property
             name="extraVMargs"
             value="-DextraVMargsunused=notused"/>
 
-		<!-- if not otherwise set, use a unique workspace name -->
+        <!-- if not otherwise set, use a unique workspace name -->
         <property
             name="data-dir"
             value="${testRoot}/junitworkspaces/workspace-${classname}"/>
         <property
             name="testRoot"
             value="${testRoot}"/>
-      <!--
-        Some common values, of milliseconds to more recognizable units: 
-        14400000: 4 hours
-        7200000: 2 hours 
-        3600000: 1 hour  
-        1800000: 30 minutes 
-        600000: 10 minutes
-      -->
-
+        <!--
+            Some common values, of milliseconds to more recognizable
+            units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
+            1800000: 30 minutes 600000: 10 minutes
+        -->
         <property
             name="timeout"
             value="3600000"/>
@@ -62,7 +57,7 @@
             value="${junit-report-output}/raw/${classname}.xml"/>
         <property
             name="jvm"
-            value="${env.JAVA_6_HOME}/bin/java"/>
+            value="${env.JAVA_5_HOME}/bin/java"/>
         <dirname
             file="${ant.file}"
             property="currentDir"/>
@@ -74,6 +69,9 @@
             message="plugin-name: ${plugin-name}"/>
         <echo
             level="debug"
+            message="testPlugin: ${testPlugin}"/>
+        <echo
+            level="debug"
             message="classname: ${classname}"/>
         <echo
             level="info"
@@ -209,7 +207,7 @@
             <jvmarg
                 value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
             <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
+                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
             <jvmarg
                 value="-Dwtp.autotest.noninteractive=true"/>
             <jvmarg
@@ -285,7 +283,6 @@
             basedir="${junit-report-output}"
             includes="${classname}.xml"
             destdir="${junit-report-output}/html"/>
-
     </target>
     <target
         name="collect">
diff --git a/releng.wtpbuilder/distribution/patches3.tests/testdependency.xml b/releng.wtpbuilder/distribution/patches3.tests/testdependency.xml
index b0c29bb..99b13d7 100644
--- a/releng.wtpbuilder/distribution/patches3.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/patches3.tests/testdependency.xml
@@ -10,12 +10,12 @@
     default="get">
     <property
         environment="env"/>
-<!-- required to get proper value of dropinsFolder -->
+    <!-- required to get proper value of dropinsFolder -->
     <property
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
     <echo
-    	  level="debug"
+        level="debug"
         message="keyCfgFile: ${keyCfgFile}"/>
     <fail
         message="Required property file does not exist: ${keyCfgFile}">
@@ -136,7 +136,7 @@
                 name="install.destination"
                 value="${base.install.dir}"/>
         </ant>
-    </target>    
+    </target>
     <target
         name="getAndInstallDropins"
         if="${groupId}.url">