[jbossws-commits] JBossWS SVN: r6958 - in stack/native/trunk: modules/testsuite/framework-tests/scripts and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-05-08 05:07:22 -0400 (Thu, 08 May 2008) New Revision: 6958 Modified: stack/native/trunk/build.xml stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml Log: Use mvn clean instead of ant clean Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-05-08 09:07:12 UTC (rev 6957) +++ stack/native/trunk/build.xml 2008-05-08 09:07:22 UTC (rev 6958) @@ -117,19 +117,4 @@ </exec> </target> - <!-- ================================================================== --> - <!-- Miscellaneous --> - <!-- ================================================================== --> - - <target name="clean" description="Cleans up most generated files."> - - <echo message="*************************************"/> - <echo message="* mvn clean *"/> - <echo message="*************************************"/> - - <exec dir="${basedir}" executable="mvn" failonerror="true"> - <arg value="clean"/> - </exec> - </target> - </project> Modified: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-08 09:07:12 UTC (rev 6957) +++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2008-05-08 09:07:22 UTC (rev 6958) @@ -19,7 +19,7 @@ <!-- Define the JAX-WS wsconsume task --> <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> - <pathelement path="${maven.classpath}"/> + <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-08 09:07:12 UTC (rev 6957) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-08 09:07:22 UTC (rev 6958) @@ -51,7 +51,7 @@ </goals> <configuration> <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="maven.test.classpath" refid="maven.test.classpath"/> <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> <property name="tests.output.dir" value="${project.build.directory}"/> <property name="project.version" value="${project.version}"/> @@ -67,7 +67,7 @@ </goals> <configuration> <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="maven.test.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-wstools.xml" target="wstools"/> @@ -82,7 +82,7 @@ </goals> <configuration> <tasks> - <property name="maven.classpath" refid="maven.test.classpath"/> + <property name="maven.test.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-wsprovide.xml" target="wsprovide"/> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2008-05-08 09:07:12 UTC (rev 6957) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2008-05-08 09:07:22 UTC (rev 6958) @@ -11,44 +11,43 @@ <project> <!-- ================================================================== --> - <!-- Generating sources --> - <!-- ================================================================== --> - - <target name="wsconsume" depends="prepend-jars" description="Consume JAX-WS contracts"> - - <!-- Define the JAX-WS wsconsume task --> - <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> + <!-- Generating sources --> + <!-- ================================================================== --> + + <target name="wsconsume" depends="prepend-jars" 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="${wsconsume.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> - + + <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> + <!-- - wsconsume cannot run with jaxws-api from build output - http://jira.jboss.org/jira/browse/JBWS-2175 + wsconsume cannot run with jaxws-api from build output + http://jira.jboss.org/jira/browse/JBWS-2175 --> - <target name="available-jars"> + <target name="available-jars"> <property name="jaxws.ext.jar" value="${basedir}/../../jaxws-ext/target/jbossws-native-jaxws-ext-${project.version}.jar"/> <available property="jaxws.ext.jar.available" file="${jaxws.ext.jar}"/> - <echo message="checking: ${jaxws.ext.jar}"/> <echo message="jaxws.ext.jar.available=${jaxws.ext.jar.available}"/> </target> - <target name="prepend-jars" depends="available-jars,prepend-jaxws-ext"> - <property name="wsconsume.classpath" value="${maven.classpath}"/> + <target name="prepend-jars" depends="available-jars,prepend-jaxws-ext"> + <property name="wsconsume.classpath" value="${maven.test.classpath}"/> </target> - <target name="prepend-jaxws-ext" if="jaxws.ext.jar.available"> - <property name="wsconsume.classpath" value="${jaxws.ext.jar}:${maven.classpath}"/> + <target name="prepend-jaxws-ext" if="jaxws.ext.jar.available"> + <property name="wsconsume.classpath" value="${jaxws.ext.jar}:${maven.test.classpath}"/> </target> </project> \ No newline at end of file Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2008-05-08 09:07:12 UTC (rev 6957) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2008-05-08 09:07:22 UTC (rev 6958) @@ -19,7 +19,7 @@ <!-- Define the JAX-WS wsprovide task --> <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> <classpath> - <pathelement path="${maven.classpath}"/> + <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-08 09:07:12 UTC (rev 6957) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-08 09:07:22 UTC (rev 6958) @@ -19,7 +19,7 @@ <!-- Define the JAX-RPC tools task --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath> - <pathelement path="${maven.classpath}"/> + <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef>