Author: richard.opalka(a)jboss.com Date: 2010-08-31 07:52:44 -0400 (Tue, 31 Aug 2010) New Revision: 12878 Added: stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt Log: [JBWS-2960] enabling test Modified: stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2010-08-31 11:20:43 UTC (rev 12877) +++ stack/cxf/trunk/modules/testsuite/framework-tests/pom.xml 2010-08-31 11:52:44 UTC (rev 12878) @@ -100,6 +100,7 @@ <property name="project.version" value="${project.version}"/> <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml" /> <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> @@ -111,7 +112,14 @@ </goals> <configuration> <tasks> + <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}"/> + <property name="log4j.conf" value="${basedir}/src/test/etc/log4j.xml"/> + <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"/> Modified: stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-08-31 11:20:43 UTC (rev 12877) +++ stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsconsume.xml 2010-08-31 11:52:44 UTC (rev 12878) @@ -7,28 +7,62 @@ <!-- ============================================================ --> <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.test.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" fork="true"> - <jvmarg line="-Dlog4j.configuration=file://${log4j.conf}"/> - <jvmarg line="-Dlog4j.output.dir=${log4j.output.dir}"/> - </wsconsume> - <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" fork="true"> - <jvmarg line="-Dlog4j.configuration=file://${log4j.conf}"/> - <jvmarg line="-Dlog4j.output.dir=${log4j.output.dir}"/> - </wsconsume> + + <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}" + log4jConf="${log4j.conf}" + loggingDir="${log4j.output.dir}" + /> + + <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}" + log4jConf="${log4j.conf}" + loggingDir="${log4j.output.dir}" + /> + </target> - + + <macrodef name="wsconsume-macro"> + + <attribute name="wsdl"/> + <attribute name="package"/> + <attribute name="outputDir"/> + <attribute name="jbossHome"/> + <attribute name="log4jConf"/> + <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.configuration=file://@{log4jConf}"/> + <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> + </wsconsume> + </sequential> + + </macrodef> + </project> Added: stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/framework-tests/scripts/antrun-wsprovide.xml 2010-08-31 11:52:44 UTC (rev 12878) @@ -0,0 +1,59 @@ +<?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}" + log4jConf="${log4j.conf}" + 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="log4jConf"/> + <attribute name="loggingDir"/> + <attribute name="resourcesDir"/> + + <sequential> + <wsprovide + sei="@{sei}" + fork="true" + genwsdl="true" + verbose="true" + 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.configuration=file://@{log4jConf}"/> + <jvmarg line="-Dlog4j.output.dir=@{loggingDir}"/> + </wsprovide> + </sequential> + + </macrodef> + +</project> Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-08-31 11:20:43 UTC (rev 12877) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-08-31 11:52:44 UTC (rev 12878) @@ -32,7 +32,6 @@ # [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack org/jboss/test/ws/jaxws/jbws2937/** org/jboss/test/ws/jaxws/jbws2942/** -org/jboss/test/ws/jaxws/jbws2960/** org/jboss/test/ws/jaxws/jbws3022/** org/jboss/test/ws/jaxws/jbws3031/** org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.*