Author: thomas.diesler(a)jboss.com Date: 2008-05-07 10:01:19 -0400 (Wed, 07 May 2008) New Revision: 6938 Added: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools/ stack/metro/trunk/modules/testsuite/framework-tests/scripts/ stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml stack/metro/trunk/modules/testsuite/metro-tests/scripts/ stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml Removed: stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools/ Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml stack/metro/trunk/modules/testsuite/metro-tests/pom.xml stack/metro/trunk/modules/testsuite/pom.xml stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt Log: Add wsconsume Copied: stack/metro/trunk/modules/client/src/main/java/org/jboss/wsf/stack/metro/tools (from rev 6937, stack/metro/trunk/modules/server/src/main/java/org/jboss/wsf/stack/metro/tools) Modified: stack/metro/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-07 13:39:33 UTC (rev 6937) +++ stack/metro/trunk/modules/testsuite/framework-tests/pom.xml 2008-05-07 14:01:19 UTC (rev 6938) @@ -58,6 +58,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/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml (rev 0) +++ stack/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-07 14:01:19 UTC (rev 6938) @@ -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/metro/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/metro/trunk/modules/testsuite/metro-tests/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-05-07 13:39:33 UTC (rev 6937) +++ stack/metro/trunk/modules/testsuite/metro-tests/pom.xml 2008-05-07 14:01:19 UTC (rev 6938) @@ -21,6 +21,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/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml (rev 0) +++ stack/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml 2008-05-07 14:01:19 UTC (rev 6938) @@ -0,0 +1,29 @@ +<?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}/wsit/rm/WEB-INF/wsdl/Calc.wsdl" package="org.jboss.test.ws.wsit.rm" 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/metro/trunk/modules/testsuite/metro-tests/scripts/antrun-wsconsume.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-05-07 13:39:33 UTC (rev 6937) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-05-07 14:01:19 UTC (rev 6938) @@ -46,7 +46,16 @@ <groupId>org.jboss.ws</groupId> <artifactId>jbossws-spi</artifactId> </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> + + <dependency> <groupId>javax.ejb</groupId> <artifactId>ejb-api</artifactId> </dependency> Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-07 13:39:33 UTC (rev 6937) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-07 14:01:19 UTC (rev 6938) @@ -80,7 +80,3 @@ # [JBWS-2164] Fix tools tests with maven build org/jboss/test/ws/jaxws/smoke/tools/** -# [JBWS-2163] wsconsume for maven build -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** -org/jboss/test/ws/wsit/rm/** \ No newline at end of file Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-07 13:39:33 UTC (rev 6937) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-07 14:01:19 UTC (rev 6938) @@ -80,7 +80,3 @@ # [JBWS-2164] Fix tools tests with maven build org/jboss/test/ws/jaxws/smoke/tools/** -# [JBWS-2163] wsconsume for maven build -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** -org/jboss/test/ws/wsit/rm/** \ No newline at end of file Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-07 13:39:33 UTC (rev 6937) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-07 14:01:19 UTC (rev 6938) @@ -86,7 +86,3 @@ # [JBWS-2164] Fix tools tests with maven build org/jboss/test/ws/jaxws/smoke/tools/** -# [JBWS-2163] wsconsume for maven build -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** -org/jboss/test/ws/wsit/rm/** \ No newline at end of file Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-07 13:39:33 UTC (rev 6937) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-07 14:01:19 UTC (rev 6938) @@ -101,7 +101,3 @@ # [JBWS-2164] Fix tools tests with maven build org/jboss/test/ws/jaxws/smoke/tools/** -# [JBWS-2163] wsconsume for maven build -org/jboss/test/ws/jaxws/complex/** -org/jboss/test/ws/jaxws/holder/** -org/jboss/test/ws/wsit/rm/** \ No newline at end of file