[131224] Update Dali distribution to WTP build infrastructure on behalf of Oracle tran.le@oracle.com
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index d3a4f47..0f179a8 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -1,8 +1,6 @@
<project name="Build specific targets and properties" default="test">
<property name="postingDirectory" value="${buildDirectory}" />
-
-
<!-- ===================================================================== -->
<!-- Steps to do after the build is done. -->
<!-- ===================================================================== -->
@@ -17,8 +15,8 @@
<dirname file="${ant.file}" property="test.component.dir" />
<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
- <property file="${buildDirectory}/label.properties" />
<property file="${wtp.builder.home}/build.properties" />
+ <property file="${buildDirectory}/label.properties" />
<mkdir dir="${testRoot}" />
<mkdir dir="${testRoot}/results" />
@@ -31,12 +29,11 @@
<echo message="${baseos} ${basews} ${basearch} " />
<ant antfile="${test.component.dir}/testdependency.xml" target="get">
- <property name="dependency.properties" value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
+ <property name="dependency.properties" value="${buildDirectory}/maps/releng.dali/maps/dependencies.properties" />
<property name="base.install.dir" value="${testRoot}" />
</ant>
- <unzip dest="${testRoot}" src="${postingDirectory}/${buildLabel}/wtp-${buildLabel}.zip" overwrite="true" />
- <unzip dest="${testRoot}" src="${postingDirectory}/${buildLabel}/wtp-wst-Automated-Tests-${buildLabel}.zip" overwrite="true" />
- <unzip dest="${testRoot}" src="${postingDirectory}/${buildLabel}/wtp-jst-Automated-Tests-${buildLabel}.zip" overwrite="true" />
+ <unzip dest="${testRoot}" src="${postingDirectory}/${buildLabel}/dali-${buildLabel}.zip" overwrite="true" />
+ <unzip dest="${testRoot}" src="${postingDirectory}/${buildLabel}/dali-Automated-Tests-${buildLabel}.zip" overwrite="true" />
<antcall target="runTestEclipse">
<param name="testTarget" value="all" />
@@ -47,12 +44,12 @@
<property name="monitorTargets" value="${wtp.builder.home}/scripts/monitoring/build.xml" />
<ant antfile="${monitorTargets}" target="notifyTest" >
- <property name="testManifest" value="${wtp.builder.home}/distribution/wtp.site/testManifest.xml"/>
+ <property name="testManifest" value="${wtp.builder.home}/distribution/dali.site/testManifest.xml"/>
</ant>
</target>
<target name="runTestEclipse">
- <java taskname="test-wtp-${testTarget}" classpath="${testRoot}/eclipse/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true" timeout="3600000" output="${testRoot}/results/consolelogs/wtptestlog.txt" dir="${testRoot}">
+ <java taskname="test-dali-${testTarget}" classpath="${testRoot}/eclipse/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true" timeout="3600000" output="${testRoot}/results/consolelogs/dalitestlog.txt" dir="${testRoot}">
<jvmarg value="-Dosgi.ws=${basews}" />
<jvmarg value="-Dosgi.os=${baseos}" />
<jvmarg value="-Dosgi.arch=${basearch}" />
@@ -89,5 +86,4 @@
</copy>
</target>
-
</project>
diff --git a/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php b/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php
index 1717172..5c2aa4b 100644
--- a/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php
+++ b/releng.wtpbuilder/distribution/dali.tests/templateFiles/index.php
@@ -62,7 +62,7 @@
</tr>
</table>
<br>
-These <a href="consolelogs/wtptestlog.txt">logs</a> contain the console output captured while
+These <a href="consolelogs/dalitestlog.txt">logs</a> contain the console output captured while
running the JUnit automated tests. <br>
<br>
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
index ef5e077..852205d 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
@@ -21,15 +21,8 @@
<!-- The directory that will contain the xml and html results from the tests that are run -->
<property name="results" value="${basedir}/results" />
- <!-- jonas install directory -->
- <property name="jonas432Dir" value="${testDir}/${jonas432DirName}"/>
-
<target name="init">
- <antcall target="setPropertyJOnAS432Dir"/>
- </target>
- <target name="setPropertyJOnAS432Dir" unless="jonas432Dir">
- <property name="jonas432Dir" value="${testDir}/${jonas432DirName}"/>
</target>
<target name="setup" if="clean" description="Reinstall the test Eclipse installation if specified by user">
@@ -45,31 +38,6 @@
</target>
- <target name="runapitests" depends="setup">
- <!--
- <condition property="usepiagent">
- <and>
- <available file="${eclipse-home}/plugins/${testPlugin}/test.xml" property="test.xml.exists"/>
- <isset property="package.includes"/>
- </and>
- </condition>
- -->
- <antcall target="runapitests2"/>
- <antcall target="runapitests3"/>
- </target>
-
- <target name="runapitests2" if="usepiagent">
- <ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}">
- <property name="library-file" value="${testDir}/api-tests.xml"/>
- </ant>
- <copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false"/>
- <antcall target="genHtml" />
- </target>
-
- <target name="runapitests3" unless="usepiagent">
- <antcall target="runtests"/>
- </target>
-
<target name="runtests" depends="setup" description="Runs ant on the test.xml for a specified plugin. Requires a property value setting for testPlugin only if test.properties is not available. The property testPlugin represents a directory name made up of the plugin id and plugin version. This directory must contain a valid test.xml.">
<available file="${eclipse-home}/plugins/${testPlugin}/test.xml" property="test.xml.exists"/>
<antcall target="runtests2"/>
@@ -77,7 +45,9 @@
<target name="runtests2" if="test.xml.exists">
<antcall target="runtests-normal"/>
+ <!--
<antcall target="runtests-runAsPerfApp"/>
+ -->
<copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}_${platform}.xml" failonerror="false" />
<antcall target="genHtml" />
</target>
@@ -105,442 +75,23 @@
</antcall>
</target>
- <target name="wst-server-tests" description="Runs the org.eclipse.wst.server.*.tests test.xml">
- <antcall target="runapitests">
- <param name="testPlugin" value="${org.eclipse.wst.server.core.tests}" />
- <param name="report" value="org.eclipse.wst.server.core.tests" />
- <param name="package.includes" value="org.eclipse.wst.server"/>
- </antcall>
- <antcall target="runapitests">
- <param name="testPlugin" value="${org.eclipse.wst.server.ui.tests}" />
- <param name="report" value="org.eclipse.wst.server.ui.tests" />
- <param name="package.includes" value="org.eclipse.wst.server"/>
+
+ <target name="dali-utility-tests" description="Runs the org.eclipse.dali.utility.tests test.xml">
+ <antcall target="runtests">
+ <param name="testPlugin" value="${org.eclipse.dali.utility.tests}" />
+ <param name="report" value="org.eclipse.dali.utility.tests" />
</antcall>
</target>
- <target name="wst-monitor-tests" 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" 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" 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" 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" 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" 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-j2ee-core-tests" 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" 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" 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="wst-common-snippets-tests">
- <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" 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" 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>
-
-
- <target name="wst-server-perfTests" description="Runs the org.eclipse.wst.server.tests.performance test.xml">
- <antcall target="runperftests">
- <param name="testPlugin" value="${org.eclipse.wst.server.tests.performance}" />
- <param name="report" value="org.eclipse.wst.server.tests.performance" />
- </antcall>
- </target>
-
- <target name="jst-server-tomcat-perfTests" description="Runs the org.eclipse.jst.server.tomcat.tests.performance test.xml">
- <antcall target="runperftests">
- <param name="testPlugin" value="${org.eclipse.jst.server.tomcat.tests.performance}" />
- <param name="report" value="org.eclipse.jst.server.tomcat.tests.performance" />
- </antcall>
- </target>
-
- <!-- JSP TESTS -->
- <target name="jst-jsp-tests" description="Runs test.xml for
- org.eclipse.jst.jsp.core.tests
- org.eclipse.jst.jsp.ui.tests
- org.eclipse.jst.jsp.tests.encoding">
- <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>
-
- <target name="jst-jsp-perfTests" description="Runs test.xml for
- org.eclipse.jst.jsp.ui.tests.performance">
- <antcall target="runperftests">
- <param name="testPlugin" value="${org.eclipse.jst.jsp.ui.tests.performance}" />
- <param name="report" value="org.eclipse.jst.jsp.ui.tests.performance" />
- </antcall>
- </target>
-
- <!-- SSE TESTS -->
- <target name="wst-sse-tests" description="Runs test.xml for
- org.eclipse.wst.sse.core.tests
- org.eclipse.wst.sse.ui.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" description="Runs test.xml for
- org.eclipse.wst.xml.core.tests
- org.eclipse.wst.xml.ui.tests
- org.eclipse.wst.xml.tests.encoding
- org.eclipse.wst.xml.validation.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>
- </target>
-
- <!-- WSDL TESTS -->
- <target name="wst-wsdl-tests" description="Runs test.xml for
- org.eclipse.wst.wsdl.tests
- org.eclipse.wst.wsdl.validation.tests">
- <antcall target="runapitests">
- <param name="testPlugin" value="${org.eclipse.wst.wsdl.tests}" />
- <param name="report" value="org.eclipse.wst.wsdl.tests" />
- <param name="package.includes" value="org.eclipse.wst.wsdl"/>
- </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>
- </target>
-
- <!-- WSI TESTS -->
- <target name="wst-wsi-tests" description="Runs test.xml for
- org.eclipse.wst.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" description="Runs test.xml for
- org.eclipse.wst.xsd.validation.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>
- </target>
-
- <target name="wst-xml-perfTests" description="Runs test.xml for
- org.eclipse.wst.xml.ui.tests.performance">
- <antcall target="runperftests">
- <param name="testPlugin" value="${org.eclipse.wst.xml.ui.tests.performance}" />
- <param name="report" value="org.eclipse.wst.xml.ui.tests.performance" />
- </antcall>
- </target>
-
- <!-- HTML TESTS -->
- <target name="wst-html-tests" description="Runs test.xml for
- org.eclipse.wst.html.core.tests
- org.eclipse.wst.html.ui.tests
- org.eclipse.wst.html.tests.encoding">
- <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>
-
- <target name="wst-html-perfTests" description="Runs test.xml for
- org.eclipse.wst.html.ui.tests.performance">
- <antcall target="runperftests">
- <param name="testPlugin" value="${org.eclipse.wst.html.ui.tests.performance}" />
- <param name="report" value="org.eclipse.wst.html.ui.tests.performance" />
- </antcall>
- </target>
-
- <!-- DTD Tests -->
- <target name="wst-dtd-tests">
- <antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.wst.dtd.ui.tests}" />
- <param name="report" value="org.eclipse.wst.dtd.ui.tests" />
- </antcall>
- </target>
-
- <!-- CSS TESTS -->
- <target name="wst-css-tests" 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>
-
- <target name="wst-css-perfTests" description="Runs test.xml for
- org.eclipse.wst.css.ui.tests.performance">
- <antcall target="runperftests">
- <param name="testPlugin" value="${org.eclipse.wst.css.ui.tests.performance}" />
- <param name="report" value="org.eclipse.wst.css.ui.tests.performance" />
- </antcall>
- </target>
-
- <target name="wst-common-perfTests" description="Runs test.xml for org.eclipse.wst.common.tests.performance">
- <antcall target="runperftests">
- <param name="testPlugin" value="${org.eclipse.wst.common.tests.performance}" />
- <param name="report" value="org.eclipse.wst.common.tests.performance" />
- </antcall>
- </target>
-
- <!-- WS TESTS -->
-
- <target name="wst-ws-tests" 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" 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>
-
- <target name="jst-ws-perfTests" description="Runs the org.eclipse.jst.ws.tests.performance test.xml">
- <antcall target="runperftests">
- <param name="testPlugin" value="${org.eclipse.jst.ws.tests.performance}" />
- <param name="report" value="org.eclipse.jst.ws.tests.performance" />
- </antcall>
- </target>
-
- <!-- wsdl performance tests -->
- <target name="wst-wsdl-perfTests">
- <antcall target="runperftests">
- <param name="testPlugin" value="${org.eclipse.wst.wsdl.tests.performance}" />
- <param name="report" value="org.eclipse.wst.wsdl.tests.performance" />
- </antcall>
- </target>
-
- <!-- xsd performance tests -->
- <target name="wst-xsd-perfTests">
- <antcall target="runperftests">
- <param name="testPlugin" value="${org.eclipse.wst.xsd.tests.performance}" />
- <param name="report" value="org.eclipse.wst.xsd.tests.performance" />
- </antcall>
- </target>
-
- <!-- rdb performance tests -->
- <target name="wst-rdb-perfTests">
- <antcall target="runperftests">
- <param name="testPlugin" value="${org.eclipse.wst.rdb.tests.performance}"/>
- <param name="report" value="org.eclipse.wst.rdb.tests.performance"/>
- </antcall>
- </target>
-
- <!-- j2ee performance tests -->
- <target name="jst-j2ee-perfTests">
- <antcall target="runperftests">
- <param name="testPlugin" value="${org.eclipse.jst.j2ee.core.tests.performance}"/>
- <param name="report" value="org.eclipse.jst.j2ee.core.tests.performance"/>
- </antcall>
- </target>
<target name="all" depends="init">
- <echo message="Starting WTP Unit Tests"/>
+ <echo message="Starting Dali Unit Tests"/>
+
+ <echo message="Starting dali-utility-tests"/>
+ <antcall target="dali-utility-tests" />
- <echo message="Starting wst-server-tests"/>
- <antcall target="wst-server-tests"/>
-
- <echo message="Starting wst-monitor-tests"/>
- <antcall target="wst-monitor-tests"/>
-
- <echo message="Starting wst-cache-tests"/>
- <antcall target="wst-cache-tests"/>
-
- <echo message="Starting wst-common-tests"/>
- <antcall target="wst-common-tests" />
-
- <echo message="Starting wst-common-snippets-tests"/>
- <antcall target="wst-common-snippets-tests"/>
- <echo message="Starting wst-sse-tests"/>
- <antcall target="wst-sse-tests" />
-
- <echo message="Starting wst-xml-tests"/>
- <antcall target="wst-xml-tests" />
-
- <echo message="Starting wst-wsdl-tests"/>
- <antcall target="wst-wsdl-tests" />
-
- <echo message="Starting wst-wsi-tests"/>
- <antcall target="wst-wsi-tests" />
-
- <echo message="Starting wst-xsd-tests"/>
- <antcall target="wst-xsd-tests" />
-
- <echo message="Starting wst-html-tests"/>
- <antcall target="wst-html-tests" />
-
- <echo message="Starting wst-dtd-tests"/>
- <antcall target="wst-dtd-tests" />
-
- <echo message="Starting wst-css-tests"/>
- <antcall target="wst-css-tests" />
-
- <echo message="Starting wst-ws-tests"/>
- <antcall target="wst-ws-tests" />
-
-
- <echo message="Starting jst-server-tests"/>
- <antcall target="jst-server-tests"/>
-
- <echo message="Starting jst-server-tomcat-tests"/>
- <antcall target="jst-server-tomcat-tests"/>
-
- <echo message="Starting jst-server-geronimo-tests"/>
- <antcall target="jst-server-geronimo-tests"/>
-
- <echo message="Starting jst-server-generic-tests"/>
- <antcall target="jst-server-generic-tests"/>
-
- <echo message="Starting jst-j2ee-core-tests"/>
- <antcall target="jst-j2ee-core-tests" />
-
- <echo message="Starting jst-j2ee-tests"/>
- <antcall target="jst-j2ee-tests" />
-
- <echo message="Starting jst-servlet-tests"/>
- <antcall target="jst-servlet-tests" />
-
- <echo message="Starting jst-validation-framework-tests"/>
- <antcall target="jst-validation-framework-tests" />
-
- <echo message="Starting jst-jsp-tests"/>
- <antcall target="jst-jsp-tests" />
-
- <echo message="Starting jst-ws-tests"/>
- <antcall target="jst-ws-tests" />
-
- <echo message="Ended WTP Unit Tests"/>
+ <echo message="Ended Dali Unit Tests"/>
</target>
<target name="setupPerformance">
diff --git a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
index d96c11d..4199104 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
@@ -13,6 +13,10 @@
<project name="test" default="get">
<target name="get">
+
+ <antcall target="getAndInstall">
+ <param name="groupId" value="wst" />
+ </antcall>
<antcall target="getAndInstall">
<param name="groupId" value="emf" />
</antcall>
@@ -28,24 +32,14 @@
<antcall target="getAndInstall">
<param name="groupId" value="eclipseTestFramework" />
</antcall>
- <antcall target="getAndInstall">
- <param name="groupId" value="tomcat.5" />
- </antcall>
- <antcall target="getAndInstall">
- <param name="groupId" value="jonas.4" />
- </antcall>
- <antcall target="getAndInstall">
- <param name="groupId" value="oagis.release" />
- </antcall>
- <antcall target="getAndInstall">
- <param name="groupId" value="oagis.wsdl" />
- </antcall>
-
</target>
-
<target name="getAndInstall">
+
+ <echo message="dependencyTargets: ${dependencyTargets}" />
+ <echo message="groupId: ${groupId}" />
+
<ant antfile="${dependencyTargets}" target="checkDependency">
<property name="groupId" value="${groupId}" />
</ant>
@@ -55,8 +49,5 @@
</ant>
</target>
-
-
-
</project>