Author: thomas.diesler(a)jboss.com Date: 2008-05-09 09:50:22 -0400 (Fri, 09 May 2008) New Revision: 6991 Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml Log: Fix compile of wstools generated artifacts Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-09 10:27:32 UTC (rev 6990) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-09 13:50:22 UTC (rev 6991) @@ -70,6 +70,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="jboss.bind.address" value="${jboss.bind.address}"/> + <property name="java.jdk15.home" value="${java.jdk15.home}"/> <ant antfile="scripts/antrun-wstools.xml" target="wstools"/> </tasks> </configuration> 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-09 10:27:32 UTC (rev 6990) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-09 13:50:22 UTC (rev 6991) @@ -14,75 +14,44 @@ <!-- Generating sources --> <!-- ================================================================== --> - <target name="wstools" description="Generate the JAX-RPC artifacts."> + <target name="wstools" depends="generate-sources,compile-sources,copy-resources" description="Generate the JAX-RPC artifacts."> + </target> + + <!-- Generate JAX-RPC artifacts --> + <target name="generate-sources"> - <!-- Define the JAX-RPC tools task --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath> <pathelement path="${maven.test.classpath}"/> </classpath> </taskdef> - <!-- Generate JAX-RPC artifacts --> - <mkdir dir="${tests.output.dir}/wstools/java"/> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/hello/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/replyto/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> - <!--wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools--> - <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"> - <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> - </wstools> + <macro-wstools dest="jaxrpc/samples/docstyle/wrapped/WEB-INF" config="jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/docstyle/bare/WEB-INF" config="jaxrpc/samples/docstyle/bare/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/dynamichandler/WEB-INF" config="jaxrpc/samples/dynamichandler/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/exception/WEB-INF" config="jaxrpc/samples/exception/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/handler/WEB-INF" config="jaxrpc/samples/handler/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/holder/WEB-INF" config="jaxrpc/samples/holder/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/jmstransport/META-INF" config="jaxrpc/samples/jmstransport/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/jsr109ejb/doclit/META-INF" config="jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/message/WEB-INF" config="jaxrpc/samples/message/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/oneway/WEB-INF" config="jaxrpc/samples/oneway/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/rpcstyle/WEB-INF" config="jaxrpc/samples/rpcstyle/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/secureejb/META-INF" config="jaxrpc/samples/secureejb/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/wsaddr/hello/WEB-INF" config="jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> + <macro-wstools dest="jaxrpc/samples/wsaddr/replyto/WEB-INF" config="jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/> + <!--wstools dest="jaxrpc/samples/wsbpel/hello/WEB-INF" config="jaxrpc/samples/wsbpel/hello/wstools-config.xml"/--> + <macro-wstools dest="jaxrpc/samples/wssecurity/WEB-INF" config="jaxrpc/samples/wssecurity/wstools-config.xml"/> + </target> + + <!-- Copy generated resources --> + <target name="compile-sources"> + + <mkdir dir="${tests.output.dir}/wstools/java"/> <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> @@ -93,20 +62,46 @@ <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/> </move> - <!-- Copy generated resources --> + <!-- + Cannot run javac from tasks + http://jira.codehaus.org/browse/MANTRUN-91 + --> + <javac destdir="${tests.output.dir}/test-classes" debug="true" encoding="utf-8" deprecation="true" fork="true" + executable="${java.jdk15.home}/bin/javac" compiler="javac1.5"> + <src path="${tests.output.dir}/wstools/java"/> + <classpath> + <pathelement path="${maven.test.classpath}"/> + </classpath> + </javac> + </target> + + <!-- Copy generated resources --> + <target name="copy-resources"> + <copy todir="${tests.output.dir}/test-resources"> <fileset dir="${tests.output.dir}/wstools/resources"> <include name="**/*.wsdl"/> <include name="**/*.xml"/> </fileset> </copy> - <!-- Copy resources that cannot (yet) be generated --> + <copy todir="${tests.output.dir}/test-resources/jaxrpc/samples" overwrite="true"> <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/> <filterset> - <filter token="jboss.bind.address" value="${node0}"/> + <filter token="jboss.bind.address" value="${jboss.bind.address}"/> </filterset> </copy> </target> + <!-- macro-wstools --> + <macrodef name="macro-wstools"> + <attribute name="dest"/> + <attribute name="config"/> + <sequential> + <wstools dest="${tests.output.dir}/wstools/resources/@{dest}" config="${tests.resources.dir}/@{config}"> + <sysproperty key="log4j.output.dir" value="${tests.output.dir}"/> + </wstools> + </sequential> + </macrodef> + </project> \ No newline at end of file