Author: thomas.diesler(a)jboss.com Date: 2008-05-07 08:39:17 -0400 (Wed, 07 May 2008) New Revision: 6932 Added: stack/native/trunk/modules/testsuite/framework-tests/scripts/ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml stack/native/trunk/modules/testsuite/native-tests/scripts/ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt Log: Add wsconsume Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-07 12:14:50 UTC (rev 6931) +++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-07 12:39:17 UTC (rev 6932) @@ -58,6 +58,21 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <id>wsconsume</id> + <phase>generate-sources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> + </tasks> + </configuration> + </execution> + <execution> <phase>test-compile</phase> <goals> <goal>run</goal> Added: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml (rev 0) +++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-07 12:39:17 UTC (rev 6932) @@ -0,0 +1,30 @@ +<?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$ --> + +<project> + + <!-- ================================================================== --> + <!-- Generating sources --> + <!-- ================================================================== --> + + <target name="wsconsume" description="Consume JAX-WS contracts"> + + <!-- Define the JAX-WS wsconsume task --> + <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> + <classpath> + <pathelement path="${maven.classpath}"/> + </classpath> + </taskdef> + + <wsconsume wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" package="org.jboss.test.ws.jaxws.complex" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" package="org.jboss.test.ws.jaxws.holder" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + </target> + +</project> \ No newline at end of file Property changes on: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-07 12:14:50 UTC (rev 6931) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-07 12:39:17 UTC (rev 6932) @@ -31,6 +31,22 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> + <id>wsconsume</id> + <phase>generate-sources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> + </tasks> + </configuration> + </execution> + <execution> + <id>build-jars</id> <phase>test-compile</phase> <goals> <goal>run</goal> Added: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2008-05-07 12:39:17 UTC (rev 6932) @@ -0,0 +1,35 @@ +<?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$ --> + +<project> + + <!-- ================================================================== --> + <!-- Generating sources --> + <!-- ================================================================== --> + + <target name="wsconsume" description="Consume JAX-WS contracts"> + + <!-- Define the JAX-WS wsconsume task --> + <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> + <classpath> + <pathelement path="${maven.classpath}"/> + </classpath> + </taskdef> + + <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" destdir="${tests.output.dir}/test-classes" keep="true" verbose="false"/> + </target> + +</project> \ No newline at end of file Property changes on: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-05-07 12:14:50 UTC (rev 6931) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-05-07 12:39:17 UTC (rev 6932) @@ -63,6 +63,13 @@ <version>3.8.1</version> <scope>test</scope> </dependency> + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <version>1.5.0</version> + <scope>system</scope> + <systemPath>${java.home}/../lib/tools.jar</systemPath> + </dependency> </dependencies> <!-- Build --> Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-07 12:14:50 UTC (rev 6931) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-07 12:39:17 UTC (rev 6932) @@ -28,16 +28,6 @@ # [JBWS-1526] Automated testing and availablity checks of public endpoints (interop) org/jboss/test/ws/interop/** -# [JBWS-2163] wsconsume for maven build --> -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** -org/jboss/test/ws/jaxws/smoke/tools/** -org/jboss/test/ws/benchmark/** -org/jboss/test/ws/interop/** -org/jboss/test/ws/jaxws/samples/wssecuritypolicy/** -org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/** -org/jboss/test/ws/jaxws/samples/wssecurity/** - # [JBWS-2167] Fix samples jaxr for maven build org/jboss/test/ws/jaxws/samples/jaxr/**