Author: thomas.diesler(a)jboss.com Date: 2007-08-03 06:41:27 -0400 (Fri, 03 Aug 2007) New Revision: 4152 Removed: trunk/jbossws-core/ant-import/build-testsuite.xml Modified: trunk/build/build.xml trunk/jbossws-core/ant-import-tests/build-testsuite.xml Log: Remove references to testsuite.dir Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-08-03 10:26:39 UTC (rev 4151) +++ trunk/build/build.xml 2007-08-03 10:41:27 UTC (rev 4152) @@ -123,7 +123,6 @@ <target name="clean" depends="prepare" description="Cleans up most generated files."> <delete dir="${build.dir}/output"/> <ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${testsuite.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="clean" inheritall="false"/> </target> @@ -131,7 +130,6 @@ <target name="clobber" depends="prepare" description="Cleans up all generated files."> <delete dir="${build.dir}/output"/> <ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/> - <ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="clobber" inheritall="false"/> </target> Deleted: trunk/jbossws-core/ant-import/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import/build-testsuite.xml 2007-08-03 10:26:39 UTC (rev 4151) +++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-08-03 10:41:27 UTC (rev 4152) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- ============================================================ --> -<!-- JBoss, the OpenSource J2EE webOS --> -<!-- Distributable under LGPL license. --> -<!-- See terms of license at http://www.gnu.org. --> -<!-- ============================================================ --> - -<!-- $Id: build-testsuite.xml 4092 2007-08-02 11:14:11Z thomas.diesler(a)jboss.com $ --> - -<project> - - <property name="tests.output.dir" value="${int.native.dir}/output/tests"/> - <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> - - <property name="tests.dir" value="${testsuite.dir}/src"/> - <property name="tests.java.dir" value="${tests.dir}/java"/> - <property name="tests.resources.dir" value="${tests.dir}/resources"/> - - <!-- Define excludesfile --> - <property name="excludesfile" value="${int.native.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="tests-init" depends="tests-classpath"> - - <path id="ws.stack.classpath"> - <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> - <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> - <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> - </path> - - <path id="tests.extra.classpath"> - <pathelement location="${jboss.client}/policy.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - </path> - - </target> - - <!-- ================================================================== --> - <!-- Compiling --> - <!-- ================================================================== --> - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/> - </target> - -</project> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 10:26:39 UTC (rev 4151) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 10:41:27 UTC (rev 4152) @@ -10,18 +10,18 @@ <project> - <property environment="env"/> <property name="tests.output.dir" value="${core.dir}/output/tests"/> + <import file="${build.dir}/ant-import/build-testsuite.xml"/> + <!-- Define excluded tests --> + <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/> + <property name="excludesfile" value="${core.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + <property name="tests.dir" value="${core.dir}/src/test"/> <property name="tests.java.dir" value="${tests.dir}/java"/> <property name="tests.resources.dir" value="${tests.dir}/resources"/> - <!-- Define excluded tests --> - <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/> - <property name="excludesfile" value="${core.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> - <!-- Init the various classpaths -->