295767 fishy logs lost
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
index 39fc90e..b226b12 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
@@ -24,7 +24,7 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
+    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
index b851f0d..191f8e9 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
@@ -154,10 +154,7 @@
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
 
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
+       <!--
             set path to eclipse folder. If local folder, use '.';
             otherwise, use c:\path\to\eclipse or /path/to/eclipse/
         -->
@@ -219,6 +216,8 @@
                 value="-nosplash"/>
             <arg
                 value="-consolelog"/>
+              <arg
+                  value="-debug"/>
             <arg
                 value="-data"/>
             <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 bf63962..7bd2ab3 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
@@ -22,10 +22,9 @@
             dir="${junit-report-output}/raw"/>
         <!--
             if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
+            string, even if unused string. Remember, though, extraVMArgs
+            can contain more than one extra arg, so much be passed to VM
+            as a "line", not "value".
         -->
         <property
             name="extraVMargs"
@@ -147,23 +146,21 @@
             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>
+        <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}"/>
-    	
-    	<echo message="redirected output: ${junit-report-output}/${classname}.output.txt" />
-       <echo message="redirected error: ${junit-report-output}/${classname}.error.txt" />
-     
-    	
+        <echo
+            message="redirected output: ${junit-report-output}/${classname}.output.txt"/>
+        <echo
+            message="redirected error: ${junit-report-output}/${classname}.error.txt"/>
         <!--
             If there is not exactly one launcher in the stack, we'd best
             fail fast, since we are not expecting that, and may indicate
@@ -223,17 +220,14 @@
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
                 value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
+            <jvmarg
+                value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
             <arg
                 value="-nosplash"/>
             <arg
-                value="-consolelog"/> 
-              <arg
-                  value="-consolelog"/>         	
+                value="-consolelog"/>
+            <arg
+                value="-debug"/>
             <arg
                 value="-data"/>
             <arg
@@ -261,7 +255,7 @@
         </java>
         <echo
             level="info"
-            message="suitejunitresult: ${v200911192003}"/>
+            message="suitejunitresult: ${suitejunitresult}"/>
         <antcall
             target="summarizeFailure"/>
         <antcall
diff --git a/releng.wtpbuilder/distribution/jaxws.site/build.xml b/releng.wtpbuilder/distribution/jaxws.site/build.xml
index 39fc90e..b226b12 100644
--- a/releng.wtpbuilder/distribution/jaxws.site/build.xml
+++ b/releng.wtpbuilder/distribution/jaxws.site/build.xml
@@ -24,7 +24,7 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
+    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
diff --git a/releng.wtpbuilder/distribution/jaxws.tests/build.xml b/releng.wtpbuilder/distribution/jaxws.tests/build.xml
index 038cd8b..98d6419 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/build.xml
@@ -154,10 +154,7 @@
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
 
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
+       <!--
             set path to eclipse folder. If local folder, use '.';
             otherwise, use c:\path\to\eclipse or /path/to/eclipse/
         -->
@@ -219,6 +216,8 @@
                 value="-nosplash"/>
             <arg
                 value="-consolelog"/>
+              <arg
+                  value="-debug"/>
             <arg
                 value="-data"/>
             <arg
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 bf63962..7bd2ab3 100644
--- a/releng.wtpbuilder/distribution/jaxws.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/jaxws.tests/testScripts/wtp-junit-tests.xml
@@ -22,10 +22,9 @@
             dir="${junit-report-output}/raw"/>
         <!--
             if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
+            string, even if unused string. Remember, though, extraVMArgs
+            can contain more than one extra arg, so much be passed to VM
+            as a "line", not "value".
         -->
         <property
             name="extraVMargs"
@@ -147,23 +146,21 @@
             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>
+        <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}"/>
-    	
-    	<echo message="redirected output: ${junit-report-output}/${classname}.output.txt" />
-       <echo message="redirected error: ${junit-report-output}/${classname}.error.txt" />
-     
-    	
+        <echo
+            message="redirected output: ${junit-report-output}/${classname}.output.txt"/>
+        <echo
+            message="redirected error: ${junit-report-output}/${classname}.error.txt"/>
         <!--
             If there is not exactly one launcher in the stack, we'd best
             fail fast, since we are not expecting that, and may indicate
@@ -223,17 +220,14 @@
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
                 value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
+            <jvmarg
+                value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
             <arg
                 value="-nosplash"/>
             <arg
-                value="-consolelog"/> 
-              <arg
-                  value="-consolelog"/>         	
+                value="-consolelog"/>
+            <arg
+                value="-debug"/>
             <arg
                 value="-data"/>
             <arg
@@ -261,7 +255,7 @@
         </java>
         <echo
             level="info"
-            message="suitejunitresult: ${v200911192003}"/>
+            message="suitejunitresult: ${suitejunitresult}"/>
         <antcall
             target="summarizeFailure"/>
         <antcall
diff --git a/releng.wtpbuilder/distribution/jsdt.site/build.xml b/releng.wtpbuilder/distribution/jsdt.site/build.xml
index 39fc90e..b226b12 100644
--- a/releng.wtpbuilder/distribution/jsdt.site/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.site/build.xml
@@ -24,7 +24,7 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
+    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.xml b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
index 2b85fa7..3df8a70 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
@@ -154,10 +154,7 @@
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
 
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
+       <!--
             set path to eclipse folder. If local folder, use '.';
             otherwise, use c:\path\to\eclipse or /path/to/eclipse/
         -->
@@ -219,6 +216,8 @@
                 value="-nosplash"/>
             <arg
                 value="-consolelog"/>
+              <arg
+                  value="-debug"/>
             <arg
                 value="-data"/>
             <arg
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
index bf63962..7bd2ab3 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
@@ -22,10 +22,9 @@
             dir="${junit-report-output}/raw"/>
         <!--
             if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
+            string, even if unused string. Remember, though, extraVMArgs
+            can contain more than one extra arg, so much be passed to VM
+            as a "line", not "value".
         -->
         <property
             name="extraVMargs"
@@ -147,23 +146,21 @@
             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>
+        <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}"/>
-    	
-    	<echo message="redirected output: ${junit-report-output}/${classname}.output.txt" />
-       <echo message="redirected error: ${junit-report-output}/${classname}.error.txt" />
-     
-    	
+        <echo
+            message="redirected output: ${junit-report-output}/${classname}.output.txt"/>
+        <echo
+            message="redirected error: ${junit-report-output}/${classname}.error.txt"/>
         <!--
             If there is not exactly one launcher in the stack, we'd best
             fail fast, since we are not expecting that, and may indicate
@@ -223,17 +220,14 @@
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
                 value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
+            <jvmarg
+                value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
             <arg
                 value="-nosplash"/>
             <arg
-                value="-consolelog"/> 
-              <arg
-                  value="-consolelog"/>         	
+                value="-consolelog"/>
+            <arg
+                value="-debug"/>
             <arg
                 value="-data"/>
             <arg
@@ -261,7 +255,7 @@
         </java>
         <echo
             level="info"
-            message="suitejunitresult: ${v200911192003}"/>
+            message="suitejunitresult: ${suitejunitresult}"/>
         <antcall
             target="summarizeFailure"/>
         <antcall
diff --git a/releng.wtpbuilder/distribution/pave.site/build.xml b/releng.wtpbuilder/distribution/pave.site/build.xml
index 39fc90e..b226b12 100644
--- a/releng.wtpbuilder/distribution/pave.site/build.xml
+++ b/releng.wtpbuilder/distribution/pave.site/build.xml
@@ -24,7 +24,7 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
+    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
diff --git a/releng.wtpbuilder/distribution/pave.tests/build.xml b/releng.wtpbuilder/distribution/pave.tests/build.xml
index 8805e05..ccab006 100644
--- a/releng.wtpbuilder/distribution/pave.tests/build.xml
+++ b/releng.wtpbuilder/distribution/pave.tests/build.xml
@@ -154,10 +154,7 @@
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
 
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
+       <!--
             set path to eclipse folder. If local folder, use '.';
             otherwise, use c:\path\to\eclipse or /path/to/eclipse/
         -->
@@ -219,6 +216,8 @@
                 value="-nosplash"/>
             <arg
                 value="-consolelog"/>
+              <arg
+                  value="-debug"/>
             <arg
                 value="-data"/>
             <arg
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 bf63962..7bd2ab3 100644
--- a/releng.wtpbuilder/distribution/pave.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/pave.tests/testScripts/wtp-junit-tests.xml
@@ -22,10 +22,9 @@
             dir="${junit-report-output}/raw"/>
         <!--
             if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
+            string, even if unused string. Remember, though, extraVMArgs
+            can contain more than one extra arg, so much be passed to VM
+            as a "line", not "value".
         -->
         <property
             name="extraVMargs"
@@ -147,23 +146,21 @@
             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>
+        <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}"/>
-    	
-    	<echo message="redirected output: ${junit-report-output}/${classname}.output.txt" />
-       <echo message="redirected error: ${junit-report-output}/${classname}.error.txt" />
-     
-    	
+        <echo
+            message="redirected output: ${junit-report-output}/${classname}.output.txt"/>
+        <echo
+            message="redirected error: ${junit-report-output}/${classname}.error.txt"/>
         <!--
             If there is not exactly one launcher in the stack, we'd best
             fail fast, since we are not expecting that, and may indicate
@@ -223,17 +220,14 @@
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
                 value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
+            <jvmarg
+                value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
             <arg
                 value="-nosplash"/>
             <arg
-                value="-consolelog"/> 
-              <arg
-                  value="-consolelog"/>         	
+                value="-consolelog"/>
+            <arg
+                value="-debug"/>
             <arg
                 value="-data"/>
             <arg
@@ -261,7 +255,7 @@
         </java>
         <echo
             level="info"
-            message="suitejunitresult: ${v200911192003}"/>
+            message="suitejunitresult: ${suitejunitresult}"/>
         <antcall
             target="summarizeFailure"/>
         <antcall
diff --git a/releng.wtpbuilder/distribution/servadapt.site/build.xml b/releng.wtpbuilder/distribution/servadapt.site/build.xml
index 39fc90e..b226b12 100644
--- a/releng.wtpbuilder/distribution/servadapt.site/build.xml
+++ b/releng.wtpbuilder/distribution/servadapt.site/build.xml
@@ -24,7 +24,7 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
+    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
diff --git a/releng.wtpbuilder/distribution/servadapt.tests/build.xml b/releng.wtpbuilder/distribution/servadapt.tests/build.xml
index a4cc7f6..f7e3510 100644
--- a/releng.wtpbuilder/distribution/servadapt.tests/build.xml
+++ b/releng.wtpbuilder/distribution/servadapt.tests/build.xml
@@ -154,10 +154,7 @@
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
 
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
+       <!--
             set path to eclipse folder. If local folder, use '.';
             otherwise, use c:\path\to\eclipse or /path/to/eclipse/
         -->
@@ -219,6 +216,8 @@
                 value="-nosplash"/>
             <arg
                 value="-consolelog"/>
+              <arg
+                  value="-debug"/>
             <arg
                 value="-data"/>
             <arg
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 bf63962..7bd2ab3 100644
--- a/releng.wtpbuilder/distribution/servadapt.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/servadapt.tests/testScripts/wtp-junit-tests.xml
@@ -22,10 +22,9 @@
             dir="${junit-report-output}/raw"/>
         <!--
             if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
+            string, even if unused string. Remember, though, extraVMArgs
+            can contain more than one extra arg, so much be passed to VM
+            as a "line", not "value".
         -->
         <property
             name="extraVMargs"
@@ -147,23 +146,21 @@
             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>
+        <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}"/>
-    	
-    	<echo message="redirected output: ${junit-report-output}/${classname}.output.txt" />
-       <echo message="redirected error: ${junit-report-output}/${classname}.error.txt" />
-     
-    	
+        <echo
+            message="redirected output: ${junit-report-output}/${classname}.output.txt"/>
+        <echo
+            message="redirected error: ${junit-report-output}/${classname}.error.txt"/>
         <!--
             If there is not exactly one launcher in the stack, we'd best
             fail fast, since we are not expecting that, and may indicate
@@ -223,17 +220,14 @@
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
                 value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
+            <jvmarg
+                value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
             <arg
                 value="-nosplash"/>
             <arg
-                value="-consolelog"/> 
-              <arg
-                  value="-consolelog"/>         	
+                value="-consolelog"/>
+            <arg
+                value="-debug"/>
             <arg
                 value="-data"/>
             <arg
@@ -261,7 +255,7 @@
         </java>
         <echo
             level="info"
-            message="suitejunitresult: ${v200911192003}"/>
+            message="suitejunitresult: ${suitejunitresult}"/>
         <antcall
             target="summarizeFailure"/>
         <antcall
diff --git a/releng.wtpbuilder/distribution/vex.site/build.xml b/releng.wtpbuilder/distribution/vex.site/build.xml
index 39fc90e..b226b12 100644
--- a/releng.wtpbuilder/distribution/vex.site/build.xml
+++ b/releng.wtpbuilder/distribution/vex.site/build.xml
@@ -24,7 +24,7 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
+    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
diff --git a/releng.wtpbuilder/distribution/vex.tests/build.xml b/releng.wtpbuilder/distribution/vex.tests/build.xml
index b606f8b..7598b45 100644
--- a/releng.wtpbuilder/distribution/vex.tests/build.xml
+++ b/releng.wtpbuilder/distribution/vex.tests/build.xml
@@ -154,10 +154,7 @@
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
 
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
+       <!--
             set path to eclipse folder. If local folder, use '.';
             otherwise, use c:\path\to\eclipse or /path/to/eclipse/
         -->
@@ -219,6 +216,8 @@
                 value="-nosplash"/>
             <arg
                 value="-consolelog"/>
+              <arg
+                  value="-debug"/>
             <arg
                 value="-data"/>
             <arg
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 bf63962..7bd2ab3 100644
--- a/releng.wtpbuilder/distribution/vex.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/vex.tests/testScripts/wtp-junit-tests.xml
@@ -22,10 +22,9 @@
             dir="${junit-report-output}/raw"/>
         <!--
             if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
+            string, even if unused string. Remember, though, extraVMArgs
+            can contain more than one extra arg, so much be passed to VM
+            as a "line", not "value".
         -->
         <property
             name="extraVMargs"
@@ -147,23 +146,21 @@
             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>
+        <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}"/>
-    	
-    	<echo message="redirected output: ${junit-report-output}/${classname}.output.txt" />
-       <echo message="redirected error: ${junit-report-output}/${classname}.error.txt" />
-     
-    	
+        <echo
+            message="redirected output: ${junit-report-output}/${classname}.output.txt"/>
+        <echo
+            message="redirected error: ${junit-report-output}/${classname}.error.txt"/>
         <!--
             If there is not exactly one launcher in the stack, we'd best
             fail fast, since we are not expecting that, and may indicate
@@ -223,17 +220,14 @@
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
                 value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
+            <jvmarg
+                value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
             <arg
                 value="-nosplash"/>
             <arg
-                value="-consolelog"/> 
-              <arg
-                  value="-consolelog"/>         	
+                value="-consolelog"/>
+            <arg
+                value="-debug"/>
             <arg
                 value="-data"/>
             <arg
@@ -261,7 +255,7 @@
         </java>
         <echo
             level="info"
-            message="suitejunitresult: ${v200911192003}"/>
+            message="suitejunitresult: ${suitejunitresult}"/>
         <antcall
             target="summarizeFailure"/>
         <antcall
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index ba7ad2b..79ded3d 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -188,10 +188,7 @@
         <property
             name="plugin-path"
             value="${testRoot}${dropinsFolder}/eclipse/plugins"/>
-        <property
-            name="vmargs"
-            value="-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/
         -->
diff --git a/releng.wtpbuilder/distribution/xml.site/build.xml b/releng.wtpbuilder/distribution/xml.site/build.xml
index 39fc90e..b226b12 100644
--- a/releng.wtpbuilder/distribution/xml.site/build.xml
+++ b/releng.wtpbuilder/distribution/xml.site/build.xml
@@ -24,7 +24,7 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
+    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
diff --git a/releng.wtpbuilder/distribution/xml.tests/build.xml b/releng.wtpbuilder/distribution/xml.tests/build.xml
index bd2ef55..f96d7f8 100644
--- a/releng.wtpbuilder/distribution/xml.tests/build.xml
+++ b/releng.wtpbuilder/distribution/xml.tests/build.xml
@@ -154,10 +154,7 @@
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
 
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
+       <!--
             set path to eclipse folder. If local folder, use '.';
             otherwise, use c:\path\to\eclipse or /path/to/eclipse/
         -->
@@ -219,6 +216,8 @@
                 value="-nosplash"/>
             <arg
                 value="-consolelog"/>
+              <arg
+                  value="-debug"/>
             <arg
                 value="-data"/>
             <arg
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 bf63962..7bd2ab3 100644
--- a/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/xml.tests/testScripts/wtp-junit-tests.xml
@@ -22,10 +22,9 @@
             dir="${junit-report-output}/raw"/>
         <!--
             if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
+            string, even if unused string. Remember, though, extraVMArgs
+            can contain more than one extra arg, so much be passed to VM
+            as a "line", not "value".
         -->
         <property
             name="extraVMargs"
@@ -147,23 +146,21 @@
             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>
+        <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}"/>
-    	
-    	<echo message="redirected output: ${junit-report-output}/${classname}.output.txt" />
-       <echo message="redirected error: ${junit-report-output}/${classname}.error.txt" />
-     
-    	
+        <echo
+            message="redirected output: ${junit-report-output}/${classname}.output.txt"/>
+        <echo
+            message="redirected error: ${junit-report-output}/${classname}.error.txt"/>
         <!--
             If there is not exactly one launcher in the stack, we'd best
             fail fast, since we are not expecting that, and may indicate
@@ -223,17 +220,14 @@
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
                 value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
+            <jvmarg
+                value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
             <arg
                 value="-nosplash"/>
             <arg
-                value="-consolelog"/> 
-              <arg
-                  value="-consolelog"/>         	
+                value="-consolelog"/>
+            <arg
+                value="-debug"/>
             <arg
                 value="-data"/>
             <arg
@@ -261,7 +255,7 @@
         </java>
         <echo
             level="info"
-            message="suitejunitresult: ${v200911192003}"/>
+            message="suitejunitresult: ${suitejunitresult}"/>
         <antcall
             target="summarizeFailure"/>
         <antcall
diff --git a/releng.wtpbuilder/distribution/xmlsec.site/build.xml b/releng.wtpbuilder/distribution/xmlsec.site/build.xml
index 39fc90e..b226b12 100644
--- a/releng.wtpbuilder/distribution/xmlsec.site/build.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.site/build.xml
@@ -24,7 +24,7 @@
         message="ant.file: ${ant.file}"/>
     <target
         name="build">
-    	<mkdir dir="${buildDirectory}/${buildLabel} "/>
+    	<mkdir dir="${buildDirectory}/${buildLabel}"/>
         <java
             jar="${eclipse.launcher}"
             fork="true"
diff --git a/releng.wtpbuilder/distribution/xmlsec.tests/build.xml b/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
index fe78906..41eaea7 100644
--- a/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.tests/build.xml
@@ -154,10 +154,7 @@
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
 
-        <property
-            name="vmargs"
-            value="-Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm}  -Dperf.buildId=${buildType}${date}-${time}"/>
-        <!--
+       <!--
             set path to eclipse folder. If local folder, use '.';
             otherwise, use c:\path\to\eclipse or /path/to/eclipse/
         -->
@@ -219,6 +216,8 @@
                 value="-nosplash"/>
             <arg
                 value="-consolelog"/>
+              <arg
+                  value="-debug"/>
             <arg
                 value="-data"/>
             <arg
diff --git a/releng.wtpbuilder/distribution/xmlsec.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/xmlsec.tests/testScripts/wtp-junit-tests.xml
index bf63962..7bd2ab3 100644
--- a/releng.wtpbuilder/distribution/xmlsec.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/xmlsec.tests/testScripts/wtp-junit-tests.xml
@@ -22,10 +22,9 @@
             dir="${junit-report-output}/raw"/>
         <!--
             if not otherwise set, be sure extraVMargs is at least some
-            string, even if unused string. 
-            
-            Remember, though, extraVMArgs can contain more than one extra arg, 
-            so much be passed to VM as a "line", not "value". 
+            string, even if unused string. Remember, though, extraVMArgs
+            can contain more than one extra arg, so much be passed to VM
+            as a "line", not "value".
         -->
         <property
             name="extraVMargs"
@@ -147,23 +146,21 @@
             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>
+        <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}"/>
-    	
-    	<echo message="redirected output: ${junit-report-output}/${classname}.output.txt" />
-       <echo message="redirected error: ${junit-report-output}/${classname}.error.txt" />
-     
-    	
+        <echo
+            message="redirected output: ${junit-report-output}/${classname}.output.txt"/>
+        <echo
+            message="redirected error: ${junit-report-output}/${classname}.error.txt"/>
         <!--
             If there is not exactly one launcher in the stack, we'd best
             fail fast, since we are not expecting that, and may indicate
@@ -223,17 +220,14 @@
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
             <jvmarg
                 value="-Dprojectname=${projectname}"/>
-        	
-              <jvmarg
-                  value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/> 	
-        	
-        	
+            <jvmarg
+                value="-D${xulRunnerParam}=${env.WTP_XULRUNNER}"/>
             <arg
                 value="-nosplash"/>
             <arg
-                value="-consolelog"/> 
-              <arg
-                  value="-consolelog"/>         	
+                value="-consolelog"/>
+            <arg
+                value="-debug"/>
             <arg
                 value="-data"/>
             <arg
@@ -261,7 +255,7 @@
         </java>
         <echo
             level="info"
-            message="suitejunitresult: ${v200911192003}"/>
+            message="suitejunitresult: ${suitejunitresult}"/>
         <antcall
             target="summarizeFailure"/>
         <antcall