Author: thomas.diesler(a)jboss.com Date: 2008-04-04 08:44:45 -0400 (Fri, 04 Apr 2008) New Revision: 6237 Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml stack/metro/trunk/ant-import/build-thirdparty.xml stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt stack/metro/trunk/version.properties Log: [JBWS-2096] Migrate common jax-ws tests to framework (WIP) Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-04 12:32:03 UTC (rev 6236) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-04-04 12:44:45 UTC (rev 6237) @@ -97,7 +97,10 @@ <!-- The compile classpath for jboss50 integration --> <path id="metro.integration.classpath"> - <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar --> + <!-- + A stack MUST NOT have a compile time dependency on framework + http://www.jboss.org/index.html?module=bb&op=viewtopic&t=133071 + --> <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-04 12:32:03 UTC (rev 6236) +++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-04-04 12:44:45 UTC (rev 6237) @@ -22,6 +22,9 @@ <property name="tests.java.dir" value="${tests.dir}/java"/> <property name="tests.resources.dir" value="${tests.dir}/resources"/> + <property name="tests.framework.dir" value="${metro.dir}/src/test-framework"/> + <property name="tests.framework.resources.dir" value="${tests.framework.dir}/resources"/> + <!-- Init the various classpaths --> @@ -55,44 +58,31 @@ <pathelement location="${int.metro.dir}/thirdparty/jbossws-framework.jar"/> </path> - <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport"> - <classpath refid="ws.stack.classpath"/> - </taskdef> - </target> - <!-- ================================================================== --> - <!-- Generating sources --> - <!-- ================================================================== --> - - <target name="wsimport" depends="tests-init" description="Consume JAX-WS contracts"> + <!-- ================================================================== --> + <!-- Generating sources --> + <!-- ================================================================== --> + + <target name="wsconsume" depends="tests-init" unless="noconsume" description="Consume JAX-WS contracts"> + + <!-- Define the JAX-WS wsconsume task --> + <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> + <classpath refid="tests.client.classpath"/> + </taskdef> - <mkdir dir="${tests.output.dir}/wsimport"/> + <wsconsume wsdl="${tests.resources.dir}/wsit/rm/WEB-INF/wsdl/Calc.wsdl" package="org.jboss.test.ws.wsit.rm" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> - <wsimport wsdl="${tests.resources.dir}/wsit/rm/WEB-INF/wsdl/Calc.wsdl" destdir="${tests.output.dir}/wsimport" sourcedestdir="${tests.output.dir}/wsimport" keep="true" - verbose="false" package="org.jboss.test.ws.wsit.rm" target="2.0"/> - - </target> - - <!-- - Generate JAX-WS sources - --> - <target name="wsgen" depends="tests-compile" description="Provide the JAX-WS contracts."> - - <!-- placeholder for jaxws tools extension points --> - - </target> - - <target name="tests-compile-generated-resources" depends="wsgen"> - - </target> - + <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"/> + </target> + <!-- ================================================================== --> <!-- Compiling --> <!-- ================================================================== --> - <target name="tests-compile" depends="wsimport,tests-classpath" description="Compile sources"> - <macro-compile-classes srcdir="${tests.output.dir}/wsimport" excludesfile="${excludesfile}"/> + <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="${metro.dir}/src/test-framework/java" excludesfile="${excludesfile}"/> <macro-compile-classes srcdir="${metro.dir}/src/test/java" excludesfile="${excludesfile}"/> </target> @@ -107,7 +97,7 @@ <macro-copy-resources srcdir="${metro.dir}/src/test"/> </target> - <target name="tests-jars" depends="wsimport,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments."> + <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> <ant antfile="${metro.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/> <ant antfile="${int.metro.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/> </target> Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-04 12:32:03 UTC (rev 6236) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss422.txt 2008-04-04 12:44:45 UTC (rev 6237) @@ -2,8 +2,26 @@ # $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $ # +# [JBWS-1674] Fix @WebServiceRef with Metro +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** + +# [JBWS-2105] Remove dependency on native wsdl model +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/jbws1190/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1529/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/jbws1665/** +org/jboss/test/ws/jaxws/jbws1809/** +org/jboss/test/ws/jaxws/jbws1904/** +org/jboss/test/ws/jaxws/jbws1909/** +org/jboss/test/ws/jaxws/jbws1969/** +org/jboss/test/ws/jaxws/jbws860/** +org/jboss/test/ws/jaxws/jbws944/** +org/jboss/test/ws/jaxws/webfault/** + # [JBWS-1673] Fix JAXR samples for Metro org/jboss/test/ws/jaxws/samples/jaxr/** -# [JBWS-1674] Fix @WebServiceRef with Metro -org/jboss/test/ws/jaxws/samples/webserviceref/** Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-04 12:32:03 UTC (rev 6236) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss423.txt 2008-04-04 12:44:45 UTC (rev 6237) @@ -2,8 +2,26 @@ # $Id$ # +# [JBWS-1674] Fix @WebServiceRef with Metro +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** + +# [JBWS-2105] Remove dependency on native wsdl model +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/jbws1190/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1529/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/jbws1665/** +org/jboss/test/ws/jaxws/jbws1809/** +org/jboss/test/ws/jaxws/jbws1904/** +org/jboss/test/ws/jaxws/jbws1909/** +org/jboss/test/ws/jaxws/jbws1969/** +org/jboss/test/ws/jaxws/jbws860/** +org/jboss/test/ws/jaxws/jbws944/** +org/jboss/test/ws/jaxws/webfault/** + # [JBWS-1673] Fix JAXR samples for Metro org/jboss/test/ws/jaxws/samples/jaxr/** -# [JBWS-1674] Fix @WebServiceRef with Metro -org/jboss/test/ws/jaxws/samples/webserviceref/** Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-04 12:32:03 UTC (rev 6236) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss500.txt 2008-04-04 12:44:45 UTC (rev 6237) @@ -2,6 +2,22 @@ # $Id: test-excludes.txt 3907 2007-07-17 12:55:40Z thomas.diesler(a)jboss.com $ # +# [JBWS-2105] Remove dependency on native wsdl model +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/jbws1190/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1529/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/jbws1665/** +org/jboss/test/ws/jaxws/jbws1809/** +org/jboss/test/ws/jaxws/jbws1904/** +org/jboss/test/ws/jaxws/jbws1909/** +org/jboss/test/ws/jaxws/jbws1969/** +org/jboss/test/ws/jaxws/jbws860/** +org/jboss/test/ws/jaxws/jbws944/** +org/jboss/test/ws/jaxws/webfault/** + # [JBWS-1673] Fix JAXR samples for Metro org/jboss/test/ws/jaxws/samples/jaxr/** Modified: stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-04 12:32:03 UTC (rev 6236) +++ stack/metro/trunk/src/test/resources/test-excludes-jboss501.txt 2008-04-04 12:44:45 UTC (rev 6237) @@ -2,6 +2,22 @@ # $Id$ # +# [JBWS-2105] Remove dependency on native wsdl model +org/jboss/test/ws/jaxws/binding/** +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/jbws1190/** +org/jboss/test/ws/jaxws/jbws1505/** +org/jboss/test/ws/jaxws/jbws1529/** +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/jbws1665/** +org/jboss/test/ws/jaxws/jbws1809/** +org/jboss/test/ws/jaxws/jbws1904/** +org/jboss/test/ws/jaxws/jbws1909/** +org/jboss/test/ws/jaxws/jbws1969/** +org/jboss/test/ws/jaxws/jbws860/** +org/jboss/test/ws/jaxws/jbws944/** +org/jboss/test/ws/jaxws/webfault/** + # [JBWS-1673] Fix JAXR samples for Metro org/jboss/test/ws/jaxws/samples/jaxr/** @@ -13,4 +29,5 @@ # TODO: Fix classpath to ClientLauncher org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2008-04-04 12:32:03 UTC (rev 6236) +++ stack/metro/trunk/version.properties 2008-04-04 12:44:45 UTC (rev 6237) @@ -15,8 +15,8 @@ # Thirdparty library versions jbossws-spi=1.0.2.GA -jbossws-common=1.0.4.GA -jbossws-framework=3.0.1.GA +jbossws-common=snapshot +jbossws-framework=snapshot jbossws-jboss42=4.2.1.GA junit=3.8.1