Author: richard.opalka(a)jboss.com Date: 2010-05-14 04:59:04 -0400 (Fri, 14 May 2010) New Revision: 12233 Added: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.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/pom.xml Log: [JBWS-3024] endorsing wsconsume and wsprovide tools when generating test artifacts Modified: stack/native/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2010-05-14 06:56:04 UTC (rev 12232) +++ stack/native/trunk/modules/testsuite/framework-tests/pom.xml 2010-05-14 08:59:04 UTC (rev 12233) @@ -1,10 +1,10 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - + <name>JBoss Web Services - Stack Native Framework Tests</name> <artifactId>jbossws-native-framework-tests</artifactId> <packaging>jar</packaging> - + <!-- Parent --> <parent> <groupId>org.jboss.ws.native</groupId> @@ -12,7 +12,7 @@ <version>3.3.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - + <!-- Dependencies --> <dependencies> <dependency> @@ -22,7 +22,7 @@ <type>zip</type> </dependency> </dependencies> - + <!-- Plugins --> <build> <plugins> @@ -43,11 +43,11 @@ </plugin> </plugins> </build> - + <!-- Profiles --> <profiles> - - <!-- + + <!-- Name: noprepare Descr: Skip test preparation with -Dnoprepare --> @@ -97,6 +97,8 @@ <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}" /> + <property name="log4j.output.dir" value="{log4j.output.dir}"/> + <property name="jboss.home" value="${jboss.home}"/> <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" /> </tasks> </configuration> @@ -112,6 +114,9 @@ <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}" /> + <property name="log4j.output.dir" value="{log4j.output.dir}"/> + <property name="jboss.home" value="${jboss.home}"/> + <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/> <ant antfile="src/test/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" /> <ant antfile="src/test/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" /> <ant antfile="src/test/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> @@ -143,7 +148,7 @@ </plugins> </build> </profile> - + </profiles> - + </project> Modified: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-05-14 06:56:04 UTC (rev 12232) +++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-05-14 08:59:04 UTC (rev 12233) @@ -8,29 +8,57 @@ <project> - <!-- ================================================================== --> - <!-- Generating sources --> - <!-- ================================================================== --> + <target name="wsconsume" description="Consume JAX-WS contracts"> - <target name="wsconsume" depends="prepend-jars" description="Consume JAX-WS contracts"> - <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> - <pathelement path="${wsconsume.classpath}"/> + <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> - <!-- - [JBWS-2950] We need to specify JAX-WS 2.1 target - explicitely here, because native default is 2.2 - but JDK6 comes with JAX-WS 2.1 API only. - --> - <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}" nocompile="true" keep="true" verbose="false" target="2.1"/> - <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}" nocompile="true" keep="true" verbose="false" target="2.1"/> - </target> + <wsconsume-macro + wsdl="${tests.resources.dir}/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl" + package="org.jboss.test.ws.jaxws.complex" + outputDir="${tests.output.dir}" + jbossHome="${jboss.home}" + loggingDir="${log4j.output.dir}" + /> - <target name="prepend-jars"> - <property name="wsconsume.classpath" value="${maven.test.classpath}"/> + <wsconsume-macro + wsdl="${tests.resources.dir}/jaxws/holder/META-INF/wsdl/HolderService.wsdl" + package="org.jboss.test.ws.jaxws.holder" + outputDir="${tests.output.dir}" + jbossHome="${jboss.home}" + loggingDir="${log4j.output.dir}" + /> + </target> + <macrodef name="wsconsume-macro"> + + <attribute name="wsdl"/> + <attribute name="package"/> + <attribute name="outputDir"/> + <attribute name="jbossHome"/> + <attribute name="loggingDir"/> + + <sequential> + <wsconsume + wsdl="@{wsdl}" + package="@{package}" + sourcedestdir="@{outputdir}/wsconsume/java" + destdir="@{outputdir}" + nocompile="true" + keep="true" + verbose="false" + target="2.2" + fork="true" + > + <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> + </wsconsume> + </sequential> + + </macrodef> + </project> Copied: stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml (from rev 12203, stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml) =================================================================== --- stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml (rev 0) +++ stack/native/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml 2010-05-14 08:59:04 UTC (rev 12233) @@ -0,0 +1,56 @@ +<?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. --> +<!-- ============================================================ --> + +<project> + + <target name="wsprovide" description="Provide JAX-WS contracts"> + + <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> + <classpath> + <pathelement path="${maven.test.classpath}"/> + </classpath> + </taskdef> + + <wsprovide-macro + sei="org.jboss.test.ws.jaxws.jbws2960.AddNumbersImpl" + destdir="jaxws/jbws2960" + jbossHome="${jboss.home}" + outputDir="${tests.output.dir}" + loggingDir="${log4j.output.dir}" + resourcesDir="jaxws/jbws2960" + /> + + </target> + + <macrodef name="wsprovide-macro"> + + <attribute name="sei"/> + <attribute name="destDir"/> + <attribute name="jbossHome"/> + <attribute name="outputDir"/> + <attribute name="loggingDir"/> + <attribute name="resourcesDir"/> + + <sequential> + <wsprovide + sei="@{sei}" + fork="true" + genwsdl="true" + verbose="false" + classpath="@{outputDir}/test-classes" + destdir="@{outputDir}/test-classes/@{destDir}" + resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}" + > + <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> + </wsprovide> + </sequential> + + </macrodef> + +</project> Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2010-05-14 06:56:04 UTC (rev 12232) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2010-05-14 08:59:04 UTC (rev 12233) @@ -54,6 +54,8 @@ <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}" /> + <property name="log4j.output.dir" value="${log4j.output.dir}"/> + <property name="jboss.home" value="${jboss.home}"/> <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume" /> </tasks> </configuration> @@ -70,6 +72,8 @@ <property name="tests.resources.dir" value="${test.resources.directory}" /> <property name="tests.output.dir" value="${project.build.directory}" /> <property name="jboss.bind.address" value="${jboss.bind.address}" /> + <property name="log4j.output.dir" value="${log4j.output.dir}"/> + <property name="jboss.home" value="${jboss.home}"/> <ant antfile="scripts/antrun-wstools.xml" target="wstools" /> </tasks> </configuration> @@ -85,6 +89,8 @@ <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="log4j.output.dir" value="${log4j.output.dir}"/> + <property name="jboss.home" value="${jboss.home}"/> <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide" /> </tasks> </configuration> @@ -97,8 +103,10 @@ </goals> <configuration> <tasks> + <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> <property name="tests.output.dir" value="${project.build.directory}" /> - <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> + <property name="log4j.output.dir" value="${log4j.output.dir}"/> + <property name="jboss.home" value="${jboss.home}"/> <ant antfile="scripts/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" /> <ant antfile="scripts/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" /> <ant antfile="scripts/build-jars-jaxws.xml" target="build-jars-jaxws" /> @@ -112,7 +120,7 @@ </plugins> </build> </profile> - + </profiles> - + </project> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2010-05-14 06:56:04 UTC (rev 12232) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsconsume.xml 2010-05-14 08:59:04 UTC (rev 12233) @@ -8,34 +8,97 @@ <project> - <!-- ================================================================== --> - <!-- Generating sources --> - <!-- ================================================================== --> + <target name="wsconsume" description="Consume JAX-WS contracts"> - <target name="wsconsume" depends="prepend-jars" description="Consume JAX-WS contracts"> - <taskdef name="wsconsume" classname="org.jboss.wsf.spi.tools.ant.WSConsumeTask"> <classpath> - <pathelement path="${wsconsume.classpath}"/> + <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> - <!-- - [JBWS-2950] We need to specify JAX-WS 2.1 target - explicitely here, because native default is 2.2 - but JDK6 comes with JAX-WS 2.1 API only. - --> - <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}" nocompile="true" keep="true" verbose="false" target="2.1"/> - <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}" nocompile="true" keep="true" verbose="false" target="2.1"/> - <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}" nocompile="true" keep="true" verbose="false" target="2.1"/> - <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}" nocompile="true" keep="true" verbose="false" target="2.1"/> - <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}" nocompile="true" keep="true" verbose="false" target="2.1"/> - <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}" nocompile="true" keep="true" verbose="false" target="2.1"/> - <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}" nocompile="true" keep="true" verbose="false" target="2.1"/> - </target> + <wsconsume-macro + wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" + package="org.jboss.test.ws.benchmark.jaxws.doclit" + outputDir="${tests.output.dir}" + jbossHome="${jboss.home}" + loggingDir="${log4j.output.dir}" + /> - <target name="prepend-jars"> - <property name="wsconsume.classpath" value="${maven.test.classpath}"/> + <wsconsume-macro + wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" + package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" + outputDir="${tests.output.dir}" + jbossHome="${jboss.home}" + loggingDir="${log4j.output.dir}" + /> + + <wsconsume-macro + wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" + package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" + outputDir="${tests.output.dir}" + jbossHome="${jboss.home}" + loggingDir="${log4j.output.dir}" + /> + + <wsconsume-macro + wsdl="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" + package="org.jboss.test.ws.interop.soapwsdl.baserpclit" + outputDir="${tests.output.dir}" + jbossHome="${jboss.home}" + loggingDir="${log4j.output.dir}" + /> + + <wsconsume-macro + wsdl="${tests.resources.dir}/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl" + package="org.jboss.test.ws.jaxws.samples.wssecuritypolicy" + outputDir="${tests.output.dir}" + jbossHome="${jboss.home}" + loggingDir="${log4j.output.dir}" + /> + + <wsconsume-macro + wsdl="${tests.resources.dir}/jaxws/samples/wssecurityAnnotatedpolicy/META-INF/wsdl/HelloService.wsdl" + package="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy" + outputDir="${tests.output.dir}" + jbossHome="${jboss.home}" + loggingDir="${log4j.output.dir}" + /> + + <wsconsume-macro + wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" + package="org.jboss.test.ws.jaxws.samples.wssecurity" + outputDir="${tests.output.dir}" + jbossHome="${jboss.home}" + loggingDir="${log4j.output.dir}" + /> + </target> + <macrodef name="wsconsume-macro"> + + <attribute name="wsdl"/> + <attribute name="package"/> + <attribute name="outputDir"/> + <attribute name="jbossHome"/> + <attribute name="loggingDir"/> + + <sequential> + <wsconsume + wsdl="@{wsdl}" + package="@{package}" + sourcedestdir="@{outputdir}/wsconsume/java" + destdir="@{outputdir}" + nocompile="true" + keep="true" + verbose="false" + target="2.2" + fork="true" + > + <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> + </wsconsume> + </sequential> + + </macrodef> + </project> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2010-05-14 06:56:04 UTC (rev 12232) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wsprovide.xml 2010-05-14 08:59:04 UTC (rev 12233) @@ -7,14 +7,9 @@ <!-- ============================================================ --> <project> - - <!-- ================================================================== --> - <!-- Generating sources --> - <!-- ================================================================== --> <target name="wsprovide" description="Provide the JAX-WS contracts."> - <!-- Define the JAX-WS wsprovide task --> <taskdef name="wsprovide" classname="org.jboss.wsf.spi.tools.ant.WSProvideTask"> <classpath> <pathelement path="${maven.test.classpath}"/> @@ -22,20 +17,50 @@ <classpath location="${tests.output.dir}/test-resources/jaxws/samples/wssecurityAnnotatedpolicy"/> </taskdef> - <wsprovide - resourcedestdir="${tests.output.dir}/test-resources/wsprovide/jaxws/samples/wssecurity" - genwsdl="true" + <wsprovide-macro sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean" - destdir="${tests.output.dir}/test-classes" - verbose="false"/> + destDir="" + jbossHome="${jboss.home}" + outputDir="${tests.output.dir}" + loggingDir="${log4j.output.dir}" + resourcesDir="wsprovide/jaxws/samples/wssecurity" + /> - <wsprovide - resourcedestdir="${tests.output.dir}/test-resources/wsprovide/jaxws/samples/wssecurityAnnotatedpolicy" - genwsdl="true" + <wsprovide-macro sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean" - destdir="${tests.output.dir}/test-classes" - verbose="false"/> + destDir="" + jbossHome="${jboss.home}" + outputDir="${tests.output.dir}" + loggingDir="${log4j.output.dir}" + resourcesDir="wsprovide/jaxws/samples/wssecurityAnnotatedpolicy" + /> </target> + <macrodef name="wsprovide-macro"> + + <attribute name="sei"/> + <attribute name="destDir"/> + <attribute name="jbossHome"/> + <attribute name="outputDir"/> + <attribute name="loggingDir"/> + <attribute name="resourcesDir"/> + + <sequential> + <wsprovide + sei="@{sei}" + fork="true" + genwsdl="true" + verbose="false" + classpath="@{outputDir}/test-classes" + destdir="@{outputDir}/test-classes/@{destDir}" + resourcedestdir="@{outputDir}/test-resources/@{resourcesDir}" + > + <jvmarg line="-Djava.endorsed.dirs=@{jbossHome}/lib/endorsed"/> + <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> + </wsprovide> + </sequential> + + </macrodef> + </project> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2010-05-14 06:56:04 UTC (rev 12232) +++ stack/native/trunk/modules/testsuite/pom.xml 2010-05-14 08:59:04 UTC (rev 12233) @@ -27,6 +27,7 @@ <hibernate.version>3.2.4.sp1</hibernate.version> <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> <hornetq.version>2.1.0.BETA3</hornetq.version> + <log4j.output.dir>${project.build.directory}</log4j.output.dir> </properties> <!-- Modules --> @@ -195,7 +196,7 @@ </property> <property> <name>log4j.output.dir</name> - <value>${project.build.directory}</value> + <value>${log4j.output.dir}</value> </property> <property> <name>org.jboss.ws.wsse.keyStore</name>