add explicit xulrunner
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL
index 0810ae5..9cdd80e 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/JUNIT.XSL
@@ -293,7 +293,8 @@
                         name="href">javascript:displayProperties('<xsl:value-of
                         select="@package"/>.<xsl:value-of
                         select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt; </a>
+                    Properties &gt;&gt;
+                </a>
             </div>
             <p/>
             <a
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testScripts/wtp-junit-tests.xml
index e1a59f5..16c4133 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
@@ -152,9 +152,10 @@
            <isset
                property="env.WTP_XULRUNNER"/>
        </condition>
-       <echo message="xulRunnerParam: ${xulRunnerParam}"  />
-       <echo message="WTP_XULRUNNER: ${env.WTP_XULRUNNER}"  />
-    	
+        <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
diff --git a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
index af2e00d..80c5293 100644
--- a/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
+++ b/releng.wtpbuilder/buildtemplates/distribution/template.tests/testdependency.xml
@@ -17,6 +17,15 @@
     <echo
         level="debug"
         message="keyCfgFile: ${keyCfgFile}"/>
+    <fail
+        message="Required property file does not exist: ${keyCfgFile}">
+        <condition>
+            <not>
+                <available
+                    file="${keyCfgFile}"/>
+            </not>
+        </condition>
+    </fail>
     <property
         file="${keyCfgFile}"/>
     <condition
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.xml b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
index 2b85fa7..2dbd0cd 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
@@ -22,9 +22,7 @@
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
-
-
-    <!-- 
+    <!--
         typcially already set, but in case of standalone tests, may not
         be
     -->
@@ -153,7 +151,6 @@
         <property
             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}"/>
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/JUNIT.XSL b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/JUNIT.XSL
index 0810ae5..9cdd80e 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/JUNIT.XSL
+++ b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/JUNIT.XSL
@@ -293,7 +293,8 @@
                         name="href">javascript:displayProperties('<xsl:value-of
                         select="@package"/>.<xsl:value-of
                         select="@name"/>');</xsl:attribute>
-                    Properties &gt;&gt; </a>
+                    Properties &gt;&gt;
+                </a>
             </div>
             <p/>
             <a
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
index e1a59f5..4475c54 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/testScripts/wtp-junit-tests.xml
@@ -144,17 +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}"  />
-    	
+        <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
@@ -214,11 +214,8 @@
                 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
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml b/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml
index b749e60..daf65f4 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/testdependency.xml
@@ -17,6 +17,15 @@
     <echo
         level="debug"
         message="keyCfgFile: ${keyCfgFile}"/>
+    <fail
+        message="Required property file does not exist: ${keyCfgFile}">
+        <condition>
+            <not>
+                <available
+                    file="${keyCfgFile}"/>
+            </not>
+        </condition>
+    </fail>
     <property
         file="${keyCfgFile}"/>
     <condition
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
index 2c8bb40..0881d2b 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/wtp-junit-tests.xml
@@ -16,15 +16,6 @@
         file="${keyCfgFile}"/>
     <target
         name="init">
-        <!--
-            Parameters: (Mandatory) data-dir - the workspace directory
-            for Eclipse to write its data plugin-name - 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"/>
@@ -46,10 +37,6 @@
             name="testRoot"
             value="${testRoot}"/>
         <!--
-            temporarily changed from 30 minutes to 1 hrs to help spot
-            problematic tests
-        -->
-        <!--
             Some common values, of milliseconds to more recognizable
             units: 14400000: 4 hours 7200000: 2 hours 3600000: 1 hour
             1800000: 30 minutes 600000: 10 minutes
@@ -82,7 +69,7 @@
             level="debug"
             message="classname: ${classname}"/>
         <echo
-            level="debug"
+            level="info"
             message="extraVMargs: ${extraVMargs}"/>
         <echo
             level="debug"
@@ -158,6 +145,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
@@ -217,6 +215,8 @@
                 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/distribution/wtp.tests/testdependency.xml b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
index 060b9b5..98b565a 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
@@ -30,6 +30,13 @@
         file="${keyCfgFile}"/>
     <target
         name="get">
+        <!--
+            read in this properties, just so we can make sure our
+            requested pre-reqs are defined, which we do later with
+            statements such if="${groupId}.url"
+        -->
+        <property
+            file="${dependency.properties}"/>
         <antcall
             target="getAndInstallDropins">
             <param
@@ -116,7 +123,8 @@
         </antcall>
     </target>
     <target
-        name="getAndInstallBase">
+        name="getAndInstallBase"
+        if="${groupId}.url">
         <ant
             antfile="${dependencyTargets}"
             target="checkDependency">
@@ -136,7 +144,8 @@
         </ant>
     </target>
     <target
-        name="getAndInstallDropins">
+        name="getAndInstallDropins"
+        if="${groupId}.url">
         <ant
             antfile="${dependencyTargets}"
             target="checkDependency">