add explicit xulrunner
diff --git a/releng.control/commonVariations.shsource b/releng.control/commonVariations.shsource
index 100a74c..97f83ee 100644
--- a/releng.control/commonVariations.shsource
+++ b/releng.control/commonVariations.shsource
@@ -131,3 +131,8 @@
 export REMOTE_SSH_COMMAND="ssh david_williams@build.eclipse.org "
 
 export DASHBOARDHOST=206.191.52.34
+
+# comment out WTP_XULRUNNER if no special version is required
+# rarely needed. machine specific
+export WTP_XULRUNNER=/shared/common/mozilla-xulrunner181-1.8.1.4-30.ppc
+echo "WTP_XULRUNNER: " $WTP_XULRUNNER
diff --git a/releng.wtpbuilder/buildtemplates/buildall.xml b/releng.wtpbuilder/buildtemplates/buildall.xml
index 3884a60..0a4f860 100644
--- a/releng.wtpbuilder/buildtemplates/buildall.xml
+++ b/releng.wtpbuilder/buildtemplates/buildall.xml
@@ -19,22 +19,25 @@
                 name="componentpropertyfile"
                 value="vex.properties"/>
         </ant>
-    	<!--
+        <ant>
+            <property
+                name="componentpropertyfile"
+                value="pave.properties"/>
+        </ant>
+        <ant>
+            <property
+                name="componentpropertyfile"
+                value="jsdt.properties"/>
+        </ant>
+        <ant>
+            <property
+                name="componentpropertyfile"
+                value="xml.properties"/>
+        </ant>
         <ant>
             <property
                 name="componentpropertyfile"
                 value="servadapt.properties"/>
         </ant>
-        -->
-        <ant>
-            <property
-              	name="componentpropertyfile"
-                value="pave.properties"/>
-        </ant>
-       <ant>
-           <property
-                    name="componentpropertyfile"
-               value="jsdt.properties"/>
-       </ant>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
index f97acc4..b851f0d 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
@@ -153,13 +153,7 @@
         <property
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
-       <condition
-           property="xulRunnerParam"
-           value="-Dorg.eclipse.swt.browser.XULRunnerPath=${env.WTP_XULRUNNER}"
-           else="-Dunused=notused">
-           <isset
-               property="env.WTP_XULRUNNER"/>
-       </condition>
+
         <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}"/>
@@ -221,8 +215,6 @@
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
                 value="-Dprojectname=${projectname}"/>
-            <jvmarg
-        	  value="${xulRunnerParam}"/>        	
             <arg
                 value="-nosplash"/>
             <arg
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
index 8014baf..e1a59f5 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
@@ -68,7 +68,7 @@
             level="debug"
             message="classname: ${classname}"/>
         <echo
-            level="debug"
+            level="info"
             message="extraVMargs: ${extraVMargs}"/>
         <echo
             level="debug"
@@ -144,6 +144,17 @@
             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
@@ -203,6 +214,11 @@
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
                 value="-Dprojectname=${projectname}"/>
+        	
+              <jvmarg
+                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
+        	
+        	
             <arg
                 value="-nosplash"/>
             <arg
diff --git a/releng.wtpbuilder/components/servadapt/build.properties b/releng.wtpbuilder/components/servadapt/build.properties
index e8db6cc..5bed879 100644
--- a/releng.wtpbuilder/components/servadapt/build.properties
+++ b/releng.wtpbuilder/components/servadapt/build.properties
@@ -44,14 +44,4 @@
 flattenDependencies=true
 parallelCompilation=true
 
-prereq.eclipseplatform=false
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
 
diff --git a/releng.wtpbuilder/components/servadapt/customTargets.xml b/releng.wtpbuilder/components/servadapt/customTargets.xml
index 83585ba..6588249 100644
--- a/releng.wtpbuilder/components/servadapt/customTargets.xml
+++ b/releng.wtpbuilder/components/servadapt/customTargets.xml
@@ -269,33 +269,70 @@
     <!--
       Helper targets
     -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
+	    <target
+	        name="gatherLogs"
+	        if="logsAvailable">
+	        <mkdir
+	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+	        <echo
+	            level="debug"
+	            message="logExtension: ${logExtension}"/>
+	        <antcall
+	            target="allElements">
+	            <param
+	                name="target"
+	                value="gatherLogs"/>
+	            <param
+	                name="logExtension"
+	                value="${logExtension}"/>
+	        </antcall>
+	        <unzip
+	            dest="${buildDirectory}/${buildLabel}/compilelogs"
+	            overwrite="true">
+	            <fileset
                 dir="${buildDirectory}/features/org.eclipse.jst.server_adapters.ext.feature">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
+	                <include
+	                    name="**/*.log.zip"/>
+	            </fileset>
+	        </unzip>
+	        <!--
+	            TODO: it is unclear if the above "gather" and unzip do
+	            anything constructive. I think not and should be removed
+	            (after experimental run, of course.
+	        -->
+	        <!--
+	            workaround: see
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+	        -->
+	        <copy
+	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+	            overwrite="true">
+	            <!--
+	                we want all @dot.xml files, but assumes a certain
+	                structure, to include directory for name of plugin
+	            -->
+	            <fileset
+	                dir="${buildDirectory}/features/">
+	                <include
+	                    name="**/feature.temp.folder/"/>
+	                <exclude
+	                    name="**/*tests*feature*/feature.temp.folder/" />
+	                     
+	            </fileset>
+	            <compositemapper>
+	                <mapper
+	                    type="regexp"
+	                    from="(.*)/plugins/(.*)/@dot.xml"
+	                    to="/\2/@dot.xml"/>
+	                <mapper
+	                    type="regexp"
+	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+	                    to="/\2/\3bin.xml"/>
+	            </compositemapper>
+	        </copy>
+	    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/servadapt/dependency.xml b/releng.wtpbuilder/components/servadapt/dependency.xml
index 817a393..3aa2d0b 100644
--- a/releng.wtpbuilder/components/servadapt/dependency.xml
+++ b/releng.wtpbuilder/components/servadapt/dependency.xml
@@ -23,52 +23,52 @@
     <condition
         property="getprereq.eclipse">
         <istrue
-            value="${prereq.eclipse}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.eclipseplatform">
         <istrue
-            value="${prereq.eclipseplatform}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.emf">
         <istrue
-            value="${prereq.emf}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.emfxsd">
         <istrue
-            value="${prereq.emfxsd}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.emfvalidation">
         <istrue
-            value="${prereq.emfvalidation}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.gef">
         <istrue
-            value="${prereq.gef}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.dtp">
         <istrue
-            value="${prereq.dtp}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.wst">
         <istrue
-            value="${prereq.wst}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.jst">
         <istrue
-            value="${prereq.jst}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.wtp">
         <istrue
-            value="${prereq.wtp}"/>
+            value="false"/>
     </condition>
     <target
         name="get">
diff --git a/releng.wtpbuilder/components/servadapt_sdk/build.properties b/releng.wtpbuilder/components/servadapt_sdk/build.properties
index ddd3c4f..5bed879 100644
--- a/releng.wtpbuilder/components/servadapt_sdk/build.properties
+++ b/releng.wtpbuilder/components/servadapt_sdk/build.properties
@@ -44,15 +44,4 @@
 flattenDependencies=true
 parallelCompilation=true
 
-prereq.eclipseplatform=false
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
-
 
diff --git a/releng.wtpbuilder/components/servadapt_sdk/customTargets.xml b/releng.wtpbuilder/components/servadapt_sdk/customTargets.xml
index 7248a05..81a71e2 100644
--- a/releng.wtpbuilder/components/servadapt_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/servadapt_sdk/customTargets.xml
@@ -269,33 +269,70 @@
     <!--
       Helper targets
     -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
+	    <target
+	        name="gatherLogs"
+	        if="logsAvailable">
+	        <mkdir
+	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+	        <echo
+	            level="debug"
+	            message="logExtension: ${logExtension}"/>
+	        <antcall
+	            target="allElements">
+	            <param
+	                name="target"
+	                value="gatherLogs"/>
+	            <param
+	                name="logExtension"
+	                value="${logExtension}"/>
+	        </antcall>
+	        <unzip
+	            dest="${buildDirectory}/${buildLabel}/compilelogs"
+	            overwrite="true">
+	            <fileset
                 dir="${buildDirectory}/features/org.eclipse.jst.server_adapters.ext.sdk.feature">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
+	                <include
+	                    name="**/*.log.zip"/>
+	            </fileset>
+	        </unzip>
+	        <!--
+	            TODO: it is unclear if the above "gather" and unzip do
+	            anything constructive. I think not and should be removed
+	            (after experimental run, of course.
+	        -->
+	        <!--
+	            workaround: see
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+	        -->
+	        <copy
+	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+	            overwrite="true">
+	            <!--
+	                we want all @dot.xml files, but assumes a certain
+	                structure, to include directory for name of plugin
+	            -->
+	            <fileset
+	                dir="${buildDirectory}/features/">
+	                <include
+	                    name="**/feature.temp.folder/"/>
+	                <exclude
+	                    name="**/*tests*feature*/feature.temp.folder/" />
+	                     
+	            </fileset>
+	            <compositemapper>
+	                <mapper
+	                    type="regexp"
+	                    from="(.*)/plugins/(.*)/@dot.xml"
+	                    to="/\2/@dot.xml"/>
+	                <mapper
+	                    type="regexp"
+	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+	                    to="/\2/\3bin.xml"/>
+	            </compositemapper>
+	        </copy>
+	    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/servadapt_sdk/dependency.xml b/releng.wtpbuilder/components/servadapt_sdk/dependency.xml
index 817a393..2023e34 100644
--- a/releng.wtpbuilder/components/servadapt_sdk/dependency.xml
+++ b/releng.wtpbuilder/components/servadapt_sdk/dependency.xml
@@ -20,56 +20,57 @@
     <property
         file="${keyCfgFile}"/>
         
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="${prereq.eclipse}"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="${prereq.eclipseplatform}"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="${prereq.emf}"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="${prereq.emfxsd}"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="${prereq.emfvalidation}"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="${prereq.gef}"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="${prereq.dtp}"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="${prereq.wst}"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="${prereq.jst}"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="${prereq.wtp}"/>
-    </condition>
+	    <condition
+	        property="getprereq.eclipse">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.eclipseplatform">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.emf">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.emfxsd">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.emfvalidation">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.gef">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.dtp">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.wst">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.jst">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.wtp">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	            	
     <target
         name="get">
         <!--
diff --git a/releng.wtpbuilder/components/servadapt_tests/build.properties b/releng.wtpbuilder/components/servadapt_tests/build.properties
index 52efd55..4d26330 100644
--- a/releng.wtpbuilder/components/servadapt_tests/build.properties
+++ b/releng.wtpbuilder/components/servadapt_tests/build.properties
@@ -44,13 +44,3 @@
 flattenDependencies=true
 parallelCompilation=true
 
-prereq.eclipseplatform=false
-prereq.eclipse=false
-prereq.emf=false
-prereq.emfxsd=false
-prereq.emfvalidation=false
-prereq.gef=false
-prereq.dtp=false
-prereq.wst=false
-prereq.jst=false
-prereq.wtp=false
diff --git a/releng.wtpbuilder/components/servadapt_tests/customTargets.xml b/releng.wtpbuilder/components/servadapt_tests/customTargets.xml
index 7b29c67..143042c 100644
--- a/releng.wtpbuilder/components/servadapt_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/servadapt_tests/customTargets.xml
@@ -269,33 +269,70 @@
     <!--
       Helper targets
     -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
+	    <target
+	        name="gatherLogs"
+	        if="logsAvailable">
+	        <mkdir
             dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
+	        <echo
+	            level="debug"
+	            message="logExtension: ${logExtension}"/>
+	        <antcall
+	            target="allElements">
+	            <param
+	                name="target"
+	                value="gatherLogs"/>
+	            <param
+	                name="logExtension"
+	                value="${logExtension}"/>
+	        </antcall>
+	        <unzip
             dest="${buildDirectory}/${buildLabel}/testcompilelogs"
             overwrite="true">
-            <fileset
+	            <fileset
                 dir="${buildDirectory}/features/org.eclipse.jst.server_adapters.ext_tests.feature">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
+	                <include
+	                    name="**/*.log.zip"/>
+	            </fileset>
+	        </unzip>
+	        <!--
+	            TODO: it is unclear if the above "gather" and unzip do
+	            anything constructive. I think not and should be removed
+	            (after experimental run, of course.
+	        -->
+	        <!--
+	            workaround: see
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+	        -->
+	        <copy
+	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
+	            overwrite="true">
+	            <!--
+	                we want all @dot.xml files, but assumes a certain
+	                structure, to include directory for name of plugin
+	            -->
+	            <fileset
+	                dir="${buildDirectory}/features/">
+	                <include
+	                    name="**/feature.temp.folder/"/>
+	                <exclude
+	                    name="**/*tests*feature*/feature.temp.folder/" />
+	                     
+	            </fileset>
+	            <compositemapper>
+	                <mapper
+	                    type="regexp"
+	                    from="(.*)/plugins/(.*)/@dot.xml"
+	                    to="/\2/@dot.xml"/>
+	                <mapper
+	                    type="regexp"
+	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+	                    to="/\2/\3bin.xml"/>
+	            </compositemapper>
+	        </copy>
+	    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/servadapt_tests/dependency.xml b/releng.wtpbuilder/components/servadapt_tests/dependency.xml
index 235d96c..b4a2703 100644
--- a/releng.wtpbuilder/components/servadapt_tests/dependency.xml
+++ b/releng.wtpbuilder/components/servadapt_tests/dependency.xml
@@ -20,56 +20,56 @@
     <property
         file="${keyCfgFile}"/>
         
-    <condition
-        property="getprereq.eclipse">
-        <istrue
-            value="${prereq.eclipse}"/>
-    </condition>
-    <condition
-        property="getprereq.eclipseplatform">
-        <istrue
-            value="${prereq.eclipseplatform}"/>
-    </condition>
-    <condition
-        property="getprereq.emf">
-        <istrue
-            value="${prereq.emf}"/>
-    </condition>
-    <condition
-        property="getprereq.emfxsd">
-        <istrue
-            value="${prereq.emfxsd}"/>
-    </condition>
-    <condition
-        property="getprereq.emfvalidation">
-        <istrue
-            value="${prereq.emfvalidation}"/>
-    </condition>
-    <condition
-        property="getprereq.gef">
-        <istrue
-            value="${prereq.gef}"/>
-    </condition>
-    <condition
-        property="getprereq.dtp">
-        <istrue
-            value="${prereq.dtp}"/>
-    </condition>
-    <condition
-        property="getprereq.wst">
-        <istrue
-            value="${prereq.wst}"/>
-    </condition>
-    <condition
-        property="getprereq.jst">
-        <istrue
-            value="${prereq.jst}"/>
-    </condition>
-    <condition
-        property="getprereq.wtp">
-        <istrue
-            value="${prereq.wtp}"/>
-    </condition>
+	    <condition
+	        property="getprereq.eclipse">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.eclipseplatform">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.emf">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.emfxsd">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.emfvalidation">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.gef">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.dtp">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.wst">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.jst">
+	        <istrue
+	            value="false"/>
+	    </condition>
+	    <condition
+	        property="getprereq.wtp">
+	        <istrue
+	            value="false"/>
+	    </condition>
     <target
         name="get">
         <!--
diff --git a/releng.wtpbuilder/components/xml/customTargets.xml b/releng.wtpbuilder/components/xml/customTargets.xml
index 6384791..32116ae 100644
--- a/releng.wtpbuilder/components/xml/customTargets.xml
+++ b/releng.wtpbuilder/components/xml/customTargets.xml
@@ -123,16 +123,6 @@
                 name="mapTag"
                 value="${mapVersionTag}"/>
         </ant>
-       <ant
-           antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
-           target="maputil">
-           <property
-               name="mapcomponent"
-               value="${env.RELENGCOMMON}"/>
-           <property
-               name="mapTag"
-               value="${mapVersionTag}"/>
-       </ant>
         <ant
             antfile="${wtp.builder.home}/scripts/build/maptasks.xml"
             target="maputil">
@@ -279,33 +269,70 @@
     <!--
       Helper targets
     -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
+	    <target
+	        name="gatherLogs"
+	        if="logsAvailable">
+	        <mkdir
+	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+	        <echo
+	            level="debug"
+	            message="logExtension: ${logExtension}"/>
+	        <antcall
+	            target="allElements">
+	            <param
+	                name="target"
+	                value="gatherLogs"/>
+	            <param
+	                name="logExtension"
+	                value="${logExtension}"/>
+	        </antcall>
+	        <unzip
+	            dest="${buildDirectory}/${buildLabel}/compilelogs"
+	            overwrite="true">
+	            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.xml_ui.feature">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
+	                <include
+	                    name="**/*.log.zip"/>
+	            </fileset>
+	        </unzip>
+	        <!--
+	            TODO: it is unclear if the above "gather" and unzip do
+	            anything constructive. I think not and should be removed
+	            (after experimental run, of course.
+	        -->
+	        <!--
+	            workaround: see
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+	        -->
+	        <copy
+	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+	            overwrite="true">
+	            <!--
+	                we want all @dot.xml files, but assumes a certain
+	                structure, to include directory for name of plugin
+	            -->
+	            <fileset
+	                dir="${buildDirectory}/features/">
+	                <include
+	                    name="**/feature.temp.folder/"/>
+	                <exclude
+	                    name="**/*tests*feature*/feature.temp.folder/" />
+	                     
+	            </fileset>
+	            <compositemapper>
+	                <mapper
+	                    type="regexp"
+	                    from="(.*)/plugins/(.*)/@dot.xml"
+	                    to="/\2/@dot.xml"/>
+	                <mapper
+	                    type="regexp"
+	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+	                    to="/\2/\3bin.xml"/>
+	            </compositemapper>
+	        </copy>
+	    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/xml_sdk/customTargets.xml b/releng.wtpbuilder/components/xml_sdk/customTargets.xml
index 9039aeb..4f29c6d 100644
--- a/releng.wtpbuilder/components/xml_sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/xml_sdk/customTargets.xml
@@ -269,33 +269,70 @@
     <!--
       Helper targets
     -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
-            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
-            dest="${buildDirectory}/${buildLabel}/compilelogs"
-            overwrite="true">
-            <fileset
+	    <target
+	        name="gatherLogs"
+	        if="logsAvailable">
+	        <mkdir
+	            dir="${buildDirectory}/${buildLabel}/compilelogs"/>
+	        <echo
+	            level="debug"
+	            message="logExtension: ${logExtension}"/>
+	        <antcall
+	            target="allElements">
+	            <param
+	                name="target"
+	                value="gatherLogs"/>
+	            <param
+	                name="logExtension"
+	                value="${logExtension}"/>
+	        </antcall>
+	        <unzip
+	            dest="${buildDirectory}/${buildLabel}/compilelogs"
+	            overwrite="true">
+	            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.xml_sdk.feature">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
+	                <include
+	                    name="**/*.log.zip"/>
+	            </fileset>
+	        </unzip>
+	        <!--
+	            TODO: it is unclear if the above "gather" and unzip do
+	            anything constructive. I think not and should be removed
+	            (after experimental run, of course.
+	        -->
+	        <!--
+	            workaround: see
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+	        -->
+	        <copy
+	            todir="${buildDirectory}/${buildLabel}/compilelogs/plugins"
+	            overwrite="true">
+	            <!--
+	                we want all @dot.xml files, but assumes a certain
+	                structure, to include directory for name of plugin
+	            -->
+	            <fileset
+	                dir="${buildDirectory}/features/">
+	                <include
+	                    name="**/feature.temp.folder/"/>
+	                <exclude
+	                    name="**/*tests*feature*/feature.temp.folder/" />
+	                     
+	            </fileset>
+	            <compositemapper>
+	                <mapper
+	                    type="regexp"
+	                    from="(.*)/plugins/(.*)/@dot.xml"
+	                    to="/\2/@dot.xml"/>
+	                <mapper
+	                    type="regexp"
+	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+	                    to="/\2/\3bin.xml"/>
+	            </compositemapper>
+	        </copy>
+	    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/components/xml_tests/customTargets.xml b/releng.wtpbuilder/components/xml_tests/customTargets.xml
index 94ae594..63deb40 100644
--- a/releng.wtpbuilder/components/xml_tests/customTargets.xml
+++ b/releng.wtpbuilder/components/xml_tests/customTargets.xml
@@ -269,33 +269,70 @@
     <!--
       Helper targets
     -->
-    <target
-        name="gatherLogs"
-        if="logsAvailable">
-        <mkdir
+	    <target
+	        name="gatherLogs"
+	        if="logsAvailable">
+	        <mkdir
             dir="${buildDirectory}/${buildLabel}/testcompilelogs"/>
-        <echo
-            level="debug"
-            message="logExtension: ${logExtension}"/>
-        <antcall
-            target="allElements">
-            <param
-                name="target"
-                value="gatherLogs"/>
-            <param
-                name="logExtension"
-                value="${logExtension}"/>
-        </antcall>
-        <unzip
+	        <echo
+	            level="debug"
+	            message="logExtension: ${logExtension}"/>
+	        <antcall
+	            target="allElements">
+	            <param
+	                name="target"
+	                value="gatherLogs"/>
+	            <param
+	                name="logExtension"
+	                value="${logExtension}"/>
+	        </antcall>
+	        <unzip
             dest="${buildDirectory}/${buildLabel}/testcompilelogs"
             overwrite="true">
-            <fileset
+	            <fileset
                 dir="${buildDirectory}/features/org.eclipse.wst.xml_tests_ui.feature">
-                <include
-                    name="**/*.log.zip"/>
-            </fileset>
-        </unzip>
-    </target>
+	                <include
+	                    name="**/*.log.zip"/>
+	            </fileset>
+	        </unzip>
+	        <!--
+	            TODO: it is unclear if the above "gather" and unzip do
+	            anything constructive. I think not and should be removed
+	            (after experimental run, of course.
+	        -->
+	        <!--
+	            workaround: see
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=156043 and
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=172361 and
+	            https://bugs.eclipse.org/bugs/show_bug.cgi?id=294070
+	        -->
+	        <copy
+	            todir="${buildDirectory}/${buildLabel}/testcompilelogs/plugins"
+	            overwrite="true">
+	            <!--
+	                we want all @dot.xml files, but assumes a certain
+	                structure, to include directory for name of plugin
+	            -->
+	            <fileset
+	                dir="${buildDirectory}/features/">
+	                <include
+	                    name="**/feature.temp.folder/"/>
+	                <exclude
+	                    name="**/*tests*feature*/feature.temp.folder/" />
+	                     
+	            </fileset>
+	            <compositemapper>
+	                <mapper
+	                    type="regexp"
+	                    from="(.*)/plugins/(.*)/@dot.xml"
+	                    to="/\2/@dot.xml"/>
+	                <mapper
+	                    type="regexp"
+	                    from="(.*)/plugins/(.*)/(.*)bin.xml"
+	                    to="/\2/\3bin.xml"/>
+	            </compositemapper>
+	        </copy>
+	    </target>
     <target
         name="clean"
         unless="noclean">
diff --git a/releng.wtpbuilder/distribution/jaxws.site/publish.xml b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
index 406ff3e..71afb65 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/publish.xml
+++ b/releng.wtpbuilder/distribution/jaxws.site/publish.xml
@@ -425,47 +425,42 @@
             value="${buildBranch}"/>
 
         <!--  Insert PreRequsites  -->
-    	
-              <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformFile@"
-                value="${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformURL@"
-                value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformBuildURL@"
-                value="${eclipseplatform.url}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilelinux@"
-                value="${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilewindows@"
-                value="${eclipseplatform.file.win32-win32-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilemacos@"
-                value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformBuildHome@"
-                value="${eclipseplatform.build.home}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatform.mirror.prefixuri@"
-                value="${eclipseplatform.mirror.prefixuri}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatform.fspath.prefix@"
-                value="${eclipseplatform.fspath.prefix}"/>
-
-    
-    	
-    	
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformFile@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformURL@"
+            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildURL@"
+            value="${eclipseplatform.url}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilelinux@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilewindows@"
+            value="${eclipseplatform.file.win32-win32-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilemacos@"
+            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildHome@"
+            value="${eclipseplatform.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.mirror.prefixuri@"
+            value="${eclipseplatform.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.fspath.prefix@"
+            value="${eclipseplatform.fspath.prefix}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipseFile@"
@@ -534,57 +529,54 @@
             file="${resultingIndex}"
             token="@emf.mirror.prefixuri@"
             value="${emf.mirror.prefixuri}"/>
-    	
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceURL@"
-           value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceFile@"
-           value="${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceName@"
-           value="${emfsourcedoc.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceDescription@"
-           value="${emfsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceBuildHome@"
-           value="${emfsourcedoc.build.home}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsource.mirror.prefixuri@"
-           value="${emfsourcedoc.mirror.prefixuri}"/>
-    	
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceURL@"
-           value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceFile@"
-           value="${emfxsdsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceName@"
-           value="${emfxsdsourcedoc.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceDescription@"
-           value="${emfxsdsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceBuildHome@"
-           value="${emfxsdsourcedoc.build.home}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsource.mirror.prefixuri@"
-           value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-           	
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceURL@"
+            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceFile@"
+            value="${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceName@"
+            value="${emfsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceDescription@"
+            value="${emfsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceBuildHome@"
+            value="${emfsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsource.mirror.prefixuri@"
+            value="${emfsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceURL@"
+            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceFile@"
+            value="${emfxsdsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceName@"
+            value="${emfxsdsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceDescription@"
+            value="${emfxsdsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceBuildHome@"
+            value="${emfxsdsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsource.mirror.prefixuri@"
+            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
             token="@emfxsdFile@"
@@ -657,14 +649,14 @@
             file="${resultingIndex}"
             token="@emfvalidationsourceDescription@"
             value="${emfvalidationsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@wstName@"
-           value="${wst.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@wstDescription@"
-           value="${wst.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstName@"
+            value="${wst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstDescription@"
+            value="${wst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wstFile@"
@@ -681,15 +673,14 @@
             file="${resultingIndex}"
             token="@wst.mirror.prefixuri@"
             value="${wst.mirror.prefixuri}"/>
-    	
-    	       <replace
-    	           file="${resultingIndex}"
-    	           token="@jstName@"
-    	           value="${jst.name}"/>
-    	       <replace
-    	           file="${resultingIndex}"
-    	           token="@jstDescription@"
-    	           value="${jst.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstName@"
+            value="${jst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstDescription@"
+            value="${jst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@jstFile@"
@@ -706,15 +697,14 @@
             file="${resultingIndex}"
             token="@jst.mirror.prefixuri@"
             value="${jst.mirror.prefixuri}"/>
-            	
-              <replace
-                  file="${resultingIndex}"
-                  token="@wtpName@"
-                  value="${wtp.name}"/>
-              <replace
-                  file="${resultingIndex}"
-                  token="@wtpDescription@"
-                  value="${wtp.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpName@"
+            value="${wtp.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpDescription@"
+            value="${wtp.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wtpFile@"
@@ -747,14 +737,14 @@
             file="${resultingIndex}"
             token="@gef.mirror.prefixuri@"
             value="${gef.mirror.prefixuri}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@gefName@"
-           value="${gef.name}"/>
         <replace
-           file="${resultingIndex}"
-           token="@gefDescription@"
-           value="${gef.description}"/>
+            file="${resultingIndex}"
+            token="@gefName@"
+            value="${gef.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@gefDescription@"
+            value="${gef.description}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipserelengFile@"
@@ -819,11 +809,11 @@
             file="${resultingIndex}"
             token="@dtp.mirror.prefixuri@"
             value="${dtp.mirror.prefixuri}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@dtpName@"
-           value="${dtp.name}"/>
-    	<replace
+        <replace
+            file="${resultingIndex}"
+            token="@dtpName@"
+            value="${dtp.name}"/>
+        <replace
             file="${resultingIndex}"
             token="@dtpDescription@"
             value="${dtp.description}"/>
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/buildNotes.php
index e843ecf..f666887 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/buildNotes.php
@@ -27,34 +27,34 @@
 $hasNotes = false;
 $aDirectory = dir("buildnotes");
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
+	if ($anEntry != "." && $anEntry != "..") {
+		//print_r($anEntry);
+		//echo "<br />";
 
-        $subject = $anEntry;
-        $pattern = '/^buildnotes_(.*)/i';
-        preg_match($pattern, $subject, $matches);
-        $subject = $matches[1];
-        //print_r($subject);
-        //echo "<br />";
-        $pattern = '/^(.*)\.html$/';
-        preg_match($pattern, $subject, $matches);
-        //print_r($matches);
-        //echo "<br />";
+		$subject = $anEntry;
+		$pattern = '/^buildnotes_(.*)/i';
+		preg_match($pattern, $subject, $matches);
+		$subject = $matches[1];
+		//print_r($subject);
+		//echo "<br />";
+		$pattern = '/^(.*)\.html$/';
+		preg_match($pattern, $subject, $matches);
+		//print_r($matches);
+		//echo "<br />";
 
-        $component = $matches[1];
+		$component = $matches[1];
 
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
+		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
+		echo "<tr>";
+		echo "$line";
+		echo "</tr>";
+		$hasNotes = true;
 
-    }
+	}
 }
 $aDirectory.closedir();
 if (!$hasNotes) {
-    echo "<br>There are no build notes for this build.";
+	echo "<br>There are no build notes for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/consoleLogs.php
index 7dd5f42..2ee3c36 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/consoleLogs.php
@@ -32,15 +32,15 @@
 $index = 0;
 $dirindex = 0;
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        if (is_file("$rootDir/$anEntry")) {
-            $entries[$index] = $anEntry;
-            $index++;
-        } else if (is_dir("$rootDir/$anEntry")) {
-            $direntries[$dirindex] = $anEntry;
-            $dirindex++;
-        }
-    }
+	if ($anEntry != "." && $anEntry != "..") {
+		if (is_file("$rootDir/$anEntry")) {
+			$entries[$index] = $anEntry;
+			$index++;
+		} else if (is_dir("$rootDir/$anEntry")) {
+			$direntries[$dirindex] = $anEntry;
+			$dirindex++;
+		}
+	}
 }
 $aDirectory->close();
 
@@ -49,43 +49,43 @@
 sort($direntries);
 
 for ($i = 0; $i < $dirindex; $i++) {
-    $anEntry = $direntries[$i];
-    $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
+	$anEntry = $direntries[$i];
+	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
 }
 for ($i = 0; $i < $index; $i++) {
-    $anEntry = $entries[$i];
-    $logsize = filesize("testResults/consolelogs/$anEntry");
+	$anEntry = $entries[$i];
+	$logsize = filesize("testResults/consolelogs/$anEntry");
 
 
-    $level = 0;
-    if ($logsize > 20000) {
-        $level = 2;
-    }
-    else if ($logsize > 2000) {
-        $level = 1;
-    }
+	$level = 0;
+	if ($logsize > 20000) {
+		$level = 2;
+	}
+	else if ($logsize > 2000) {
+		$level = 1;
+	}
 
-    if ($level == 0) {
-        $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-    }
-    else if ($level == 1) {
-        $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-    } else if ($level == 2) {
-        $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-    }
+	if ($level == 0) {
+		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-    $hasNotes = true;
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
+	$hasNotes = true;
 }
 
 if (!$hasNotes) {
-    echo "<br>There are no test logs for this build.";
+	echo "<br>There are no test logs for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/logIndex.php
index 0b36334..721ca00 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/logIndex.php
@@ -4,79 +4,80 @@
 
 function endsWith( $str, $sub ) {
 
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
 }
 
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
+$parts = explode("/", getcwd());
+$parts2 = explode("-", $parts[count($parts) - 1]);
+$buildName = $parts2[1];
 
-        echo "<title>Test Console Output for $buildName </title>";
+echo "<title>Test Console Output for $buildName </title>";
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
+	type="text/css">
+<title>Console Logs from Running JUnit Plug-in Tests</title>
+</head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
+<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr>
-    <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Console
-      output from running JUnit plugin tests for
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+	<tr>
+		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+			color="#FFFFFF" face="Arial,Helvetica">Console output from running
+		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
+	</tr>
 </table>
 <table border="0">
 
 <?php
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
+$hasNotes = false;
+$aDirectory = dir(".");
+$index = 0;
+while ($anEntry = $aDirectory->read()) {
+	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+		$entries[$index] = $anEntry;
+		$index++;
+	}
+}
+aDirectory.closedir();
 
 
-        sort($entries);
+sort($entries);
 
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
+for ($i = 0; $i < $index; $i++) {
+	$anEntry = $entries[$i];
+	$logsize = filesize("$anEntry");
 
 
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
+	$level = 0;
+	if ($logsize > 20000) {
+		$level = 2;
+	}
+	else if ($logsize > 2000) {
+		$level = 1;
+	}
 
-                if ($level == 0) {
-                        $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
+	if ($level == 0) {
+		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
+	$hasNotes = true;
+}
 
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
+if (!$hasNotes) {
+	echo "<br>There are no test logs for this build.";
+}
 ?>
 
 </table>
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/miscUtil.php
index 966ed48..5001f38 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/miscUtil.php
@@ -16,19 +16,19 @@
 	$criteria = 10 * $onemeg;
 	$scaleChar = "M";
 	if (file_exists($filename)) {
-      	$zipfilesize=filesize($filename);
-      	if ($zipfilesize > $criteria) {
-      		$zipfilesize=round($zipfilesize/$onemeg, 0);
-      		$scaleChar = "M";
-      	}
-      	else {
-      		$zipfilesize=round($zipfilesize/$onekilo, 0);
-      		$scaleChar = "K";
-      	}
-  	} 
-  	else {
-  	   $zipfilesize = 0;
-  	}
+		$zipfilesize=filesize($filename);
+		if ($zipfilesize > $criteria) {
+			$zipfilesize=round($zipfilesize/$onemeg, 0);
+			$scaleChar = "M";
+		}
+		else {
+			$zipfilesize=round($zipfilesize/$onekilo, 0);
+			$scaleChar = "K";
+		}
+	}
+	else {
+		$zipfilesize = 0;
+	}
 	$result =  "(" . $zipfilesize . $scaleChar . ")";
 	return $result;
 }
@@ -57,10 +57,10 @@
 	else {
 		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
 		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
+		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+		if (file_exists($wholePath)) {
+			$result = true;
+		}
 	}
 	return $result;
 }
diff --git a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/report2.php
index 52d2284..cb68e7b 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/report2.php
+++ b/releng.wtpbuilder/distribution/jaxws.site/staticDropFiles/report2.php
@@ -1,42 +1,42 @@
 
-        <?php
+<?php
 
 function parse_testResults($filename)
 {
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
+	$junitFailures = 0;
+	if (is_file($filename)) {
+		$handle = @fopen($filename, "r");
+		if ($handle)
+		{
+			$size = filesize($filename);
+			$content = fread($handle, $size);
+			fclose($handle);
+			$junitStart = strpos($content, "Errors &amp; Failures");
+			$junitEnd = strpos($content, "</table>", $junitStart);
+			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
+			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
+			while ($start !== false)
+			{
+				$start += 29;
+				$stop = strpos($junitInfo, "</font></b></td>", $start);
+				if ($stop !== false)
+				{
+					$result = substr($junitInfo, $start, $stop - $start);
+					if (is_numeric($result))
+					{
+						$junitFailures += $result;
+					}
+					else if (strcmp($result, "DNF") == 0)
+					{
+						$junitFailures++;
+					}
+				}
+				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
+			}
+			$results = array($junitFailures);
+			return $results;
+		}
+	}
 }
 
 
diff --git a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
index 9883d8f..2df61b0 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/jaxws.site/templateFiles/index.html.template.php
@@ -557,32 +557,32 @@
 
 
 
-                     <?php
-                     if ("true" === $prereq_emf) {
-                            echo "<tr valign=\"top\">";
-                            echo "<td width=\"10%\"></td>";
-                            echo "<td>";
-                            echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-                            echo "</td> ";
-                            echo "<td align=\"right\">";
-                            echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-                            echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-                            echo "</tr>";
-                     }
-                     ?>
-                     <?php
-                     if ("true" === $prereq_emfxsd) {
-                            echo "<tr valign=\"top\">";
-                            echo "<td width=\"10%\"></td>";
-                            echo "<td>";
-                            echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-                            echo "</td> ";
-                            echo "<td align=\"right\">";
-                            echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-                            echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-                            echo "</tr>";
-                     }
-                     ?>
+			<?php
+			if ("true" === $prereq_emf) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+			<?php
+			if ("true" === $prereq_emfxsd) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
 
 			<?php
 			if ("true" === $prereq_emfvalidation) {
@@ -725,13 +725,12 @@
 		<td>
 		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-			<tr><td>
-				<!-- 
+			<tr>
+				<td><!-- 
 				Its silly to always display 'Build notes', but hard to 
 				compute if required or not. 
 				<a href="buildNotes.php">Build notes</a> <br /> 
-				-->
-				<a href="directory.txt">map files</a> <br />
+				--> <a href="directory.txt">map files</a> <br />
 				<?php
 
 				if ($displayTestSummary) {
diff --git a/releng.wtpbuilder/distribution/jaxws.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/jaxws.site/transformReportToHTML.xml
index 3e9f35b..b72f6cd 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/transformReportToHTML.xml
+++ b/releng.wtpbuilder/distribution/jaxws.site/transformReportToHTML.xml
@@ -6,12 +6,14 @@
     <target
         name="main"
         description="example.@dot.xml to produce example.@dot.html">
-      <xslt
-          destdir="${resultDir}/compilelogs"
-          scanincludeddirectories="true"
-          style="compilerXMLOutputToHTML.xsl"
-          force="true" >
-            <fileset dir="${resultDir}/compilelogs" includes="**/*.xml" />
-      </xslt>
+        <xslt
+            destdir="${resultDir}/compilelogs"
+            scanincludeddirectories="true"
+            style="compilerXMLOutputToHTML.xsl"
+            force="true">
+            <fileset
+                dir="${resultDir}/compilelogs"
+                includes="**/*.xml"/>
+        </xslt>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/build.xml b/releng.wtpbuilder/distribution/jaxws.tests/build.xml
index 7e956b0..038cd8b 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/build.xml
@@ -25,6 +25,15 @@
 
 
     <!-- 
+        typcially already set, but in case of standalone tests, may not
+        be
+    -->
+    <property
+        name="buildLabel"
+        value="${buildType}-${buildId}-${timestamp}"/>
+
+
+    <!-- 
 	   Steps to do after the build is done. 
 	 -->
     <target
@@ -66,7 +75,6 @@
             dir="${testRoot}/results"/>
         <mkdir
             dir="${testRoot}/results/consolelogs"/>
-
         <copy
             todir="${testRoot}"
             overwrite="true">
@@ -145,9 +153,7 @@
         <property
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
-        <property
-            name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
+
         <property
             name="vmargs"
             value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/jaxws.tests/templateFiles/index.php
index 8d23693..a42c883 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/templateFiles/index.php
+++ b/releng.wtpbuilder/distribution/jaxws.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/jaxws.tests/testScripts/ComputePluginVersion.jar b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/ComputePluginVersion.jar
deleted file mode 100644
index ad06a45..0000000
--- a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/ComputePluginVersion.jar
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/JUNIT.XSL
index 30a407d..0810ae5 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/JUNIT.XSL
+++ b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/JUNIT.XSL
@@ -12,34 +12,36 @@
         <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%
+                    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/jaxws.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml
index a68e1ff..96c6ddc 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/test.xml
@@ -30,7 +30,15 @@
     <!--properties file containing the build information-->
     <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"
@@ -54,9 +62,9 @@
     <property
         name="results"
         value="${testRoot}/results"/>
-       <property
-           name="library-file"
-           value="${testRoot}/wtp-junit-tests.xml"/>	
+    <property
+        name="library-file"
+        value="${testRoot}/wtp-junit-tests.xml"/>
     <target
         name="init">
     </target>
@@ -66,9 +74,13 @@
         <echo
             level="info"
             message="Starting Unit Tests"/>
-    	<!-- notice that subant, unlike most ant tasks, defaults to false for inheritall -->
+        <!--
+            unlike other ant tasks, subant defaults to false for
+            inheritall!
+        -->
         <subant
-            target="" inheritall="true">
+            target=""
+            inheritall="true">
             <fileset
                 dir="${eclipse-home}/plugins/">
                 <exclude
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/wtp-junit-tests.xml
index ac983df..e1a59f5 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/wtp-junit-tests.xml
@@ -15,19 +15,18 @@
         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
+            if not otherwise set, be sure extraVMargs is at least some
+            string, even if unused string
         -->
         <property
             name="extraVMargs"
-            value=""/>
+            value="-Dunused=notuse"/>
 
         <!-- if not otherwise set, use a unique workspace name -->
         <property
@@ -36,13 +35,17 @@
         <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
+        -->
         <property
             name="timeout"
             value="1800000"/>
         <property
             name="junit-report-output"
             value="${junit-report-output}"/>
-        
         <property
             name="formatter"
             value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
@@ -61,12 +64,11 @@
         <echo
             level="debug"
             message="plugin-name: ${plugin-name}"/>
-     
         <echo
             level="debug"
             message="classname: ${classname}"/>
         <echo
-            level="debug"
+            level="info"
             message="extraVMargs: ${extraVMargs}"/>
         <echo
             level="debug"
@@ -80,7 +82,6 @@
         <echo
             level="debug"
             message="eclipse-home: ${eclipse-home}"/>
-
         <echo
             level="debug"
             message="junit-report-output: ${junit-report-output}"/>
@@ -139,6 +140,21 @@
         <echo
             level="debug"
             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
@@ -185,23 +201,27 @@
             <jvmarg
                 value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
             <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
+                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
             <jvmarg
                 value="-Dwtp.autotest.noninteractive=true"/>
-
             <jvmarg
-                line="${extraVMargs}"/>
+                value="${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="-consolelog"/>
-            <arg
-                value="-debug"/>
-            <arg
                 value="-data"/>
             <arg
                 value="${data-dir}"/>
@@ -261,14 +281,14 @@
             includes="${classname}.xml"
             destdir="${junit-report-output}/html"/>
     </target>
-            	
     <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" />
+        <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>
     <target
         name="summarizeFailure"
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml b/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
index 9069630..5520b7d 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/testdependency.xml
@@ -19,57 +19,56 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="true"/>
+    </condition>
     <target
         name="get">
         <!--
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.xml b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
index 4b82be5..2b85fa7 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
@@ -156,7 +156,7 @@
 
         <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} "/>
+            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/
@@ -214,7 +214,7 @@
             <jvmarg
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
-                value="-Dprojectname=${projectname}"/>      	
+                value="-Dprojectname=${projectname}"/>
             <arg
                 value="-nosplash"/>
             <arg
@@ -268,7 +268,6 @@
             <sysproperty
                 key="buildLabel"
                 value="${buildLabel}"/>
-
         </java>
         <echo
             message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/ComputePluginVersion.jar b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/ComputePluginVersion.jar
deleted file mode 100644
index ad06a45..0000000
--- a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/ComputePluginVersion.jar
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/pave.site/publish.xml b/releng.wtpbuilder/distribution/pave.site/publish.xml
index 406ff3e..71afb65 100644
--- a/releng.wtpbuilder/distribution/pave.site/publish.xml
+++ b/releng.wtpbuilder/distribution/pave.site/publish.xml
@@ -425,47 +425,42 @@
             value="${buildBranch}"/>
 
         <!--  Insert PreRequsites  -->
-    	
-              <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformFile@"
-                value="${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformURL@"
-                value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformBuildURL@"
-                value="${eclipseplatform.url}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilelinux@"
-                value="${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilewindows@"
-                value="${eclipseplatform.file.win32-win32-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilemacos@"
-                value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformBuildHome@"
-                value="${eclipseplatform.build.home}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatform.mirror.prefixuri@"
-                value="${eclipseplatform.mirror.prefixuri}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatform.fspath.prefix@"
-                value="${eclipseplatform.fspath.prefix}"/>
-
-    
-    	
-    	
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformFile@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformURL@"
+            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildURL@"
+            value="${eclipseplatform.url}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilelinux@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilewindows@"
+            value="${eclipseplatform.file.win32-win32-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilemacos@"
+            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildHome@"
+            value="${eclipseplatform.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.mirror.prefixuri@"
+            value="${eclipseplatform.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.fspath.prefix@"
+            value="${eclipseplatform.fspath.prefix}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipseFile@"
@@ -534,57 +529,54 @@
             file="${resultingIndex}"
             token="@emf.mirror.prefixuri@"
             value="${emf.mirror.prefixuri}"/>
-    	
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceURL@"
-           value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceFile@"
-           value="${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceName@"
-           value="${emfsourcedoc.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceDescription@"
-           value="${emfsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceBuildHome@"
-           value="${emfsourcedoc.build.home}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsource.mirror.prefixuri@"
-           value="${emfsourcedoc.mirror.prefixuri}"/>
-    	
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceURL@"
-           value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceFile@"
-           value="${emfxsdsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceName@"
-           value="${emfxsdsourcedoc.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceDescription@"
-           value="${emfxsdsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceBuildHome@"
-           value="${emfxsdsourcedoc.build.home}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsource.mirror.prefixuri@"
-           value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-           	
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceURL@"
+            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceFile@"
+            value="${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceName@"
+            value="${emfsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceDescription@"
+            value="${emfsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceBuildHome@"
+            value="${emfsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsource.mirror.prefixuri@"
+            value="${emfsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceURL@"
+            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceFile@"
+            value="${emfxsdsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceName@"
+            value="${emfxsdsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceDescription@"
+            value="${emfxsdsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceBuildHome@"
+            value="${emfxsdsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsource.mirror.prefixuri@"
+            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
             token="@emfxsdFile@"
@@ -657,14 +649,14 @@
             file="${resultingIndex}"
             token="@emfvalidationsourceDescription@"
             value="${emfvalidationsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@wstName@"
-           value="${wst.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@wstDescription@"
-           value="${wst.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstName@"
+            value="${wst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstDescription@"
+            value="${wst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wstFile@"
@@ -681,15 +673,14 @@
             file="${resultingIndex}"
             token="@wst.mirror.prefixuri@"
             value="${wst.mirror.prefixuri}"/>
-    	
-    	       <replace
-    	           file="${resultingIndex}"
-    	           token="@jstName@"
-    	           value="${jst.name}"/>
-    	       <replace
-    	           file="${resultingIndex}"
-    	           token="@jstDescription@"
-    	           value="${jst.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstName@"
+            value="${jst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstDescription@"
+            value="${jst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@jstFile@"
@@ -706,15 +697,14 @@
             file="${resultingIndex}"
             token="@jst.mirror.prefixuri@"
             value="${jst.mirror.prefixuri}"/>
-            	
-              <replace
-                  file="${resultingIndex}"
-                  token="@wtpName@"
-                  value="${wtp.name}"/>
-              <replace
-                  file="${resultingIndex}"
-                  token="@wtpDescription@"
-                  value="${wtp.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpName@"
+            value="${wtp.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpDescription@"
+            value="${wtp.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wtpFile@"
@@ -747,14 +737,14 @@
             file="${resultingIndex}"
             token="@gef.mirror.prefixuri@"
             value="${gef.mirror.prefixuri}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@gefName@"
-           value="${gef.name}"/>
         <replace
-           file="${resultingIndex}"
-           token="@gefDescription@"
-           value="${gef.description}"/>
+            file="${resultingIndex}"
+            token="@gefName@"
+            value="${gef.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@gefDescription@"
+            value="${gef.description}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipserelengFile@"
@@ -819,11 +809,11 @@
             file="${resultingIndex}"
             token="@dtp.mirror.prefixuri@"
             value="${dtp.mirror.prefixuri}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@dtpName@"
-           value="${dtp.name}"/>
-    	<replace
+        <replace
+            file="${resultingIndex}"
+            token="@dtpName@"
+            value="${dtp.name}"/>
+        <replace
             file="${resultingIndex}"
             token="@dtpDescription@"
             value="${dtp.description}"/>
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/buildNotes.php
index e843ecf..f666887 100644
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/buildNotes.php
@@ -27,34 +27,34 @@
 $hasNotes = false;
 $aDirectory = dir("buildnotes");
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
+	if ($anEntry != "." && $anEntry != "..") {
+		//print_r($anEntry);
+		//echo "<br />";
 
-        $subject = $anEntry;
-        $pattern = '/^buildnotes_(.*)/i';
-        preg_match($pattern, $subject, $matches);
-        $subject = $matches[1];
-        //print_r($subject);
-        //echo "<br />";
-        $pattern = '/^(.*)\.html$/';
-        preg_match($pattern, $subject, $matches);
-        //print_r($matches);
-        //echo "<br />";
+		$subject = $anEntry;
+		$pattern = '/^buildnotes_(.*)/i';
+		preg_match($pattern, $subject, $matches);
+		$subject = $matches[1];
+		//print_r($subject);
+		//echo "<br />";
+		$pattern = '/^(.*)\.html$/';
+		preg_match($pattern, $subject, $matches);
+		//print_r($matches);
+		//echo "<br />";
 
-        $component = $matches[1];
+		$component = $matches[1];
 
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
+		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
+		echo "<tr>";
+		echo "$line";
+		echo "</tr>";
+		$hasNotes = true;
 
-    }
+	}
 }
 $aDirectory.closedir();
 if (!$hasNotes) {
-    echo "<br>There are no build notes for this build.";
+	echo "<br>There are no build notes for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/consoleLogs.php
index 7dd5f42..2ee3c36 100644
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/consoleLogs.php
@@ -32,15 +32,15 @@
 $index = 0;
 $dirindex = 0;
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        if (is_file("$rootDir/$anEntry")) {
-            $entries[$index] = $anEntry;
-            $index++;
-        } else if (is_dir("$rootDir/$anEntry")) {
-            $direntries[$dirindex] = $anEntry;
-            $dirindex++;
-        }
-    }
+	if ($anEntry != "." && $anEntry != "..") {
+		if (is_file("$rootDir/$anEntry")) {
+			$entries[$index] = $anEntry;
+			$index++;
+		} else if (is_dir("$rootDir/$anEntry")) {
+			$direntries[$dirindex] = $anEntry;
+			$dirindex++;
+		}
+	}
 }
 $aDirectory->close();
 
@@ -49,43 +49,43 @@
 sort($direntries);
 
 for ($i = 0; $i < $dirindex; $i++) {
-    $anEntry = $direntries[$i];
-    $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
+	$anEntry = $direntries[$i];
+	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
 }
 for ($i = 0; $i < $index; $i++) {
-    $anEntry = $entries[$i];
-    $logsize = filesize("testResults/consolelogs/$anEntry");
+	$anEntry = $entries[$i];
+	$logsize = filesize("testResults/consolelogs/$anEntry");
 
 
-    $level = 0;
-    if ($logsize > 20000) {
-        $level = 2;
-    }
-    else if ($logsize > 2000) {
-        $level = 1;
-    }
+	$level = 0;
+	if ($logsize > 20000) {
+		$level = 2;
+	}
+	else if ($logsize > 2000) {
+		$level = 1;
+	}
 
-    if ($level == 0) {
-        $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-    }
-    else if ($level == 1) {
-        $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-    } else if ($level == 2) {
-        $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-    }
+	if ($level == 0) {
+		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-    $hasNotes = true;
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
+	$hasNotes = true;
 }
 
 if (!$hasNotes) {
-    echo "<br>There are no test logs for this build.";
+	echo "<br>There are no test logs for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/logIndex.php
index 0b36334..721ca00 100644
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/logIndex.php
@@ -4,79 +4,80 @@
 
 function endsWith( $str, $sub ) {
 
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
 }
 
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
+$parts = explode("/", getcwd());
+$parts2 = explode("-", $parts[count($parts) - 1]);
+$buildName = $parts2[1];
 
-        echo "<title>Test Console Output for $buildName </title>";
+echo "<title>Test Console Output for $buildName </title>";
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
+	type="text/css">
+<title>Console Logs from Running JUnit Plug-in Tests</title>
+</head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
+<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr>
-    <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Console
-      output from running JUnit plugin tests for
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+	<tr>
+		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+			color="#FFFFFF" face="Arial,Helvetica">Console output from running
+		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
+	</tr>
 </table>
 <table border="0">
 
 <?php
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
+$hasNotes = false;
+$aDirectory = dir(".");
+$index = 0;
+while ($anEntry = $aDirectory->read()) {
+	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+		$entries[$index] = $anEntry;
+		$index++;
+	}
+}
+aDirectory.closedir();
 
 
-        sort($entries);
+sort($entries);
 
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
+for ($i = 0; $i < $index; $i++) {
+	$anEntry = $entries[$i];
+	$logsize = filesize("$anEntry");
 
 
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
+	$level = 0;
+	if ($logsize > 20000) {
+		$level = 2;
+	}
+	else if ($logsize > 2000) {
+		$level = 1;
+	}
 
-                if ($level == 0) {
-                        $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
+	if ($level == 0) {
+		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
+	$hasNotes = true;
+}
 
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
+if (!$hasNotes) {
+	echo "<br>There are no test logs for this build.";
+}
 ?>
 
 </table>
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/miscUtil.php
index 966ed48..5001f38 100644
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/miscUtil.php
@@ -16,19 +16,19 @@
 	$criteria = 10 * $onemeg;
 	$scaleChar = "M";
 	if (file_exists($filename)) {
-      	$zipfilesize=filesize($filename);
-      	if ($zipfilesize > $criteria) {
-      		$zipfilesize=round($zipfilesize/$onemeg, 0);
-      		$scaleChar = "M";
-      	}
-      	else {
-      		$zipfilesize=round($zipfilesize/$onekilo, 0);
-      		$scaleChar = "K";
-      	}
-  	} 
-  	else {
-  	   $zipfilesize = 0;
-  	}
+		$zipfilesize=filesize($filename);
+		if ($zipfilesize > $criteria) {
+			$zipfilesize=round($zipfilesize/$onemeg, 0);
+			$scaleChar = "M";
+		}
+		else {
+			$zipfilesize=round($zipfilesize/$onekilo, 0);
+			$scaleChar = "K";
+		}
+	}
+	else {
+		$zipfilesize = 0;
+	}
 	$result =  "(" . $zipfilesize . $scaleChar . ")";
 	return $result;
 }
@@ -57,10 +57,10 @@
 	else {
 		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
 		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
+		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+		if (file_exists($wholePath)) {
+			$result = true;
+		}
 	}
 	return $result;
 }
diff --git a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/report2.php
index 52d2284..cb68e7b 100644
--- a/releng.wtpbuilder/distribution/pave.site/staticDropFiles/report2.php
+++ b/releng.wtpbuilder/distribution/pave.site/staticDropFiles/report2.php
@@ -1,42 +1,42 @@
 
-        <?php
+<?php
 
 function parse_testResults($filename)
 {
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
+	$junitFailures = 0;
+	if (is_file($filename)) {
+		$handle = @fopen($filename, "r");
+		if ($handle)
+		{
+			$size = filesize($filename);
+			$content = fread($handle, $size);
+			fclose($handle);
+			$junitStart = strpos($content, "Errors &amp; Failures");
+			$junitEnd = strpos($content, "</table>", $junitStart);
+			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
+			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
+			while ($start !== false)
+			{
+				$start += 29;
+				$stop = strpos($junitInfo, "</font></b></td>", $start);
+				if ($stop !== false)
+				{
+					$result = substr($junitInfo, $start, $stop - $start);
+					if (is_numeric($result))
+					{
+						$junitFailures += $result;
+					}
+					else if (strcmp($result, "DNF") == 0)
+					{
+						$junitFailures++;
+					}
+				}
+				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
+			}
+			$results = array($junitFailures);
+			return $results;
+		}
+	}
 }
 
 
diff --git a/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php
index b074720..04b16bd 100644
--- a/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/pave.site/templateFiles/index.html.template.php
@@ -557,32 +557,32 @@
 
 
 
-                     <?php
-                     if ("true" === $prereq_emf) {
-                            echo "<tr valign=\"top\">";
-                            echo "<td width=\"10%\"></td>";
-                            echo "<td>";
-                            echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-                            echo "</td> ";
-                            echo "<td align=\"right\">";
-                            echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-                            echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-                            echo "</tr>";
-                     }
-                     ?>
-                     <?php
-                     if ("true" === $prereq_emfxsd) {
-                            echo "<tr valign=\"top\">";
-                            echo "<td width=\"10%\"></td>";
-                            echo "<td>";
-                            echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-                            echo "</td> ";
-                            echo "<td align=\"right\">";
-                            echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-                            echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-                            echo "</tr>";
-                     }
-                     ?>
+			<?php
+			if ("true" === $prereq_emf) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+			<?php
+			if ("true" === $prereq_emfxsd) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
 
 			<?php
 			if ("true" === $prereq_emfvalidation) {
@@ -725,13 +725,12 @@
 		<td>
 		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-			<tr><td>
-				<!-- 
+			<tr>
+				<td><!-- 
 				Its silly to always display 'Build notes', but hard to 
 				compute if required or not. 
 				<a href="buildNotes.php">Build notes</a> <br /> 
-				-->
-				<a href="directory.txt">map files</a> <br />
+				--> <a href="directory.txt">map files</a> <br />
 				<?php
 
 				if ($displayTestSummary) {
diff --git a/releng.wtpbuilder/distribution/pave.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/pave.site/transformReportToHTML.xml
index 3e9f35b..b72f6cd 100644
--- a/releng.wtpbuilder/distribution/pave.site/transformReportToHTML.xml
+++ b/releng.wtpbuilder/distribution/pave.site/transformReportToHTML.xml
@@ -6,12 +6,14 @@
     <target
         name="main"
         description="example.@dot.xml to produce example.@dot.html">
-      <xslt
-          destdir="${resultDir}/compilelogs"
-          scanincludeddirectories="true"
-          style="compilerXMLOutputToHTML.xsl"
-          force="true" >
-            <fileset dir="${resultDir}/compilelogs" includes="**/*.xml" />
-      </xslt>
+        <xslt
+            destdir="${resultDir}/compilelogs"
+            scanincludeddirectories="true"
+            style="compilerXMLOutputToHTML.xsl"
+            force="true">
+            <fileset
+                dir="${resultDir}/compilelogs"
+                includes="**/*.xml"/>
+        </xslt>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/pave.tests/build.xml b/releng.wtpbuilder/distribution/pave.tests/build.xml
index d25061b..8805e05 100644
--- a/releng.wtpbuilder/distribution/pave.tests/build.xml
+++ b/releng.wtpbuilder/distribution/pave.tests/build.xml
@@ -25,6 +25,15 @@
 
 
     <!-- 
+        typcially already set, but in case of standalone tests, may not
+        be
+    -->
+    <property
+        name="buildLabel"
+        value="${buildType}-${buildId}-${timestamp}"/>
+
+
+    <!-- 
 	   Steps to do after the build is done. 
 	 -->
     <target
@@ -66,7 +75,6 @@
             dir="${testRoot}/results"/>
         <mkdir
             dir="${testRoot}/results/consolelogs"/>
-
         <copy
             todir="${testRoot}"
             overwrite="true">
@@ -145,9 +153,7 @@
         <property
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
-        <property
-            name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
+
         <property
             name="vmargs"
             value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
diff --git a/releng.wtpbuilder/distribution/pave.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/pave.tests/templateFiles/index.php
index 8d23693..a42c883 100644
--- a/releng.wtpbuilder/distribution/pave.tests/templateFiles/index.php
+++ b/releng.wtpbuilder/distribution/pave.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/pave.tests/testScripts/ComputePluginVersion.jar b/releng.wtpbuilder/distribution/pave.tests/testScripts/ComputePluginVersion.jar
deleted file mode 100644
index ad06a45..0000000
--- a/releng.wtpbuilder/distribution/pave.tests/testScripts/ComputePluginVersion.jar
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/pave.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/pave.tests/testScripts/JUNIT.XSL
index 30a407d..0810ae5 100644
--- a/releng.wtpbuilder/distribution/pave.tests/testScripts/JUNIT.XSL
+++ b/releng.wtpbuilder/distribution/pave.tests/testScripts/JUNIT.XSL
@@ -12,34 +12,36 @@
         <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%
+                    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/pave.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/pave.tests/testScripts/test.xml
index a68e1ff..96c6ddc 100644
--- a/releng.wtpbuilder/distribution/pave.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/pave.tests/testScripts/test.xml
@@ -30,7 +30,15 @@
     <!--properties file containing the build information-->
     <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"
@@ -54,9 +62,9 @@
     <property
         name="results"
         value="${testRoot}/results"/>
-       <property
-           name="library-file"
-           value="${testRoot}/wtp-junit-tests.xml"/>	
+    <property
+        name="library-file"
+        value="${testRoot}/wtp-junit-tests.xml"/>
     <target
         name="init">
     </target>
@@ -66,9 +74,13 @@
         <echo
             level="info"
             message="Starting Unit Tests"/>
-    	<!-- notice that subant, unlike most ant tasks, defaults to false for inheritall -->
+        <!--
+            unlike other ant tasks, subant defaults to false for
+            inheritall!
+        -->
         <subant
-            target="" inheritall="true">
+            target=""
+            inheritall="true">
             <fileset
                 dir="${eclipse-home}/plugins/">
                 <exclude
diff --git a/releng.wtpbuilder/distribution/pave.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/pave.tests/testScripts/wtp-junit-tests.xml
index ac983df..e1a59f5 100644
--- a/releng.wtpbuilder/distribution/pave.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/pave.tests/testScripts/wtp-junit-tests.xml
@@ -15,19 +15,18 @@
         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
+            if not otherwise set, be sure extraVMargs is at least some
+            string, even if unused string
         -->
         <property
             name="extraVMargs"
-            value=""/>
+            value="-Dunused=notuse"/>
 
         <!-- if not otherwise set, use a unique workspace name -->
         <property
@@ -36,13 +35,17 @@
         <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
+        -->
         <property
             name="timeout"
             value="1800000"/>
         <property
             name="junit-report-output"
             value="${junit-report-output}"/>
-        
         <property
             name="formatter"
             value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
@@ -61,12 +64,11 @@
         <echo
             level="debug"
             message="plugin-name: ${plugin-name}"/>
-     
         <echo
             level="debug"
             message="classname: ${classname}"/>
         <echo
-            level="debug"
+            level="info"
             message="extraVMargs: ${extraVMargs}"/>
         <echo
             level="debug"
@@ -80,7 +82,6 @@
         <echo
             level="debug"
             message="eclipse-home: ${eclipse-home}"/>
-
         <echo
             level="debug"
             message="junit-report-output: ${junit-report-output}"/>
@@ -139,6 +140,21 @@
         <echo
             level="debug"
             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
@@ -185,23 +201,27 @@
             <jvmarg
                 value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
             <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
+                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
             <jvmarg
                 value="-Dwtp.autotest.noninteractive=true"/>
-
             <jvmarg
-                line="${extraVMargs}"/>
+                value="${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="-consolelog"/>
-            <arg
-                value="-debug"/>
-            <arg
                 value="-data"/>
             <arg
                 value="${data-dir}"/>
@@ -261,14 +281,14 @@
             includes="${classname}.xml"
             destdir="${junit-report-output}/html"/>
     </target>
-            	
     <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" />
+        <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>
     <target
         name="summarizeFailure"
diff --git a/releng.wtpbuilder/distribution/pave.tests/testdependency.xml b/releng.wtpbuilder/distribution/pave.tests/testdependency.xml
index e5d0673..b9afcb8 100644
--- a/releng.wtpbuilder/distribution/pave.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/pave.tests/testdependency.xml
@@ -19,57 +19,56 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="true"/>
-	    </condition>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="true"/>
+    </condition>
     <target
         name="get">
         <!--
diff --git a/releng.wtpbuilder/distribution/servadapt.site/publish.xml b/releng.wtpbuilder/distribution/servadapt.site/publish.xml
index 416d8dc..71afb65 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/publish.xml
+++ b/releng.wtpbuilder/distribution/servadapt.site/publish.xml
@@ -427,6 +427,42 @@
         <!--  Insert PreRequsites  -->
         <replace
             file="${resultingIndex}"
+            token="@eclipseplatformFile@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformURL@"
+            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildURL@"
+            value="${eclipseplatform.url}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilelinux@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilewindows@"
+            value="${eclipseplatform.file.win32-win32-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilemacos@"
+            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildHome@"
+            value="${eclipseplatform.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.mirror.prefixuri@"
+            value="${eclipseplatform.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.fspath.prefix@"
+            value="${eclipseplatform.fspath.prefix}"/>
+        <replace
+            file="${resultingIndex}"
             token="@eclipseFile@"
             value="${eclipse.file.linux-gtk-x86}"/>
         <replace
@@ -495,6 +531,54 @@
             value="${emf.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@emfsourceURL@"
+            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceFile@"
+            value="${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceName@"
+            value="${emfsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceDescription@"
+            value="${emfsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceBuildHome@"
+            value="${emfsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsource.mirror.prefixuri@"
+            value="${emfsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceURL@"
+            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceFile@"
+            value="${emfxsdsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceName@"
+            value="${emfxsdsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceDescription@"
+            value="${emfxsdsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceBuildHome@"
+            value="${emfxsdsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsource.mirror.prefixuri@"
+            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
             token="@emfxsdFile@"
             value="${emfxsd.file}"/>
         <replace
@@ -567,6 +651,14 @@
             value="${emfvalidationsourcedoc.description}"/>
         <replace
             file="${resultingIndex}"
+            token="@wstName@"
+            value="${wst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstDescription@"
+            value="${wst.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@wstFile@"
             value="${wst.file}"/>
         <replace
@@ -583,6 +675,14 @@
             value="${wst.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@jstName@"
+            value="${jst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstDescription@"
+            value="${jst.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@jstFile@"
             value="${jst.file}"/>
         <replace
@@ -599,6 +699,14 @@
             value="${jst.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
+            token="@wtpName@"
+            value="${wtp.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpDescription@"
+            value="${wtp.description}"/>
+        <replace
+            file="${resultingIndex}"
             token="@wtpFile@"
             value="${wtp.file}"/>
         <replace
@@ -629,14 +737,14 @@
             file="${resultingIndex}"
             token="@gef.mirror.prefixuri@"
             value="${gef.mirror.prefixuri}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@gefName@"
-           value="${gef.name}"/>
         <replace
-           file="${resultingIndex}"
-           token="@gefDescription@"
-           value="${gef.description}"/>
+            file="${resultingIndex}"
+            token="@gefName@"
+            value="${gef.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@gefDescription@"
+            value="${gef.description}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipserelengFile@"
@@ -701,11 +809,11 @@
             file="${resultingIndex}"
             token="@dtp.mirror.prefixuri@"
             value="${dtp.mirror.prefixuri}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@dtpName@"
-           value="${dtp.name}"/>
-    	<replace
+        <replace
+            file="${resultingIndex}"
+            token="@dtpName@"
+            value="${dtp.name}"/>
+        <replace
             file="${resultingIndex}"
             token="@dtpDescription@"
             value="${dtp.description}"/>
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/buildNotes.php
index e843ecf..f666887 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/buildNotes.php
@@ -27,34 +27,34 @@
 $hasNotes = false;
 $aDirectory = dir("buildnotes");
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
+	if ($anEntry != "." && $anEntry != "..") {
+		//print_r($anEntry);
+		//echo "<br />";
 
-        $subject = $anEntry;
-        $pattern = '/^buildnotes_(.*)/i';
-        preg_match($pattern, $subject, $matches);
-        $subject = $matches[1];
-        //print_r($subject);
-        //echo "<br />";
-        $pattern = '/^(.*)\.html$/';
-        preg_match($pattern, $subject, $matches);
-        //print_r($matches);
-        //echo "<br />";
+		$subject = $anEntry;
+		$pattern = '/^buildnotes_(.*)/i';
+		preg_match($pattern, $subject, $matches);
+		$subject = $matches[1];
+		//print_r($subject);
+		//echo "<br />";
+		$pattern = '/^(.*)\.html$/';
+		preg_match($pattern, $subject, $matches);
+		//print_r($matches);
+		//echo "<br />";
 
-        $component = $matches[1];
+		$component = $matches[1];
 
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
+		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
+		echo "<tr>";
+		echo "$line";
+		echo "</tr>";
+		$hasNotes = true;
 
-    }
+	}
 }
 $aDirectory.closedir();
 if (!$hasNotes) {
-    echo "<br>There are no build notes for this build.";
+	echo "<br>There are no build notes for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/consoleLogs.php
index 7dd5f42..2ee3c36 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/consoleLogs.php
@@ -32,15 +32,15 @@
 $index = 0;
 $dirindex = 0;
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        if (is_file("$rootDir/$anEntry")) {
-            $entries[$index] = $anEntry;
-            $index++;
-        } else if (is_dir("$rootDir/$anEntry")) {
-            $direntries[$dirindex] = $anEntry;
-            $dirindex++;
-        }
-    }
+	if ($anEntry != "." && $anEntry != "..") {
+		if (is_file("$rootDir/$anEntry")) {
+			$entries[$index] = $anEntry;
+			$index++;
+		} else if (is_dir("$rootDir/$anEntry")) {
+			$direntries[$dirindex] = $anEntry;
+			$dirindex++;
+		}
+	}
 }
 $aDirectory->close();
 
@@ -49,43 +49,43 @@
 sort($direntries);
 
 for ($i = 0; $i < $dirindex; $i++) {
-    $anEntry = $direntries[$i];
-    $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
+	$anEntry = $direntries[$i];
+	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
 }
 for ($i = 0; $i < $index; $i++) {
-    $anEntry = $entries[$i];
-    $logsize = filesize("testResults/consolelogs/$anEntry");
+	$anEntry = $entries[$i];
+	$logsize = filesize("testResults/consolelogs/$anEntry");
 
 
-    $level = 0;
-    if ($logsize > 20000) {
-        $level = 2;
-    }
-    else if ($logsize > 2000) {
-        $level = 1;
-    }
+	$level = 0;
+	if ($logsize > 20000) {
+		$level = 2;
+	}
+	else if ($logsize > 2000) {
+		$level = 1;
+	}
 
-    if ($level == 0) {
-        $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-    }
-    else if ($level == 1) {
-        $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-    } else if ($level == 2) {
-        $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-    }
+	if ($level == 0) {
+		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-    $hasNotes = true;
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
+	$hasNotes = true;
 }
 
 if (!$hasNotes) {
-    echo "<br>There are no test logs for this build.";
+	echo "<br>There are no test logs for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/logIndex.php
index 0b36334..721ca00 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/logIndex.php
@@ -4,79 +4,80 @@
 
 function endsWith( $str, $sub ) {
 
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
 }
 
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
+$parts = explode("/", getcwd());
+$parts2 = explode("-", $parts[count($parts) - 1]);
+$buildName = $parts2[1];
 
-        echo "<title>Test Console Output for $buildName </title>";
+echo "<title>Test Console Output for $buildName </title>";
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
+	type="text/css">
+<title>Console Logs from Running JUnit Plug-in Tests</title>
+</head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
+<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr>
-    <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Console
-      output from running JUnit plugin tests for
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+	<tr>
+		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+			color="#FFFFFF" face="Arial,Helvetica">Console output from running
+		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
+	</tr>
 </table>
 <table border="0">
 
 <?php
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
+$hasNotes = false;
+$aDirectory = dir(".");
+$index = 0;
+while ($anEntry = $aDirectory->read()) {
+	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+		$entries[$index] = $anEntry;
+		$index++;
+	}
+}
+aDirectory.closedir();
 
 
-        sort($entries);
+sort($entries);
 
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
+for ($i = 0; $i < $index; $i++) {
+	$anEntry = $entries[$i];
+	$logsize = filesize("$anEntry");
 
 
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
+	$level = 0;
+	if ($logsize > 20000) {
+		$level = 2;
+	}
+	else if ($logsize > 2000) {
+		$level = 1;
+	}
 
-                if ($level == 0) {
-                        $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
+	if ($level == 0) {
+		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
+	$hasNotes = true;
+}
 
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
+if (!$hasNotes) {
+	echo "<br>There are no test logs for this build.";
+}
 ?>
 
 </table>
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/miscUtil.php
index 966ed48..5001f38 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/miscUtil.php
@@ -16,19 +16,19 @@
 	$criteria = 10 * $onemeg;
 	$scaleChar = "M";
 	if (file_exists($filename)) {
-      	$zipfilesize=filesize($filename);
-      	if ($zipfilesize > $criteria) {
-      		$zipfilesize=round($zipfilesize/$onemeg, 0);
-      		$scaleChar = "M";
-      	}
-      	else {
-      		$zipfilesize=round($zipfilesize/$onekilo, 0);
-      		$scaleChar = "K";
-      	}
-  	} 
-  	else {
-  	   $zipfilesize = 0;
-  	}
+		$zipfilesize=filesize($filename);
+		if ($zipfilesize > $criteria) {
+			$zipfilesize=round($zipfilesize/$onemeg, 0);
+			$scaleChar = "M";
+		}
+		else {
+			$zipfilesize=round($zipfilesize/$onekilo, 0);
+			$scaleChar = "K";
+		}
+	}
+	else {
+		$zipfilesize = 0;
+	}
 	$result =  "(" . $zipfilesize . $scaleChar . ")";
 	return $result;
 }
@@ -57,10 +57,10 @@
 	else {
 		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
 		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
+		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+		if (file_exists($wholePath)) {
+			$result = true;
+		}
 	}
 	return $result;
 }
diff --git a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/report2.php
index 52d2284..cb68e7b 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/report2.php
+++ b/releng.wtpbuilder/distribution/servadapt.site/staticDropFiles/report2.php
@@ -1,42 +1,42 @@
 
-        <?php
+<?php
 
 function parse_testResults($filename)
 {
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
+	$junitFailures = 0;
+	if (is_file($filename)) {
+		$handle = @fopen($filename, "r");
+		if ($handle)
+		{
+			$size = filesize($filename);
+			$content = fread($handle, $size);
+			fclose($handle);
+			$junitStart = strpos($content, "Errors &amp; Failures");
+			$junitEnd = strpos($content, "</table>", $junitStart);
+			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
+			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
+			while ($start !== false)
+			{
+				$start += 29;
+				$stop = strpos($junitInfo, "</font></b></td>", $start);
+				if ($stop !== false)
+				{
+					$result = substr($junitInfo, $start, $stop - $start);
+					if (is_numeric($result))
+					{
+						$junitFailures += $result;
+					}
+					else if (strcmp($result, "DNF") == 0)
+					{
+						$junitFailures++;
+					}
+				}
+				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
+			}
+			$results = array($junitFailures);
+			return $results;
+		}
+	}
 }
 
 
diff --git a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/servadapt.site/templateFiles/index.html.template.php
index 508791f..b6a152a 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/servadapt.site/templateFiles/index.html.template.php
@@ -28,7 +28,7 @@
 $eclipseDescription="@eclipseDescription@";
 
 $eclipseplatformMirrorPrefixuri="@eclipseplatform.mirror.prefixuri@";
-$eclipseplatformFSpathPrefix="@eclipseplatform.fspath.prefix@";
+$eclipseplatformFSpathPrefix="@eclipse.fspath.prefix@";
 
 $eclipseplatformfilelinux="@eclipseplatformfilelinux@";
 $eclipseplatformfilewindows="@eclipseplatformfilewindows@";
@@ -48,16 +48,22 @@
 $wstFile="@wstFile@";
 $wstMirrorPrefixuri="@wst.mirror.prefixuri@";
 $wstBuildHome="@wstBuildHome@";
+$wstName="@wstName@";
+$wstDescription="@wstDescription@";
 
 $jstURL="@jstURL@";
 $jstFile="@jstFile@";
 $jstMirrorPrefixuri="@jst.mirror.prefixuri@";
 $jstBuildHome="@jstBuildHome@";
+$jstName="@jstName@";
+$jstDescription="@jstDescription@";
 
 $wtpURL="@wtpURL@";
 $wtpFile="@wtpFile@";
 $wtpMirrorPrefixuri="@wtp.mirror.prefixuri@";
 $wtpBuildHome="@wtpBuildHome@";
+$wtpName="@wtpName@";
+$wtpDescription="@wtpDescription@";
 
 $gefURL="@gefURL@";
 $gefFile="@gefFile@";
@@ -343,34 +349,34 @@
 		<td>
 		<table border=0 cellspacing=1 cellpadding=1 width="90%" align="center">
 
-              <?php
-              if ("true" === $prereq_eclipseplatform) {
-                     echo "<tr valign=\"top\">";
-                     echo "<td width=\"10%\"></td>";
-                     echo "<td width=\"40%\">Eclipse Platform</td>";
+		<?php
+		if ("true" === $prereq_eclipseplatform) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td width=\"40%\">Eclipse Platform</td>";
 
 
-                     //customize page depending on user's browser/platform, if we can detect it
-                     $usersPlatform = getPlatform();
-                     // assume windows by default, since likely most frequent, even for cases where
-                     // platform is "unknown". I've noticed Opera reports 'unknown' :(
-                     $recommendedFile=$eclipseplatformfilewindows;
-                     if (strcmp($usersPlatform,"linux")== 0) {
-                            $recommendedFile=$eclipseplatformfilelinux;
-                     } else if (strcmp($usersPlatform,"mac") == 0) {
-                            $recommendedFile=$eclipseplatformfilemacosx;
-                     }
+			//customize page depending on user's browser/platform, if we can detect it
+			$usersPlatform = getPlatform();
+			// assume windows by default, since likely most frequent, even for cases where
+			// platform is "unknown". I've noticed Opera reports 'unknown' :(
+			$recommendedFile=$eclipseplatformfilewindows;
+			if (strcmp($usersPlatform,"linux")== 0) {
+				$recommendedFile=$eclipseplatformfilelinux;
+			} else if (strcmp($usersPlatform,"mac") == 0) {
+				$recommendedFile=$eclipseplatformfilemacosx;
+			}
 
-                     echo "<td align=\"right\">";
+			echo "<td align=\"right\">";
 
-                     echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
-                     echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
-                     echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $eclipseMirrorPrefixuri, $eclipseURL, $recommendedFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $eclipseplatformBuildURL . "\">appropriate platform</a>";
+			echo " or <a href=\"" . $eclipseplatformBuildHome . "\">equivalent</a></td>";
 
 
-                     echo " </tr>";
-              }
-              ?>
+			echo " </tr>";
+		}
+		?>
 
 		<?php
 		if ("true" === $prereq_eclipse) {
@@ -490,7 +496,58 @@
 		}
 		?>
 
+		<?php
+		if ("true" === $prereq_wst) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
 
+			echo $wstName . "&nbsp;" . $wstDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $wstMirrorPrefixuri, $wstURL, $wstFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $wstBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+
+		<?php
+		if ("true" === $prereq_jst) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $jstName . "&nbsp;" . $jstDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $jstMirrorPrefixuri, $jstURL, $jstFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $jstBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
+		<?php
+		if ("true" === $prereq_wtp) {
+			echo "<tr valign=\"top\">";
+			echo "<td width=\"10%\"></td>";
+			echo "<td>";
+
+			echo $wtpName . "&nbsp;" . $wtpDescription;
+
+			echo "</td>";
+			echo "<td align=\"right\">";
+
+			echo getPrereqReferenceOrName($eclipseMirrorScript, $wtpMirrorPrefixuri, $wtpURL, $wtpFile, $eclipseFSpathPrefix);
+			echo " or <a href=\"" . $wtpBuildHome . "\">equivalent</a></td>";
+
+			echo " </tr>";
+		}
+		?>
 			<tr valign="middle">
 				<td width="10%"></td>
 				<td colspan="2">
@@ -500,12 +557,32 @@
 
 
 
-			<tr valign="middle">
-				<td width="10%"></td>
-				<td colspan="2">
-				<hr />
-				</td>
-			</tr>
+			<?php
+			if ("true" === $prereq_emf) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+			<?php
+			if ("true" === $prereq_emfxsd) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
 
 			<?php
 			if ("true" === $prereq_emfvalidation) {
@@ -649,8 +726,11 @@
 		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
 			<tr>
-				<td><a href="buildNotes.php">Build notes</a> <br />
-				<a href="directory.txt">map files</a> <br />
+				<td><!-- 
+				Its silly to always display 'Build notes', but hard to 
+				compute if required or not. 
+				<a href="buildNotes.php">Build notes</a> <br /> 
+				--> <a href="directory.txt">map files</a> <br />
 				<?php
 
 				if ($displayTestSummary) {
diff --git a/releng.wtpbuilder/distribution/servadapt.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/servadapt.site/transformReportToHTML.xml
index 3e9f35b..b72f6cd 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/transformReportToHTML.xml
+++ b/releng.wtpbuilder/distribution/servadapt.site/transformReportToHTML.xml
@@ -6,12 +6,14 @@
     <target
         name="main"
         description="example.@dot.xml to produce example.@dot.html">
-      <xslt
-          destdir="${resultDir}/compilelogs"
-          scanincludeddirectories="true"
-          style="compilerXMLOutputToHTML.xsl"
-          force="true" >
-            <fileset dir="${resultDir}/compilelogs" includes="**/*.xml" />
-      </xslt>
+        <xslt
+            destdir="${resultDir}/compilelogs"
+            scanincludeddirectories="true"
+            style="compilerXMLOutputToHTML.xsl"
+            force="true">
+            <fileset
+                dir="${resultDir}/compilelogs"
+                includes="**/*.xml"/>
+        </xslt>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/build.xml b/releng.wtpbuilder/distribution/servadapt.tests/build.xml
index 4e15602..a4cc7f6 100644
--- a/releng.wtpbuilder/distribution/servadapt.tests/build.xml
+++ b/releng.wtpbuilder/distribution/servadapt.tests/build.xml
@@ -25,6 +25,15 @@
 
 
     <!-- 
+        typcially already set, but in case of standalone tests, may not
+        be
+    -->
+    <property
+        name="buildLabel"
+        value="${buildType}-${buildId}-${timestamp}"/>
+
+
+    <!-- 
 	   Steps to do after the build is done. 
 	 -->
     <target
@@ -66,7 +75,6 @@
             dir="${testRoot}/results"/>
         <mkdir
             dir="${testRoot}/results/consolelogs"/>
-
         <copy
             todir="${testRoot}"
             overwrite="true">
@@ -145,9 +153,7 @@
         <property
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
-        <property
-            name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
+
         <property
             name="vmargs"
             value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/servadapt.tests/templateFiles/index.php
index 8d23693..a42c883 100644
--- a/releng.wtpbuilder/distribution/servadapt.tests/templateFiles/index.php
+++ b/releng.wtpbuilder/distribution/servadapt.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/servadapt.tests/testScripts/ComputePluginVersion.jar b/releng.wtpbuilder/distribution/servadapt.tests/testScripts/ComputePluginVersion.jar
deleted file mode 100644
index ad06a45..0000000
--- a/releng.wtpbuilder/distribution/servadapt.tests/testScripts/ComputePluginVersion.jar
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/servadapt.tests/testScripts/JUNIT.XSL
index 30a407d..0810ae5 100644
--- a/releng.wtpbuilder/distribution/servadapt.tests/testScripts/JUNIT.XSL
+++ b/releng.wtpbuilder/distribution/servadapt.tests/testScripts/JUNIT.XSL
@@ -12,34 +12,36 @@
         <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%
+                    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/servadapt.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/servadapt.tests/testScripts/test.xml
index b4c0253..96c6ddc 100644
--- a/releng.wtpbuilder/distribution/servadapt.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/servadapt.tests/testScripts/test.xml
@@ -30,7 +30,15 @@
     <!--properties file containing the build information-->
     <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"
@@ -54,91 +62,38 @@
     <property
         name="results"
         value="${testRoot}/results"/>
+    <property
+        name="library-file"
+        value="${testRoot}/wtp-junit-tests.xml"/>
     <target
         name="init">
-        <antcall
-            target="computePluginVersion"/>
-        <property
-            file="${testRoot}/test2.properties"/>
     </target>
     <target
-        name="runtests"
-        description="Runs ant on the test.xml for a specified plugin.">
-        <available
-            file="${eclipse-home}/plugins/${testPlugin}/test.xml"
-            property="test.xml.exists"/>
-        <antcall
-            target="runtests2"/>
-    </target>
-    <target
-        name="runtests2"
-        if="test.xml.exists">
-        <antcall
-            target="runtests-normal"/>
-        <copy
-            file="${eclipse-home}/${report}.xml"
-            tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <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"/>
-        </ant>
-        <copy
-            file="${eclipse-home}/${report}.xml"
-            tofile="${results}/xml/${report}_${platform}.xml"
-            failonerror="false"/>
-        <antcall
-            target="genHtml"/>
-    </target>
-    <target
-        name="servadapt-tests"
-        depends="init">
-        <antcall
-            target="runtests">
-            <param
-                name="testPlugin"
-                value="${org.eclipse.jst.server.tomcat.core.tests}"/>
-            <param
-                name="report"
-                value="org.eclipse.jst.server.tomcat.core.tests"/>
-        </antcall>
-    </target>
-
-
-    <!-- releng Tests -->
-    <!--
-        <target name="releng-tests" depends="init" description="Runs the
-        releng tests."> <antcall target="runtests"> <param
-        name="testPlugin" value="${org.eclipse.wtp.releng.tests}" />
-        <param name="report" value="org.eclipse.wtp.releng.tests" />
-        </antcall> </target>
-    -->
-    <target
         name="all"
         depends="init">
         <echo
             level="info"
             message="Starting Unit Tests"/>
         <!--
-            <echo level="info" message="Starting releng tests" />
-            <antcall target="releng-tests" />
+            unlike other ant tasks, subant defaults to false for
+            inheritall!
         -->
-        <echo
-            level="info"
-            message="Starting servadapt tests"/>
-        <antcall
-            target="servadapt-tests"/>
+        <subant
+            target=""
+            inheritall="true">
+            <fileset
+                dir="${eclipse-home}/plugins/">
+                <exclude
+                    name="**/*performance*/test.xml"/>
+                <include
+                    name="**/test.xml"/>
+            </fileset>
+        </subant>
         <echo
             level="info"
             message="Ended Unit Tests"/>
+        <antcall
+            target="genHtml"/>
     </target>
     <target
         name="genHtml"
@@ -149,30 +104,4 @@
             basedir="${results}/xml"
             destdir="${results}/html"/>
     </target>
-    <target
-        name="computePluginVersion"
-        depends="test2properties"
-        unless="test2propertiesexists">
-        <java
-            classname="org.eclipse.wtp.releng.test.ComputePluginVersion">
-            <classpath>
-                <pathelement
-                    location="ComputePluginVersion.jar"/>
-            </classpath>
-            <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"/>
-        </condition>
-    </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/servadapt.tests/testScripts/wtp-junit-tests.xml
index 9c7df40..e1a59f5 100644
--- a/releng.wtpbuilder/distribution/servadapt.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/servadapt.tests/testScripts/wtp-junit-tests.xml
@@ -15,28 +15,18 @@
         file="${keyCfgFile}"/>
     <target
         name="init">
-        <!--
-            Parameters: (Mandatory) data-dir - the workspace directory
-            for Eclipse to write its data plugin-name - symboic name of
-            the plugin to test testPlugin - directory name of plugin
-            (with version suffix) classname - the name of the test class
-            (Optional - overrides defaults set in script) extraVMargs -
-            allows separate setting of VM args from separate caller.
-            timeout - overrides default test timeout value (in
-            milliseconds).
-        -->
         <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
+            if not otherwise set, be sure extraVMargs is at least some
+            string, even if unused string
         -->
         <property
             name="extraVMargs"
-            value=""/>
+            value="-Dunused=notuse"/>
 
         <!-- if not otherwise set, use a unique workspace name -->
         <property
@@ -45,6 +35,11 @@
         <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
+        -->
         <property
             name="timeout"
             value="1800000"/>
@@ -52,9 +47,6 @@
             name="junit-report-output"
             value="${junit-report-output}"/>
         <property
-            name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}"/>
-        <property
             name="formatter"
             value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
         <property
@@ -74,12 +66,9 @@
             message="plugin-name: ${plugin-name}"/>
         <echo
             level="debug"
-            message="testPlugin: ${testPlugin}"/>
-        <echo
-            level="debug"
             message="classname: ${classname}"/>
         <echo
-            level="debug"
+            level="info"
             message="extraVMargs: ${extraVMargs}"/>
         <echo
             level="debug"
@@ -95,9 +84,6 @@
             message="eclipse-home: ${eclipse-home}"/>
         <echo
             level="debug"
-            message="plugin-path: ${plugin-path}"/>
-        <echo
-            level="debug"
             message="junit-report-output: ${junit-report-output}"/>
         <echo
             level="debug"
@@ -154,6 +140,21 @@
         <echo
             level="debug"
             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
@@ -200,24 +201,27 @@
             <jvmarg
                 value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
             <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
+                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
             <jvmarg
                 value="-Dwtp.autotest.noninteractive=true"/>
             <jvmarg
-                value="-DPLUGIN_PATH=${plugin-path}"/>
+                value="${extraVMargs}"/>
             <jvmarg
-                line="${extraVMargs}"/>
+                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="-consolelog"/>
-            <arg
-                value="-debug"/>
-            <arg
                 value="-data"/>
             <arg
                 value="${data-dir}"/>
@@ -276,7 +280,6 @@
             basedir="${junit-report-output}"
             includes="${classname}.xml"
             destdir="${junit-report-output}/html"/>
-
     </target>
     <target
         name="collect">
@@ -284,6 +287,8 @@
             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>
     <target
         name="summarizeFailure"
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml b/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml
index 4e0c1d9..bee318e 100644
--- a/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/servadapt.tests/testdependency.xml
@@ -19,56 +19,55 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
     <condition
         property="getprereq.eclipse">
         <istrue
-            value="${prereq.eclipse}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.eclipseplatform">
         <istrue
-            value="${prereq.eclipseplatform}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.emf">
         <istrue
-            value="${prereq.emf}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.emfxsd">
         <istrue
-            value="${prereq.emfxsd}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.emfvalidation">
         <istrue
-            value="${prereq.emfvalidation}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.gef">
         <istrue
-            value="${prereq.gef}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.dtp">
         <istrue
-            value="${prereq.dtp}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.wst">
         <istrue
-            value="${prereq.wst}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.jst">
         <istrue
-            value="${prereq.jst}"/>
+            value="false"/>
     </condition>
     <condition
         property="getprereq.wtp">
         <istrue
-            value="${prereq.wtp}"/>
+            value="false"/>
     </condition>
     <target
         name="get">
diff --git a/releng.wtpbuilder/distribution/vex.site/publish.xml b/releng.wtpbuilder/distribution/vex.site/publish.xml
index 406ff3e..71afb65 100644
--- a/releng.wtpbuilder/distribution/vex.site/publish.xml
+++ b/releng.wtpbuilder/distribution/vex.site/publish.xml
@@ -425,47 +425,42 @@
             value="${buildBranch}"/>
 
         <!--  Insert PreRequsites  -->
-    	
-              <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformFile@"
-                value="${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformURL@"
-                value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformBuildURL@"
-                value="${eclipseplatform.url}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilelinux@"
-                value="${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilewindows@"
-                value="${eclipseplatform.file.win32-win32-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilemacos@"
-                value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformBuildHome@"
-                value="${eclipseplatform.build.home}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatform.mirror.prefixuri@"
-                value="${eclipseplatform.mirror.prefixuri}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatform.fspath.prefix@"
-                value="${eclipseplatform.fspath.prefix}"/>
-
-    
-    	
-    	
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformFile@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformURL@"
+            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildURL@"
+            value="${eclipseplatform.url}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilelinux@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilewindows@"
+            value="${eclipseplatform.file.win32-win32-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilemacos@"
+            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildHome@"
+            value="${eclipseplatform.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.mirror.prefixuri@"
+            value="${eclipseplatform.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.fspath.prefix@"
+            value="${eclipseplatform.fspath.prefix}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipseFile@"
@@ -534,57 +529,54 @@
             file="${resultingIndex}"
             token="@emf.mirror.prefixuri@"
             value="${emf.mirror.prefixuri}"/>
-    	
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceURL@"
-           value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceFile@"
-           value="${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceName@"
-           value="${emfsourcedoc.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceDescription@"
-           value="${emfsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceBuildHome@"
-           value="${emfsourcedoc.build.home}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsource.mirror.prefixuri@"
-           value="${emfsourcedoc.mirror.prefixuri}"/>
-    	
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceURL@"
-           value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceFile@"
-           value="${emfxsdsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceName@"
-           value="${emfxsdsourcedoc.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceDescription@"
-           value="${emfxsdsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceBuildHome@"
-           value="${emfxsdsourcedoc.build.home}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsource.mirror.prefixuri@"
-           value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-           	
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceURL@"
+            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceFile@"
+            value="${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceName@"
+            value="${emfsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceDescription@"
+            value="${emfsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceBuildHome@"
+            value="${emfsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsource.mirror.prefixuri@"
+            value="${emfsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceURL@"
+            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceFile@"
+            value="${emfxsdsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceName@"
+            value="${emfxsdsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceDescription@"
+            value="${emfxsdsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceBuildHome@"
+            value="${emfxsdsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsource.mirror.prefixuri@"
+            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
             token="@emfxsdFile@"
@@ -657,14 +649,14 @@
             file="${resultingIndex}"
             token="@emfvalidationsourceDescription@"
             value="${emfvalidationsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@wstName@"
-           value="${wst.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@wstDescription@"
-           value="${wst.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstName@"
+            value="${wst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstDescription@"
+            value="${wst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wstFile@"
@@ -681,15 +673,14 @@
             file="${resultingIndex}"
             token="@wst.mirror.prefixuri@"
             value="${wst.mirror.prefixuri}"/>
-    	
-    	       <replace
-    	           file="${resultingIndex}"
-    	           token="@jstName@"
-    	           value="${jst.name}"/>
-    	       <replace
-    	           file="${resultingIndex}"
-    	           token="@jstDescription@"
-    	           value="${jst.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstName@"
+            value="${jst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstDescription@"
+            value="${jst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@jstFile@"
@@ -706,15 +697,14 @@
             file="${resultingIndex}"
             token="@jst.mirror.prefixuri@"
             value="${jst.mirror.prefixuri}"/>
-            	
-              <replace
-                  file="${resultingIndex}"
-                  token="@wtpName@"
-                  value="${wtp.name}"/>
-              <replace
-                  file="${resultingIndex}"
-                  token="@wtpDescription@"
-                  value="${wtp.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpName@"
+            value="${wtp.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpDescription@"
+            value="${wtp.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wtpFile@"
@@ -747,14 +737,14 @@
             file="${resultingIndex}"
             token="@gef.mirror.prefixuri@"
             value="${gef.mirror.prefixuri}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@gefName@"
-           value="${gef.name}"/>
         <replace
-           file="${resultingIndex}"
-           token="@gefDescription@"
-           value="${gef.description}"/>
+            file="${resultingIndex}"
+            token="@gefName@"
+            value="${gef.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@gefDescription@"
+            value="${gef.description}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipserelengFile@"
@@ -819,11 +809,11 @@
             file="${resultingIndex}"
             token="@dtp.mirror.prefixuri@"
             value="${dtp.mirror.prefixuri}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@dtpName@"
-           value="${dtp.name}"/>
-    	<replace
+        <replace
+            file="${resultingIndex}"
+            token="@dtpName@"
+            value="${dtp.name}"/>
+        <replace
             file="${resultingIndex}"
             token="@dtpDescription@"
             value="${dtp.description}"/>
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/buildNotes.php
index e843ecf..f666887 100644
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/buildNotes.php
@@ -27,34 +27,34 @@
 $hasNotes = false;
 $aDirectory = dir("buildnotes");
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
+	if ($anEntry != "." && $anEntry != "..") {
+		//print_r($anEntry);
+		//echo "<br />";
 
-        $subject = $anEntry;
-        $pattern = '/^buildnotes_(.*)/i';
-        preg_match($pattern, $subject, $matches);
-        $subject = $matches[1];
-        //print_r($subject);
-        //echo "<br />";
-        $pattern = '/^(.*)\.html$/';
-        preg_match($pattern, $subject, $matches);
-        //print_r($matches);
-        //echo "<br />";
+		$subject = $anEntry;
+		$pattern = '/^buildnotes_(.*)/i';
+		preg_match($pattern, $subject, $matches);
+		$subject = $matches[1];
+		//print_r($subject);
+		//echo "<br />";
+		$pattern = '/^(.*)\.html$/';
+		preg_match($pattern, $subject, $matches);
+		//print_r($matches);
+		//echo "<br />";
 
-        $component = $matches[1];
+		$component = $matches[1];
 
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
+		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
+		echo "<tr>";
+		echo "$line";
+		echo "</tr>";
+		$hasNotes = true;
 
-    }
+	}
 }
 $aDirectory.closedir();
 if (!$hasNotes) {
-    echo "<br>There are no build notes for this build.";
+	echo "<br>There are no build notes for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/consoleLogs.php
index 7dd5f42..2ee3c36 100644
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/consoleLogs.php
@@ -32,15 +32,15 @@
 $index = 0;
 $dirindex = 0;
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        if (is_file("$rootDir/$anEntry")) {
-            $entries[$index] = $anEntry;
-            $index++;
-        } else if (is_dir("$rootDir/$anEntry")) {
-            $direntries[$dirindex] = $anEntry;
-            $dirindex++;
-        }
-    }
+	if ($anEntry != "." && $anEntry != "..") {
+		if (is_file("$rootDir/$anEntry")) {
+			$entries[$index] = $anEntry;
+			$index++;
+		} else if (is_dir("$rootDir/$anEntry")) {
+			$direntries[$dirindex] = $anEntry;
+			$dirindex++;
+		}
+	}
 }
 $aDirectory->close();
 
@@ -49,43 +49,43 @@
 sort($direntries);
 
 for ($i = 0; $i < $dirindex; $i++) {
-    $anEntry = $direntries[$i];
-    $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
+	$anEntry = $direntries[$i];
+	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
 }
 for ($i = 0; $i < $index; $i++) {
-    $anEntry = $entries[$i];
-    $logsize = filesize("testResults/consolelogs/$anEntry");
+	$anEntry = $entries[$i];
+	$logsize = filesize("testResults/consolelogs/$anEntry");
 
 
-    $level = 0;
-    if ($logsize > 20000) {
-        $level = 2;
-    }
-    else if ($logsize > 2000) {
-        $level = 1;
-    }
+	$level = 0;
+	if ($logsize > 20000) {
+		$level = 2;
+	}
+	else if ($logsize > 2000) {
+		$level = 1;
+	}
 
-    if ($level == 0) {
-        $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-    }
-    else if ($level == 1) {
-        $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-    } else if ($level == 2) {
-        $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-    }
+	if ($level == 0) {
+		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-    $hasNotes = true;
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
+	$hasNotes = true;
 }
 
 if (!$hasNotes) {
-    echo "<br>There are no test logs for this build.";
+	echo "<br>There are no test logs for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/logIndex.php
index 0b36334..721ca00 100644
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/logIndex.php
@@ -4,79 +4,80 @@
 
 function endsWith( $str, $sub ) {
 
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
 }
 
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
+$parts = explode("/", getcwd());
+$parts2 = explode("-", $parts[count($parts) - 1]);
+$buildName = $parts2[1];
 
-        echo "<title>Test Console Output for $buildName </title>";
+echo "<title>Test Console Output for $buildName </title>";
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
+	type="text/css">
+<title>Console Logs from Running JUnit Plug-in Tests</title>
+</head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
+<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr>
-    <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Console
-      output from running JUnit plugin tests for
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+	<tr>
+		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+			color="#FFFFFF" face="Arial,Helvetica">Console output from running
+		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
+	</tr>
 </table>
 <table border="0">
 
 <?php
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
+$hasNotes = false;
+$aDirectory = dir(".");
+$index = 0;
+while ($anEntry = $aDirectory->read()) {
+	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+		$entries[$index] = $anEntry;
+		$index++;
+	}
+}
+aDirectory.closedir();
 
 
-        sort($entries);
+sort($entries);
 
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
+for ($i = 0; $i < $index; $i++) {
+	$anEntry = $entries[$i];
+	$logsize = filesize("$anEntry");
 
 
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
+	$level = 0;
+	if ($logsize > 20000) {
+		$level = 2;
+	}
+	else if ($logsize > 2000) {
+		$level = 1;
+	}
 
-                if ($level == 0) {
-                        $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
+	if ($level == 0) {
+		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
+	$hasNotes = true;
+}
 
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
+if (!$hasNotes) {
+	echo "<br>There are no test logs for this build.";
+}
 ?>
 
 </table>
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/miscUtil.php
index 966ed48..5001f38 100644
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/miscUtil.php
@@ -16,19 +16,19 @@
 	$criteria = 10 * $onemeg;
 	$scaleChar = "M";
 	if (file_exists($filename)) {
-      	$zipfilesize=filesize($filename);
-      	if ($zipfilesize > $criteria) {
-      		$zipfilesize=round($zipfilesize/$onemeg, 0);
-      		$scaleChar = "M";
-      	}
-      	else {
-      		$zipfilesize=round($zipfilesize/$onekilo, 0);
-      		$scaleChar = "K";
-      	}
-  	} 
-  	else {
-  	   $zipfilesize = 0;
-  	}
+		$zipfilesize=filesize($filename);
+		if ($zipfilesize > $criteria) {
+			$zipfilesize=round($zipfilesize/$onemeg, 0);
+			$scaleChar = "M";
+		}
+		else {
+			$zipfilesize=round($zipfilesize/$onekilo, 0);
+			$scaleChar = "K";
+		}
+	}
+	else {
+		$zipfilesize = 0;
+	}
 	$result =  "(" . $zipfilesize . $scaleChar . ")";
 	return $result;
 }
@@ -57,10 +57,10 @@
 	else {
 		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
 		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
+		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+		if (file_exists($wholePath)) {
+			$result = true;
+		}
 	}
 	return $result;
 }
diff --git a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/report2.php
index 52d2284..cb68e7b 100644
--- a/releng.wtpbuilder/distribution/vex.site/staticDropFiles/report2.php
+++ b/releng.wtpbuilder/distribution/vex.site/staticDropFiles/report2.php
@@ -1,42 +1,42 @@
 
-        <?php
+<?php
 
 function parse_testResults($filename)
 {
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
+	$junitFailures = 0;
+	if (is_file($filename)) {
+		$handle = @fopen($filename, "r");
+		if ($handle)
+		{
+			$size = filesize($filename);
+			$content = fread($handle, $size);
+			fclose($handle);
+			$junitStart = strpos($content, "Errors &amp; Failures");
+			$junitEnd = strpos($content, "</table>", $junitStart);
+			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
+			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
+			while ($start !== false)
+			{
+				$start += 29;
+				$stop = strpos($junitInfo, "</font></b></td>", $start);
+				if ($stop !== false)
+				{
+					$result = substr($junitInfo, $start, $stop - $start);
+					if (is_numeric($result))
+					{
+						$junitFailures += $result;
+					}
+					else if (strcmp($result, "DNF") == 0)
+					{
+						$junitFailures++;
+					}
+				}
+				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
+			}
+			$results = array($junitFailures);
+			return $results;
+		}
+	}
 }
 
 
diff --git a/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php
index aed12df..bf628ac 100644
--- a/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/vex.site/templateFiles/index.html.template.php
@@ -557,32 +557,32 @@
 
 
 
-                     <?php
-                     if ("true" === $prereq_emf) {
-                            echo "<tr valign=\"top\">";
-                            echo "<td width=\"10%\"></td>";
-                            echo "<td>";
-                            echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-                            echo "</td> ";
-                            echo "<td align=\"right\">";
-                            echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-                            echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-                            echo "</tr>";
-                     }
-                     ?>
-                     <?php
-                     if ("true" === $prereq_emfxsd) {
-                            echo "<tr valign=\"top\">";
-                            echo "<td width=\"10%\"></td>";
-                            echo "<td>";
-                            echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-                            echo "</td> ";
-                            echo "<td align=\"right\">";
-                            echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-                            echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-                            echo "</tr>";
-                     }
-                     ?>
+			<?php
+			if ("true" === $prereq_emf) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+			<?php
+			if ("true" === $prereq_emfxsd) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
 
 			<?php
 			if ("true" === $prereq_emfvalidation) {
@@ -725,13 +725,12 @@
 		<td>
 		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-			<tr><td>
-				<!-- 
+			<tr>
+				<td><!-- 
 				Its silly to always display 'Build notes', but hard to 
 				compute if required or not. 
 				<a href="buildNotes.php">Build notes</a> <br /> 
-				-->
-				<a href="directory.txt">map files</a> <br />
+				--> <a href="directory.txt">map files</a> <br />
 				<?php
 
 				if ($displayTestSummary) {
diff --git a/releng.wtpbuilder/distribution/vex.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/vex.site/transformReportToHTML.xml
index 3e9f35b..b72f6cd 100644
--- a/releng.wtpbuilder/distribution/vex.site/transformReportToHTML.xml
+++ b/releng.wtpbuilder/distribution/vex.site/transformReportToHTML.xml
@@ -6,12 +6,14 @@
     <target
         name="main"
         description="example.@dot.xml to produce example.@dot.html">
-      <xslt
-          destdir="${resultDir}/compilelogs"
-          scanincludeddirectories="true"
-          style="compilerXMLOutputToHTML.xsl"
-          force="true" >
-            <fileset dir="${resultDir}/compilelogs" includes="**/*.xml" />
-      </xslt>
+        <xslt
+            destdir="${resultDir}/compilelogs"
+            scanincludeddirectories="true"
+            style="compilerXMLOutputToHTML.xsl"
+            force="true">
+            <fileset
+                dir="${resultDir}/compilelogs"
+                includes="**/*.xml"/>
+        </xslt>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/vex.tests/build.xml b/releng.wtpbuilder/distribution/vex.tests/build.xml
index 557d0e4..b606f8b 100644
--- a/releng.wtpbuilder/distribution/vex.tests/build.xml
+++ b/releng.wtpbuilder/distribution/vex.tests/build.xml
@@ -25,6 +25,15 @@
 
 
     <!-- 
+        typcially already set, but in case of standalone tests, may not
+        be
+    -->
+    <property
+        name="buildLabel"
+        value="${buildType}-${buildId}-${timestamp}"/>
+
+
+    <!-- 
 	   Steps to do after the build is done. 
 	 -->
     <target
@@ -66,7 +75,6 @@
             dir="${testRoot}/results"/>
         <mkdir
             dir="${testRoot}/results/consolelogs"/>
-
         <copy
             todir="${testRoot}"
             overwrite="true">
@@ -145,9 +153,7 @@
         <property
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
-        <property
-            name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
+
         <property
             name="vmargs"
             value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
diff --git a/releng.wtpbuilder/distribution/vex.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/vex.tests/templateFiles/index.php
index 8d23693..a42c883 100644
--- a/releng.wtpbuilder/distribution/vex.tests/templateFiles/index.php
+++ b/releng.wtpbuilder/distribution/vex.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/vex.tests/testScripts/ComputePluginVersion.jar b/releng.wtpbuilder/distribution/vex.tests/testScripts/ComputePluginVersion.jar
deleted file mode 100644
index ad06a45..0000000
--- a/releng.wtpbuilder/distribution/vex.tests/testScripts/ComputePluginVersion.jar
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/vex.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/vex.tests/testScripts/JUNIT.XSL
index 30a407d..0810ae5 100644
--- a/releng.wtpbuilder/distribution/vex.tests/testScripts/JUNIT.XSL
+++ b/releng.wtpbuilder/distribution/vex.tests/testScripts/JUNIT.XSL
@@ -12,34 +12,36 @@
         <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%
+                    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/vex.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/vex.tests/testScripts/test.xml
index a68e1ff..96c6ddc 100644
--- a/releng.wtpbuilder/distribution/vex.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/vex.tests/testScripts/test.xml
@@ -30,7 +30,15 @@
     <!--properties file containing the build information-->
     <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"
@@ -54,9 +62,9 @@
     <property
         name="results"
         value="${testRoot}/results"/>
-       <property
-           name="library-file"
-           value="${testRoot}/wtp-junit-tests.xml"/>	
+    <property
+        name="library-file"
+        value="${testRoot}/wtp-junit-tests.xml"/>
     <target
         name="init">
     </target>
@@ -66,9 +74,13 @@
         <echo
             level="info"
             message="Starting Unit Tests"/>
-    	<!-- notice that subant, unlike most ant tasks, defaults to false for inheritall -->
+        <!--
+            unlike other ant tasks, subant defaults to false for
+            inheritall!
+        -->
         <subant
-            target="" inheritall="true">
+            target=""
+            inheritall="true">
             <fileset
                 dir="${eclipse-home}/plugins/">
                 <exclude
diff --git a/releng.wtpbuilder/distribution/vex.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/vex.tests/testScripts/wtp-junit-tests.xml
index ac983df..e1a59f5 100644
--- a/releng.wtpbuilder/distribution/vex.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/vex.tests/testScripts/wtp-junit-tests.xml
@@ -15,19 +15,18 @@
         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
+            if not otherwise set, be sure extraVMargs is at least some
+            string, even if unused string
         -->
         <property
             name="extraVMargs"
-            value=""/>
+            value="-Dunused=notuse"/>
 
         <!-- if not otherwise set, use a unique workspace name -->
         <property
@@ -36,13 +35,17 @@
         <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
+        -->
         <property
             name="timeout"
             value="1800000"/>
         <property
             name="junit-report-output"
             value="${junit-report-output}"/>
-        
         <property
             name="formatter"
             value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
@@ -61,12 +64,11 @@
         <echo
             level="debug"
             message="plugin-name: ${plugin-name}"/>
-     
         <echo
             level="debug"
             message="classname: ${classname}"/>
         <echo
-            level="debug"
+            level="info"
             message="extraVMargs: ${extraVMargs}"/>
         <echo
             level="debug"
@@ -80,7 +82,6 @@
         <echo
             level="debug"
             message="eclipse-home: ${eclipse-home}"/>
-
         <echo
             level="debug"
             message="junit-report-output: ${junit-report-output}"/>
@@ -139,6 +140,21 @@
         <echo
             level="debug"
             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
@@ -185,23 +201,27 @@
             <jvmarg
                 value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
             <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
+                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
             <jvmarg
                 value="-Dwtp.autotest.noninteractive=true"/>
-
             <jvmarg
-                line="${extraVMargs}"/>
+                value="${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="-consolelog"/>
-            <arg
-                value="-debug"/>
-            <arg
                 value="-data"/>
             <arg
                 value="${data-dir}"/>
@@ -261,14 +281,14 @@
             includes="${classname}.xml"
             destdir="${junit-report-output}/html"/>
     </target>
-            	
     <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" />
+        <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>
     <target
         name="summarizeFailure"
diff --git a/releng.wtpbuilder/distribution/vex.tests/testdependency.xml b/releng.wtpbuilder/distribution/vex.tests/testdependency.xml
index 09ef6ee..732a4d2 100644
--- a/releng.wtpbuilder/distribution/vex.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/vex.tests/testdependency.xml
@@ -19,57 +19,56 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
diff --git a/releng.wtpbuilder/distribution/xml.site/publish.xml b/releng.wtpbuilder/distribution/xml.site/publish.xml
index 406ff3e..71afb65 100644
--- a/releng.wtpbuilder/distribution/xml.site/publish.xml
+++ b/releng.wtpbuilder/distribution/xml.site/publish.xml
@@ -425,47 +425,42 @@
             value="${buildBranch}"/>
 
         <!--  Insert PreRequsites  -->
-    	
-              <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformFile@"
-                value="${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformURL@"
-                value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformBuildURL@"
-                value="${eclipseplatform.url}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilelinux@"
-                value="${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilewindows@"
-                value="${eclipseplatform.file.win32-win32-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilemacos@"
-                value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformBuildHome@"
-                value="${eclipseplatform.build.home}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatform.mirror.prefixuri@"
-                value="${eclipseplatform.mirror.prefixuri}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatform.fspath.prefix@"
-                value="${eclipseplatform.fspath.prefix}"/>
-
-    
-    	
-    	
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformFile@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformURL@"
+            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildURL@"
+            value="${eclipseplatform.url}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilelinux@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilewindows@"
+            value="${eclipseplatform.file.win32-win32-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilemacos@"
+            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildHome@"
+            value="${eclipseplatform.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.mirror.prefixuri@"
+            value="${eclipseplatform.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.fspath.prefix@"
+            value="${eclipseplatform.fspath.prefix}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipseFile@"
@@ -534,57 +529,54 @@
             file="${resultingIndex}"
             token="@emf.mirror.prefixuri@"
             value="${emf.mirror.prefixuri}"/>
-    	
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceURL@"
-           value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceFile@"
-           value="${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceName@"
-           value="${emfsourcedoc.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceDescription@"
-           value="${emfsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceBuildHome@"
-           value="${emfsourcedoc.build.home}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsource.mirror.prefixuri@"
-           value="${emfsourcedoc.mirror.prefixuri}"/>
-    	
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceURL@"
-           value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceFile@"
-           value="${emfxsdsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceName@"
-           value="${emfxsdsourcedoc.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceDescription@"
-           value="${emfxsdsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceBuildHome@"
-           value="${emfxsdsourcedoc.build.home}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsource.mirror.prefixuri@"
-           value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-           	
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceURL@"
+            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceFile@"
+            value="${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceName@"
+            value="${emfsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceDescription@"
+            value="${emfsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceBuildHome@"
+            value="${emfsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsource.mirror.prefixuri@"
+            value="${emfsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceURL@"
+            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceFile@"
+            value="${emfxsdsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceName@"
+            value="${emfxsdsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceDescription@"
+            value="${emfxsdsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceBuildHome@"
+            value="${emfxsdsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsource.mirror.prefixuri@"
+            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
             token="@emfxsdFile@"
@@ -657,14 +649,14 @@
             file="${resultingIndex}"
             token="@emfvalidationsourceDescription@"
             value="${emfvalidationsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@wstName@"
-           value="${wst.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@wstDescription@"
-           value="${wst.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstName@"
+            value="${wst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstDescription@"
+            value="${wst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wstFile@"
@@ -681,15 +673,14 @@
             file="${resultingIndex}"
             token="@wst.mirror.prefixuri@"
             value="${wst.mirror.prefixuri}"/>
-    	
-    	       <replace
-    	           file="${resultingIndex}"
-    	           token="@jstName@"
-    	           value="${jst.name}"/>
-    	       <replace
-    	           file="${resultingIndex}"
-    	           token="@jstDescription@"
-    	           value="${jst.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstName@"
+            value="${jst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstDescription@"
+            value="${jst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@jstFile@"
@@ -706,15 +697,14 @@
             file="${resultingIndex}"
             token="@jst.mirror.prefixuri@"
             value="${jst.mirror.prefixuri}"/>
-            	
-              <replace
-                  file="${resultingIndex}"
-                  token="@wtpName@"
-                  value="${wtp.name}"/>
-              <replace
-                  file="${resultingIndex}"
-                  token="@wtpDescription@"
-                  value="${wtp.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpName@"
+            value="${wtp.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpDescription@"
+            value="${wtp.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wtpFile@"
@@ -747,14 +737,14 @@
             file="${resultingIndex}"
             token="@gef.mirror.prefixuri@"
             value="${gef.mirror.prefixuri}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@gefName@"
-           value="${gef.name}"/>
         <replace
-           file="${resultingIndex}"
-           token="@gefDescription@"
-           value="${gef.description}"/>
+            file="${resultingIndex}"
+            token="@gefName@"
+            value="${gef.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@gefDescription@"
+            value="${gef.description}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipserelengFile@"
@@ -819,11 +809,11 @@
             file="${resultingIndex}"
             token="@dtp.mirror.prefixuri@"
             value="${dtp.mirror.prefixuri}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@dtpName@"
-           value="${dtp.name}"/>
-    	<replace
+        <replace
+            file="${resultingIndex}"
+            token="@dtpName@"
+            value="${dtp.name}"/>
+        <replace
             file="${resultingIndex}"
             token="@dtpDescription@"
             value="${dtp.description}"/>
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/buildNotes.php
index e843ecf..f666887 100644
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/buildNotes.php
@@ -27,34 +27,34 @@
 $hasNotes = false;
 $aDirectory = dir("buildnotes");
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
+	if ($anEntry != "." && $anEntry != "..") {
+		//print_r($anEntry);
+		//echo "<br />";
 
-        $subject = $anEntry;
-        $pattern = '/^buildnotes_(.*)/i';
-        preg_match($pattern, $subject, $matches);
-        $subject = $matches[1];
-        //print_r($subject);
-        //echo "<br />";
-        $pattern = '/^(.*)\.html$/';
-        preg_match($pattern, $subject, $matches);
-        //print_r($matches);
-        //echo "<br />";
+		$subject = $anEntry;
+		$pattern = '/^buildnotes_(.*)/i';
+		preg_match($pattern, $subject, $matches);
+		$subject = $matches[1];
+		//print_r($subject);
+		//echo "<br />";
+		$pattern = '/^(.*)\.html$/';
+		preg_match($pattern, $subject, $matches);
+		//print_r($matches);
+		//echo "<br />";
 
-        $component = $matches[1];
+		$component = $matches[1];
 
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
+		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
+		echo "<tr>";
+		echo "$line";
+		echo "</tr>";
+		$hasNotes = true;
 
-    }
+	}
 }
 $aDirectory.closedir();
 if (!$hasNotes) {
-    echo "<br>There are no build notes for this build.";
+	echo "<br>There are no build notes for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/consoleLogs.php
index 7dd5f42..2ee3c36 100644
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/consoleLogs.php
@@ -32,15 +32,15 @@
 $index = 0;
 $dirindex = 0;
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        if (is_file("$rootDir/$anEntry")) {
-            $entries[$index] = $anEntry;
-            $index++;
-        } else if (is_dir("$rootDir/$anEntry")) {
-            $direntries[$dirindex] = $anEntry;
-            $dirindex++;
-        }
-    }
+	if ($anEntry != "." && $anEntry != "..") {
+		if (is_file("$rootDir/$anEntry")) {
+			$entries[$index] = $anEntry;
+			$index++;
+		} else if (is_dir("$rootDir/$anEntry")) {
+			$direntries[$dirindex] = $anEntry;
+			$dirindex++;
+		}
+	}
 }
 $aDirectory->close();
 
@@ -49,43 +49,43 @@
 sort($direntries);
 
 for ($i = 0; $i < $dirindex; $i++) {
-    $anEntry = $direntries[$i];
-    $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
+	$anEntry = $direntries[$i];
+	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
 }
 for ($i = 0; $i < $index; $i++) {
-    $anEntry = $entries[$i];
-    $logsize = filesize("testResults/consolelogs/$anEntry");
+	$anEntry = $entries[$i];
+	$logsize = filesize("testResults/consolelogs/$anEntry");
 
 
-    $level = 0;
-    if ($logsize > 20000) {
-        $level = 2;
-    }
-    else if ($logsize > 2000) {
-        $level = 1;
-    }
+	$level = 0;
+	if ($logsize > 20000) {
+		$level = 2;
+	}
+	else if ($logsize > 2000) {
+		$level = 1;
+	}
 
-    if ($level == 0) {
-        $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-    }
-    else if ($level == 1) {
-        $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-    } else if ($level == 2) {
-        $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-    }
+	if ($level == 0) {
+		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-    $hasNotes = true;
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
+	$hasNotes = true;
 }
 
 if (!$hasNotes) {
-    echo "<br>There are no test logs for this build.";
+	echo "<br>There are no test logs for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/logIndex.php
index 0b36334..721ca00 100644
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/logIndex.php
@@ -4,79 +4,80 @@
 
 function endsWith( $str, $sub ) {
 
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
 }
 
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
+$parts = explode("/", getcwd());
+$parts2 = explode("-", $parts[count($parts) - 1]);
+$buildName = $parts2[1];
 
-        echo "<title>Test Console Output for $buildName </title>";
+echo "<title>Test Console Output for $buildName </title>";
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
+	type="text/css">
+<title>Console Logs from Running JUnit Plug-in Tests</title>
+</head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
+<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr>
-    <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Console
-      output from running JUnit plugin tests for
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+	<tr>
+		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+			color="#FFFFFF" face="Arial,Helvetica">Console output from running
+		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
+	</tr>
 </table>
 <table border="0">
 
 <?php
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
+$hasNotes = false;
+$aDirectory = dir(".");
+$index = 0;
+while ($anEntry = $aDirectory->read()) {
+	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+		$entries[$index] = $anEntry;
+		$index++;
+	}
+}
+aDirectory.closedir();
 
 
-        sort($entries);
+sort($entries);
 
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
+for ($i = 0; $i < $index; $i++) {
+	$anEntry = $entries[$i];
+	$logsize = filesize("$anEntry");
 
 
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
+	$level = 0;
+	if ($logsize > 20000) {
+		$level = 2;
+	}
+	else if ($logsize > 2000) {
+		$level = 1;
+	}
 
-                if ($level == 0) {
-                        $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
+	if ($level == 0) {
+		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
+	$hasNotes = true;
+}
 
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
+if (!$hasNotes) {
+	echo "<br>There are no test logs for this build.";
+}
 ?>
 
 </table>
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/miscUtil.php
index 966ed48..5001f38 100644
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/miscUtil.php
@@ -16,19 +16,19 @@
 	$criteria = 10 * $onemeg;
 	$scaleChar = "M";
 	if (file_exists($filename)) {
-      	$zipfilesize=filesize($filename);
-      	if ($zipfilesize > $criteria) {
-      		$zipfilesize=round($zipfilesize/$onemeg, 0);
-      		$scaleChar = "M";
-      	}
-      	else {
-      		$zipfilesize=round($zipfilesize/$onekilo, 0);
-      		$scaleChar = "K";
-      	}
-  	} 
-  	else {
-  	   $zipfilesize = 0;
-  	}
+		$zipfilesize=filesize($filename);
+		if ($zipfilesize > $criteria) {
+			$zipfilesize=round($zipfilesize/$onemeg, 0);
+			$scaleChar = "M";
+		}
+		else {
+			$zipfilesize=round($zipfilesize/$onekilo, 0);
+			$scaleChar = "K";
+		}
+	}
+	else {
+		$zipfilesize = 0;
+	}
 	$result =  "(" . $zipfilesize . $scaleChar . ")";
 	return $result;
 }
@@ -57,10 +57,10 @@
 	else {
 		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
 		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
+		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+		if (file_exists($wholePath)) {
+			$result = true;
+		}
 	}
 	return $result;
 }
diff --git a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/report2.php
index 52d2284..cb68e7b 100644
--- a/releng.wtpbuilder/distribution/xml.site/staticDropFiles/report2.php
+++ b/releng.wtpbuilder/distribution/xml.site/staticDropFiles/report2.php
@@ -1,42 +1,42 @@
 
-        <?php
+<?php
 
 function parse_testResults($filename)
 {
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
+	$junitFailures = 0;
+	if (is_file($filename)) {
+		$handle = @fopen($filename, "r");
+		if ($handle)
+		{
+			$size = filesize($filename);
+			$content = fread($handle, $size);
+			fclose($handle);
+			$junitStart = strpos($content, "Errors &amp; Failures");
+			$junitEnd = strpos($content, "</table>", $junitStart);
+			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
+			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
+			while ($start !== false)
+			{
+				$start += 29;
+				$stop = strpos($junitInfo, "</font></b></td>", $start);
+				if ($stop !== false)
+				{
+					$result = substr($junitInfo, $start, $stop - $start);
+					if (is_numeric($result))
+					{
+						$junitFailures += $result;
+					}
+					else if (strcmp($result, "DNF") == 0)
+					{
+						$junitFailures++;
+					}
+				}
+				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
+			}
+			$results = array($junitFailures);
+			return $results;
+		}
+	}
 }
 
 
diff --git a/releng.wtpbuilder/distribution/xml.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/xml.site/templateFiles/index.html.template.php
index cfe18d3..f104e8e 100644
--- a/releng.wtpbuilder/distribution/xml.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/xml.site/templateFiles/index.html.template.php
@@ -557,32 +557,32 @@
 
 
 
-                     <?php
-                     if ("true" === $prereq_emf) {
-                            echo "<tr valign=\"top\">";
-                            echo "<td width=\"10%\"></td>";
-                            echo "<td>";
-                            echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-                            echo "</td> ";
-                            echo "<td align=\"right\">";
-                            echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-                            echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-                            echo "</tr>";
-                     }
-                     ?>
-                     <?php
-                     if ("true" === $prereq_emfxsd) {
-                            echo "<tr valign=\"top\">";
-                            echo "<td width=\"10%\"></td>";
-                            echo "<td>";
-                            echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-                            echo "</td> ";
-                            echo "<td align=\"right\">";
-                            echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-                            echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-                            echo "</tr>";
-                     }
-                     ?>
+			<?php
+			if ("true" === $prereq_emf) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+			<?php
+			if ("true" === $prereq_emfxsd) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
 
 			<?php
 			if ("true" === $prereq_emfvalidation) {
@@ -725,13 +725,12 @@
 		<td>
 		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-			<tr><td>
-				<!-- 
+			<tr>
+				<td><!-- 
 				Its silly to always display 'Build notes', but hard to 
 				compute if required or not. 
 				<a href="buildNotes.php">Build notes</a> <br /> 
-				-->
-				<a href="directory.txt">map files</a> <br />
+				--> <a href="directory.txt">map files</a> <br />
 				<?php
 
 				if ($displayTestSummary) {
diff --git a/releng.wtpbuilder/distribution/xml.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/xml.site/transformReportToHTML.xml
index 3e9f35b..b72f6cd 100644
--- a/releng.wtpbuilder/distribution/xml.site/transformReportToHTML.xml
+++ b/releng.wtpbuilder/distribution/xml.site/transformReportToHTML.xml
@@ -6,12 +6,14 @@
     <target
         name="main"
         description="example.@dot.xml to produce example.@dot.html">
-      <xslt
-          destdir="${resultDir}/compilelogs"
-          scanincludeddirectories="true"
-          style="compilerXMLOutputToHTML.xsl"
-          force="true" >
-            <fileset dir="${resultDir}/compilelogs" includes="**/*.xml" />
-      </xslt>
+        <xslt
+            destdir="${resultDir}/compilelogs"
+            scanincludeddirectories="true"
+            style="compilerXMLOutputToHTML.xsl"
+            force="true">
+            <fileset
+                dir="${resultDir}/compilelogs"
+                includes="**/*.xml"/>
+        </xslt>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.tests/build.xml b/releng.wtpbuilder/distribution/xml.tests/build.xml
index 1ffd8ec..bd2ef55 100644
--- a/releng.wtpbuilder/distribution/xml.tests/build.xml
+++ b/releng.wtpbuilder/distribution/xml.tests/build.xml
@@ -25,6 +25,15 @@
 
 
     <!-- 
+        typcially already set, but in case of standalone tests, may not
+        be
+    -->
+    <property
+        name="buildLabel"
+        value="${buildType}-${buildId}-${timestamp}"/>
+
+
+    <!-- 
 	   Steps to do after the build is done. 
 	 -->
     <target
@@ -66,7 +75,6 @@
             dir="${testRoot}/results"/>
         <mkdir
             dir="${testRoot}/results/consolelogs"/>
-
         <copy
             todir="${testRoot}"
             overwrite="true">
@@ -145,9 +153,7 @@
         <property
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
-        <property
-            name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
+
         <property
             name="vmargs"
             value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
diff --git a/releng.wtpbuilder/distribution/xml.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/xml.tests/templateFiles/index.php
index 8d23693..a42c883 100644
--- a/releng.wtpbuilder/distribution/xml.tests/templateFiles/index.php
+++ b/releng.wtpbuilder/distribution/xml.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/xml.tests/testScripts/ComputePluginVersion.jar b/releng.wtpbuilder/distribution/xml.tests/testScripts/ComputePluginVersion.jar
deleted file mode 100644
index ad06a45..0000000
--- a/releng.wtpbuilder/distribution/xml.tests/testScripts/ComputePluginVersion.jar
+++ /dev/null
Binary files differ
diff --git a/releng.wtpbuilder/distribution/xml.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/xml.tests/testScripts/JUNIT.XSL
index 30a407d..0810ae5 100644
--- a/releng.wtpbuilder/distribution/xml.tests/testScripts/JUNIT.XSL
+++ b/releng.wtpbuilder/distribution/xml.tests/testScripts/JUNIT.XSL
@@ -12,34 +12,36 @@
         <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%
+                    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/xml.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/xml.tests/testScripts/test.xml
index 9e5e0f5..96c6ddc 100644
--- a/releng.wtpbuilder/distribution/xml.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/xml.tests/testScripts/test.xml
@@ -30,7 +30,15 @@
     <!--properties file containing the build information-->
     <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"
@@ -54,49 +62,38 @@
     <property
         name="results"
         value="${testRoot}/results"/>
+    <property
+        name="library-file"
+        value="${testRoot}/wtp-junit-tests.xml"/>
     <target
         name="init">
-
     </target>
-
-
-    <target
-        name="xml-tests"
-        depends="init">
-       <subant
-           target="">
-           <property
-               name="eclipse-home"
-               value="${testRoot}${dropinsFolder}/eclipse/"/>
-           <property
-               name="library-file"
-               value="${testRoot}/wtp-junit-tests.xml"/>
-           <fileset
-               dir="${eclipse-home}/plugins/"
-               includes="**/test.xml"/>
-       </subant>
-    </target>
-
-
     <target
         name="all"
         depends="init">
         <echo
             level="info"
             message="Starting Unit Tests"/>
-       
-        <echo
-            level="info"
-            message="Starting xml tests"/>
-        <antcall
-            target="xml-tests"/>
+        <!--
+            unlike other ant tasks, subant defaults to false for
+            inheritall!
+        -->
+        <subant
+            target=""
+            inheritall="true">
+            <fileset
+                dir="${eclipse-home}/plugins/">
+                <exclude
+                    name="**/*performance*/test.xml"/>
+                <include
+                    name="**/test.xml"/>
+            </fileset>
+        </subant>
         <echo
             level="info"
             message="Ended Unit Tests"/>
-      
         <antcall
-           target="genHtml"/> 
-       	
+            target="genHtml"/>
     </target>
     <target
         name="genHtml"
@@ -107,5 +104,4 @@
             basedir="${results}/xml"
             destdir="${results}/html"/>
     </target>
-
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
index 226784d..e1a59f5 100644
--- a/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
@@ -15,19 +15,18 @@
         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
+            if not otherwise set, be sure extraVMargs is at least some
+            string, even if unused string
         -->
         <property
             name="extraVMargs"
-            value=""/>
+            value="-Dunused=notuse"/>
 
         <!-- if not otherwise set, use a unique workspace name -->
         <property
@@ -36,13 +35,17 @@
         <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
+        -->
         <property
             name="timeout"
             value="1800000"/>
         <property
             name="junit-report-output"
             value="${junit-report-output}"/>
-        
         <property
             name="formatter"
             value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
@@ -61,12 +64,11 @@
         <echo
             level="debug"
             message="plugin-name: ${plugin-name}"/>
-     
         <echo
             level="debug"
             message="classname: ${classname}"/>
         <echo
-            level="debug"
+            level="info"
             message="extraVMargs: ${extraVMargs}"/>
         <echo
             level="debug"
@@ -82,9 +84,6 @@
             message="eclipse-home: ${eclipse-home}"/>
         <echo
             level="debug"
-            message="plugin-path: ${plugin-path}"/>
-        <echo
-            level="debug"
             message="junit-report-output: ${junit-report-output}"/>
         <echo
             level="debug"
@@ -141,6 +140,21 @@
         <echo
             level="debug"
             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
@@ -187,24 +201,27 @@
             <jvmarg
                 value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol"/>
             <jvmarg
-                value="-DurlLogLocation=${buildDirectory}/outgoinghttplogfromtests.log"/>
+                value="-DurlLogLocation=${buildDirectory}/${buildLabel}/httplogstest/outgoinghttplog-${plugin-name}.log"/>
             <jvmarg
                 value="-Dwtp.autotest.noninteractive=true"/>
             <jvmarg
-                value="-DPLUGIN_PATH=${plugin-path}"/>
+                value="${extraVMargs}"/>
             <jvmarg
-                line="${extraVMargs}"/>
+                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="-consolelog"/>
-            <arg
-                value="-debug"/>
-            <arg
                 value="-data"/>
             <arg
                 value="${data-dir}"/>
@@ -264,13 +281,14 @@
             includes="${classname}.xml"
             destdir="${junit-report-output}/html"/>
     </target>
-            	
     <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>
     <target
         name="summarizeFailure"
diff --git a/releng.wtpbuilder/distribution/xml.tests/testdependency.xml b/releng.wtpbuilder/distribution/xml.tests/testdependency.xml
index db4fb35..6c32216 100644
--- a/releng.wtpbuilder/distribution/xml.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/xml.tests/testdependency.xml
@@ -19,57 +19,56 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-        
-	    <condition
-	        property="getprereq.eclipse">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.eclipseplatform">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emf">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfxsd">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.emfvalidation">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.gef">
-	        <istrue
-	            value="true"/>
-	    </condition>
-	    <condition
-	        property="getprereq.dtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.jst">
-	        <istrue
-	            value="false"/>
-	    </condition>
-	    <condition
-	        property="getprereq.wtp">
-	        <istrue
-	            value="false"/>
-	    </condition>
+    <condition
+        property="getprereq.eclipse">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.eclipseplatform">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.emf">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfxsd">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.emfvalidation">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.gef">
+        <istrue
+            value="true"/>
+    </condition>
+    <condition
+        property="getprereq.dtp">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.jst">
+        <istrue
+            value="false"/>
+    </condition>
+    <condition
+        property="getprereq.wtp">
+        <istrue
+            value="false"/>
+    </condition>
     <target
         name="get">
         <!--
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml b/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
index 406ff3e..71afb65 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.site/publish.xml
@@ -425,47 +425,42 @@
             value="${buildBranch}"/>
 
         <!--  Insert PreRequsites  -->
-    	
-              <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformFile@"
-                value="${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformURL@"
-                value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformBuildURL@"
-                value="${eclipseplatform.url}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilelinux@"
-                value="${eclipseplatform.file.linux-gtk-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilewindows@"
-                value="${eclipseplatform.file.win32-win32-x86}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformfilemacos@"
-                value="${eclipseplatform.file.macosx-carbon-ppc}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatformBuildHome@"
-                value="${eclipseplatform.build.home}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatform.mirror.prefixuri@"
-                value="${eclipseplatform.mirror.prefixuri}"/>
-            <replace
-                file="${resultingIndex}"
-                token="@eclipseplatform.fspath.prefix@"
-                value="${eclipseplatform.fspath.prefix}"/>
-
-    
-    	
-    	
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformFile@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformURL@"
+            value="${eclipseplatform.url}/${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildURL@"
+            value="${eclipseplatform.url}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilelinux@"
+            value="${eclipseplatform.file.linux-gtk-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilewindows@"
+            value="${eclipseplatform.file.win32-win32-x86}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformfilemacos@"
+            value="${eclipseplatform.file.macosx-carbon-ppc}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatformBuildHome@"
+            value="${eclipseplatform.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.mirror.prefixuri@"
+            value="${eclipseplatform.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@eclipseplatform.fspath.prefix@"
+            value="${eclipseplatform.fspath.prefix}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipseFile@"
@@ -534,57 +529,54 @@
             file="${resultingIndex}"
             token="@emf.mirror.prefixuri@"
             value="${emf.mirror.prefixuri}"/>
-    	
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceURL@"
-           value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceFile@"
-           value="${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceName@"
-           value="${emfsourcedoc.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceDescription@"
-           value="${emfsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsourceBuildHome@"
-           value="${emfsourcedoc.build.home}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfsource.mirror.prefixuri@"
-           value="${emfsourcedoc.mirror.prefixuri}"/>
-    	
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceURL@"
-           value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceFile@"
-           value="${emfxsdsourcedoc.file}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceName@"
-           value="${emfxsdsourcedoc.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceDescription@"
-           value="${emfxsdsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsourceBuildHome@"
-           value="${emfxsdsourcedoc.build.home}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@emfxsdsource.mirror.prefixuri@"
-           value="${emfxsdsourcedoc.mirror.prefixuri}"/>
-           	
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceURL@"
+            value="${emfsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceFile@"
+            value="${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceName@"
+            value="${emfsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceDescription@"
+            value="${emfsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsourceBuildHome@"
+            value="${emfsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfsource.mirror.prefixuri@"
+            value="${emfsourcedoc.mirror.prefixuri}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceURL@"
+            value="${emfxsdsourcedoc.url}/${emfsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceFile@"
+            value="${emfxsdsourcedoc.file}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceName@"
+            value="${emfxsdsourcedoc.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceDescription@"
+            value="${emfxsdsourcedoc.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsourceBuildHome@"
+            value="${emfxsdsourcedoc.build.home}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@emfxsdsource.mirror.prefixuri@"
+            value="${emfxsdsourcedoc.mirror.prefixuri}"/>
         <replace
             file="${resultingIndex}"
             token="@emfxsdFile@"
@@ -657,14 +649,14 @@
             file="${resultingIndex}"
             token="@emfvalidationsourceDescription@"
             value="${emfvalidationsourcedoc.description}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@wstName@"
-           value="${wst.name}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@wstDescription@"
-           value="${wst.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstName@"
+            value="${wst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wstDescription@"
+            value="${wst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wstFile@"
@@ -681,15 +673,14 @@
             file="${resultingIndex}"
             token="@wst.mirror.prefixuri@"
             value="${wst.mirror.prefixuri}"/>
-    	
-    	       <replace
-    	           file="${resultingIndex}"
-    	           token="@jstName@"
-    	           value="${jst.name}"/>
-    	       <replace
-    	           file="${resultingIndex}"
-    	           token="@jstDescription@"
-    	           value="${jst.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstName@"
+            value="${jst.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@jstDescription@"
+            value="${jst.description}"/>
         <replace
             file="${resultingIndex}"
             token="@jstFile@"
@@ -706,15 +697,14 @@
             file="${resultingIndex}"
             token="@jst.mirror.prefixuri@"
             value="${jst.mirror.prefixuri}"/>
-            	
-              <replace
-                  file="${resultingIndex}"
-                  token="@wtpName@"
-                  value="${wtp.name}"/>
-              <replace
-                  file="${resultingIndex}"
-                  token="@wtpDescription@"
-                  value="${wtp.description}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpName@"
+            value="${wtp.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@wtpDescription@"
+            value="${wtp.description}"/>
         <replace
             file="${resultingIndex}"
             token="@wtpFile@"
@@ -747,14 +737,14 @@
             file="${resultingIndex}"
             token="@gef.mirror.prefixuri@"
             value="${gef.mirror.prefixuri}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@gefName@"
-           value="${gef.name}"/>
         <replace
-           file="${resultingIndex}"
-           token="@gefDescription@"
-           value="${gef.description}"/>
+            file="${resultingIndex}"
+            token="@gefName@"
+            value="${gef.name}"/>
+        <replace
+            file="${resultingIndex}"
+            token="@gefDescription@"
+            value="${gef.description}"/>
         <replace
             file="${resultingIndex}"
             token="@eclipserelengFile@"
@@ -819,11 +809,11 @@
             file="${resultingIndex}"
             token="@dtp.mirror.prefixuri@"
             value="${dtp.mirror.prefixuri}"/>
-       <replace
-           file="${resultingIndex}"
-           token="@dtpName@"
-           value="${dtp.name}"/>
-    	<replace
+        <replace
+            file="${resultingIndex}"
+            token="@dtpName@"
+            value="${dtp.name}"/>
+        <replace
             file="${resultingIndex}"
             token="@dtpDescription@"
             value="${dtp.description}"/>
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/buildNotes.php b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/buildNotes.php
index e843ecf..f666887 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/buildNotes.php
+++ b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/buildNotes.php
@@ -27,34 +27,34 @@
 $hasNotes = false;
 $aDirectory = dir("buildnotes");
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        //print_r($anEntry);
-        //echo "<br />";
+	if ($anEntry != "." && $anEntry != "..") {
+		//print_r($anEntry);
+		//echo "<br />";
 
-        $subject = $anEntry;
-        $pattern = '/^buildnotes_(.*)/i';
-        preg_match($pattern, $subject, $matches);
-        $subject = $matches[1];
-        //print_r($subject);
-        //echo "<br />";
-        $pattern = '/^(.*)\.html$/';
-        preg_match($pattern, $subject, $matches);
-        //print_r($matches);
-        //echo "<br />";
+		$subject = $anEntry;
+		$pattern = '/^buildnotes_(.*)/i';
+		preg_match($pattern, $subject, $matches);
+		$subject = $matches[1];
+		//print_r($subject);
+		//echo "<br />";
+		$pattern = '/^(.*)\.html$/';
+		preg_match($pattern, $subject, $matches);
+		//print_r($matches);
+		//echo "<br />";
 
-        $component = $matches[1];
+		$component = $matches[1];
 
-        $line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
-        echo "<tr>";
-        echo "$line";
-        echo "</tr>";
-        $hasNotes = true;
+		$line = "<td>Component: <a href=\"buildnotes/$anEntry\">$component</a></td>";
+		echo "<tr>";
+		echo "$line";
+		echo "</tr>";
+		$hasNotes = true;
 
-    }
+	}
 }
 $aDirectory.closedir();
 if (!$hasNotes) {
-    echo "<br>There are no build notes for this build.";
+	echo "<br>There are no build notes for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/consoleLogs.php b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/consoleLogs.php
index 7dd5f42..2ee3c36 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/consoleLogs.php
+++ b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/consoleLogs.php
@@ -32,15 +32,15 @@
 $index = 0;
 $dirindex = 0;
 while ($anEntry = $aDirectory->read()) {
-    if ($anEntry != "." && $anEntry != "..") {
-        if (is_file("$rootDir/$anEntry")) {
-            $entries[$index] = $anEntry;
-            $index++;
-        } else if (is_dir("$rootDir/$anEntry")) {
-            $direntries[$dirindex] = $anEntry;
-            $dirindex++;
-        }
-    }
+	if ($anEntry != "." && $anEntry != "..") {
+		if (is_file("$rootDir/$anEntry")) {
+			$entries[$index] = $anEntry;
+			$index++;
+		} else if (is_dir("$rootDir/$anEntry")) {
+			$direntries[$dirindex] = $anEntry;
+			$dirindex++;
+		}
+	}
 }
 $aDirectory->close();
 
@@ -49,43 +49,43 @@
 sort($direntries);
 
 for ($i = 0; $i < $dirindex; $i++) {
-    $anEntry = $direntries[$i];
-    $line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
+	$anEntry = $direntries[$i];
+	$line = "<td><a href=\"testResults/consolelogs/$anEntry/logIndex.php\">$anEntry</a></td>";
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
 }
 for ($i = 0; $i < $index; $i++) {
-    $anEntry = $entries[$i];
-    $logsize = filesize("testResults/consolelogs/$anEntry");
+	$anEntry = $entries[$i];
+	$logsize = filesize("testResults/consolelogs/$anEntry");
 
 
-    $level = 0;
-    if ($logsize > 20000) {
-        $level = 2;
-    }
-    else if ($logsize > 2000) {
-        $level = 1;
-    }
+	$level = 0;
+	if ($logsize > 20000) {
+		$level = 2;
+	}
+	else if ($logsize > 2000) {
+		$level = 1;
+	}
 
-    if ($level == 0) {
-        $line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-    }
-    else if ($level == 1) {
-        $line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-    } else if ($level == 2) {
-        $line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-    }
+	if ($level == 0) {
+		$line = "<td><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"testResults/consolelogs/$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-    echo "<tr>";
-    echo "$line";
-    echo "</tr>";
-    $hasNotes = true;
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
+	$hasNotes = true;
 }
 
 if (!$hasNotes) {
-    echo "<br>There are no test logs for this build.";
+	echo "<br>There are no test logs for this build.";
 }
 ?>
 
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/logIndex.php b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/logIndex.php
index 0b36334..721ca00 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/logIndex.php
+++ b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/logIndex.php
@@ -4,79 +4,80 @@
 
 function endsWith( $str, $sub ) {
 
-   return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
+	return ( substr( $str, strlen( $str ) - strlen( $sub ) ) === $sub );
 }
 
-        $parts = explode("/", getcwd());
-        $parts2 = explode("-", $parts[count($parts) - 1]);
-        $buildName = $parts2[1];
+$parts = explode("/", getcwd());
+$parts2 = explode("-", $parts[count($parts) - 1]);
+$buildName = $parts2[1];
 
-        echo "<title>Test Console Output for $buildName </title>";
+echo "<title>Test Console Output for $buildName </title>";
 ?>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css" type="text/css">
-<title>Console Logs from Running JUnit Plug-in Tests</title></head>
+<link rel="stylesheet" href="http://dev.eclipse.org/default_style.css"
+	type="text/css">
+<title>Console Logs from Running JUnit Plug-in Tests</title>
+</head>
 <body>
 
-<p><b><font face="Verdana" size="+3">Test Console Output</font></b> </p>
+<p><b><font face="Verdana" size="+3">Test Console Output</font></b></p>
 
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr>
-    <td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Console
-      output from running JUnit plugin tests for
-      <?php echo "$buildName"; ?>
-      </font></b></td>
-  </tr>
+<table border=0 cellspacing=5 cellpadding=2 width="100%">
+	<tr>
+		<td align=LEFT valign=TOP colspan="3" bgcolor="#0080C0"><b><font
+			color="#FFFFFF" face="Arial,Helvetica">Console output from running
+		JUnit plugin tests for <?php echo "$buildName"; ?> </font></b></td>
+	</tr>
 </table>
 <table border="0">
 
 <?php
-        $hasNotes = false;
-        $aDirectory = dir(".");
-        $index = 0;
-        while ($anEntry = $aDirectory->read()) {
-                if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
-                        $entries[$index] = $anEntry;
-                        $index++;
-                }
-        }
-        aDirectory.closedir();
+$hasNotes = false;
+$aDirectory = dir(".");
+$index = 0;
+while ($anEntry = $aDirectory->read()) {
+	if ($anEntry != "." && $anEntry != ".." && !endsWith(__FILE__, $anEntry)) {
+		$entries[$index] = $anEntry;
+		$index++;
+	}
+}
+aDirectory.closedir();
 
 
-        sort($entries);
+sort($entries);
 
-        for ($i = 0; $i < $index; $i++) {
-                $anEntry = $entries[$i];
-                $logsize = filesize("$anEntry");
+for ($i = 0; $i < $index; $i++) {
+	$anEntry = $entries[$i];
+	$logsize = filesize("$anEntry");
 
 
-                $level = 0;
-                if ($logsize > 20000) {
-                        $level = 2;
-                }
-                else if ($logsize > 2000) {
-                        $level = 1;
-                }
+	$level = 0;
+	if ($logsize > 20000) {
+		$level = 2;
+	}
+	else if ($logsize > 2000) {
+		$level = 1;
+	}
 
-                if ($level == 0) {
-                        $line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
-                }
-                else if ($level == 1) {
-                        $line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
-                } else if ($level == 2) {
-                        $line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
-                }
+	if ($level == 0) {
+		$line = "<td><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</td>";
+	}
+	else if ($level == 1) {
+		$line = "<td><em><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</em></td>";
+	} else if ($level == 2) {
+		$line = "<td><strong><a href=\"$anEntry\">$anEntry</a>  ($logsize bytes)</strong></td>";
+	}
 
 
-                echo "<tr>";
-                echo "$line";
-                echo "</tr>";
-                $hasNotes = true;
-        }
+	echo "<tr>";
+	echo "$line";
+	echo "</tr>";
+	$hasNotes = true;
+}
 
-        if (!$hasNotes) {
-                echo "<br>There are no test logs for this build.";
-        }
+if (!$hasNotes) {
+	echo "<br>There are no test logs for this build.";
+}
 ?>
 
 </table>
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/miscUtil.php
index 966ed48..5001f38 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/miscUtil.php
@@ -16,19 +16,19 @@
 	$criteria = 10 * $onemeg;
 	$scaleChar = "M";
 	if (file_exists($filename)) {
-      	$zipfilesize=filesize($filename);
-      	if ($zipfilesize > $criteria) {
-      		$zipfilesize=round($zipfilesize/$onemeg, 0);
-      		$scaleChar = "M";
-      	}
-      	else {
-      		$zipfilesize=round($zipfilesize/$onekilo, 0);
-      		$scaleChar = "K";
-      	}
-  	} 
-  	else {
-  	   $zipfilesize = 0;
-  	}
+		$zipfilesize=filesize($filename);
+		if ($zipfilesize > $criteria) {
+			$zipfilesize=round($zipfilesize/$onemeg, 0);
+			$scaleChar = "M";
+		}
+		else {
+			$zipfilesize=round($zipfilesize/$onekilo, 0);
+			$scaleChar = "K";
+		}
+	}
+	else {
+		$zipfilesize = 0;
+	}
 	$result =  "(" . $zipfilesize . $scaleChar . ")";
 	return $result;
 }
@@ -57,10 +57,10 @@
 	else {
 		// TODO: for now, we'll do a raw check on the whole file name, since enable_url_open
 		// is off. better would be to check if we are on build.eclipse.org or download.eclipse.org?
-    $wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
-    if (file_exists($wholePath)) {
-    	$result = true;
-    }
+		$wholePath = trim($eclipseFSpathPrefix) . "/" . trim($mirrorPrefixuri) . "/" . trim($prereqfilename);
+		if (file_exists($wholePath)) {
+			$result = true;
+		}
 	}
 	return $result;
 }
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/report2.php b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/report2.php
index 52d2284..cb68e7b 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/report2.php
+++ b/releng.wtpbuilder/distribution/xmlsec.site/staticDropFiles/report2.php
@@ -1,42 +1,42 @@
 
-        <?php
+<?php
 
 function parse_testResults($filename)
 {
-        $junitFailures = 0;
-        if (is_file($filename)) {
-                $handle = @fopen($filename, "r");
-                if ($handle)
-                {
-                        $size = filesize($filename);
-                        $content = fread($handle, $size);
-                        fclose($handle);
-                        $junitStart = strpos($content, "Errors &amp; Failures");
-                        $junitEnd = strpos($content, "</table>", $junitStart);
-                        $junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
-                        $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
-                        while ($start !== false)
-                        {
-                                $start += 29;
-                                $stop = strpos($junitInfo, "</font></b></td>", $start);
-                                if ($stop !== false)
-                                {
-                                        $result = substr($junitInfo, $start, $stop - $start);
-                                        if (is_numeric($result))
-                                        {
-                                                $junitFailures += $result;
-                                        }
-                                        else if (strcmp($result, "DNF") == 0)
-                                        {
-                                                $junitFailures++;
-                                        }
-                                }
-                                $start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
-                        }
-                        $results = array($junitFailures);
-                        return $results;
-                }
-        }
+	$junitFailures = 0;
+	if (is_file($filename)) {
+		$handle = @fopen($filename, "r");
+		if ($handle)
+		{
+			$size = filesize($filename);
+			$content = fread($handle, $size);
+			fclose($handle);
+			$junitStart = strpos($content, "Errors &amp; Failures");
+			$junitEnd = strpos($content, "</table>", $junitStart);
+			$junitInfo = substr($content, $junitStart, $junitEnd - $junitStart);
+			$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">");
+			while ($start !== false)
+			{
+				$start += 29;
+				$stop = strpos($junitInfo, "</font></b></td>", $start);
+				if ($stop !== false)
+				{
+					$result = substr($junitInfo, $start, $stop - $start);
+					if (is_numeric($result))
+					{
+						$junitFailures += $result;
+					}
+					else if (strcmp($result, "DNF") == 0)
+					{
+						$junitFailures++;
+					}
+				}
+				$start = strpos($junitInfo, "<td><b><font color=\"#ff0000\">", $stop);
+			}
+			$results = array($junitFailures);
+			return $results;
+		}
+	}
 }
 
 
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
index 3ed07b7..556e62a 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
+++ b/releng.wtpbuilder/distribution/xmlsec.site/templateFiles/index.html.template.php
@@ -557,32 +557,32 @@
 
 
 
-                     <?php
-                     if ("true" === $prereq_emf) {
-                            echo "<tr valign=\"top\">";
-                            echo "<td width=\"10%\"></td>";
-                            echo "<td>";
-                            echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
-                            echo "</td> ";
-                            echo "<td align=\"right\">";
-                            echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
-                            echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
-                            echo "</tr>";
-                     }
-                     ?>
-                     <?php
-                     if ("true" === $prereq_emfxsd) {
-                            echo "<tr valign=\"top\">";
-                            echo "<td width=\"10%\"></td>";
-                            echo "<td>";
-                            echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
-                            echo "</td> ";
-                            echo "<td align=\"right\">";
-                            echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
-                            echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
-                            echo "</tr>";
-                     }
-                     ?>
+			<?php
+			if ("true" === $prereq_emf) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfsourceName . "&nbsp;" . $emfsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfsourceMirrorPrefixuri, $emfsourceURL, $emfsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
+			<?php
+			if ("true" === $prereq_emfxsd) {
+				echo "<tr valign=\"top\">";
+				echo "<td width=\"10%\"></td>";
+				echo "<td>";
+				echo $emfxsdsourceName . "&nbsp;" . $emfxsdsourceDescription;
+				echo "</td> ";
+				echo "<td align=\"right\">";
+				echo getPrereqReferenceOrName($eclipseMirrorScript, $emfxsdsourceMirrorPrefixuri, $emfxsdsourceURL, $emfxsdsourceFile, $eclipseFSpathPrefix);
+				echo " or <a href=\"" . $emfxsdsourceBuildHome . "\">equivalent</a></td>";
+				echo "</tr>";
+			}
+			?>
 
 			<?php
 			if ("true" === $prereq_emfvalidation) {
@@ -725,13 +725,12 @@
 		<td>
 		<table border=0 cellspacing=2 cellpadding=2 width="90%" align="center">
 
-			<tr><td>
-				<!-- 
+			<tr>
+				<td><!-- 
 				Its silly to always display 'Build notes', but hard to 
 				compute if required or not. 
 				<a href="buildNotes.php">Build notes</a> <br /> 
-				-->
-				<a href="directory.txt">map files</a> <br />
+				--> <a href="directory.txt">map files</a> <br />
 				<?php
 
 				if ($displayTestSummary) {
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/transformReportToHTML.xml b/releng.wtpbuilder/distribution/xmlsec.site/transformReportToHTML.xml
index 3e9f35b..b72f6cd 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/transformReportToHTML.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.site/transformReportToHTML.xml
@@ -6,12 +6,14 @@
     <target
         name="main"
         description="example.@dot.xml to produce example.@dot.html">
-      <xslt
-          destdir="${resultDir}/compilelogs"
-          scanincludeddirectories="true"
-          style="compilerXMLOutputToHTML.xsl"
-          force="true" >
-            <fileset dir="${resultDir}/compilelogs" includes="**/*.xml" />
-      </xslt>
+        <xslt
+            destdir="${resultDir}/compilelogs"
+            scanincludeddirectories="true"
+            style="compilerXMLOutputToHTML.xsl"
+            force="true">
+            <fileset
+                dir="${resultDir}/compilelogs"
+                includes="**/*.xml"/>
+        </xslt>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/xmlsec.tests/build.xml b/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
index aae40de..fe78906 100644
--- a/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
@@ -25,6 +25,15 @@
 
 
     <!-- 
+        typcially already set, but in case of standalone tests, may not
+        be
+    -->
+    <property
+        name="buildLabel"
+        value="${buildType}-${buildId}-${timestamp}"/>
+
+
+    <!-- 
 	   Steps to do after the build is done. 
 	 -->
     <target
@@ -66,7 +75,6 @@
             dir="${testRoot}/results"/>
         <mkdir
             dir="${testRoot}/results/consolelogs"/>
-
         <copy
             todir="${testRoot}"
             overwrite="true">
@@ -145,9 +153,7 @@
         <property
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
-        <property
-            name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
+
         <property
             name="vmargs"
             value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
diff --git a/releng.wtpbuilder/distribution/xmlsec.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/xmlsec.tests/templateFiles/index.php
index 8d23693..a42c883 100644
--- a/releng.wtpbuilder/distribution/xmlsec.tests/templateFiles/index.php
+++ b/releng.wtpbuilder/distribution/xmlsec.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;