[jbossws-commits] JBossWS SVN: r1435 - in branches/jbossws-1.0: . src/ant src/main/resources/samples src/main/resources/samples/common src/main/resources/samples/jaxrpc/secureejb src/main/resources/samples/jaxrpc/wsbpel src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler

Author: thomas.diesler(a)jboss.com Date: 2006-11-15 10:39:59 -0500 (Wed, 15 Nov 2006) New Revision: 1435 Added: branches/jbossws-1.0/src/ant/build-release.xml branches/jbossws-1.0/src/main/resources/samples/common/build-thirdparty.xml branches/jbossws-1.0/src/main/resources/samples/version.properties Modified: branches/jbossws-1.0/ant.properties.example branches/jbossws-1.0/build.xml branches/jbossws-1.0/src/ant/build-samples.xml branches/jbossws-1.0/src/ant/build-thirdparty.xml branches/jbossws-1.0/src/main/resources/samples/ant.properties.example branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml branches/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java branches/jbossws-1.0/version.properties Log: Automate release steps Samples use thirdparty get Modified: branches/jbossws-1.0/ant.properties.example =================================================================== --- branches/jbossws-1.0/ant.properties.example 2006-11-15 00:17:51 UTC (rev 1434) +++ branches/jbossws-1.0/ant.properties.example 2006-11-15 15:39:59 UTC (rev 1435) @@ -13,18 +13,22 @@ jboss.server.instance=default # Tomcat Home -#tomcat.home=/usr/java/tomcat -#tomcat.manager.username=manager -#tomcat.manager.password=manager +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 # JBoss Repository -jboss.local.repository=/home/tdiesler/cvs/jboss.local.repository +#jboss.repository=file:/home/tdiesler/cvs/jboss.local.repository jboss.repository=http://repository.jboss.com +# JBossWS Release +jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content +jboss.local.repository=/home/tdiesler/cvs/jboss.local.repository + # Force thirdparty HTTP get #force.thirdparty.get=true Modified: branches/jbossws-1.0/build.xml =================================================================== --- branches/jbossws-1.0/build.xml 2006-11-15 00:17:51 UTC (rev 1434) +++ branches/jbossws-1.0/build.xml 2006-11-15 15:39:59 UTC (rev 1435) @@ -15,6 +15,7 @@ <import file="${basedir}/src/ant/build-thirdparty.xml"/> <import file="${basedir}/src/ant/build-samples.xml"/> + <import file="${basedir}/src/ant/build-release.xml"/> <!-- ================================================================== --> <!-- Setup --> @@ -64,14 +65,16 @@ <target name="prepare"> - <echo message="jboss.home = ${jboss.home}"/> + <echo message="jboss.jdk15.home = ${jboss.jdk15.home}"/> + <echo message="jboss.jdk14.home = ${jboss.jdk14.home}"/> <echo message="tomcat.home = ${tomcat.home}"/> <echo/> - <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/> + <available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/> <available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/> - <available property="jboss.available" file="${jboss.client}/jboss-client.jar"/> + <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/> <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> + <available property="jboss.available" file="${jboss.client}/jboss-client.jar"/> <checksum file="version.properties" fileext=".md5" verifyproperty="checksum.ok"/> <checksum file="version.properties" fileext=".md5"/> @@ -578,144 +581,6 @@ <delete dir="${build.lib.dir}/build"/> </target> - <!-- ================================================================== --> - <!-- Release --> - <!-- ================================================================== --> - - <!-- Deploy jbossws to the server specified like this: -Dserver=default --> - <target name="release" depends="all" description="Release to jboss.local.repository"> - - <!-- jbossws --> - <property name="jbossws.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> - <mkdir dir="${jbossws.dir}/lib"/> - <copy todir="${jbossws.dir}/lib" overwrite="true"> - <fileset dir="${build.lib.dir}"> - <include name="jbossws.sar"/> - <include name="jbossws-client.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <copy tofile="${jbossws.dir}/component-info.xml" file="${src.etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="version.properties"/> - </filterset> - </copy> - - <!-- jbossws14 --> - <property name="jbossws14.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/> - <mkdir dir="${jbossws14.dir}/lib"/> - <copy todir="${jbossws14.dir}/lib" overwrite="true"> - <fileset dir="${build.lib.dir}"> - <include name="jbossws14.sar"/> - <include name="jbossws14-client.jar"/> - <include name="jboss-jaxws14.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </copy> - <copy tofile="${jbossws14.dir}/component-info.xml" file="${src.etc.dir}/jbossws14-component-info.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="version.properties"/> - </filterset> - </copy> - </target> - - <!-- ================================================================== --> - <!-- Misc. --> - <!-- ================================================================== --> - - <!-- Build the bin dist --> - <target name="build-bin-dist" description="Build the binary distribution" - depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs"> - - <mkdir dir="${build.bin.dist}"/> - <mkdir dir="${build.bin.dist}/bin"/> - <mkdir dir="${build.bin.dist}/samples"/> - <mkdir dir="${build.bin.dist}/docs/html"/> - <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.5"/> - <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.4"/> - <mkdir dir="${build.bin.dist}/lib/tomcat/common/endorsed"/> - <mkdir dir="${build.bin.dist}/lib/tomcat/common/lib"/> - <mkdir dir="${build.bin.dist}/lib/tomcat/webapps"/> - - <copy todir="${build.bin.dist}" file="${src.etc.dir}/JBossORG-EULA.txt" overwrite="true"/> - <copy todir="${build.bin.dist}" filtering="true" overwrite="true"> - <fileset dir="${src.dist.dir}"/> - <filterset> - <filtersfile file="version.properties"/> - </filterset> - </copy> - <copy todir="${build.bin.dist}/bin"> - <fileset dir="${src.etc.dir}"> - <include name="wstools.bat"/> - <include name="wstools.sh"/> - </fileset> - </copy> - - <!-- samples --> - <copy todir="${build.bin.dist}" file="${build.dir}/${samples.target}.zip" overwrite="true"/> - - <!-- documentation --> - <copy todir="${build.bin.dist}/docs/html" overwrite="true"> - <fileset dir="${docs.userguide.dir}/build/en/html"/> - </copy> - <copy todir="${build.bin.dist}/docs" overwrite="true"> - <fileset dir="${docs.userguide.dir}/build/en/pdf"/> - </copy> - - <!-- lib/jdk1.5 --> - <copy todir="${build.bin.dist}/lib/jboss-jdk1.5" overwrite="true"> - <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/> - </copy> - - <!-- lib/jdk1.4 --> - <copy todir="${build.bin.dist}/lib/jboss-jdk1.4" overwrite="true"> - <fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/> - </copy> - - <!-- lib/tomcat --> - <copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true"> - <fileset dir="${thirdparty.dir}"> - <include name="serializer.jar"/> - <include name="xalan.jar"/> - <include name="xercesImpl.jar"/> - </fileset> - </copy> - <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true"> - <fileset dir="${thirdparty.dir}"> - <include name="activation.jar"/> - <include name="log4j.jar"/> - <include name="mailapi.jar"/> - </fileset> - <fileset dir="${build.lib.dir}"> - <include name="jbossws-core.jar"/> - <include name="jbossws-tomcat-integration.jar"/> - <include name="jbossws-thirdparty.jar"/> - </fileset> - </copy> - <copy todir="${build.bin.dist}/lib/tomcat/webapps" overwrite="true"> - <fileset dir="${build.lib.dir}" includes="jbossws.war"/> - </copy> - - <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/> - </target> - - <!-- Build the src dist --> - <target name="build-src-dist" description="Build the source distribution"> - <mkdir dir="${build.src.dist}/jbossws-${version.id}-src"/> - <copy todir="${build.src.dist}/jbossws-${version.id}-src"> - <fileset dir="${basedir}"> - <include name="ant.properties.example"/> - <include name="version.properties"/> - <include name="build.xml"/> - <include name="src/**"/> - </fileset> - </copy> - <zip destfile="${build.dir}/jbossws-${version.id}-src.zip" basedir="${build.src.dist}" - includes="jbossws-${version.id}/**"/> - </target> <target name="clean" depends="prepare" description="Cleans up most generated files."> <delete dir="${build.dir}"/> </target> Added: branches/jbossws-1.0/src/ant/build-release.xml =================================================================== --- branches/jbossws-1.0/src/ant/build-release.xml 2006-11-15 00:17:51 UTC (rev 1434) +++ branches/jbossws-1.0/src/ant/build-release.xml 2006-11-15 15:39:59 UTC (rev 1435) @@ -0,0 +1,207 @@ +<?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="release" name="JBossWS Release"> + + <target name="release" depends="all,release-to-repository,release-to-portal" description="Release JBossWS"> + <echo message="*********************************************"/> + <echo message="* Released: jbossws-${version.id}"/> + <echo message="*"/> + <echo message="* Almost there, please do these steps manually"/> + <echo message="*"/> + <echo message="* 1) Create SVN tag: jbossws-${version.id}"/> + <echo message="* 2) Update portal-content/project.xml"/> + <echo message="* 3) Update portal-content/counter.xml"/> + <echo message="* 4) Commit the portal-content"/> + <echo message="* 5) Write a stick post on the user forum"/> + <echo message="* 6) Release the jbossws-${version.id} version in JIRA"/> + <echo message="* 7) Post a message to jbossws-announce(a)lists.jboss.org&quot;/&gt; + <echo message="* 8) Post a message to thecore(a)jboss.org&quot;/&gt; + <echo message="*"/> + <echo message="*********************************************"/> + </target> + + <!-- Release to jboss.local.repository --> + <target name="release-to-repository" depends="module-jars,module-jars14" description="Release to jboss.local.repository"> + + <!-- jbossws --> + <property name="jbossws.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> + <mkdir dir="${jbossws.dir}/lib"/> + <copy todir="${jbossws.dir}/lib" overwrite="true"> + <fileset dir="${build.lib.dir}"> + <include name="jbossws.sar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-jboss-integration.jar"/> + <include name="jbossws-tomcat-integration.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <copy tofile="${jbossws.dir}/component-info.xml" file="${src.etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="version.properties"/> + </filterset> + </copy> + + <!-- jbossws14 --> + <property name="jbossws14.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/> + <mkdir dir="${jbossws14.dir}/lib"/> + <copy todir="${jbossws14.dir}/lib" overwrite="true"> + <fileset dir="${build.lib.dir}"> + <include name="jbossws14.sar"/> + <include name="jbossws14-client.jar"/> + <include name="jbossws14-jboss-integration.jar"/> + <include name="jbossws14-tomcat-integration.jar"/> + <include name="jboss-jaxws14.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + <copy tofile="${jbossws14.dir}/component-info.xml" file="${src.etc.dir}/jbossws14-component-info.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="version.properties"/> + </filterset> + </copy> + + </target> + + <!-- Release to portal content --> + <target name="check-portal-content" depends="prepare" unless="jbossws.portal.content.available"> + <echo message="*********************************************"/> + <echo message="* Not available: ${jbossws.portal.content}"/> + <echo message="*********************************************"/> + </target> + <target name="release-to-portal" depends="check-portal-content" description="Release to portal-content" if="jbossws.portal.content.available"> + + <property name="portal.freezone" value="${jbossws.portal.content}/freezone"/> + <property name="portal.userguide" value="${portal.freezone}/user-guide"/> + <property name="portal.downloads" value="${jbossws.portal.content}/downloads"/> + + <!-- Copy user guide --> + <copy todir="${portal.userguide}" overwrite="true"> + <fileset dir="${docs.userguide.dir}/build"> + <include name="en/**"/> + </fileset> + </copy> + + <!-- Copy downloads --> + <copy todir="${portal.downloads}" overwrite="true"> + <fileset dir="${build.dir}"> + <include name="jbossws-${version.id}.zip"/> + <include name="jbossws-src-${version.id}.zip"/> + <include name="jbossws-samples-${version.id}.zip"/> + </fileset> + </copy> + + <!-- Copy Release Notes --> + <copy tofile="${portal.downloads}/ReleaseNotes-${version.id}.txt" file="${build.bin.dist}/ReleaseNotes.txt" overwrite="true"/> + <copy tofile="${portal.downloads}/Install-${version.id}.txt" file="${build.bin.dist}/Install.txt" overwrite="true"/> + </target> + + <!-- ================================================================== --> + <!-- Build distributions --> + <!-- ================================================================== --> + + <!-- Build the bin dist --> + <target name="build-bin-dist" description="Build the binary distribution" + depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs"> + + <mkdir dir="${build.bin.dist}"/> + <mkdir dir="${build.bin.dist}/bin"/> + <mkdir dir="${build.bin.dist}/docs/html"/> + <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.5"/> + <mkdir dir="${build.bin.dist}/lib/jboss-jdk1.4"/> + <mkdir dir="${build.bin.dist}/lib/tomcat/common/endorsed"/> + <mkdir dir="${build.bin.dist}/lib/tomcat/common/lib"/> + <mkdir dir="${build.bin.dist}/lib/tomcat/webapps"/> + + <copy todir="${build.bin.dist}" file="${src.etc.dir}/JBossORG-EULA.txt" overwrite="true"/> + <copy todir="${build.bin.dist}" filtering="true" overwrite="true"> + <fileset dir="${src.dist.dir}"/> + <filterset> + <filtersfile file="version.properties"/> + </filterset> + </copy> + <copy todir="${build.bin.dist}/bin"> + <fileset dir="${src.etc.dir}"> + <include name="wstools.bat"/> + <include name="wstools.sh"/> + </fileset> + </copy> + + <!-- samples --> + <copy todir="${build.bin.dist}" file="${build.dir}/${samples.target}.zip" overwrite="true"/> + + <!-- documentation --> + <copy todir="${build.bin.dist}/docs/html" overwrite="true"> + <fileset dir="${docs.userguide.dir}/build/en/html"/> + </copy> + <copy todir="${build.bin.dist}/docs" overwrite="true"> + <fileset dir="${docs.userguide.dir}/build/en/pdf"/> + </copy> + + <!-- lib/jdk1.5 --> + <copy todir="${build.bin.dist}/lib/jboss-jdk1.5" overwrite="true"> + <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/> + </copy> + + <!-- lib/jdk1.4 --> + <copy todir="${build.bin.dist}/lib/jboss-jdk1.4" overwrite="true"> + <fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/> + </copy> + + <!-- lib/tomcat --> + <copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="serializer.jar"/> + <include name="xalan.jar"/> + <include name="xercesImpl.jar"/> + </fileset> + </copy> + <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="activation.jar"/> + <include name="log4j.jar"/> + <include name="mailapi.jar"/> + </fileset> + <fileset dir="${build.lib.dir}"> + <include name="jbossws-core.jar"/> + <include name="jbossws-tomcat-integration.jar"/> + <include name="jbossws-thirdparty.jar"/> + </fileset> + </copy> + <copy todir="${build.bin.dist}/lib/tomcat/webapps" overwrite="true"> + <fileset dir="${build.lib.dir}" includes="jbossws.war"/> + </copy> + + <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/> + </target> + + <!-- Build the src dist --> + <target name="build-src-dist" description="Build the source distribution"> + <mkdir dir="${build.src.dist}/jbossws-src-${version.id}"/> + <copy todir="${build.src.dist}/jbossws-src-${version.id}"> + <fileset dir="${basedir}"> + <include name="ant.properties.example"/> + <include name="version.properties"/> + <include name="build.xml"/> + <include name="src/**"/> + <include name="docs/user-guide/**"/> + </fileset> + </copy> + <zip destfile="${build.dir}/jbossws-src-${version.id}.zip" basedir="${build.src.dist}" + includes="jbossws-src-${version.id}/**"/> + </target> + +</project> Property changes on: branches/jbossws-1.0/src/ant/build-release.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0/src/ant/build-samples.xml =================================================================== --- branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-15 00:17:51 UTC (rev 1434) +++ branches/jbossws-1.0/src/ant/build-samples.xml 2006-11-15 15:39:59 UTC (rev 1435) @@ -21,29 +21,25 @@ <property name="samples.target" value="jbossws-samples-${version.id}"/> <property name="build.src.samples.dir" value="${build.dir}/${samples.target}"/> - <copy todir="${build.src.samples.dir}"> + <copy todir="${build.src.samples.dir}" filtering="yes"> <fileset dir="${src.samples.dir}"> <include name="common/imported-build.xml"/> + <include name="common/build-thirdparty.xml"/> <include name="ant.properties.example"/> + <include name="version.properties"/> <include name="**/build.xml"/> </fileset> + <filterset> + <filtersfile file="version.properties"/> + </filterset> </copy> - <mkdir dir="${build.src.samples.dir}/lib"/> - <copy todir="${build.src.samples.dir}/lib"> - <fileset dir="${jboss.client}"> - <include name="commons-logging.jar"/> - <include name="jbossall-client.jar"/> - <include name="mail.jar"/> - <include name="jboss-aop-jdk50-client.jar"/> - <include name="jboss-aspect-jdk50-client.jar"/> - <include name="jboss-ejb3-client.jar"/> - </fileset> - <fileset dir="${jboss.server.deploy}/ejb3.deployer"> - <include name="jboss-annotations-ejb3.jar"/> - <include name="jboss-ejb3x.jar"/> - </fileset> + <!-- + <copy todir="${build.src.samples.dir}/thirdparty" overwrite="true"> <fileset dir="${build.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> <include name="jbossws-jboss-integration.jar"/> <include name="jbossws-tomcat-integration.jar"/> @@ -51,19 +47,9 @@ <include name="jbossws14-jboss-integration.jar"/> <include name="jbossws14-tomcat-integration.jar"/> </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="activation.jar"/> - <include name="commons-collections.jar"/> - <include name="dom4j.jar"/> - <include name="javassist.jar"/> - <include name="jbossretro-rt.jar"/> - <include name="jboss-backport-concurrent.jar"/> - <include name="jboss-xml-binding.jar"/> - <include name="log4j.jar"/> - <include name="servlet-api.jar"/> - </fileset> </copy> - + --> + <!-- samples/common --> <mkdir dir="${build.src.samples.dir}/common/java"/> <mkdir dir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples"/> @@ -275,7 +261,6 @@ <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"> <fileset dir="${test.resources.dir}/jaxrpc/samples/wsbpel" /> </copy> - <copy todir="${build.src.samples.dir}/lib" file="${thirdparty.dir}/jbpm-bpel.sar" /> <!-- samples/wseventing --> <mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/java"/> @@ -349,7 +334,11 @@ <!-- Build the samples zip --> <zip destfile="${build.dir}/${samples.target}.zip"> - <fileset dir="${build.dir}" includes="${samples.target}/**"/> + <fileset dir="${build.dir}"> + <include name="${samples.target}/**"/> + <exclude name="${samples.target}/output/**"/> + <exclude name="${samples.target}/thirdparty/**"/> + </fileset> </zip> </target> Modified: branches/jbossws-1.0/src/ant/build-thirdparty.xml =================================================================== --- branches/jbossws-1.0/src/ant/build-thirdparty.xml 2006-11-15 00:17:51 UTC (rev 1434) +++ branches/jbossws-1.0/src/ant/build-thirdparty.xml 2006-11-15 15:39:59 UTC (rev 1435) @@ -27,13 +27,13 @@ <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <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}/apache-xalan/${apache-xalan}/lib/serializer.jar" dest="${thirdparty.dir}/serializer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xalan/${apache-xalan}/lib/xalan.jar" dest="${thirdparty.dir}/xalan.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/resolver.jar" dest="${thirdparty.dir}/resolver.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xercesImpl.jar" dest="${thirdparty.dir}/xercesImpl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xerces/${apache-xerces}/lib/xml-apis.jar" dest="${thirdparty.dir}/xml-apis.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-xmlsec/${apache-xmlsec}/lib/xmlsec.jar" dest="${thirdparty.dir}/xmlsec.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.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}/jbossas/core-libs/${jbossas}/lib/jboss.jar" dest="${thirdparty.dir}/jboss.jar" usetimestamp="true" verbose="true"/> Modified: branches/jbossws-1.0/src/main/resources/samples/ant.properties.example =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-11-15 00:17:51 UTC (rev 1434) +++ branches/jbossws-1.0/src/main/resources/samples/ant.properties.example 2006-11-15 15:39:59 UTC (rev 1435) @@ -1,14 +1,14 @@ # JBossWS samples build properties # -# JBoss Home +# The Required JBoss Home #jboss.jdk15.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 #jboss.jdk14.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA # The JBoss server instance jboss.server.instance=default -# Tomcat Home +# The Optional Tomcat Home #tomcat.home=/usr/java/tomcat #tomcat.manager.username=manager #tomcat.manager.password=manager @@ -16,3 +16,10 @@ # 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 Added: branches/jbossws-1.0/src/main/resources/samples/common/build-thirdparty.xml =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/common/build-thirdparty.xml 2006-11-15 00:17:51 UTC (rev 1434) +++ branches/jbossws-1.0/src/main/resources/samples/common/build-thirdparty.xml 2006-11-15 15:39:59 UTC (rev 1435) @@ -0,0 +1,132 @@ +<?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:build-thirdparty.xml 1125 2006-10-03 15:45:31Z thomas.diesler(a)jboss.com $ --> + +<project name="JBossWS-Thirdparty"> + + <!-- ========= --> + <!-- Libraries --> + <!-- ========= --> + + <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> + </target> + + <target name="thirdparty-get" depends="init" if="force.thirdparty.get" + 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/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}/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-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"/> + </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="jboss-jaxrpc.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jboss-xml-binding.jar"/> + <include name="jbossretro-rt.jar"/> + <include name="jboss-backport-concurrent.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> + </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> + </path> + + </target> + +</project> Property changes on: branches/jbossws-1.0/src/main/resources/samples/common/build-thirdparty.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-15 00:17:51 UTC (rev 1434) +++ branches/jbossws-1.0/src/main/resources/samples/common/imported-build.xml 2006-11-15 15:39:59 UTC (rev 1435) @@ -4,21 +4,30 @@ <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.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"/> - + + <!-- Force Thirdparty Get --> + <condition property="force.thirdparty.get"> + <not> + <available file="${thirdparty.dir}" type="dir"/> + </not> + </condition> + <!-- Target Server [jboss|tomcat] --> <property name="jbossws.target.server.${jbossws.target.server}" value="true"/> <condition property="only-on-jboss"> @@ -30,42 +39,7 @@ <isset property="HAVE_JDK_1.5"/> </and> </condition> - - <!-- JBossWS Version --> - <condition property="jbossws.version" value="jbossws14"> - <not> - <isset property="HAVE_JDK_1.5"/> - </not> - </condition> - <condition property="jbossws.version" value="jbossws"> - <isset property="HAVE_JDK_1.5"/> - </condition> - <!-- JBoss Home --> - <condition property="jboss.home" value="${jboss.jdk14.home}"> - <not> - <isset property="HAVE_JDK_1.5"/> - </not> - </condition> - <condition property="jboss.home" value="${jboss.jdk15.home}"> - <isset property="HAVE_JDK_1.5"/> - </condition> - - <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"/> - - <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/> - <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> - - <!-- Java Endorsed --> - <condition property="jbossws.endorsed.dirs" value="${jboss.home}/lib/endorsed"> - <isset property="jbossws.target.server.jboss"/> - </condition> - <condition property="jbossws.endorsed.dirs" value="${tomcat.home}/common/endorsed"> - <isset property="jbossws.target.server.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 @@ -88,48 +62,32 @@ <property name="node0.http.url" value="http://${node0}:8080"/> <property name="node0.jndi.url" value="jnp://${node0}:1099"/> - <path id="client.classpath"> - <fileset dir="${basedir}/lib"> - <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.version}-client.jar"/> - <include name="log4j.jar"/> - <include name="mail.jar"/> - </fileset> - </path> + <!-- 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="compile.classpath"> - <path refid="client.classpath"/> - <fileset dir="${basedir}/lib"> - <include name="jboss-annotations-ejb3.jar"/> - <include name="jboss-ejb3x.jar"/> - </fileset> - <pathelement location="${basedir}/lib/${jbossws.version}-jboss-integration.jar"/> - <pathelement location="${basedir}/lib/${jbossws.version}-tomcat-integration.jar"/> - </path> + </target> + + <!-- Init--> + <target name="init" depends="prepare,check-jboss,check-tomcat"> - <path id="tests.classpath"> - <path refid="client.classpath"/> - <fileset dir="${basedir}/lib"> - <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.version}-jboss-integration.jar"/> - <pathelement location="${basedir}/lib/${jbossws.version}-tomcat-integration.jar"/> - <pathelement location="${basedir}/lib/servlet-api.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 message="jboss.jdk15.home = ${jboss.jdk15.home}"/> + <echo message="jboss.jdk14.home = ${jboss.jdk14.home}"/> + <echo message="tomcat.home = ${tomcat.home}"/> + <echo message="java.home = ${java.home}"/> + <!--echo message="java.endorsed.dirs = ${jbossws.endorsed.dirs}"/--> + <echo message="node0 = ${node0}"/> <echo/> + <echo message="***************************"/> + <echo message="* ${chapter}"/> + <echo message="***************************"/> + <echo/> <mkdir dir="${build.tests.dir}/classes"/> <mkdir dir="${build.tests.dir}/resources"/> @@ -140,22 +98,70 @@ <mkdir dir="${build.tests.dir}/wstools/resources"/> <touch file="${build.tests.dir}/log/samples.log"/> + </target> - <!-- - Compile the java sources - --> - <target name="compile" depends="init" description="compile the sources" if="HAVE_JDK_1.4"> + <!-- Check JBoss --> + <target name="check-jboss"> + + <condition property="jboss.home" value="${jboss.jdk14.home}"> + <not> + <isset property="HAVE_JDK_1.5"/> + </not> + </condition> + <condition property="jboss.home" value="${jboss.jdk15.home}"> + <isset property="HAVE_JDK_1.5"/> + </condition> + + <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/> + <fail message="JBoss not available: ${jboss.home}" unless="jboss.available"/> + + <!-- Java Endorsed --> + <condition property="jbossws.endorsed.dirs" value="${jboss.home}/lib/endorsed"> + <isset property="jbossws.target.server.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"/> + + <condition property="jboss.ejb3.deployer" value="${jboss.server.deploy}/ejb3.deployer"> + <isset property="HAVE_JDK_1.5"/> + </condition> + + </target> + + <!-- Check tomcat --> + <target name="check-tomcat" if="jbossws.target.server.tomcat"> + + <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> + <condition property="cannot.use.tomcat"> + <and> + <isset property="jbossws.target.server.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 --> + <target name="compile" depends="init,thirdparty" + description="compile the sources" if="HAVE_JDK_1.4"> <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on"> <src path="${common.java}"/> <src path="${java.dir}"/> </javac> </target> - - <!-- - Compile the java sources with jdk-1.5 - --> - <target name="compile15" depends="init" description="compile the sources" if="HAVE_JDK_1.5"> + <target name="compile15" depends="init,thirdparty" + description="compile the sources" if="HAVE_JDK_1.5"> <mkdir dir="${build.tests.dir}/classes"/> <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on"> <src path="${common.java}"/> @@ -228,7 +234,7 @@ <target name="one-test" depends="init" if="test" description="run a single test"> <junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}"> - <!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006" /--> + <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}"/> Modified: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml 2006-11-15 00:17:51 UTC (rev 1434) +++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/secureejb/build.xml 2006-11-15 15:39:59 UTC (rev 1435) @@ -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: branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-11-15 00:17:51 UTC (rev 1434) +++ branches/jbossws-1.0/src/main/resources/samples/jaxrpc/wsbpel/build.xml 2006-11-15 15:39:59 UTC (rev 1435) @@ -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" /> - <fileset dir="${basedir}/lib"> - <include name="dom4j.jar" /> - <include name="commons-collections.jar" /> + <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"/> + </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 Added: branches/jbossws-1.0/src/main/resources/samples/version.properties =================================================================== --- branches/jbossws-1.0/src/main/resources/samples/version.properties 2006-11-15 00:17:51 UTC (rev 1434) +++ branches/jbossws-1.0/src/main/resources/samples/version.properties 2006-11-15 15:39:59 UTC (rev 1435) @@ -0,0 +1,21 @@ + +# $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-jbossws=(a)version.id@ +jboss-jbossxb=@jboss-jbossxb@ +oswego-concurrent=@oswego-concurrent@ +sun-jaf=@sun-jaf@ +sun-javamail=@sun-javamail@ +sun-servlet=@sun-servlet@ + Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2006-11-15 00:17:51 UTC (rev 1434) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase.java 2006-11-15 15:39:59 UTC (rev 1435) @@ -33,11 +33,11 @@ import junit.framework.Test; -import org.jboss.mx.util.ObjectNameFactory; import org.jboss.test.ws.JBossWSTest; import org.jboss.test.ws.JBossWSTestSetup; import org.jboss.ws.jaxrpc.ServiceExt; import org.jboss.ws.metadata.HandlerMetaData; +import org.jboss.ws.utils.ObjectNameFactory; /** * Test dynamic handlers Modified: branches/jbossws-1.0/version.properties =================================================================== --- branches/jbossws-1.0/version.properties 2006-11-15 00:17:51 UTC (rev 1434) +++ branches/jbossws-1.0/version.properties 2006-11-15 15:39:59 UTC (rev 1435) @@ -26,9 +26,9 @@ apache-ant=1.6.5 apache-collections=3.1 apache-log4j=1.2.8 +apache-logging=1.0.5.GA-jboss apache-xalan=j_2.7.0 apache-xerces=2.7.1 -dom4j=1.6.1jboss jboss-backport-concurrent=2.1.0.GA jboss-jbossretro=1.0.2.GA jbossas=4.0.4.GA