Author: thomas.diesler(a)jboss.com Date: 2007-08-03 06:08:11 -0400 (Fri, 03 Aug 2007) New Revision: 4147 Modified: trunk/build/ant-import/build-setup.xml trunk/jbossws-core/ant-import-tests/build-testsuite.xml Log: Move common testsuite to framework Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-08-03 10:00:33 UTC (rev 4146) +++ trunk/build/ant-import/build-setup.xml 2007-08-03 10:08:11 UTC (rev 4147) @@ -19,7 +19,6 @@ <property name="build.dir" value="${basedir}/build"/> <property name="core.dir" value="${basedir}/jbossws-core"/> - <property name="testsuite.dir" value="${basedir}/testsuite"/> <property name="int.sunri.dir" value="${basedir}/integration/sunri"/> <property name="int.xfire.dir" value="${basedir}/integration/xfire"/> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 10:00:33 UTC (rev 4146) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-03 10:08:11 UTC (rev 4147) @@ -189,7 +189,7 @@ <target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources"> <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${testsuite.dir}/src/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${core.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> <macro-compile-classes srcdir="${core.dir}/src/test/java" excludesfile="${excludesfile}"/> </target> @@ -199,8 +199,8 @@ <!-- Copy resources --> <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${testsuite.dir}/src"/> - <macro-copy-resources srcdir="${tests.dir}"/> + <macro-copy-resources srcdir="${core.dir}/src/test-framework"/> + <macro-copy-resources srcdir="${core.dir}/src/test"/> </target> <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments."> @@ -208,7 +208,7 @@ <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> <ant antfile="${core.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> <ant antfile="${core.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> - <ant antfile="${testsuite.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${core.dir}/src/test-framework/etc/build-jars-jaxws.xml" target="build-jars-jaxws"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/>