Attempt to make the Dali tests fetch from a build located locally.
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index 0c28a00..48eb162 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -12,8 +12,8 @@
         environment="env"/>
     <fail
         message="testRoot must be set for this task"
-        unless="testRoot"/>
-  <!-- required to get proper value of dropinsFolder -->
+        unless="testRoot" />
+  <!-- required to get proper value of dropinsFolder --> 
     <property
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
@@ -95,7 +95,7 @@
             target="get">
             <property
                 name="dependency.properties"
-                value="${buildDirectory}/maps/${env.RELENGDALI}/maps/dependencies.properties" />
+                value="${buildDirectory}/${env.RELENGDALI}/maps/dependencies.properties"/>
             <property
                 name="base.install.dir"
                 value="${testRoot}"/>
@@ -116,7 +116,8 @@
             can continue on error, if desired. (such as if zip was not
             created, due to other failures or options).
         -->
-        <echo message="installing dali sdk" />
+        <echo 
+        	message="installing dali sdk" />
         <exec
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
@@ -238,7 +239,7 @@
                 value="-Dprojectname=${projectname}"/>
             <jvmarg
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-        	  <arg
+            <arg
                 value="-nosplash"/>
             <arg
                 value="-consolelog"/>
@@ -258,7 +259,7 @@
                 value="-logger"/>
             <arg
                 value="org.apache.tools.ant.DefaultLogger"/>
-        	<arg 
+            <arg
                 value="-file"/>
             <arg
                 value="${testRoot}/test.xml"/>
diff --git a/releng.wtpbuilder/distribution/dali.tests/runDaliTests.bat b/releng.wtpbuilder/distribution/dali.tests/runDaliTests.bat
new file mode 100644
index 0000000..619c180
--- /dev/null
+++ b/releng.wtpbuilder/distribution/dali.tests/runDaliTests.bat
@@ -0,0 +1,74 @@
+REM Example script to run standalone Dali tests for a given local build
+REM
+@echo off
+SETLOCAL
+
+REM These "home" directories must be accurate for your machine.
+set BUILD_HOME=T:\work\runDaliTests
+set ANT_HOME=C:\bin\ant-1.7.0
+set JAVA_HOME=J:\jdk1.6.0_13
+set JAVA_6_HOME=J:\jdk1.6.0_13
+
+REM standard for windows. Linux or other platforms would need to change these.
+set BASEOS=win32
+set BASEWS=win32
+set BASEARCH=x86
+
+REM These 'set' commands should rarely, if ever have to be changed
+REM Some are not actually used, but values are provided
+REM to prevent spurious "warnings" in logs.
+REM In other cases, the directory must exist before this script runs.
+set PATH=%ANT_HOME%\bin;%JAVA_HOME%\bin;%PATH%
+set BASE_BUILDERS=%BUILD_HOME%\basebuilders
+set LOCAL_PREREQS_CACHE=%BUILD_HOME%\prereqcache
+set RELENG=webtools.maps/releng
+set RELENG_BUILDER=webtools.releng/releng.wtpbuilder
+set DISPLAY=localhost:0
+set BASE_BUILDERS=%BUILD_HOME%/basebuilders
+set PROJECT_BUILDERS=%BUILD_HOME%/projectBuilders
+set PROJECT_PROJECTS=%BUILD_HOME%/projects
+set PROJECT_TESTS=%BUILD_HOME%/project-tests
+set RECOMMENDED_TMP_DIR=%BUILD_HOME%/temp
+
+REM Distribution specific properties
+set DISTRIBUTION_NAME=dali
+set PROJECT_NAME=Dali-Build
+set RELENGDALI=webtools.maps/releng.dali
+
+REM the following comments apply to the -D variables provided to the ant command
+REM projectname: what ever the project would is called in cruisecontrol (even though CC isn't used here)
+REM build.distribution: the name of the distribution as it appears in releng.wtpbuilder
+REM build.committers: should be true if you want to download and reproduce a build from 'committers' area.
+REM                   If working from a build on 'downloads' area, omit the variable (do not just set to false).
+REM DbuildDirectory: location of the local build to test.
+REM DtestRoot: location where the tests will be installed and run.
+REM DkeyCfgFile: path of the releng build.cfg file.
+REM Dwtp.builder.home: location of the releng.wtpbuilder.
+REM buildType:        I, S, or R
+REM buildId:          Basically the "middle" part of a download zip or build name, such as the 3.2I in wtp-sdk-I-3.2I-20090722042933.zip
+REM timestamp         Basically the "end" part of a download zip or build name, such as 20090722042933 in wtp-sdk-I-3.2I-20090722042933.zip
+REM build.stream      (not sure if needed)
+REM buildBranch       Build branch used in various scripts ... usually the "middle" part of projectname, such as R3.2 in wtp-R3.2-I
+REM testTarget        The specific test suite(s) to run. These target names are from the test.xml file. Omit or use 'all' to run all tests.
+REM -f antfile        The name or path should not have to be changed, but the "releng.wtpbuilder" project must already be checked out from CVS
+REM                   (or exported from Eclipse) into a directory named 'webtools.releng' which is immediately under the BUILD_HOME directory.
+REM                   It is assume this batch file, then, is in the BUILD_HOME directory.
+REM Note: the buildDirectory should have at least two folders, one named 'webtools.maps' which contains all the maps, 
+REM and another folder which contains the result of a build and which is named ${buildType}-${buildId}-${timestamp}.
+
+ant  -Dprojectname=%PROJECT_NAME% ^
+     -Dbuild.distribution=%DISTRIBUTION_NAME%   ^
+     -Dbuild.committers=true   ^
+     -DbuildDirectory=%PROJECT_BUILDERS%/%PROJECT_NAME% ^
+     -DtestRoot=%PROJECT_TESTS% ^
+     -DkeyCfgFile=%PROJECT_BUILDERS%/%PROJECT_NAME%/%RELENG%/maps/build.cfg ^
+     -Dwtp.builder.home=%BUILD_HOME%/%RELENG_BUILDER% ^
+     -DbuildType=I ^
+     -DbuildId=I200907231609 ^
+     -Dtimestamp=200907231609 ^
+     -Dbuild.stream=R3.2 ^
+     -DbuildBranch=R3.2 ^
+     -DtestTarget=dali-core-tests ^
+     -f webtools.releng\releng.wtpbuilder\build.xml test
+
+ENDLOCAL
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml
index 969bb28..ff81fb3 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/dali-junit-tests.xml
@@ -65,7 +65,7 @@
             value="${junit-report-output}"/>
         <property
             name="plugin-path"
-            value="${testRoot}${dropinsFolder}/eclipse/plugins${testPlugin}"/>
+            value="${testRoot}${dropinsFolder}/eclipse/plugins/${testPlugin}"/>
         <property
             name="formatter"
             value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
@@ -166,7 +166,6 @@
         <echo
             level="debug"
             message="DISPLAY: ${env.DISPLAY}"/>
-
         <!--
             If there is not exactly one launcher in the stack, we'd best
             fail fast, since we are not expecting that, and may indicate
@@ -255,7 +254,6 @@
                 output="${junit-report-output}/${classname}.output.txt"
                 error="${junit-report-output}/${classname}.error.txt"/>
         </java>
-    	
         <echo
             level="info"
             message="suitejunitresult: ${suitejunitresult}"/>
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
index cf08dfe..e11b8cb 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
@@ -4,10 +4,16 @@
     basedir=".">
     <property
         environment="env"/>
-  <!-- required to get proper value of dropinsFolder -->
+    <!-- required to get proper value of dropinsFolder -->
     <property
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
+    <available 
+    	file="${keyCfgFile}" 
+    	property="keyCfgFile.exists"/>
+    <fail 
+    	message="${keyCfgFile} Not Found" 
+    	unless="keyCfgFile.exists"/>
     <echo
         level="debug"
         message="keyCfgFile: ${keyCfgFile}"/>
@@ -58,19 +64,35 @@
         name="results"
         value="${testRoot}/results"/>
 
+    <!-- jonas install directory -->
+    <property
+        name="jonas432Dir"
+        value="${testRoot}/${jonas432DirName}"/>
     <target
         name="init">
         <antcall
+            target="setPropertyJOnAS432Dir"/>
+        <antcall
             target="computePluginVersion"/>
         <property
             file="${testRoot}/test2.properties"/>
     </target>
     <target
+        name="setPropertyJOnAS432Dir"
+        unless="jonas432Dir">
+        <property
+            name="jonas432Dir"
+            value="${testRoot}/${jonas432DirName}"/>
+    </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"/>
+        <fail
+            message="${eclipse-home}/plugins/${testPlugin}/test.xml Not Found"
+            unless="test.xml.exists"/>
         <antcall
             target="runtests2"/>
     </target>
@@ -102,6 +124,693 @@
         <antcall
             target="genHtml"/>
     </target>
+    <target
+        name="wst-server-tests"
+        depends="init"
+        description="Runs the org.eclipse.wst.server.*.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.server.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.server.core.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.server.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.server.ui.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="wst-monitor-tests"
+        depends="init"
+        description="Runs the org.eclipse.wst.internet.monitor.*.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.internet.monitor.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.internet.monitor.core.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.internet.monitor.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.internet.monitor.ui.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="wst-cache-tests"
+        depends="init"
+        description="Runs the org.eclipse.wst.internet.cache.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.internet.cache.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.internet.cache.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="jst-server-tests"
+        depends="init"
+        description="Runs the org.eclipse.jst.server.*.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.server.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.server.core.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.server.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.server.ui.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="jst-server-tomcat-tests"
+        depends="init"
+        description="Runs the org.eclipse.jst.server.tomcat.*.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.server.tomcat.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.server.tomcat.core.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.server.tomcat.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.server.tomcat.ui.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="jst-server-generic-tests"
+        depends="init"
+        description="Runs the org.eclipse.jst.server.generic.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.server.generic.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.server.generic.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="jst-server-geronimo-tests"
+        depends="init"
+        description="Runs the org.eclipse.jst.server.geronimo.*.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.server.geronimo.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.server.geronimo.core.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.server.geronimo.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.server.geronimo.ui.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="jst-jem-tests"
+        depends="init"
+        description="Runs the org.eclipse.jem.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jem.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jem.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="jst-j2ee-core-tests"
+        depends="init"
+        description="Runs the org.eclipse.jst.j2ee.core.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.j2ee.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.j2ee.core.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="jst-j2ee-tests"
+        depends="init"
+        description="Runs the org.eclipse.jst.j2ee.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.j2ee.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.j2ee.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="wst-common-tests"
+        depends="init"
+        description="Runs the org.eclipse.jst.j2ee.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.common.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.common.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="validation-framework-tests"
+        depends="init"
+        description="Runs the common validation tests">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.common.tests.validation}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.common.tests.validation"/>
+        </antcall>
+    </target>
+    <target
+        name="wst-common-snippets-tests"
+        depends="init">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.common.snippets.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.common.snippets.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="jst-servlet-tests"
+        depends="init"
+        description="Runs the org.eclipse.jst.servlet.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.servlet.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.servlet.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="jst-validation-framework-tests"
+        depends="init"
+        description="Runs the org.eclipse.jst.validation.test test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.validation.test}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.validation.test"/>
+        </antcall>
+    </target>
+
+    <!-- JSP TESTS -->
+    <target
+        name="jst-jsp-tests"
+        depends="init"
+        description="Runs test.xml for JSP tests">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.jsp.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.jsp.core.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.jsp.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.jsp.ui.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.jsp.tests.encoding}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.jsp.tests.encoding"/>
+        </antcall>
+    </target>
+
+    <!-- SSE TESTS -->
+    <target
+        name="wst-sse-tests"
+        depends="init"
+        description="Runs test.xml for SSE tests">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.sse.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.sse.core.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.sse.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.sse.ui.tests"/>
+        </antcall>
+    </target>
+
+    <!-- XML TESTS -->
+    <target
+        name="wst-xml-tests"
+        depends="init"
+        description="Runs test.xml for XML tests">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.xml.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.xml.core.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.xml.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.xml.ui.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.xml.tests.encoding}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.xml.tests.encoding"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.xml.validation.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.xml.validation.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.xml.catalog.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.xml.catalog.tests"/>
+        </antcall>
+    </target>
+
+    <!-- WSDL TESTS -->
+    <target
+        name="wst-wsdl-tests"
+        depends="init"
+        description="Runs test.xml for WSDL ">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.wsdl.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.wsdl.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.wsdl.validation.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.wsdl.validation.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.wsdl.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.wsdl.ui.tests"/>
+        </antcall>
+    </target>
+
+    <!-- WSI TESTS -->
+    <target
+        name="wst-wsi-tests"
+        depends="init"
+        description="Runs test.xml for WSI tests">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.wsi.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.wsi.tests"/>
+        </antcall>
+    </target>
+
+    <!-- XSD TESTS -->
+    <target
+        name="wst-xsd-tests"
+        depends="init"
+        description="Runs test.xml for XSD tests ">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.xsd.validation.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.xsd.validation.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.xsd.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.xsd.core.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.xsd.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.xsd.ui.tests"/>
+        </antcall>
+    </target>
+
+    <!-- HTML TESTS -->
+    <target
+        name="wst-html-tests"
+        depends="init"
+        description="Runs test.xml for HTML tests">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.html.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.html.core.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.html.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.html.ui.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.html.tests.encoding}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.html.tests.encoding"/>
+        </antcall>
+    </target>
+
+    <!-- DTD Tests -->
+    <target
+        name="wst-dtd-tests"
+        depends="init">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.dtd.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.dtd.ui.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.dtd.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.dtd.core.tests"/>
+        </antcall>
+    </target>
+
+    <!-- CSS TESTS -->
+    <target
+        name="wst-css-tests"
+        depends="init"
+        description="Runs test.xml for
+                                                                                                org.eclipse.wst.css.core.tests
+                                                                                                org.eclipse.wst.css.ui.tests
+                                                                                                org.eclipse.wst.css.tests.encoding">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.css.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.css.core.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.css.tests.encoding}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.css.tests.encoding"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.css.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.css.ui.tests"/>
+        </antcall>
+    </target>
+
+    <!-- JSF TESTS -->
+    <target
+        name="jsf-tests"
+        depends="init"
+        description="Runs test.xml for org.eclipse.jst.jsf.core.tests, org.eclipse.jst.jsf.ui.tests">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.jsf.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.jsf.core.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.jsf.ui.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.jsf.ui.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.jsf.metadata.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.jsf.metadata.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.jsf.contentassist.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.jsf.contentassist.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.jsf.context.symbol.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.jsf.context.symbol.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.jsf.designtime.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.jsf.designtime.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.jsf.facesconfig.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.jsf.facesconfig.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.jsf.facesconfig.ui.test}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.jsf.facesconfig.ui.test"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.jsf.validation.el.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.jsf.validation.el.tests"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.pagedesigner.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.pagedesigner.tests"/>
+        </antcall>
+    </target>
+
+    <!-- WS TESTS -->
+    <target
+        name="wst-ws-tests"
+        depends="init"
+        description="Runs the org.eclipse.wst.ws.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.ws.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.ws.tests"/>
+        </antcall>
+    </target>
+    <target
+        name="jst-ws-tests"
+        depends="init"
+        description="Runs the org.eclipse.jst.ws.tests test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.jst.ws.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.jst.ws.tests"/>
+        </antcall>
+    </target>
+
+    <!-- Faceted Project Framework Tests -->
+    <target
+        name="wst-facets-tests"
+        depends="init"
+        description="Runs the Faceted Project Framework tests.">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.common.project.facet.core.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.common.project.facet.core.tests"/>
+        </antcall>
+    </target>
 
     <!-- Dali tests -->
     <target
@@ -118,9 +827,8 @@
                 value="org.eclipse.jpt.utility.tests"/>
         </antcall>
     </target>
-
     <target
-        name="jpt-core-tests"
+        name="dali-core-tests"
         depends="init"
         description="Runs the org.eclipse.jpt.core.tests test.xml">
         <antcall
@@ -133,7 +841,6 @@
                 value="org.eclipse.jpt.core.tests"/>
         </antcall>
     </target>
-	
     <target
         name="jpt-eclipselink-core-tests"
         depends="init"
@@ -149,11 +856,202 @@
         </antcall>
     </target>
 
+    <!-- JSDT tests -->
+    <target
+        name="jsdt-tests"
+        depends="init"
+        description="Runs the org.eclipse.wst.jsdt.core.test.* test.xml">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.jsdt.core.tests.compiler}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.jsdt.core.tests.compiler"/>
+        </antcall>
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.jsdt.core.tests.model}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.jsdt.core.tests.model"/>
+        </antcall>
+    </target>
+    <target
+        name="xsl-tests"
+        depends="init">
+        <antcall
+            target="runtests">
+            <param
+                name="testPlugin"
+                value="${org.eclipse.wst.xsl.tests}"/>
+            <param
+                name="report"
+                value="org.eclipse.wst.xsl.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 WTP Unit Tests"/>
+        <echo
+            level="info"
+            message="Starting releng tests"/>
+        <antcall
+            target="releng-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-server-tests"/>
+        <antcall
+            target="wst-server-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-monitor-tests"/>
+        <antcall
+            target="wst-monitor-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-cache-tests"/>
+        <antcall
+            target="wst-cache-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-common-tests"/>
+        <antcall
+            target="wst-common-tests"/>
+        <echo
+            level="info"
+            message="Starting validation-framework-tests"/>
+        <antcall
+            target="validation-framework-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-common-snippets-tests"/>
+        <antcall
+            target="wst-common-snippets-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-sse-tests"/>
+        <antcall
+            target="wst-sse-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-xml-tests"/>
+        <antcall
+            target="wst-xml-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-wsdl-tests"/>
+        <antcall
+            target="wst-wsdl-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-wsi-tests"/>
+        <antcall
+            target="wst-wsi-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-xsd-tests"/>
+        <antcall
+            target="wst-xsd-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-html-tests"/>
+        <antcall
+            target="wst-html-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-dtd-tests"/>
+        <antcall
+            target="wst-dtd-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-css-tests"/>
+        <antcall
+            target="wst-css-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-ws-tests"/>
+        <antcall
+            target="wst-ws-tests"/>
+        <echo
+            level="info"
+            message="Starting jst-server-tests"/>
+        <antcall
+            target="jst-server-tests"/>
+        <echo
+            level="info"
+            message="Starting jst-server-tomcat-tests"/>
+        <antcall
+            target="jst-server-tomcat-tests"/>
+        <echo
+            level="info"
+            message="Starting jst-server-geronimo-tests"/>
+        <antcall
+            target="jst-server-geronimo-tests"/>
+        <echo
+            level="info"
+            message="Starting jst-server-generic-tests"/>
+        <antcall
+            target="jst-server-generic-tests"/>
+        <echo
+            level="info"
+            message="Starting jst-jem-tests"/>
+        <antcall
+            target="jst-jem-tests"/>
+        <echo
+            level="info"
+            message="Starting jst-j2ee-core-tests"/>
+        <antcall
+            target="jst-j2ee-core-tests"/>
+        <echo
+            level="info"
+            message="Starting jst-j2ee-tests"/>
+        <antcall
+            target="jst-j2ee-tests"/>
+        <echo
+            level="info"
+            message="Starting jst-validation-framework-tests"/>
+        <antcall
+            target="jst-validation-framework-tests"/>
+        <echo
+            level="info"
+            message="Starting jst-jsp-tests"/>
+        <antcall
+            target="jst-jsp-tests"/>
+        <echo
+            level="info"
+            message="Starting jst-ws-tests"/>
+        <antcall
+            target="jst-ws-tests"/>
+        <echo
+            level="info"
+            message="Starting wst-facets-tests"/>
+        <antcall
+            target="wst-facets-tests"/>
+        <echo
+            level="info"
             message="Starting JPT Unit Tests"/>
         <echo
             level="info"
@@ -162,9 +1060,9 @@
             target="jpt-utility-tests"/>
         <echo
             level="info"
-            message="Starting jpt-core-tests"/>
+            message="Starting dali-core-tests"/>
         <antcall
-            target="jpt-core-tests"/>
+            target="dali-core-tests"/>
         <echo
             level="info"
             message="Starting jpt-eclipselink-core-tests"/>
@@ -173,6 +1071,21 @@
         <echo
             level="info"
             message="Ended JPT Unit Tests"/>
+        <echo
+            level="info"
+            message="Starting JSF Tests"/>
+        <antcall
+            target="jsf-tests"/>
+        <echo
+            level="info"
+            message="Starting JSDT Tests"/>
+        <antcall
+            target="jsdt-tests"/>
+        <echo
+            level="info"
+            message="Starting XSL Tests"/>
+        <antcall
+            target="xsl-tests"/>
     </target>
     <target
         name="genHtml"
diff --git a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
index dae2e48..8a57fbf 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
@@ -12,22 +12,25 @@
     default="get">
   <property
       environment="env" />
-<!-- required to get proper value of dropinsFolder -->      
+<!-- required to get proper value of dropinsFolder -->
     <property
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
-<echo 
+	<echo 
         level="info"
-	message="keyCfgFile: ${keyCfgFile}" />
-    <fail
-        message="Required property file does not exist: ${keyCfgFile}">
-        <condition>
-            <not>
-                <available
-                    file="${keyCfgFile}"/>
-            </not>
-        </condition>
-    </fail>
+		message="keyCfgFile: ${keyCfgFile}"/>
+    <available 
+    	file="${keyCfgFile}" 
+    	property="keyCfgFile.exists"/>
+    <fail 
+    	message="${keyCfgFile} Not Found" 
+    	unless="keyCfgFile.exists"/>
+	<available 
+		file="${dependency.properties}" 
+		property="dependency.properties.exists"/>
+    <fail 
+    	message="${dependency.properties} Not Found" 
+    	unless="dependency.properties.exists"/>
     <property
         file="${keyCfgFile}"/>
     <target
@@ -138,8 +141,5 @@
         </ant>
     </target>
 
-
-
-
 </project>