Author: thomas.diesler(a)jboss.com Date: 2007-01-05 11:09:50 -0500 (Fri, 05 Jan 2007) New Revision: 1821 Modified: trunk/jbossws-core/build.xml trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt trunk/jbossws-core/src/main/resources/samples/ant.properties.example trunk/jbossws-core/src/main/resources/samples/build.xml trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml trunk/jbossws-core/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml trunk/jbossws-core/src/main/resources/samples/jaxrpc/mtom/build.xml trunk/jbossws-core/src/main/resources/samples/jaxrpc/secureejb/build.xml trunk/jbossws-core/src/main/resources/samples/jaxrpc/wsbpel/build.xml trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181ejb/build.xml trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181pojo/build.xml trunk/jbossws-core/src/main/resources/samples/jaxws/retail/build.xml trunk/jbossws-core/src/main/resources/samples/jaxws/wsaddressing/build.xml trunk/jbossws-core/src/main/resources/samples/version.properties Log: Fix jbossws-samples Modified: trunk/jbossws-core/build.xml =================================================================== --- trunk/jbossws-core/build.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/build.xml 2007-01-05 16:09:50 UTC (rev 1821) @@ -20,6 +20,7 @@ <property name="core.src.dir" value="${core.dir}/src/main"/> <property name="core.java.dir" value="${core.src.dir}/java"/> <property name="core.resources.dir" value="${core.src.dir}/resources"/> + <property name="core.samples.dir" value="${core.resources.dir}/samples"/> <property name="core.output.dir" value="${core.dir}/output"/> <property name="core.output.classes.dir" value="${core.output.dir}/classes"/> <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> @@ -70,8 +71,8 @@ <!-- Compile etc files (manifests and such) --> <target name="core-compile-etc" depends="core-init"> - <mkdir dir="${output.etc.dir}"/> - <copy todir="${output.etc.dir}" filtering="yes" overwrite="yes"> + <mkdir dir="${etc.dir}"/> + <copy todir="${etc.dir}" filtering="yes" overwrite="yes"> <fileset dir="${build.dir}/etc"/> <filterset> <filter token="java.vm.version" value="${java.vm.version}"/> @@ -100,7 +101,7 @@ <!-- Build jboss-jaxrpc.jar --> <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${core.output.classes14.dir}"> <include name="javax/xml/rpc/**"/> </fileset> @@ -108,7 +109,7 @@ <!-- Build jboss-saaj.jar --> <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jboss-saaj.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${core.output.classes14.dir}"> <include name="javax/xml/soap/**"/> </fileset> @@ -117,7 +118,7 @@ <!-- Build jboss-jaxws.jar --> <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jboss-jaxws.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="javax/jws/**"/> <include name="javax/xml/ws/**"/> @@ -127,7 +128,7 @@ <!-- Build jbossws-core.jar --> <mkdir dir="${core.output.lib.dir}"/> - <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/ws/**"/> <exclude name="org/jboss/ws/integration/**"/> @@ -139,7 +140,7 @@ </jar> <!-- Build jbossws-client.jar --> - <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${output.etc.dir}/default.mf"> + <jar jarfile="${core.output.lib.dir}/jbossws-client.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${core.output.classes14.dir}"> <include name="javax/xml/rpc/**"/> <include name="javax/xml/soap/**"/> @@ -157,7 +158,7 @@ <include name="schema/**"/> <include name="dtd/**"/> </fileset> - <fileset dir="${output.etc.dir}"> + <fileset dir="${etc.dir}"> <include name="wstools.sh"/> <include name="wstools.bat"/> <include name="wstools-log4j.xml"/> Modified: trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt =================================================================== --- trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt 2007-01-05 16:09:50 UTC (rev 1821) @@ -22,6 +22,19 @@ What's new in jbossws-(a)version.id@ ---------------------------------- + +Errata +------ + + +Enjoy, +The JBossWS Team + +Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +What's new in jbossws-1.0.4 +--------------------------- + * [JBWS-660] XOP inline base64Binary and sign message * [JBWS-779] Add webservices.xml support to wsdlTojava * [JBWS-868] BPEL in jbossws-samples @@ -48,11 +61,6 @@ * FIXME: [JBWS-798] Complete EventingTestCase * FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums -Enjoy, -The JBossWS Team - -Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - What's new in jbossws-1.0.3 ---------------------------------- @@ -79,6 +87,3 @@ * [JBWS-871] Arrays with JSR181 endpoints * [JBWS-923] Complete MTOM for rpc/literal * Bug fixes - -Enjoy, -The JBossWS Team \ No newline at end of file Modified: trunk/jbossws-core/src/main/resources/samples/ant.properties.example =================================================================== --- trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/samples/ant.properties.example 2007-01-05 16:09:50 UTC (rev 1821) @@ -2,19 +2,24 @@ # # Required JBoss Home -#jboss.jdk15.home=/home/tdiesler/svn/jboss/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.GA-ejb3 +#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta2 +#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.CR1-ejb3 +#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 -# Optional JBoss Home -#jboss.jdk14.home=/home/tdiesler/svn/jboss/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA +# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat] +jbossws.integration.target=jboss42 # The JBoss server instance jboss.server.instance=default # Tomcat Home -#tomcat.home=/usr/java/apache/apache-tomcat-5.5.17 +#tomcat.home=/usr/java/tomcat #tomcat.manager.username=manager #tomcat.manager.password=manager -# The target server the test endpoints are deployed to -# This can be [jboss|tomcat] -jbossws.target.server=jboss +# Force thirdparty HTTP get +#force.thirdparty.get=true + +# JBoss Repository +#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository +jboss.repository=http://repository.jboss.com Modified: trunk/jbossws-core/src/main/resources/samples/build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/build.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/samples/build.xml 2007-01-05 16:09:50 UTC (rev 1821) @@ -25,7 +25,7 @@ <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/wsbpel/build.xml" target="jars"/--> <ant antfile="${basedir}/jaxrpc/wseventing/build.xml" target="jars"/> <ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="jars"/> @@ -53,6 +53,7 @@ <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/wseventing/build.xml" target="tests"/> <ant antfile="${basedir}/jaxrpc/wssecurity/build.xml" target="tests"/> Modified: trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-05 16:09:50 UTC (rev 1821) @@ -24,107 +24,71 @@ description="Gets the thirdparty libraries"> <mkdir dir="${thirdparty.dir}"/> - <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-log4j/${apache-log4j}/lib/log4j.jar" dest="${thirdparty.dir}/log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-logging/${apache-logging}/lib/commons-logging.jar" dest="${thirdparty.dir}/commons-logging.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/javassist/${javassist}/lib/javassist.jar" dest="${thirdparty.dir}/javassist.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/backport-concurrent/${jboss-backport-concurrent}/lib/jboss-backport-concurrent.jar" dest="${thirdparty.dir}/jboss-backport-concurrent.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/common/${jboss-common}/lib/jboss-common.jar" dest="${thirdparty.dir}/jboss-common.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar" dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-core/${jboss-common-core}/lib/jboss-common-core.jar" dest="${thirdparty.dir}/jboss-common-core.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxrpc.jar" dest="${thirdparty.dir}/jboss-jaxrpc.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-jaxws.jar" dest="${thirdparty.dir}/jboss-jaxws.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jboss-saaj.jar" dest="${thirdparty.dir}/jboss-saaj.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-client.jar" dest="${thirdparty.dir}/jbossws-client.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-jboss-integration.jar" dest="${thirdparty.dir}/jbossws-jboss-integration.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws/${jboss-jbossws}/lib/jbossws-tomcat-integration.jar" dest="${thirdparty.dir}/jbossws-tomcat-integration.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws14/${jboss-jbossws}/lib/jboss-jaxws14.jar" dest="${thirdparty.dir}/jboss-jaxws14.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws14/${jboss-jbossws}/lib/jbossws14-client.jar" dest="${thirdparty.dir}/jbossws14-client.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws14/${jboss-jbossws}/lib/jbossws14-jboss-integration.jar" dest="${thirdparty.dir}/jbossws14-jboss-integration.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws14/${jboss-jbossws}/lib/jbossws14-tomcat-integration.jar" dest="${thirdparty.dir}/jbossws14-tomcat-integration.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jbossas/core-libs/${jbossas}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mailapi.jar" dest="${thirdparty.dir}/mailapi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> + <unzip dest="${thirdparty.dir}" src="${thirdparty.dir}/ejb3.deployer.zip"/> </target> <target name="thirdparty-classpath"> - <!-- jbossws vs. jbossws14 --> - <condition property="jbossws.version" value="jbossws14"> - <not> - <isset property="HAVE_JDK_1.5"/> - </not> - </condition> - <property name="jbossws.version" value="jbossws"/> - - <!-- jboss-jaxws vs. jboss-jaxws14 --> - <condition property="jaxws.version" value="jboss-jaxws14"> - <not> - <isset property="HAVE_JDK_1.5"/> - </not> - </condition> - <property name="jaxws.version" value="jboss-jaxws"/> - <path id="client.classpath"> <fileset dir="${thirdparty.dir}"> <include name="activation.jar"/> <include name="commons-logging.jar"/> <include name="concurrent.jar"/> <include name="javassist.jar"/> - <include name="jboss-common.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jboss-common-core.jar"/> <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> + <include name="jboss-logging-spi.jar"/> <include name="jboss-xml-binding.jar"/> - <include name="jbossretro-rt.jar"/> - <include name="jboss-backport-concurrent.jar"/> + <include name="jbossws-client.jar"/> <include name="log4j.jar"/> <include name="mail.jar"/> <include name="wsdl4j.jar"/> <include name="xml-apis.jar"/> - <include name="${jbossws.version}-client.jar"/> - <include name="${jaxws.version}.jar"/> </fileset> </path> - <!-- In case of jdk1.4, use a dummy location --> - <property name="jboss.ejb3.deployer" value="${thirdparty.dir}"/> - <path id="compile.classpath"> <path refid="client.classpath"/> - <fileset dir="${jboss.client}"> - <include name="jbosssx-client.jar"/> - </fileset> - <fileset dir="${jboss.ejb3.deployer}"> - <include name="jboss-annotations-ejb3.jar"/> - <include name="jboss-ejb3x.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jboss-j2ee.jar"/> - <include name="mailapi.jar"/> - <include name="${jbossws.version}-jboss-integration.jar"/> - <include name="${jbossws.version}-tomcat-integration.jar"/> - </fileset> + <pathelement location="${jboss.client}/jbosssx-client.jar"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3.jar"/> + <pathelement location="${thirdparty.dir}/jboss-j2ee.jar"/> + <pathelement location="${thirdparty.dir}/mailapi.jar"/> </path> <path id="tests.classpath"> <path refid="client.classpath"/> - <fileset dir="${jboss.client}"> - <include name="jboss-aop-jdk50-client.jar"/> - <include name="jboss-aspect-jdk50-client.jar"/> - <include name="jboss-ejb3-client.jar"/> - <include name="jbossall-client.jar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="${jbossws.version}-jboss-integration.jar"/> - <include name="${jbossws.version}-tomcat-integration.jar"/> - <include name="servlet-api.jar"/> - </fileset> + <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> + <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + <pathelement location="${thirdparty.dir}/servlet-api.jar"/> </path> </target> Modified: trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-05 16:09:50 UTC (rev 1821) @@ -2,60 +2,47 @@ <!-- $Id$ --> -<project default="imported"> +<project> - <!-- - Init - --> - <target name="init"> + <import file="${basedir}/common/build-thirdparty.xml"/> + + <!-- Prepare--> + <target name="prepare"> <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> <property name="common.java" value="${basedir}/common/java"/> <property name="common.resources" value="${basedir}/common/resources"/> - <property name="build.test.dir" value="${basedir}/output"/> + <property name="build.tests.dir" value="${basedir}/output"/> + <property name="thirdparty.dir" value="${basedir}/thirdparty"/> - <!-- JDK Detection --> - <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/> - <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - - <!-- Target Server [jboss|tomcat] --> - <property name="jbossws.target.server.${jbossws.target.server}" value="true"/> - <condition property="only-on-jboss"> - <isset property="jbossws.target.server.jboss"/> - </condition> - <condition property="only-on-jboss-jdk15"> - <and> - <isset property="jbossws.target.server.jboss"/> - <isset property="HAVE_JDK_1.5"/> - </and> - </condition> - - <!-- JBoss Home --> - <condition property="jboss.home" value="${jboss.jdk14.home}"> + <!-- Force Thirdparty Get --> + <condition property="force.thirdparty.get"> <not> - <isset property="HAVE_JDK_1.5"/> + <available file="${thirdparty.dir}" type="dir"/> </not> </condition> - <condition property="jboss.home" value="${jboss.jdk15.home}"> - <isset property="HAVE_JDK_1.5"/> + + <!-- Define jboss.home --> + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> </condition> - - <property name="jboss.client" value="${jboss.home}/client"/> - <property name="jboss.lib" value="${jboss.home}/lib"/> - <property name="jboss.client" value="${jboss.home}/client"/> - <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="jbossws.endorsed.dirs" value="${jboss.home}/lib/endorsed"> - <isset property="jbossws.target.server.jboss"/> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> - <condition property="jbossws.endorsed.dirs" value="${tomcat.home}/common/endorsed"> - <isset property="jbossws.target.server.tomcat"/> + <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> + <!-- 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 @@ -78,77 +65,85 @@ <property name="node0.http.url" value="http://${node0}:8080"/> <property name="node0.jndi.url" value="jnp://${node0}:1099"/> - <available property="jbossws.client.jar" value="jbossws14-client.jar" file="${jboss.client}/jbossws14-client.jar"/> - <available property="jbossws.client.jar" value="jbossws-client.jar" file="${jboss.client}/jbossws-client.jar"/> + <!-- Use -Ddebug=true for client 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> - <path id="client.classpath"> - <fileset dir="${jboss.client}"> - <include name="activation.jar"/> - <include name="commons-logging.jar"/> - <include name="javassist.jar"/> - <include name="jboss-xml-binding.jar"/> - <include name="jbossall-client.jar"/> - <include name="jbossretro-rt.jar"/> - <include name="jboss-backport-concurrent.jar"/> - <include name="${jbossws.client.jar}"/> - <include name="log4j.jar"/> - <include name="mail.jar"/> - </fileset> - </path> + </target> + + <!-- Init--> + <target name="init" depends="prepare,check-jboss,check-tomcat"> - <path id="compile.classpath"> - <path refid="client.classpath"/> - <pathelement location="${basedir}/lib/${jbossws.version}-jboss-integration.jar"/> - <pathelement location="${basedir}/lib/${jbossws.version}-tomcat-integration.jar"/> - </path> + <echo message="jboss.home = ${jboss.home}"/> + <echo message="tomcat.home = ${tomcat.home}"/> + <echo message="java.home = ${java.home}"/> + <echo message="node0 = ${node0}"/> + <echo/> + <echo message="***************************"/> + <echo message="* ${chapter}"/> + <echo message="***************************"/> + <echo/> - <path id="tests.classpath"> - <path refid="client.classpath"/> - <fileset dir="${jboss.client}"> - <include name="jboss-aop-jdk50-client.jar"/> - <include name="jboss-aspect-jdk50-client.jar"/> - <include name="jboss-ejb3-client.jar"/> - </fileset> - <pathelement location="${basedir}/lib/jbossws-jboss-integration.jar"/> - <pathelement location="${basedir}/lib/jbossws-tomcat-integration.jar"/> - </path> + <mkdir dir="${build.tests.dir}/classes"/> + <mkdir dir="${build.tests.dir}/resources"/> + <mkdir dir="${build.tests.dir}/reports"/> + <mkdir dir="${build.tests.dir}/libs"/> + <mkdir dir="${build.tests.dir}/log"/> + <mkdir dir="${build.tests.dir}/wstools/java"/> + <mkdir dir="${build.tests.dir}/wstools/resources"/> - <echo message="jboss.home = ${jboss.home}"/> - <echo message="tomcat.home = ${tomcat.home}"/> - <echo message="java.home = ${java.home}"/> - <echo message="node0 = ${node0}"/> - <echo/> + <touch file="${build.tests.dir}/log/samples.log"/> - <available property="jbossws.available" file="${jboss.home}/client/jbossall-client.jar"/> - <fail message="Not available: ${jboss.home}/client/jbossall-client.jar" unless="jbossws.available"/> + </target> + + <!-- Check JBoss --> + <target name="check-jboss"> - <mkdir dir="${build.test.dir}/classes"/> - <mkdir dir="${build.test.dir}/resources"/> - <mkdir dir="${build.test.dir}/reports"/> - <mkdir dir="${build.test.dir}/libs"/> - <mkdir dir="${build.test.dir}/log"/> - <mkdir dir="${build.test.dir}/wstools/java"/> - <mkdir dir="${build.test.dir}/wstools/resources"/> + <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/> + <fail message="JBoss not available: ${jboss.home}" unless="jboss.available"/> - <touch file="${build.test.dir}/log/samples.log"/> + <!-- Java Endorsed --> + <condition property="jbossws.endorsed.dirs" value="${jboss.home}/lib/endorsed"> + <isset property="jbossws.integration.target.jboss"/> + </condition> + + <property name="jboss.lib" value="${jboss.home}/lib"/> + <property name="jboss.client" value="${jboss.home}/client"/> + <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> + <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> + <property name="jboss.server.lib" value="${jboss.server}/lib"/> + </target> - <!-- - Compile the java sources - --> - <target name="compile" depends="init" description="compile the sources" if="HAVE_JDK_1.4"> - <javac destdir="${build.test.dir}/classes" classpathref="compile.classpath" debug="on"> - <src path="${common.java}"/> - <src path="${java.dir}"/> - </javac> + <!-- Check tomcat --> + <target name="check-tomcat" if="jbossws.integration.target.tomcat"> + + <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> + <condition property="cannot.use.tomcat"> + <and> + <isset property="jbossws.integration.target.tomcat"/> + <not> + <isset property="tomcat.available"/> + </not> + </and> + </condition> + <fail message="Tomcat not available: ${tomcat.home}" if="cannot.use.tomcat"/> + + <!-- Java Endorsed --> + <property name="jbossws.endorsed.dirs" value="${tomcat.home}/common/endorsed"/> + </target> - <!-- - Compile the java sources with jdk-1.5 - --> - <target name="compile15" depends="init" description="compile the sources" if="HAVE_JDK_1.5"> - <mkdir dir="${build.test.dir}/classes"/> - <javac destdir="${build.test.dir}/classes" classpathref="compile.classpath" debug="on"> + <!-- Compile the java sources --> + <target name="compile" depends="init,thirdparty" + description="compile the sources"> + <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on"> <src path="${common.java}"/> <src path="${java.dir}"/> </javac> @@ -158,9 +153,9 @@ Compile the generated java sources --> <target name="compile-generated" depends="init" description="compile the generated sources"> - <mkdir dir="${build.test.dir}/classes"/> - <javac destdir="${build.test.dir}/classes" classpathref="compile.classpath" debug="on"> - <src path="${build.test.dir}/wstools/java"/> + <mkdir dir="${build.tests.dir}/classes"/> + <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on"> + <src path="${build.tests.dir}/wstools/java"/> </javac> </target> @@ -169,17 +164,18 @@ --> <target name="copy-resources" depends="init" description="copy the resources"> <!-- copy resource files --> - <copy todir="${build.test.dir}/resources/${sample.path}"> + <copy todir="${build.tests.dir}/resources/${sample.path}"> <fileset dir="${resources.dir}"> <include name="**/*.wsdl"/> <include name="**/*.xml"/> </fileset> <filterset> <filter token="jbosstest.host.name" value="${node0}"/> + <filter token="wsdl-publish-location" value="${build.tests.dir}/wsdl-publish"/> </filterset> </copy> <!-- copy binary files --> - <copy todir="${build.test.dir}/resources/${sample.path}"> + <copy todir="${build.tests.dir}/resources/${sample.path}"> <fileset dir="${resources.dir}"> <exclude name="**/*.wsdl"/> <exclude name="**/*.xml"/> @@ -192,14 +188,14 @@ --> <target name="copy-generated" depends="init" description="copy the resources"> <!-- copy generated resource files --> - <copy todir="${build.test.dir}/resources"> - <fileset dir="${build.test.dir}/wstools/resources"> + <copy todir="${build.tests.dir}/resources"> + <fileset dir="${build.tests.dir}/wstools/resources"> <include name="${sample.path}/**/*.wsdl"/> <include name="${sample.path}/**/*.xml"/> </fileset> </copy> <!-- copy override resource files --> - <copy todir="${build.test.dir}/resources" overwrite="true"> + <copy todir="${build.tests.dir}/resources" overwrite="true"> <fileset dir="${common.resources}/overrides"> <include name="${sample.path}/**/*.wsdl"/> <include name="${sample.path}/**/*.xml"/> @@ -217,41 +213,41 @@ --> <target name="one-test" depends="init" if="test" description="run a single test"> - <junit printsummary="yes" showoutput="yes" dir="${build.test.dir}"> - <!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006" /--> + <junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}"> + <jvmarg line="${remote.debug.line}"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="tomcat.home" value="${tomcat.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> - <sysproperty key="log.dir" value="${build.test.dir}/log"/> + <sysproperty key="log.dir" value="${build.tests.dir}/log"/> <sysproperty key="java.endorsed.dirs" value="${jbossws.endorsed.dirs}"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> - <sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/> + <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${build.test.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.test.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/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> - <pathelement path="${build.test.dir}/classes"/> + <pathelement path="${build.tests.dir}/classes"/> <pathelement path="${common.resources}"/> <path refid="tests.classpath"/> </classpath> <formatter type="plain"/> <formatter type="xml"/> - <test fork="yes" todir="${build.test.dir}/reports" name="${test}"/> + <test fork="yes" todir="${build.tests.dir}/reports" name="${test}"/> </junit> - <junitreport todir="${build.test.dir}/reports"> - <fileset dir="${build.test.dir}/reports"> + <junitreport todir="${build.tests.dir}/reports"> + <fileset dir="${build.tests.dir}/reports"> <include name="TEST-*.xml"/> </fileset> - <report format="frames" todir="${build.test.dir}/reports/html"/> + <report format="frames" todir="${build.tests.dir}/reports/html"/> </junitreport> </target> @@ -262,33 +258,33 @@ --> <target name="test" depends="init" if="test" description="run a collection of tests"> - <junit printsummary="yes" showoutput="yes" dir="${build.test.dir}"> + <junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}"> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="tomcat.home" value="${tomcat.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> - <sysproperty key="log.dir" value="${build.test.dir}/log"/> + <sysproperty key="log.dir" value="${build.tests.dir}/log"/> <sysproperty key="java.endorsed.dirs" value="${jbossws.endorsed.dirs}"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> - <sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/> + <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="tomcat.manager.username" value="${tomcat.manager.username}"/> <sysproperty key="tomcat.manager.password" value="${tomcat.manager.password}"/> <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> - <sysproperty key="org.jboss.ws.wsse.keyStore" value="${build.test.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> - <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.test.dir}/resources/jaxrpc/samples/wssecurity/wsse.truststore"/> + <sysproperty key="org.jboss.ws.wsse.keyStore" value="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/wsse.keystore"/> + <sysproperty key="org.jboss.ws.wsse.trustStore" value="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/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> - <pathelement path="${build.test.dir}/classes"/> + <pathelement path="${build.tests.dir}/classes"/> <pathelement path="${common.resources}"/> <path refid="tests.classpath"/> </classpath> <formatter type="plain"/> <formatter type="xml"/> - <batchtest fork="yes" todir="${build.test.dir}/reports"> + <batchtest fork="yes" todir="${build.tests.dir}/reports"> <fileset dir="${java.dir}"> <include name="org/jboss/test/ws/${test}/**/*TestCase.java"/> </fileset> @@ -301,11 +297,11 @@ Generate the test report --> <target name="tests-report" depends="init" description="generate the test report"> - <junitreport todir="${build.test.dir}/reports"> - <fileset dir="${build.test.dir}/reports"> + <junitreport todir="${build.tests.dir}/reports"> + <fileset dir="${build.tests.dir}/reports"> <include name="TEST-*.xml"/> </fileset> - <report format="frames" todir="${build.test.dir}/reports/html"/> + <report format="frames" todir="${build.tests.dir}/reports/html"/> </junitreport> </target> @@ -319,7 +315,7 @@ Clean the build --> <target name="clean" depends="init" description="clean the build"> - <delete dir="${build.test.dir}"/> + <delete dir="${build.tests.dir}"/> </target> </project> \ No newline at end of file Modified: trunk/jbossws-core/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/samples/jaxrpc/jsr109pojo/build.xml 2007-01-05 16:09:50 UTC (rev 1821) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Id:build.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ --> +<!-- $Id$ --> <project default="main" basedir="../.." name="JBossWS Examples"> @@ -44,6 +44,7 @@ <webinf dir="${build.tests.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> Modified: trunk/jbossws-core/src/main/resources/samples/jaxrpc/mtom/build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/jaxrpc/mtom/build.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/samples/jaxrpc/mtom/build.xml 2007-01-05 16:09:50 UTC (rev 1821) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Id:build.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ --> +<!-- $Id$ --> <project default="main" basedir="../.." name="JBossWS Examples"> @@ -34,8 +34,8 @@ <!-- jaxrpc-samples-mtom --> <war warfile="${build.tests.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml"> <classes dir="${build.tests.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTestImpl.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/mtom/XOPTest.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/> </classes> <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF"> <include name="jaxrpc-mapping.xml"/> Modified: trunk/jbossws-core/src/main/resources/samples/jaxrpc/secureejb/build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/jaxrpc/secureejb/build.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/samples/jaxrpc/secureejb/build.xml 2007-01-05 16:09:50 UTC (rev 1821) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Id:build.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ --> +<!-- $Id$ --> <project default="main" basedir="../.." name="JBossWS Examples"> @@ -28,7 +28,8 @@ <!-- Build the test deployments --> - <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments"> + <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" + description="build the deployments"> <!-- jaxrpc-samples-secureejb --> <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-secureejb.jar"> Modified: trunk/jbossws-core/src/main/resources/samples/jaxrpc/wsbpel/build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2007-01-05 16:09:50 UTC (rev 1821) @@ -3,126 +3,119 @@ <!-- $Id$ --> <project default="main" basedir="../.." name="JBossWS Examples"> - - <property name="chapter" value="jaxrpc/wsbpel" /> - <property name="sample.path" value="jaxrpc/samples/wsbpel" /> - <property name="java.dir" value="${basedir}/${chapter}/java" /> - <property name="resources.dir" value="${basedir}/${chapter}/resources" /> - - <import file="${basedir}/common/imported-build.xml" /> - - <target name="init-jbpmbpel"> + + <property name="chapter" value="jaxrpc/wsbpel"/> + <property name="sample.path" value="jaxrpc/samples/wsbpel"/> + <property name="java.dir" value="${basedir}/${chapter}/java"/> + <property name="resources.dir" value="${basedir}/${chapter}/resources"/> + + <import file="${basedir}/common/imported-build.xml"/> + + <target name="init-jbpmbpel" depends="init"> + <!-- Check that jBPM BPEL has been deployed --> - <property name="jboss.server.deploy.jbpmbpel" - value="${jboss.server.deploy}/jbpm-bpel.sar" /> - <available property="jbpmbpel.available" - file="${jboss.server.deploy.jbpmbpel}" /> - <antcall target="deploy-jbpmbpel" /> - + <property name="jboss.server.deploy.jbpmbpel" value="${jboss.server.deploy}/jbpm-bpel.sar"/> + <available property="jbpmbpel.available" file="${jboss.server.deploy.jbpmbpel}" type="dir"/> + <antcall target="deploy-jbpmbpel"/> + <!-- The jBPM BPEL classpath --> <path id="jbpmbpel.classpath"> - <path refid="client.classpath" /> + <path refid="client.classpath"/> + <fileset dir="${jboss.lib}"> + <include name="commons-logging.jar"/> + </fileset> <fileset dir="${jboss.server.lib}"> - <include name="dom4j.jar" /> - <include name="commons-collections.jar" /> + <include name="dom4j.jar"/> + <include name="commons-collections.jar"/> </fileset> <fileset dir="${jboss.server.deploy.jbpmbpel}"> - <include name="jbpm*.jar" /> - <include name="commons-lang*.jar" /> - <include name="jaxen*.jar" /> + <include name="jbpm*.jar"/> + <include name="commons-lang*.jar"/> + <include name="jaxen*.jar"/> </fileset> - <path location="${jboss.server.deploy.jbpmbpel}" /> - <path location="${common.resources}" /> + <path location="${jboss.server.deploy.jbpmbpel}"/> + <path location="${common.resources}"/> </path> </target> - + <target name="deploy-jbpmbpel" unless="jbpmbpel.available"> - <mkdir dir="${jboss.server.deploy.jbpmbpel}" /> - <unjar dest="${jboss.server.deploy.jbpmbpel}" - src="${basedir}/lib/jbpm-bpel.sar" /> + <mkdir dir="${jboss.server.deploy.jbpmbpel}"/> + <unjar dest="${jboss.server.deploy.jbpmbpel}" src="${thirdparty.dir}/jbpm-bpel.sar"/> </target> - - <target name="generate-sources" - depends="init-jbpmbpel" - description="Generate the deployment resources."> - + + <target name="generate-sources" depends="init-jbpmbpel" description="Generate the deployment resources."> + <!-- Package the BPEL process and related WSDL interfaces --> <zip destfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"> - <fileset dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" /> + <fileset dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel"/> </zip> - + <!-- Define the servicegen ant task --> - <taskdef name="servicegen" - classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> - <classpath refid="jbpmbpel.classpath" /> + <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> + <classpath refid="jbpmbpel.classpath"/> </taskdef> - + <!-- Generate binding and service elements --> <servicegen processfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" - outputdir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" /> - + outputdir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl"/> + <!-- Define the wstools ant task --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath> - <path refid="client.classpath" /> - <path location="${build.tests.dir}" /> - <path location="${common.resources}" /> + <path refid="client.classpath"/> + <path location="${build.tests.dir}"/> + <path location="${common.resources}"/> </classpath> </taskdef> - + <!-- samples/wsbpel --> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" - config="${resources.dir}/hello/wstools-config.xml" /> - + <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${resources.dir}/hello/wstools-config.xml"/> + <move todir="${build.tests.dir}/wstools/java"> - <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" - includes="org/**" /> + <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" includes="org/**"/> </move> </target> - + <!-- Build the test deployments --> - <target name="jars" - depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" - description="build the deployments"> - + <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="build the deployments"> + <!-- jaxrpc-samples-wsbpel --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello.war" - webxml="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml"> + <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml"> <classes dir="${build.tests.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" /> + <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="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> - <include name="webservices.xml" /> - <include name="classes/bpel-application.xml" /> + <include name="webservices.xml"/> + <include name="classes/bpel-application.xml"/> </webinf> <webinf dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> - <include name="jaxrpc-mapping.xml" /> - <include name="wsdl/**" /> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> </webinf> </war> - + <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-wsbpel-hello-client.jar"> <fileset dir="${build.tests.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/HelloWorldService.class"/> + <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/Greeter.class"/> </fileset> <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wsbpel/hello/META-INF"> - <include name="application-client.xml" /> - <include name="jboss-client.xml" /> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> </metainf> <metainf dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF"> - <include name="jaxrpc-mapping.xml" /> + <include name="jaxrpc-mapping.xml"/> </metainf> </jar> </target> - + <!-- Run the testsuite --> <target name="tests" depends="jars" description="run the testsuite"> <antcall target="test"> - <param name="test" value="${sample.path}" /> + <param name="test" value="${sample.path}"/> </antcall> </target> - + </project> \ No newline at end of file Modified: trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181ejb/build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181ejb/build.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181ejb/build.xml 2007-01-05 16:09:50 UTC (rev 1821) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Id:build.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ --> +<!-- $Id$ --> <project default="main" basedir="../.." name="JBossWS Examples"> @@ -11,8 +11,8 @@ <import file="${basedir}/common/imported-build.xml"/> - <target name="generate-sources" depends="compile15" - description="Generate the deployment resources." if="HAVE_JDK_1.5"> + <target name="generate-sources" depends="compile" + description="Generate the deployment resources."> <!-- Define a taskdef for the wstools ant task --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> @@ -30,8 +30,8 @@ <!-- Build the test deployments --> - <target name="jars" depends="compile15,copy-resources,generate-sources,compile-generated,copy-generated" - description="build the deployments" if="HAVE_JDK_1.5"> + <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" + description="build the deployments"> <!-- jaxws-samples-jsr181ejb --> <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181ejb.ejb3"> Modified: trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181pojo/build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181pojo/build.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/samples/jaxws/jsr181pojo/build.xml 2007-01-05 16:09:50 UTC (rev 1821) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Id:build.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ --> +<!-- $Id$ --> <project default="main" basedir="../.." name="JBossWS Examples"> @@ -11,8 +11,8 @@ <import file="${basedir}/common/imported-build.xml"/> - <target name="generate-sources" depends="compile15" - description="Generate the deployment resources." if="HAVE_JDK_1.5"> + <target name="generate-sources" depends="compile" + description="Generate the deployment resources."> <!-- Define a taskdef for the wstools ant task --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> @@ -30,8 +30,8 @@ <!-- Build the test deployments --> - <target name="jars" depends="compile15,copy-resources,generate-sources,compile-generated,copy-generated" - description="build the deployments" if="HAVE_JDK_1.5"> + <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" + description="build the deployments"> <!-- jaxws-samples-jsr181pojo --> <war warfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml"> Modified: trunk/jbossws-core/src/main/resources/samples/jaxws/retail/build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/jaxws/retail/build.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/samples/jaxws/retail/build.xml 2007-01-05 16:09:50 UTC (rev 1821) @@ -14,8 +14,8 @@ <!-- Build the test deployments --> - <target name="jars" depends="compile15,copy-resources" - description="build the deployments" if="HAVE_JDK_1.5"> + <target name="jars" depends="compile,copy-resources" + description="build the deployments"> <!-- jaxws-samples-retail --> <jar jarfile="${build.test.dir}/libs/jaxws-samples-retail.ejb3"> Modified: trunk/jbossws-core/src/main/resources/samples/jaxws/wsaddressing/build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/jaxws/wsaddressing/build.xml 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/samples/jaxws/wsaddressing/build.xml 2007-01-05 16:09:50 UTC (rev 1821) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- $Id:build.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ --> +<!-- $Id$ --> <project default="main" basedir="../.." name="JBossWS Examples"> @@ -11,8 +11,8 @@ <import file="${basedir}/common/imported-build.xml"/> - <target name="generate-sources" depends="compile15" - description="Generate the deployment resources." if="HAVE_JDK_1.5"> + <target name="generate-sources" depends="compile" + description="Generate the deployment resources."> <!-- Define a taskdef for the wstools ant task --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> @@ -29,8 +29,8 @@ <!-- Build the test deployments --> - <target name="jars" depends="compile15,copy-resources,generate-sources,compile-generated,copy-generated" - description="build the deployments" if="HAVE_JDK_1.5"> + <target name="jars" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" + description="build the deployments"> <!-- jaxws-samples-wsaddressing --> <war warfile="${build.tests.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${build.tests.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml"> @@ -63,7 +63,7 @@ Run the testsuite --> <target name="tests" depends="jars" - description="run the testsuite" if="HAVE_JDK_1.5"> + description="run the testsuite"> <antcall target="test"> <param name="test" value="${sample.path}"/> </antcall> Modified: trunk/jbossws-core/src/main/resources/samples/version.properties =================================================================== --- trunk/jbossws-core/src/main/resources/samples/version.properties 2007-01-05 15:47:19 UTC (rev 1820) +++ trunk/jbossws-core/src/main/resources/samples/version.properties 2007-01-05 16:09:50 UTC (rev 1821) @@ -2,20 +2,20 @@ # $Id: version.properties 1420 2006-11-14 12:44:10Z thomas.diesler(a)jboss.com $ # thirdparty library versions -apache-collections=@apache-collections@ apache-log4j=@apache-log4j@ apache-logging=@apache-logging@ ibm-wsdl4j=@ibm-wsdl4j@ javassist=@javassist@ jbpm-bpel=@jbpm-bpel@ -jbossas=@jbossas@ -jboss-backport-concurrent=@jboss-backport-concurrent@ -jboss-common=@jboss-common@ -jboss-jbossretro=@jboss-jbossretro@ +jboss-common-core=@jboss-common-core@ +jboss-common-logging=@jboss-common-logging@ +jboss-ejb3=@jboss-ejb3@ jboss-jbossws=(a)version.id@ jboss-jbossxb=@jboss-jbossxb@ +jbossas-core-libs=@jbossas-core-libs@ oswego-concurrent=@oswego-concurrent@ sun-jaf=@sun-jaf@ +sun-jaxb=@sun-jaxb@ sun-javamail=@sun-javamail@ sun-servlet=@sun-servlet@