[jbossws-commits] JBossWS SVN: r2238 - in branches/jbossws-1.2.0: jbossws-core/src/main/resources/samples and 6 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-02-01 10:46:41 -0500 (Thu, 01 Feb 2007) New Revision: 2238 Removed: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/jaxrpc/ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/jaxws/ Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml branches/jbossws-1.2.0/jbossws-tests/build.xml branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java Log: Partial commit - JAXRPC XOP not included in samples Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-02-01 13:44:43 UTC (rev 2237) +++ branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-02-01 15:46:41 UTC (rev 2238) @@ -23,17 +23,43 @@ <copy todir="${build.src.samples.dir}"> <fileset dir="${core.samples.dir}"> - <include name="common/imported-build.xml"/> - <include name="common/build-thirdparty.xml"/> + <include name="ant-import/build-thirdparty.xml"/> + <include name="etc/jndi.properties"/> + <include name="etc/log4j.xml"/> <include name="ant.properties.example"/> + <include name="build.xml"/> + </fileset> + </copy> + <copy file="${build.src.samples.dir}/ant.properties.example" tofile="${build.src.samples.dir}/ant.properties"/> + + <copy todir="${build.src.samples.dir}"> + <fileset dir="${core.samples.dir}"> <include name="version.properties"/> - <include name="**/build.xml"/> </fileset> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> + <copy todir="${build.src.samples.dir}"> + <fileset dir="${tests.dir}"> + <include name="ant-imports/build-samples-jaxrpc.xml"/> + <include name="ant-imports/build-samples-jaxws.xml"/> + <include name="src/main/java/org/jboss/test/ws/jaxrpc/samples/**"/> + <include name="src/main/java/org/jboss/test/ws/jaxws/samples/**"/> + <include name="src/main/java/org/jboss/test/ws/*"/> + <include name="src/main/resources/jaxrpc/samples/**"/> + <include name="src/main/resources/jaxws/samples/**"/> + <include name="src/main/resources/*excludes.txt"/> + </fileset> + </copy> + + <copy todir="${build.src.samples.dir}/src/main"> + <fileset dir="${core.samples.dir}"> + <include name="etc/*"/> + </fileset> + </copy> + <mkdir dir="${build.src.samples.dir}/lib"/> <copy todir="${build.src.samples.dir}/lib"> <fileset dir="${core.output.lib.dir}"> @@ -56,291 +82,6 @@ </fileset> </copy> - <!-- samples/common --> - <mkdir dir="${build.src.samples.dir}/common/java"/> - <mkdir dir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples"/> - - <copy todir="${build.src.samples.dir}/common/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/*.java"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/common/resources"> - <fileset dir="${core.samples.dir}/common"> - <include name="tests-*-excludes.txt"/> - <include name="jndi.properties"/> - <include name="log4j.xml"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/> - </copy> - - <!-- samples/docstyle --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/docstyle/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/docstyle/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/docstyle"/> - </copy> - - <!-- samples/dynamichandler --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/dynamichandler/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/dynamichandler"/> - </copy> - - <!-- samples/exception --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/exception/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/exception/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/exception/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/exception/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/exception"/> - </copy> - - <!-- samples/handler --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/handler/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/handler/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/handler/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/handler/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/handler/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/handler"/> - </copy> - - <!-- samples/holder --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/holder/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/holder/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/holder/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/holder/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/holder/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/holder"/> - </copy> - - <!-- samples/jmstransport --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/jmstransport/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/jmstransport/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/jmstransport"/> - </copy> - - <!-- samples/jsr109ejb --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109ejb/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/jsr109ejb"/> - </copy> - - <!-- samples/jsr109pojo --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109pojo/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**/*"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/jsr109pojo"/> - </copy> - - <!-- samples/message --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/message/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/message/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/message/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/message/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/message/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/message"/> - </copy> - - <!-- samples/mtom --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/mtom/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/mtom/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/mtom/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/mtom/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/mtom"/> - </copy> - - <!-- samples/oneway --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/oneway/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/oneway/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/oneway/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/oneway/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/oneway/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/oneway"/> - </copy> - - <!-- samples/rpcstyle --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/rpcstyle/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/rpcstyle"/> - </copy> - - <!-- samples/secureejb --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/secureejb/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/secureejb/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/secureejb"/> - </copy> - - <!-- samples/swa --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/swa/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/swa/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/swa/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/swa/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/swa/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/swa"/> - </copy> - - <!-- samples/wsbpel --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel" /> - </copy> - - <!-- samples/wssecurity --> - <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/java"/> - <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"/> - - <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"> - <fileset dir="${tests.resources.dir}/jaxrpc/samples/wssecurity"> - <exclude name="store-pass-encrypt/**"/> - </fileset> - </copy> - - <!-- JAXWS samples - - - - - - - - - - - - - - - - - - - - - - --> - - <!-- samples/jsr181ejb --> - <mkdir dir="${build.src.samples.dir}/jaxws/jsr181ejb/java"/> - <mkdir dir="${build.src.samples.dir}/jaxws/jsr181ejb/resources"/> - - <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/resources"> - <fileset dir="${tests.resources.dir}/jaxws/samples/jsr181ejb"/> - </copy> - - <!-- samples/jsr181pojo --> - <mkdir dir="${build.src.samples.dir}/jaxws/jsr181pojo/java"/> - <mkdir dir="${build.src.samples.dir}/jaxws/jsr181pojo/resources"/> - - <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/resources"> - <fileset dir="${tests.resources.dir}/jaxws/samples/jsr181pojo"/> - </copy> - - <!-- samples/retail --> - <mkdir dir="${build.src.samples.dir}/jaxws/retail/java"/> - <mkdir dir="${build.src.samples.dir}/jaxws/retail/resources"/> - - <copy todir="${build.src.samples.dir}/jaxws/retail/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxws/samples/retail/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxws/retail/resources"> - <fileset dir="${tests.resources.dir}/jaxws/samples/retail"/> - </copy> - - <!-- samples/wsaddressing --> - <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/java"/> - <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/resources"/> - - <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/java"> - <fileset dir="${tests.java.dir}"> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/**"/> - </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/resources"> - <fileset dir="${tests.resources.dir}/jaxws/samples/wsaddressing"/> - </copy> - <!-- Build the samples zip --> <zip destfile="${build.output.dir}/${samples.target}.zip"> <fileset dir="${build.output.dir}"> Modified: branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-01 13:44:43 UTC (rev 2237) +++ branches/jbossws-1.2.0/build/ant-import/build-thirdparty.xml 2007-02-01 15:46:41 UTC (rev 2238) @@ -86,7 +86,7 @@ <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> <pathelement location="${thirdparty.dir}/javassist.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> - <pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/> + <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/> <pathelement location="${thirdparty.dir}/jboss-dependency.jar"/> <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-01 13:44:43 UTC (rev 2237) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/ant.properties.example 2007-02-01 15:46:41 UTC (rev 2238) @@ -21,5 +21,5 @@ #force.thirdparty.get=true # JBoss Repository -#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository -jboss.repository=http://repository.jboss.com +jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository +#jboss.repository=http://repository.jboss.com Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-01 13:44:43 UTC (rev 2237) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/build.xml 2007-02-01 15:46:41 UTC (rev 2238) @@ -1,66 +1,501 @@ <?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. --> +<!-- ============================================================ --> + <!-- $Id$ --> -<project default="main" name="JBossWS Examples"> +<project default="main" basedir="." name="JBossWS-Tests"> + + <import file="${basedir}/ant-import/build-thirdparty.xml"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + + <property name="tests.dir" value="${basedir}"/> + <property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/> + <property name="tests.lib.dir" value="${tests.dir}/lib"/> + <property name="tests.java.dir" value="${tests.dir}/src/main/java"/> + <property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/> + <property name="tests.output.dir" value="${tests.dir}/output"/> + + <property name="thirdparty.dir" value="${basedir}/thirdparty"/> + + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> + + <!-- JDK Detection --> + <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/> + <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <import file="${basedir}/common/imported-build.xml"/> - + <!-- Force thirdparty get --> + <condition property="force.thirdparty.get"> + <not> + <available file="${thirdparty.dir}" type="dir"/> + </not> + </condition> + + <!-- Use -Ddebug=true for remote debugging --> + <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"> + <isset property="debug"/> + </condition> + <condition property="remote.debug.line" value=""> + <not> + <isset property="debug"/> + </not> + </condition> + + <!-- Available integration target --> + <property name="integration.target.${jbossws.integration.target}" value="true"/> + + <!-- Define jboss.home --> + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + <condition property="jboss.home" value="${jboss40.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss40"/> + </condition> + + <!-- Integration Target Server --> + <condition property="jbossws.integration.target.jboss"> + <isset property="jboss.home"/> + </condition> + <condition property="jbossws.integration.target.tomcat"> + <equals arg1="${jbossws.integration.target}" arg2="tomcat"/> + </condition> + + <property name="jboss.client" value="${jboss.home}/client"/> + <property name="jboss.lib" value="${jboss.home}/lib"/> + <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> + <property name="jboss.server.lib" value="${jboss.server}/lib"/> + <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> + + <!-- Java Endorsed --> + <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed"> + <isset property="jbossws.integration.target.jboss"/> + </condition> + <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed"> + <isset property="jbossws.integration.target.tomcat"/> + </condition> + + <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME + otherwise and initialize the node0/node1 cluster hostnames to localhost + and ${hostname} by default. If you cannot route multicast traffic between + localhost and hostname, then you need to specify node0 and node1 binding + in the local.properties that can in order to be able to run the clustering + tests. + --> + <property environment="env"/> + <condition property="hostname" value="${env.COMPUTERNAME}"> + <os family="windows"/> + </condition> + <condition property="hostname" value="${env.HOSTNAME}"> + <not> + <os family="windows"/> + </not> + </condition> + + <!-- node0 defaults --> + <property name="node0" value="localhost"/> + <property name="node0.http.url" value="http://${node0}:8080"/> + <property name="node0.jndi.url" value="jnp://${node0}:1099"/> + <property name="node0.hajndi.url" value="jnp://${node0}:1100"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="prepare"> + + <mkdir dir="${tests.output.dir}/log"/> + <touch file="${tests.output.dir}/log/test.log"/> + + <tstamp> + <format property="build.id" pattern="yyyyMMddHHmm"/> + </tstamp> + + <!-- Define excluded tests --> + <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"> + <or> + <available file="${jboss.client}/jboss-ejb3-client.jar"/> + <isset property="integration.target.tomcat"/> + </or> + </condition> + <property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/> + <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/> + + <echo/> + <echo message="-----------------------------------------------"/> + <echo message="jboss.home = ${jboss.home}"/> + <echo message="tomcat.home = ${tomcat.home}"/> + <echo message="java.home = ${java.home}"/> + <echo message="endorsed = ${endorsed.dirs}"/> + <echo message="excludesfile = ${excludes-short-name}"/> + <echo message="-----------------------------------------------"/> + + </target> + <!-- - Build the test deployments + Init the various classpaths --> - <target name="jars" description="build the deployments"> - - <ant antfile="${basedir}/jaxrpc/docstyle/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxrpc/dynamichandler/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxrpc/exception/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxrpc/handler/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxrpc/holder/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxrpc/jmstransport/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxrpc/jsr109ejb/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxrpc/jsr109pojo/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxrpc/message/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxrpc/mtom/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxrpc/oneway/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxrpc/rpcstyle/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxrpc/swa/build.xml" target="jars"/> - <!--ant antfile="${basedir}/jaxrpc/wsbpel/build.xml" target="jars"/--> - <ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="jars"/> - - <ant antfile="${basedir}/jaxws/jsr181ejb/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxws/jsr181pojo/build.xml" target="jars"/> - <ant antfile="${basedir}/jaxws/wsaddressing/build.xml" target="jars"/> + <target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/> + + <target name="common-classpath" depends="prepare,thirdparty"> + + <!-- The combined compile classpath --> + <path id="jbossws.jars.classpath"> + <pathelement location="${tests.lib.dir}/jbossws-client.jar"/> + <pathelement location="${tests.lib.dir}/jboss-jaxrpc.jar"/> + <pathelement location="${tests.lib.dir}/jboss-jaxws.jar"/> + <pathelement location="${tests.lib.dir}/jboss-saaj.jar"/> + <pathelement location="${tests.lib.dir}/jbossws-jboss50-integration.jar"/> + <pathelement location="${tests.lib.dir}/jbossws-jboss42-integration.jar"/> + <pathelement location="${tests.lib.dir}/jbossws-jboss40-integration.jar"/> + <pathelement location="${tests.lib.dir}/jbossws-tomcat-integration.jar"/> + </path> + + <!-- The combined compile classpath --> + <path id="javac.classpath"> + <path refid="core.classpath"/> + <path refid="jbossws.jars.classpath"/> + <pathelement location="${thirdparty.dir}/activation.jar"/> + <pathelement location="${thirdparty.dir}/jboss-vfs.jar"/> + <pathelement location="${thirdparty.dir}/junit.jar"/> + <pathelement location="${thirdparty.dir}/mail.jar"/> + <pathelement location="${thirdparty.dir}/qdox.jar"/> + <pathelement location="${thirdparty.dir}/policy.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> + <pathelement location="${thirdparty.dir}/stax-api.jar"/> + <pathelement location="${thirdparty.dir}/xmlunit1.0.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> + </path> </target> - + + <target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss"> + + <!-- The test client classpath --> + <path id="test.client.classpath"> + <path refid="jbossws.jars.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}/jbossretro-rt.jar"/> + <pathelement location="${jboss.client}/log4j.jar"/> + <pathelement location="${jboss.client}/jbossall-client.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}/jbosssx.jar"/> + <path refid="javac.classpath"/> + </path> + + <!-- The jBPM BPEL classpath --> + <path id="jbpm.bpel.classpath"> + <path refid="jbossws.jars.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" /> + <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> + <pathelement location="${thirdparty.dir}/jbpm-bpel/jaxen.jar" /> + <pathelement location="${thirdparty.dir}/commons-collections.jar"/> + <pathelement location="${thirdparty.dir}/commons-logging.jar"/> + <pathelement location="${thirdparty.dir}/dom4j.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> + <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> + <!-- + <pathelement location="${thirdparty.dir}/log4j.jar"/> + <pathelement location="${tests.etc.dir}"/> + --> + </path> + </target> + + <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat"> + <!-- The test client classpath --> + <path id="test.client.classpath"> + <path refid="jbossws.jars.classpath"/> + <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/> + <path refid="javac.classpath"/> + </path> + </target> + + + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> + + <target name="compile" depends="compile14,compile15" description="Compile sources"/> + + <target name="compile14" depends="init" unless="HAVE_JDK_1.5"> + <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}"/> + <exclude name="org/jboss/test/ws/jaxws/**"/> + <exclude name="org/jboss/test/ws/tools/jsr181/**"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + + <target name="compile15" depends="init" if="HAVE_JDK_1.5"> + <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="compile-generated" depends="init" description="Compile generated 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}"> + <src path="${tests.output.dir}/wstools/java"/> + <exclude name="org/jboss/test/ws/interop/**"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + + <target name="copy-resources" depends="init" description="Copy the deployment resources."> + <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/> + <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/> + <!-- Copy resources --> + <copy todir="${tests.output.dir}/resources"> + <fileset dir="${tests.resources.dir}"> + <include name="**/*.wsdl"/> + <include name="**/*.xml"/> + <exclude name="jaxrpc/samples-override/**"/> + </fileset> + <filterset> + <filter token="jbosstest.host.name" value="${node0}"/> + <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/> + </filterset> + </copy> + <!-- Copy binary files --> + <copy todir="${tests.output.dir}/resources"> + <fileset dir="${tests.resources.dir}"> + <exclude name="**/*.wsdl"/> + <exclude name="**/*.xml"/> + </fileset> + </copy> + </target> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <target name="main" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="Build the deployments."> + <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/> + <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> + </target> + <!-- - Run the testsuite + Generate samples sources --> - <target name="tests" depends="init" description="run the testsuite"> + <target name="generate-sources" depends="compile" description="Generate the deployment resources."> + <!-- create jbpm process archives --> + <mkdir dir="${tests.output.dir}/libs"/> + <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" /> + </zip> + <!-- Copy the BPEL sar --> + <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> - <ant antfile="${basedir}/jaxrpc/docstyle/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxrpc/dynamichandler/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxrpc/exception/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxrpc/handler/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxrpc/holder/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxrpc/jmstransport/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxrpc/jsr109ejb/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxrpc/jsr109pojo/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxrpc/message/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxrpc/mtom/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxrpc/oneway/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxrpc/rpcstyle/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxrpc/secureejb/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxrpc/swa/build.xml" target="tests"/> - <!--ant antfile="${basedir}/jaxrpc/wsbpel/build.xml" target="tests"/--> - <ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="tests"/> - - <ant antfile="${basedir}/jaxws/jsr181ejb/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxws/jsr181pojo/build.xml" target="tests"/> - <ant antfile="${basedir}/jaxws/wsaddressing/build.xml" target="tests"/> - + <!-- generate wsdl binding and service definitions for bpel processes --> + <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> + <classpath refid="jbpm.bpel.classpath"/> + </taskdef> + <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" + outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" + bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> + + <!-- generate mapping artifacts --> + <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> + <classpath refid="core.classpath"/> + <classpath location="${jbossws.client.jar}"/> + <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/> + <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> + <classpath location="${thirdparty.dir}/concurrent.jar"/> + <classpath location="${tests.output.dir}/classes"/> + <classpath location="${tests.output.dir}"/> + </taskdef> + <mkdir dir="${tests.output.dir}/libs"/> + <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"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml" /> + <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> + <move todir="${tests.output.dir}/wstools/java"> + <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> + </move> + </target> + + <target name="copy-generated" depends="init" description="Copy the deployment resources."> + <!-- Copy generated resources --> + <copy todir="${tests.output.dir}/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}/resources/jaxrpc/samples" overwrite="true"> + <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/> + <filterset> + <filter token="jbosstest.host.name" value="${node0}"/> + </filterset> + </copy> + </target> + + <!-- ================================================================== --> + <!-- Testing --> + <!-- ================================================================== --> + + <!-- Run all unit tests and generate a report --> + <target name="tests" depends="main" description="Run all unit tests and generate a report"> + <antcall target="tests-main"> + <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/> + </antcall> <antcall target="tests-report"/> - </target> - -</project> \ No newline at end of file + + <!-- + Run a collection of unit tests. + ant -Dtest=tools test + --> + <target name="test" depends="init" if="test" description="Run all unit tests in a given directory"> + <antcall target="tests-main"> + <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/> + </antcall> + </target> + + <!-- Common test target --> + <target name="tests-main" depends="init"> + <mkdir dir="${tests.output.dir}/reports"/> + <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}"> + <jvmarg value="-Djava.security.manager"/> + <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> + <sysproperty key="client.scenario" value="${client.scenario}"/> + <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> + <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> + <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> + <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> + <sysproperty key="jboss.home" value="${jboss.home}"/> + <sysproperty key="jbosstest.host.name" value="${node0}"/> + <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> + <sysproperty key="tomcat.home" value="${tomcat.home}"/> + <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> + <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> + <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> + <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> + <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> + <classpath> + <path refid="test.client.classpath"/> + <pathelement location="${tests.output.dir}/classes"/> + </classpath> + <formatter type="plain" usefile="true"/> + <formatter type="xml" usefile="true"/> + <batchtest todir="${tests.output.dir}/reports" fork="true"> + <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludesfile="${excludesfile}"/> + </batchtest> + </junit> + </target> + + <!-- + Run a single unit test. + ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test + --> + <target name="one-test" depends="init" if="test" description="Run a single unit test"> + <mkdir dir="${tests.output.dir}/reports"/> + <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}"> + <jvmarg line="${remote.debug.line}"/> + <jvmarg value="-Djava.security.manager"/> + <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> + <sysproperty key="client.scenario" value="${client.scenario}"/> + <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> + <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> + <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> + <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> + <sysproperty key="jboss.home" value="${jboss.home}"/> + <sysproperty key="jbosstest.host.name" value="${node0}"/> + <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> + <sysproperty key="tomcat.home" value="${tomcat.home}"/> + <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> + <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> + <!-- + http://jira.jboss.com/jira/browse/JBWS-917 + <sysproperty key="javax.net.ssl.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/> + <sysproperty key="javax.net.ssl.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/> + <sysproperty key="javax.net.ssl.keyStorePassword" value="jbossws"/> + <sysproperty key="javax.net.ssl.trustStorePassword" value="jbossws"/> + <sysproperty key="javax.net.ssl.keyStoreType" value="jks"/> + <sysproperty key="javax.net.ssl.trustStoreType" value="jks"/> + --> + <!-- HTTPS hostname wrong: should be <localhost> --> + <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${tests.resources.dir}/jaxrpc/wsse/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStorePassword" value="jbossws"/> + <sysproperty key="org.jboss.ws.wsse.trustStorePassword" value="jbossws"/> + <sysproperty key="org.jboss.ws.wsse.keyStoreType" value="jks"/> + <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> + <classpath> + <path refid="test.client.classpath"/> + <pathelement location="${tests.output.dir}/classes"/> + </classpath> + <formatter type="plain" usefile="true"/> + <formatter type="xml" usefile="true"/> + <test todir="${tests.output.dir}/reports" name="${test}" fork="true"/> + </junit> + </target> + + <!-- ================================================================== --> + <!-- Reporting --> + <!-- ================================================================== --> + + <!-- Build the tests report --> + <target name="tests-report" depends="init" description="Build the tests report"> + <junitreport todir="${tests.output.dir}/reports"> + <fileset dir="${tests.output.dir}/reports"> + <include name="TEST-*.xml"/> + </fileset> + <report format="frames" todir="${tests.output.dir}/reports/html"/> + </junitreport> + <zip destfile="${tests.output.dir}/test-report-${build.id}.zip"> + <fileset dir="${tests.output.dir}" includes="reports/**"/> + </zip> + </target> + + <!-- ================================================================== --> + <!-- Cleaning --> + <!-- ================================================================== --> + + <target name="clean" description="Delete all generated test files."> + <delete dir="${tests.output.dir}"/> + </target> + +</project> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-01 13:44:43 UTC (rev 2237) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/version.properties 2007-02-01 15:46:41 UTC (rev 2238) @@ -12,6 +12,7 @@ jboss-common-logging-spi=@jboss-common-logging-spi@ jboss-ejb3=@jboss-ejb3@ jboss-jbossxb=@jboss-jbossxb@ +jboss-security=@jboss-security@ jbossas-core-libs=@jbossas-core-libs@ oswego-concurrent=@oswego-concurrent@ sun-jaf=@sun-jaf@ Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-01 13:44:43 UTC (rev 2237) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-01 15:46:41 UTC (rev 2238) @@ -16,7 +16,7 @@ <!-- Building --> <!-- ================================================================== --> - <target name="build-jars" description="Build the jaxrpc deployments"> + <target name="build-jars-jaxrpc" description="Build the jaxrpc deployments"> <mkdir dir="${tests.output.dir}/libs"/> @@ -2485,615 +2485,6 @@ </metainf> </jar> - <!-- jaxrpc-samples-docstyle-bare --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-docstyle-wrapped --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-dynamichandler --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*ServiceBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-dynamichandler-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/dynamichandler/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-exception --> - <war destfile="${tests.output.dir}/libs/jaxrpc-samples-exception.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-exception-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/exception/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-handler --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-handler.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-handler-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/handler/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-holder --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-holder.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-holder-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/holder/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-jmstransport --> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jmstransport.sar"> - <fileset dir="${tests.output.dir}/libs"> - <include name="jaxrpc-samples-jmstransport.jar"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-jsr109ejb-rpc --> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-jsr109ejb-doc --> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-jsr109pojo-rpc --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="jboss-web.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-jsr109pojo-doc --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-message --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-message.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-message-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/message/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-mtom --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-mtom.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-mtom-client.jar"> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-oneway --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-oneway-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/oneway/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-rpcstyle --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-rpcstyle-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-secureejb --> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-secureejb-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/secureejb/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-swa --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-swa.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-swa-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/swa/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-store-pass-encrypt.war --> - <replace file="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${tests.output.dir}"/> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-wsbpel --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war" - webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" /> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" /> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter_Impl.class" /> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> - <include name="webservices.xml" /> - <include name="classes/bpel-application.xml" /> - </webinf> - <webinf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> - <include name="jaxrpc-mapping.xml" /> - <include name="wsdl/**" /> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class" /> - <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class" /> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF"> - <include name="application-client.xml" /> - <include name="jboss-client.xml" /> - </metainf> - <metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> - <include name="jaxrpc-mapping.xml" /> - </metainf> - </jar> - - <!-- jaxrpc-samples-wssecurity-sign --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-wssecurity-encrypt --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt"> - <include name="jboss-wsse-server.xml"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity"> - <include name="wsse.keystore"/> - <include name="wsse.truststore"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jboss-wsse-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <!-- jaxrpc-utf16 --> <war warfile="${tests.output.dir}/libs/jaxrpc-utf16.war" webxml="${tests.output.dir}/resources/jaxrpc/utf16/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-01 13:44:43 UTC (rev 2237) +++ branches/jbossws-1.2.0/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-01 15:46:41 UTC (rev 2238) @@ -16,7 +16,7 @@ <!-- Building --> <!-- ================================================================== --> - <target name="build-jars" description="Build the deployments."> + <target name="build-jars-jaxws" description="Build the deployments."> <mkdir dir="${tests.output.dir}/libs"/> @@ -194,289 +194,6 @@ </webinf> </war> - <!-- jaxws-samples-asynchronous --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/> - </classes> - </war> - - <!-- jaxws-samples-context --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-context-jboss4x.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.class"/> - </fileset> - </jar> - - <!-- jaxws-samples-exception --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/ExceptionEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/exception/UserException.class"/> - </classes> - </war> - - <!-- jaxws-samples-handlerchain --> - <copy todir="${tests.output.dir}/classes/org/jboss/test/ws/jaxws/samples/handlerchain" - file="${tests.output.dir}/resources/jaxws/samples/handlerchain/jaxws-handlers.xml"/> - <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-handlerchain-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/*Handler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/handlerchain/jaxws-handlers.xml"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/handlerchain/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.handlerchain.HandlerChainClient"/> - </manifest> - </jar> - - <!-- jaxws-samples-jsr181ejb --> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181ejb.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF"> - <include name="jboss-wsse-server.xml"/> - <include name="wsse.*"/> - </metainf> - </jar> - - <!-- jaxws-samples-jsr181pojo --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/> - </classes> - </war> - - <!-- jaxws-samples-jsr181pojo-docwrapped --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" - webxml="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/> - </classes> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/> - <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxws-samples-logicalhandler --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSource.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalSourceHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF"> - <include name="jaxws-server-source-handlers.xml"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/LogicalJAXBHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ProtocolHandler.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/Echo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/ObjectFactory.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF"> - <include name="jaxws-server-jaxb-handlers.xml"/> - </webinf> - </war> - - <!-- jaxws-samples-oneway --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/> - </classes> - </war> - - <!-- jaxws-samples-provider --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared"> - <include name="wsdl/Provider.wsdl"/> - </webinf> - </war> - - <!-- jaxws-samples-retail --> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> - <include name="wsdl/*"/> - <include name="jaxws-handler.xml"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-retail-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/retail/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - - <!-- jaxws-samples-soapbinding --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrapped.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleSEI.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBareServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocWrappedServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/ExampleServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareRequest.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/SubmitBareResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrder.class"/> - <include name="org/jboss/test/ws/jaxws/samples/soapbinding/PurchaseOrderAck.class"/> - </classes> - </war> - - <!-- jaxws-samples-webmethod --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/> - </classes> - </war> - - <!-- jaxws-samples-webparam --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webparam/SecurityHeader.class"/> - </classes> - </war> - - <!-- jaxws-samples-webresult --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webresult/USAddress.class"/> - </classes> - </war> - - <!-- jaxws-samples-webservice --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02"> - <include name="jboss-web.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03"> - <include name="jboss-web.xml"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice01-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice02-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02"> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-webservice03-ejb3.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> - </fileset> - </jar> - <!-- jaxws-webserviceref --> <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: branches/jbossws-1.2.0/jbossws-tests/build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-01 13:44:43 UTC (rev 2237) +++ branches/jbossws-1.2.0/jbossws-tests/build.xml 2007-02-01 15:46:41 UTC (rev 2238) @@ -17,6 +17,7 @@ <import file="${basedir}/../integration-jboss40/build.xml"/> <import file="${basedir}/../integration-tomcat/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> + <import file="${basedir}/../jbossws-tests/ant-import/build-benchmark.xml"/> <property name="core.output.dir" value="${core.dir}/output"/> <property name="core.output.classes.dir" value="${core.output.dir}/classes"/> @@ -107,9 +108,6 @@ <target name="prepare"> - <available property="jbossws.available" file="${jboss.home}/client/jbossall-client.jar"/> - <available property="installer.setup" file="jboss-ejb3-client.jar"/> - <mkdir dir="${tests.output.dir}/log"/> <touch file="${tests.output.dir}/log/test.log"/> @@ -299,8 +297,10 @@ <!-- ================================================================== --> <target name="main" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="Build the deployments."> - <ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars" inheritall="true"/> - <ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars" inheritall="true"/> + <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/> + <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> + <ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" inheritall="true"/> + <ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> </target> <!-- @@ -374,12 +374,6 @@ </copy> </target> - <!-- Custom targets that are not needed very often --> - - <target name="build-benchmark" depends="main"> - <ant antfile="src/test/ant/build-benchmark-jars.xml" target="build-benchmark-jars" inheritall="true"/> - </target> - <!-- ================================================================== --> <!-- Testing --> <!-- ================================================================== --> @@ -392,14 +386,6 @@ <antcall target="tests-report"/> </target> - <!-- Run benchmark test cases --> - <target name="tests-benchmark" depends="init" description="Run benchmark unit tests"> - <antcall target="tests-main"> - <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/> - </antcall> - <antcall target="tests-report"/> - </target> - <!-- Run samples test cases --> <target name="tests-samples" depends="init" description="Run samples unit tests"> <antcall target="tests-main"> @@ -417,8 +403,8 @@ </target> <!-- - Run a collection of unit tests. - ant -Dtest=tools test + Run a collection of unit tests. + ant -Dtest=tools test --> <target name="test" depends="init" if="test" description="Run all unit tests in a given directory"> <antcall target="tests-main"> @@ -462,8 +448,8 @@ </target> <!-- - Run a single unit test. - ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test + Run a single unit test. + ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test --> <target name="one-test" depends="init" if="test" description="Run a single unit test"> <mkdir dir="${tests.output.dir}/reports"/> Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2007-02-01 13:44:43 UTC (rev 2237) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2007-02-01 15:46:41 UTC (rev 2238) @@ -1,26 +1,28 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxrpc.xop; +// $Id$ + import java.awt.Image; import java.awt.Toolkit; import java.io.ByteArrayInputStream; @@ -36,12 +38,13 @@ /** * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @version $Id$ - * @since Sep 22, 2006 + * @since 22-Sep-2006 */ -public class XOPTestSupport { +public class XOPTestSupport +{ - public static byte[] getBytesFromFile(File file) throws IOException { + public static byte[] getBytesFromFile(File file) throws IOException + { InputStream is = new FileInputStream(file); long length = file.length(); @@ -49,8 +52,8 @@ int offset = 0; int numRead = 0; - while (offset < bytes.length - && (numRead=is.read(bytes, offset, bytes.length-offset)) >= 0) { + while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) + { offset += numRead; } @@ -58,12 +61,12 @@ return bytes; } - public static Image createTestImage() + public static Image createTestImage(File imgFile) { Image image = null; try { - URL url = new File("resources/jaxrpc/xop/shared/attach.jpeg").toURL(); + URL url = imgFile.toURL(); image = null; try @@ -85,15 +88,15 @@ public static StreamSource createTestSource() { - return new StreamSource( new ByteArrayInputStream("<some><nestedXml/></some>".getBytes())); + return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes())); } - public static DataHandler createDataHandler() + public static DataHandler createDataHandler(File imgFile) { try { - URL url = new File("resources/jaxrpc/xop/shared/attach.jpeg").toURL(); - return new DataHandler(url); + URL url = imgFile.toURL(); + return new DataHandler(url); } catch (MalformedURLException e) { Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-02-01 13:44:43 UTC (rev 2237) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2007-02-01 15:46:41 UTC (rev 2238) @@ -48,6 +48,8 @@ */ public abstract class XOPBase extends JBossWSTest { + private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); + protected abstract XOPPing getPort(); // --------------------------------------------------------------------------------- @@ -66,7 +68,7 @@ public void testResponseOptimized() throws Exception { - byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/xop/shared/attach.jpeg")); + byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); // disable MTOM ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); @@ -80,7 +82,7 @@ public void testRequestOptimized() throws Exception { - byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/xop/shared/attach.jpeg")); + byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); // reusing the stub means cleaning the previous state ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); @@ -97,7 +99,7 @@ public void testImageResponseOptimized() throws Exception { - Image image = XOPTestSupport.createTestImage(); + Image image = XOPTestSupport.createTestImage(imgFile); if(image!=null) { @@ -113,7 +115,7 @@ public void testImageRequestOptimized() throws Exception { - Image image = XOPTestSupport.createTestImage(); + Image image = XOPTestSupport.createTestImage(imgFile); if(image!=null) { @@ -162,7 +164,7 @@ public void testDHResponseOptimized() throws Exception { - DataHandler dh = XOPTestSupport.createDataHandler(); + DataHandler dh = XOPTestSupport.createDataHandler(imgFile); // disable MTOM ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); @@ -178,7 +180,7 @@ public void testDHRequestOptimized() throws Exception { - DataHandler dh = XOPTestSupport.createDataHandler(); + DataHandler dh = XOPTestSupport.createDataHandler(imgFile); // enable MTOM ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-02-01 13:44:43 UTC (rev 2237) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2007-02-01 15:46:41 UTC (rev 2238) @@ -1,24 +1,24 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxrpc.xop.rpclit; import java.awt.Image; @@ -47,11 +47,14 @@ * @version $Id:XOPBase.java 1321 2006-10-27 11:47:18Z heiko.braun(a)jboss.com $ * @since Sep 25, 2006 */ -public abstract class XOPBase extends JBossWSTest { +public abstract class XOPBase extends JBossWSTest +{ + private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); protected abstract XOPPing getPort(); - public void testRequestResponseOptimized() throws Exception { + public void testRequestResponseOptimized() throws Exception + { DataHandler dh = new DataHandler("Another plain text attachment", "text/plain"); byte[] bytesIn = IOUtils.convertToBytes(dh); @@ -59,28 +62,30 @@ } - public void testResponseOptimized() throws Exception { + public void testResponseOptimized() throws Exception + { - byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/xop/shared/attach.jpeg")); + byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); requestComplex(new PingMsg("0|1", bytesIn)); } - public void testRequestOptimized() throws Exception { + public void testRequestOptimized() throws Exception + { - byte[] bytesIn = XOPTestSupport.getBytesFromFile(new File("resources/jaxrpc/xop/shared/attach.jpeg")); + byte[] bytesIn = XOPTestSupport.getBytesFromFile(imgFile); requestComplex(new PingMsg("1|0", bytesIn)); } private void requestComplex(PingMsg payload) throws Exception { - StringTokenizer tok =new StringTokenizer(payload.getMessage(), "|"); + StringTokenizer tok = new StringTokenizer(payload.getMessage(), "|"); boolean mtomEnabled = tok.nextToken().equals("1"); ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.valueOf(mtomEnabled)); PingMsgResponse value = getPort().ping(payload); - assertNotNull("Return value was null",value); + assertNotNull("Return value was null", value); byte[] bytesOut = value.getXopContent(); assertNotNull("Return xopContent was null", bytesOut); assertEquals("Content length doesn't match", payload.getXopContent().length, bytesOut.length); @@ -109,11 +114,12 @@ assertEquals("Content length doesn't match", bytesIn.length, bytesOut.length); } - public void testImageResponseOptimized() throws Exception { + public void testImageResponseOptimized() throws Exception + { - Image image = XOPTestSupport.createTestImage(); + Image image = XOPTestSupport.createTestImage(imgFile); - if(image!=null) + if (image != null) { // disable MTOM ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); @@ -125,11 +131,12 @@ } } - public void testImageRequestOptimized() throws Exception { + public void testImageRequestOptimized() throws Exception + { - Image image = XOPTestSupport.createTestImage(); + Image image = XOPTestSupport.createTestImage(imgFile); - if(image!=null) + if (image != null) { // enable MTOM ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); @@ -141,7 +148,8 @@ } } - public void testSourceResponseOptimized() throws Exception { + public void testSourceResponseOptimized() throws Exception + { Source source = XOPTestSupport.createTestSource(); @@ -158,7 +166,8 @@ } - public void testSourceRequestOptimized() throws Exception { + public void testSourceRequestOptimized() throws Exception + { Source source = XOPTestSupport.createTestSource(); @@ -174,9 +183,10 @@ assertNotNull("Return xopContent was null", response.getXopContent()); } - public void testDHResponseOptimized() throws Exception { + public void testDHResponseOptimized() throws Exception + { - DataHandler dh = XOPTestSupport.createDataHandler(); + DataHandler dh = XOPTestSupport.createDataHandler(imgFile); // disable MTOM ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); @@ -190,9 +200,10 @@ } - public void testDHRequestOptimized() throws Exception { + public void testDHRequestOptimized() throws Exception + { - DataHandler dh = XOPTestSupport.createDataHandler(); + DataHandler dh = XOPTestSupport.createDataHandler(imgFile); // enable MTOM ((Stub)getPort())._setProperty(StubExt.PROPERTY_MTOM_ENABLED, Boolean.TRUE); Modified: branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-01 13:44:43 UTC (rev 2237) +++ branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-01 15:46:41 UTC (rev 2238) @@ -23,6 +23,7 @@ import java.awt.Image; import java.awt.image.BufferedImage; +import java.io.File; import java.io.InputStream; import java.net.URL; @@ -39,6 +40,8 @@ */ public abstract class XOPBase extends JBossWSTest { + private File imgFile = new File("resources/jaxrpc/xop/shared/attach.jpeg"); + protected MTOMEndpoint port; protected SOAPBinding binding; @@ -74,7 +77,7 @@ { getBinding().setMTOMEnabled(true); - Image img = XOPTestSupport.createTestImage(); + Image img = XOPTestSupport.createTestImage(imgFile); if (img != null) // might fail on unix { ImageRequest request = new ImageRequest(); @@ -91,7 +94,7 @@ { getBinding().setMTOMEnabled(false); - Image img = XOPTestSupport.createTestImage(); + Image img = XOPTestSupport.createTestImage(imgFile); if (img != null) // might fail on unix {