Author: thomas.diesler(a)jboss.com Date: 2007-05-23 01:45:07 -0400 (Wed, 23 May 2007) New Revision: 3199 Modified: trunk/build/ant-import/build-testsuite.xml trunk/integration/jbws/ant-import/build-testsuite.xml trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/xfire/ant-import/build-testsuite.xml trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/MessageJavaBean.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java trunk/testsuite/ant-import/build-testsuite.xml Log: Unify test classpaths Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-05-23 04:03:24 UTC (rev 3198) +++ trunk/build/ant-import/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199) @@ -85,11 +85,92 @@ </tstamp> </target> + <target name="tests-classpath" depends="tests-classpath-jboss50,tests-classpath-jboss42"/> + + <target name="tests-classpath-jboss50" depends="tests-init" if="jbossws.integration.jboss50"> + <path id="tests.javac.classpath"> + <path refid="ws.stack.classpath"/> + <path refid="tests.extra.classpath"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> + <pathelement location="${jboss.client}/jboss-common-core.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> + <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> + <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> + <pathelement location="${jboss.client}/mail.jar"/> + <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.server.lib}/servlet-api.jar"/> + </path> + <path id="tests.client.classpath"> + <pathelement location="${jboss.client}/javassist.jar"/> + <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> + <pathelement location="${jboss.client}/wsdl4j.jar"/> + <pathelement location="${jboss.client}/log4j.jar"/> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> + <path refid="tests.javac.classpath"/> + </path> + </target> + + <target name="tests-classpath-jboss42" depends="tests-init" if="jbossws.integration.jboss42"> + <path id="tests.javac.classpath"> + <path refid="ws.stack.classpath"/> + <path refid="tests.extra.classpath"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-common-client.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3x.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> + <pathelement location="${jboss.client}/jboss-j2ee.jar"/> + <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> + <pathelement location="${jboss.client}/mail.jar"/> + <pathelement location="${jboss.client}/stax-api.jar"/> + <pathelement location="${jboss.client}/jbosssx-client.jar"/> + <pathelement location="${jboss.server.lib}/servlet-api.jar"/> + </path> + <path id="tests.client.classpath"> + <pathelement location="${jboss.client}/commons-logging.jar"/> + <pathelement location="${jboss.client}/javassist.jar"/> + <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> + <pathelement location="${jboss.client}/wsdl4j.jar"/> + <pathelement location="${jboss.client}/log4j.jar"/> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> + <path refid="tests.javac.classpath"/> + </path> + </target> + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> + + <macrodef name="macro-compile-classes"> + <attribute name="srcdir"/> + <sequential> + <mkdir dir="${tests.output.dir}/classes"/> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> + <src path="@{srcdir}"/> + <classpath refid="tests.javac.classpath"/> + </javac> + </sequential> + </macrodef> + + <!-- ================================================================== --> <!-- Building --> <!-- ================================================================== --> - <macrodef name="copy-test-resources"> + <macrodef name="macro-copy-resources"> <attribute name="srcdir"/> <sequential> <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/jndi.properties"/> Modified: trunk/integration/jbws/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-23 04:03:24 UTC (rev 3198) +++ trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199) @@ -20,73 +20,31 @@ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> - <!-- - Init the various classpaths - --> - <target name="tests-init" depends="tests-init-jboss50,tests-init-jboss42"> - <path id="jbossws.classpath"> + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="tests-init" depends="tests-prepare"> + + <path id="ws.stack.classpath"> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> </path> - </target> - - <target name="tests-init-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50"> - <path id="javac.classpath"> - <path refid="jbossws.classpath"/> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + + <path id="tests.extra.classpath"> </path> - <path id="tests.client.classpath"> - <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <path refid="javac.classpath"/> - </path> + </target> - <target name="tests-init-jboss42" depends="tests-prepare" if="jbossws.integration.jboss42"> - <path id="javac.classpath"> - <path refid="jbossws.classpath"/> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/jboss-common-client.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3x.jar"/> - <pathelement location="${jboss.client}/jboss-j2ee.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/jbosssx-client.jar"/> - </path> - <path id="tests.client.classpath"> - <pathelement location="${jboss.client}/commons-logging.jar"/> - <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <path refid="javac.classpath"/> - </path> + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> + + <target name="tests-compile" depends="tests-classpath" description="Compile sources"> + <macro-compile-classes srcdir="${tests.java.dir}"/> </target> </project> Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 04:03:24 UTC (rev 3198) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199) @@ -23,53 +23,37 @@ <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> + + <target name="tests-init" depends="jars,tests-prepare"> - <!-- - Init the various classpaths - --> - <target name="tests-init" depends="tests-prepare,thirdparty"> - - <path id="sunri.classpath"> - <pathelement location="${thirdparty.dir}/FastInfoset.jar"/> - <pathelement location="${thirdparty.dir}/http.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> - <pathelement location="${thirdparty.dir}/jsr173_api.jar"/> - <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> - <pathelement location="${thirdparty.dir}/jsr250-api.jar"/> - <pathelement location="${thirdparty.dir}/resolver.jar"/> - <pathelement location="${thirdparty.dir}/saaj-api.jar"/> - <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> - <pathelement location="${thirdparty.dir}/sjsxp.jar"/> - <pathelement location="${thirdparty.dir}/stax-ex.jar"/> - <pathelement location="${thirdparty.dir}/streambuffer.jar"/> + <path id="ws.stack.classpath"> + <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> </path> - - <!-- The combined compile classpath --> - <path id="javac.classpath"> - <path refid="sunri.classpath"/> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + + <path id="tests.extra.classpath"> </path> - - <!-- The test client classpath --> - <path id="tests.client.classpath"> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/wstx.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <path refid="javac.classpath"/> - </path> </target> + + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> + <target name="tests-compile" depends="tests-classpath" description="Compile sources"> + <macro-compile-classes srcdir="${tests.java.dir}"/> + </target> + </project> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 04:03:24 UTC (rev 3198) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199) @@ -23,28 +23,15 @@ <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> + + <target name="tests-init" depends="jars,tests-prepare"> - <!-- - Init the various classpaths - --> - <target name="tests-init" depends="tests-prepare,thirdparty"> - <!-- Cannot use XFire client [JBWS-1654] - ServiceDelegate requires non portable method getPortClassMap --> <ant antfile="${int.sunri.dir}/build.xml" target="thirdparty" inheritall="false"/> - <path id="jbossws.classpath"> - <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> - <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> - <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> - <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> - <pathelement location="${core.dir}/thirdparty/jboss-xml-binding.jar"/> - <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> - </path> - <path id="sunri.classpath"> <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> @@ -71,34 +58,22 @@ <pathelement location="${thirdparty.dir}/xfire-all.jar"/> <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> </path> - - <!-- The combined compile classpath --> - <path id="javac.classpath"> - <path refid="xfire.classpath"/> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - </path> - - <!-- The test client classpath --> - <path id="tests.client.classpath"> + + <path id="ws.stack.classpath"> <path refid="sunri.classpath"/> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> </path> + <path id="tests.extra.classpath"> + </path> + </target> + + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> + <target name="tests-compile" depends="tests-classpath" description="Compile sources"> + <macro-compile-classes srcdir="${tests.java.dir}"/> + </target> + </project> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-23 04:03:24 UTC (rev 3198) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-05-23 05:45:07 UTC (rev 3199) @@ -92,7 +92,7 @@ <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-23 04:03:24 UTC (rev 3198) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199) @@ -27,8 +27,7 @@ --> <target name="tests-init" depends="jars,tests-prepare"> - <path id="jbossws.classpath"> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <path id="ws.stack.classpath"> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> @@ -36,43 +35,19 @@ <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> </path> - <!-- The combined compile classpath --> - <path id="javac.classpath"> - <path refid="jbossws.classpath"/> - <path refid="thirdparty.classpath"/> - <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> - <pathelement location="${thirdparty.dir}/junit.jar"/> - <pathelement location="${thirdparty.dir}/qdox.jar"/> - <pathelement location="${thirdparty.dir}/policy.jar"/> - <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> - <pathelement location="${jboss.home}/client/jboss-ejb3-client.jar"/> + <path id="tests.extra.classpath"> + <pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${core.dir}/thirdparty/ejb3.deployer/jboss-ejb3.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-remoting.jar"/> + <pathelement location="${core.dir}/thirdparty/policy.jar"/> + <pathelement location="${core.dir}/thirdparty/qdox.jar"/> + <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> + <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/> </path> - <!-- The test client classpath --> - <path id="tests.client.classpath"> - <path refid="jbossws.classpath"/> - <pathelement location="${jboss.client}/commons-logging.jar"/> - <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> - <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss.server.lib}/hibernate3.jar"/> - <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/jbossws-${jbossws.integration.target}.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <path refid="javac.classpath"/> - </path> - <!-- The jBPM BPEL classpath --> <path id="jbpm.bpel.classpath"> - <path refid="jbossws.classpath"/> + <path refid="ws.stack.classpath"/> <pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml --> <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> @@ -99,7 +74,7 @@ <!-- Define the JAX-WS wsconsume task --> <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> - <classpath refid="jbossws.classpath"/> + <classpath refid="ws.stack.classpath"/> <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> </taskdef> @@ -141,7 +116,7 @@ <!-- Define the JAX-RPC tools task --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> - <classpath refid="jbossws.classpath"/> + <classpath refid="ws.stack.classpath"/> <classpath refid="thirdparty.classpath"/> <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/> <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> @@ -196,7 +171,7 @@ <!-- Define the JAX-WS wsprovide task --> <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> - <classpath refid="jbossws.classpath"/> + <classpath refid="ws.stack.classpath"/> <classpath refid="thirdparty.classpath"/> <classpath location="${thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> @@ -206,25 +181,16 @@ </target> <target name="tests-generate-resources" depends="servicegen,wstools,wsprovide"> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <src path="${tests.output.dir}/wstools/java"/> - <exclude name="org/jboss/test/ws/interop/**"/> - <classpath refid="javac.classpath"/> - </javac> + <macro-compile-classes srcdir="${tests.output.dir}/wstools/java"/> </target> <!-- ================================================================== --> <!-- Compiling --> <!-- ================================================================== --> - <target name="tests-compile" depends="wsconsume" description="Compile sources"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="${tests.java.dir}"/> - <src path="${tests.output.dir}/wsconsume/java"/> - <classpath refid="javac.classpath"/> - </javac> + <target name="tests-compile" depends="wsconsume,tests-classpath" description="Compile sources"> + <macro-compile-classes srcdir="${tests.output.dir}/wsconsume/java"/> + <macro-compile-classes srcdir="${tests.java.dir}"/> </target> <!-- ================================================================== --> @@ -233,7 +199,7 @@ <!-- Copy resources --> <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy-test-resources srcdir="${tests.dir}"/> + <macro-copy-resources srcdir="${tests.dir}"/> </target> <target name="tests-jars" depends="wsconsume,tests-compile,tests-copy-resources,tests-generate-resources" description="Build the deployments."> Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/MessageJavaBean.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/MessageJavaBean.java 2007-05-23 04:03:24 UTC (rev 3198) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws84/MessageJavaBean.java 2007-05-23 05:45:07 UTC (rev 3199) @@ -22,7 +22,6 @@ package org.jboss.test.ws.jaxrpc.jbws84; import java.io.ByteArrayInputStream; -import java.io.StringWriter; import java.rmi.RemoteException; import javax.xml.parsers.DocumentBuilder; @@ -36,10 +35,9 @@ import javax.xml.soap.SOAPMessage; import org.jboss.logging.Logger; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Document; -import com.ibm.wsdl.util.xml.DOM2Writer; - /** * @author Thomas.Diesler(a)jboss.org * @since 26-Nov-2004 @@ -53,9 +51,8 @@ */ public SOAPElement processSOAPElement(SOAPElement reqElement) throws RemoteException { - StringWriter swr = new StringWriter(); - DOM2Writer.serializeAsXML(reqElement, swr); - log.info("processSOAPElement: " + swr); + String msgStr = DOMWriter.printNode(reqElement, true); + log.info("processSOAPElement: " + msgStr); try { Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java 2007-05-23 04:03:24 UTC (rev 3198) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/samples/message/MessageTestServiceBean.java 2007-05-23 05:45:07 UTC (rev 3199) @@ -22,7 +22,6 @@ package org.jboss.test.ws.jaxrpc.samples.message; import java.io.ByteArrayInputStream; -import java.io.StringWriter; import java.rmi.RemoteException; import javax.xml.namespace.QName; @@ -37,12 +36,11 @@ import org.jboss.logging.Logger; import org.jboss.wsf.spi.utils.DOMUtils; +import org.jboss.wsf.spi.utils.DOMWriter; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import com.ibm.wsdl.util.xml.DOM2Writer; - /** * @author Thomas.Diesler(a)jboss.org * @since 26-Nov-2004 @@ -56,9 +54,8 @@ */ public SOAPElement processElement(SOAPElement msg) throws RemoteException { - StringWriter swr = new StringWriter(); - DOM2Writer.serializeAsXML(msg, swr); - log.info("processElement: " + swr); + String msgStr = DOMWriter.printNode(msg, true); + log.info("processElement: " + msgStr); try { @@ -122,7 +119,7 @@ TransformerFactory factory = TransformerFactory.newInstance(); Transformer transformer = factory.newTransformer(); transformer.transform(new DOMSource(doc), new DOMResult(parent)); - return (SOAPElement) parent.getChildElements().next(); + return (SOAPElement)parent.getChildElements().next(); } catch (RuntimeException e) { Modified: trunk/testsuite/ant-import/build-testsuite.xml =================================================================== --- trunk/testsuite/ant-import/build-testsuite.xml 2007-05-23 04:03:24 UTC (rev 3198) +++ trunk/testsuite/ant-import/build-testsuite.xml 2007-05-23 05:45:07 UTC (rev 3199) @@ -13,33 +13,19 @@ <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> - <!-- - Init the various classpaths - --> - <target name="tests-init" depends="tests-prepare"> - - </target> - <!-- ================================================================== --> - <!-- Compiling --> + <!-- Initialization --> <!-- ================================================================== --> - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="${tests.java.dir}"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - + <target name="tests-init" depends="tests-prepare"/> + <!-- ================================================================== --> <!-- Building --> <!-- ================================================================== --> <!-- Copy resources --> <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <copy-test-resources srcdir="${tests.dir}"/> + <macro-copy-resources srcdir="${tests.dir}"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">