Author: thomas.diesler(a)jboss.com Date: 2008-04-21 10:51:31 -0400 (Mon, 21 Apr 2008) New Revision: 6577 Modified: stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml stack/cxf/trunk/ant-import-tests/build-testsuite.xml Log: switch test output to maven layout Modified: stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-21 14:44:07 UTC (rev 6576) +++ stack/cxf/trunk/ant-import-tests/build-jars-jaxws.xml 2008-04-21 14:51:31 UTC (rev 6577) @@ -18,36 +18,36 @@ <target name="build-testsuite-jars" description="Build the deployments."> - <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/test-libs"/> <!-- jaxws-cxf-descriptor --> - <war warfile="${tests.output.dir}/libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-descriptor.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/descriptor/DescriptorEndpointImpl.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/descriptor/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/descriptor/WEB-INF"> <include name="jbossws-cxf.xml"/> </webinf> </war> <!-- jaxws-cxf-wsrm-basic-doc --> - <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-doc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicDocEndpoint.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-doc/WEB-INF"> <include name="jbossws-cxf.xml"/> </webinf> </war> <!-- jaxws-cxf-wsrm-basic-rpc --> - <war warfile="${tests.output.dir}/libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-wsrm-basic-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/cxf/wsrm/BasicRPCEndpoint.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> + <webinf dir="${tests.output.dir}/test-resources/jaxws/cxf/wsrm/basic-rpc/WEB-INF"> <include name="jbossws-cxf.xml"/> </webinf> </war> Modified: stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-21 14:44:07 UTC (rev 6576) +++ stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-21 14:51:31 UTC (rev 6577) @@ -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="jbossws-cxf.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/cxf/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/cxf/trunk/ant-import-tests/build-testsuite.xml 2008-04-21 14:44:07 UTC (rev 6576) +++ stack/cxf/trunk/ant-import-tests/build-testsuite.xml 2008-04-21 14:51:31 UTC (rev 6577) @@ -10,12 +10,12 @@ <project> - <property name="tests.output.dir" value="${int.cxf.dir}/output/tests"/> + <property name="tests.output.dir" value="${int.cxf.dir}/test-output/tests"/> - <import file="${int.cxf.dir}/src/test-framework/ant-import/build-testsuite.xml"/> + <import file="${int.cxf.dir}/test-src/test-framework/ant-import/build-testsuite.xml"/> <!-- Define excludesfile --> - <property name="excludesfile" value="${int.cxf.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + <property name="excludesfile" value="${int.cxf.dir}/test-src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> <!-- ================================================================== --> <!-- Initialization --> @@ -24,30 +24,30 @@ <target name="tests-init" depends="tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${int.cxf.dir}/thirdparty/jbossws-common.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jaxb-api.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jdom-${cxf.jdom}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/neethi-${cxf.neethi}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/saaj-api-${cxf.saaj}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/saaj-impl-${cxf.saaj}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-beans-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-context-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/spring-core-${cxf.spring}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/wstx.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/XmlSchema-${cxf.xmlschema}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jbossws-common.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jbossws-spi.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jaxb-api.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jaxws-api-${cxf.jaxws.api}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jdom-${cxf.jdom}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/neethi-${cxf.neethi}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/saaj-api-${cxf.saaj}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/saaj-impl-${cxf.saaj}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/spring-beans-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/spring-context-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/spring-core-${cxf.spring}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/wsdl4j.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/wstx.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/xml-resolver-${cxf.xml.resolver}.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/XmlSchema-${cxf.xmlschema}.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${int.cxf.dir}/output/lib/cxf-${cxf.version}.jar"/> - <pathelement location="${int.cxf.dir}/output/lib/jbossws-cxf-client.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jbossws-framework.jar"/> - <pathelement location="${int.cxf.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${int.cxf.dir}/test-output/lib/cxf-${cxf.version}.jar"/> + <pathelement location="${int.cxf.dir}/test-output/lib/jbossws-cxf-client.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jbossws-framework.jar"/> + <pathelement location="${int.cxf.dir}/test-thirdparty/jaxws-tools.jar"/> </path> </target> @@ -63,8 +63,8 @@ <classpath refid="tests.client.classpath"/> </taskdef> - <wsconsume wsdl="${tests.framework.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsconsume wsdl="${tests.framework.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.framework.resources.dir}/test-jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/test-wsconsume/java" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.framework.resources.dir}/test-jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/test-wsconsume/java" keep="true" verbose="false"/> --> </target> @@ -73,8 +73,8 @@ <!-- ================================================================== --> <target name="tests-compile" depends="wsconsume" description="Compile sources"> - <macro-compile-classes srcdir="${int.cxf.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> - <macro-compile-classes srcdir="${int.cxf.dir}/src/test/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${int.cxf.dir}/test-src/test-framework/java" excludesfile="${excludesfile}"/> + <macro-compile-classes srcdir="${int.cxf.dir}/test-src/test/java" excludesfile="${excludesfile}"/> </target> <!-- ================================================================== --> @@ -83,15 +83,15 @@ <!-- Copy resources --> <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${int.cxf.dir}/src/test-framework"/> - <macro-copy-resources srcdir="${int.cxf.dir}/src/test"/> + <macro-copy-resources srcdir="${int.cxf.dir}/test-src/test-framework"/> + <macro-copy-resources srcdir="${int.cxf.dir}/test-src/test"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> - <ant antfile="${int.cxf.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/> - <ant antfile="${int.cxf.dir}/ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> - <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> - <ant antfile="${int.cxf.dir}/src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> + <ant antfile="${int.cxf.dir}/test-ant-import-tests/build-jars-jaxws.xml" target="build-testsuite-jars"/> + <ant antfile="${int.cxf.dir}/test-ant-import-tests/build-samples-jaxws.xml" target="build-samples-jaxws"/> + <ant antfile="${int.cxf.dir}/test-src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> + <ant antfile="${int.cxf.dir}/test-src/test-framework/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws"/> </target> <target name="tests-main" depends="tests-jars" description="Build the deployments."/>