[jbossws-commits] JBossWS SVN: r6576 - stack/metro/trunk/ant-import-tests.

Author: thomas.diesler(a)jboss.com Date: 2008-04-21 10:44:07 -0400 (Mon, 21 Apr 2008) New Revision: 6576 Modified: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml stack/metro/trunk/ant-import-tests/build-samples-jaxws.xml stack/metro/trunk/ant-import-tests/build-testsuite.xml Log: switch test output to maven layout Modified: stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-21 14:42:11 UTC (rev 6575) +++ stack/metro/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-21 14:44:07 UTC (rev 6576) @@ -22,37 +22,37 @@ <target name="build-jars-jaxws" description="Build the deployments."> - <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/test-libs"/> <!-- jbws1869 --> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1869.war" webxml="${tests.output.dir}/resources/jaxws/jbws1869/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1869.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1869/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1869/**/*"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1869/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1869/WEB-INF"> <include name="**/*"/> </webinf> </war> <!-- jbws1871 --> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1871.war" webxml="${tests.output.dir}/resources/jaxws/jbws1871/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1871.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1871/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1871/**/*"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1871/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1871/WEB-INF"> <include name="**/*"/> </webinf> </war> <!-- wsit-rm --> - <war warfile="${tests.output.dir}/libs/wsit-rm.war" webxml="${tests.output.dir}/resources/wsit/rm/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/wsit-rm.war" webxml="${tests.output.dir}/test-resources/wsit/rm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/wsit/rm/CalculatorWSImpl.class"/> <include name="org/jboss/test/ws/wsit/rm/CalculatorWS.class"/> <include name="org/jboss/test/ws/wsit/rm/Add.class"/> <include name="org/jboss/test/ws/wsit/rm/AddResponse.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/wsit/rm/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/wsit/rm/WEB-INF"> <include name="sun-web.xml"/> <include name="web.xml"/> <include name="wsit-org.jboss.test.ws.wsit.rm.CalculatorWSImpl.xml"/> Modified: stack/metro/trunk/ant-import-tests/build-samples-jaxws.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-21 14:42:11 UTC (rev 6575) +++ stack/metro/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-21 14:44:07 UTC (rev 6576) @@ -16,20 +16,20 @@ <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> - <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/test-libs"/> <!-- jaxws-samples-wsrm --> <war - warfile="${tests.output.dir}/libs/jaxws-samples-wsrm.war" - webxml="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war" + webxml="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/wsrm/service/**"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF"> <include name="wsit-*.xml"/> </webinf> <zipfileset - dir="${tests.output.dir}/resources/jaxws/samples/wsrm/WEB-INF/wsdl" + dir="${tests.output.dir}/test-resources/jaxws/samples/wsrm/WEB-INF/wsdl" prefix="WEB-INF/wsdl"/> </war> Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-21 14:42:11 UTC (rev 6575) +++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-21 14:44:07 UTC (rev 6576) @@ -20,10 +20,10 @@ <property name="tests.dir" value="${metro.dir}/src/test"/> <property name="tests.java.dir" value="${tests.dir}/java"/> - <property name="tests.resources.dir" value="${tests.dir}/resources"/> + <property name="tests.resources.dir" value="${tests.dir}/test-resources"/> <property name="tests.framework.dir" value="${metro.dir}/src/test-framework"/> - <property name="tests.framework.resources.dir" value="${tests.framework.dir}/resources"/> + <property name="tests.framework.resources.dir" value="${tests.framework.dir}/test-resources"/> <!-- Init the various classpaths