Author: thomas.diesler(a)jboss.com Date: 2006-10-17 09:57:51 -0400 (Tue, 17 Oct 2006) New Revision: 1241 Modified: trunk/ trunk/build.xml trunk/src/ant/build-thirdparty.xml trunk/src/test/build.xml trunk/version.properties Log: Merge from jbossws-1.0 Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - clipboard.xml output output-eclipse thirdparty ant.properties + clipboard.xml output output-eclipse thirdparty ant.properties version.properties.md5 Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-10-17 13:16:41 UTC (rev 1240) +++ trunk/build.xml 2006-10-17 13:57:51 UTC (rev 1241) @@ -31,7 +31,8 @@ <property name="build.lib.dir" value="${build.dir}/lib"/> <property name="build.resources.dir" value="${build.dir}/resources"/> <property name="build.samples.dir" value="${build.dir}/samples"/> - <property name="build.dist.dir" value="${build.dir}/dist"/> + <property name="build.bin.dist" value="${build.dir}/bin-dist"/> + <property name="build.src.dist" value="${build.dir}/src-dist"/> <property name="docs.userguide.dir" value="${basedir}/docs/user-guide/project"/> <property name="src.dir" value="${basedir}/src/main"/> <property name="src.etc.dir" value="${src.dir}/etc"/> @@ -70,11 +71,17 @@ <available property="jboss.source.dist.available" file="${jboss.thirdparty}" type="dir"/> <available property="jboss.ejb3.available" file="${jboss.client}/jboss-ejb3-client.jar"/> <available property="jbossws.thirdparty.available" file="${build.lib.dir}/jbossws-thirdparty.jar"/> - + + <checksum file="version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <checksum file="version.properties" fileext=".md5"/> + <condition property="force.thirdparty.get"> - <not> - <available file="${thirdparty.dir}" type="dir"/> - </not> + <or> + <not> + <available file="${thirdparty.dir}" type="dir"/> + </not> + <isfalse value="${checksum.ok}"/> + </or> </condition> <fail message="Not available: ${jboss.client}/jboss-ejb3-client.jar" unless="jboss.ejb3.available"/> @@ -150,7 +157,6 @@ <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/**"/> - <include name="org/jboss/ws/transport/jms/**"/> <classpath path="${build.classes14.dir}"/> <classpath refid="integration.classpath"/> </javac> @@ -225,7 +231,6 @@ <fileset dir="${build.classes.dir}"> <include name="org/jboss/ws/**"/> <exclude name="org/jboss/ws/integration/**"/> - <exclude name="org/jboss/ws/transport/jms/**"/> <exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/> </fileset> <fileset dir="${build.resources.dir}"> @@ -239,7 +244,6 @@ <fileset dir="${build.classes.dir}"> <include name="org/jboss/ws/integration/*.class"/> <include name="org/jboss/ws/integration/jboss/**"/> - <include name="org/jboss/ws/transport/jms/**"/> <include name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/> </fileset> </jar> @@ -252,12 +256,9 @@ </jar> <!-- Build jbossws.beans --> - <jar jarfile="${build.lib.dir}/jbossws.beans" manifest="${build.etc.dir}/default.mf"> - <metainf dir="${build.resources.dir}/jbossws.beans/META-INF"> - <include name="jboss-beans.xml"/> - </metainf> - </jar> - + <mkdir dir="${build.lib.dir}/jbossws.beans/META-INF"/> + <copy todir="${build.lib.dir}/jbossws.beans/META-INF" file="${build.resources.dir}/jbossws.beans/META-INF/jboss-beans.xml"/> + <!-- Build jbossws-client.jar --> <jar jarfile="${build.lib.dir}/jbossws-client.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${build.classes.dir}"> @@ -265,7 +266,6 @@ <include name="org/jboss/ws/**"/> <exclude name="org/jboss/ws/integration/jboss/**"/> <exclude name="org/jboss/ws/integration/tomcat/**"/> - <exclude name="org/jboss/ws/transport/jms/**"/> </fileset> <fileset dir="${build.resources.dir}/jbossws.sar"> <include name="META-INF/standard-jaxrpc-client-config.xml"/> @@ -317,7 +317,7 @@ <include name="jbossws-context.war"/> <include name="jbossws-core.jar"/> <include name="jboss-jaxws.jar"/> - <include name="jbossws.beans"/> + <include name="jbossws.beans/**"/> </fileset> <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> @@ -357,7 +357,6 @@ <fileset dir="${build.classes14.dir}"> <include name="org/jboss/ws/**"/> <exclude name="org/jboss/ws/integration/**"/> - <exclude name="org/jboss/ws/transport/jms/**"/> <exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/> </fileset> <fileset dir="${build.resources.dir}"> @@ -366,16 +365,22 @@ </fileset> </jar> - <!-- Build jbossws-jboss-integration.jar --> + <!-- Build jbossws14-jboss-integration.jar --> <jar jarfile="${build.lib.dir}/jbossws14-jboss-integration.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${build.classes14.dir}"> <include name="org/jboss/ws/integration/*.class"/> <include name="org/jboss/ws/integration/jboss/**"/> - <include name="org/jboss/ws/transport/jms/**"/> <include name="org/jboss/ws/server/ServiceEndpointInterceptor.class"/> </fileset> </jar> - + + <!-- Build jbossws14-tomcat-integration.jar --> + <jar jarfile="${build.lib.dir}/jbossws14-tomcat-integration.jar" manifest="${build.etc.dir}/default.mf"> + <fileset dir="${build.classes14.dir}"> + <include name="org/jboss/ws/integration/tomcat/**"/> + </fileset> + </jar> + <!-- Build jbossws14-client.jar --> <jar jarfile="${build.lib.dir}/jbossws14-client.jar" manifest="${build.etc.dir}/default.mf"> <fileset dir="${build.classes14.dir}"> @@ -383,7 +388,6 @@ <include name="org/jboss/ws/**"/> <exclude name="org/jboss/ws/integration/jboss/**"/> <exclude name="org/jboss/ws/integration/tomcat/**"/> - <exclude name="org/jboss/ws/transport/jms/**"/> </fileset> <fileset dir="${build.resources.dir}/jbossws.sar"> <include name="META-INF/standard-jaxrpc-client-config.xml"/> @@ -406,7 +410,7 @@ <include name="jbossws14-core.jar"/> <include name="jbossws-context.war"/> <include name="jboss-jaxws14.jar"/> - <include name="jbossws.beans"/> + <include name="jbossws.beans/**"/> </fileset> <fileset dir="${thirdparty.dir}"> <include name="wsdl4j.jar"/> @@ -426,7 +430,6 @@ <!-- Retrotranslation --> - <target name="jbossretro" depends="compile"> <!-- Weave the build.classes to build.classes14 --> @@ -496,8 +499,8 @@ <!-- Deploy jbossws14 to the server --> <target name="module-jars14-assert" unless="jboss.jdk14.home"> - <echo>ERROR: 'jboss.jdk14.home' is not set. </echo> - <echo>Make sure to point it to your jboss confiuguration thagt should run under jdk 1.4</echo> + <echo>ERROR: 'jboss.jdk14.home' is not set. </echo> + <echo>Make sure to point it to your jboss configuration thagt should run under jdk 1.4</echo> </target> <target name="deploy-jbossws14" depends="main,module-jars14, module-jars14-assert" description="Deploy jbossws14" if="jboss.jdk14.home"> @@ -513,7 +516,6 @@ <!-- Deploy to jboss --> <target name="deploy-to-server"> - <echo>Replacing jbossxb under ${jboss.deploy.home}/client and /lib</echo> <copy todir="${jboss.deploy.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss.deploy.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss.deploy.home}/client" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/> @@ -524,6 +526,7 @@ <!-- Deploy to jboss/thirdparty --> <target name="deploy-to-thirdparty" if="jboss.source.dist.available"> + <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/> <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}.sar" overwrite="true"/> </target> @@ -620,25 +623,35 @@ <target name="most" description="Builds almost everything." depends="jars"/> - <target name="all" description="Create a distribution zip file" depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs"> - - <mkdir dir="${build.dist.dir}"/> - <mkdir dir="${build.dist.dir}/bin"/> - <mkdir dir="${build.dist.dir}/samples"/> - <mkdir dir="${build.dist.dir}/docs/html"/> - <mkdir dir="${build.dist.dir}/lib/jboss-jdk1.5"/> - <mkdir dir="${build.dist.dir}/lib/jboss-jdk1.4"/> - <mkdir dir="${build.dist.dir}/lib/tomcat/common/endorsed"/> - <mkdir dir="${build.dist.dir}/lib/tomcat/common/lib"/> - <mkdir dir="${build.dist.dir}/lib/tomcat/webapps"/> - - <copy todir="${build.dist.dir}" filtering="true" overwrite="true"> + <target name="all" description="Create a distribution zip file" + depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs,build-bin-dist,build-src-dist"> + </target> + + <!-- Build the documentation --> + <target name="build-docs" description="Build the documentation"> + <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/> + </target> + + <!-- Build the bin dist --> + <target name="build-bin-dist" description="Build the binary distribution"> + + <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}" filtering="true" overwrite="true"> <fileset dir="${src.dist.dir}"/> <filterset> <filtersfile file="version.properties"/> </filterset> </copy> - <copy todir="${build.dist.dir}/bin"> + <copy todir="${build.bin.dist}/bin"> <fileset dir="${src.etc.dir}"> <include name="wstools.bat"/> <include name="wstools.sh"/> @@ -646,35 +659,35 @@ </copy> <!-- samples --> - <copy todir="${build.dist.dir}" file="${build.dir}/${samples.target}.zip" overwrite="true"/> - + <copy todir="${build.bin.dist}" file="${build.dir}/${samples.target}.zip" overwrite="true"/> + <!-- documentation --> - <copy todir="${build.dist.dir}/docs/html" overwrite="true"> + <copy todir="${build.bin.dist}/docs/html" overwrite="true"> <fileset dir="${docs.userguide.dir}/build/en/html"/> </copy> - <copy todir="${build.dist.dir}/docs" overwrite="true"> + <copy todir="${build.bin.dist}/docs" overwrite="true"> <fileset dir="${docs.userguide.dir}/build/en/pdf"/> </copy> <!-- lib/jdk1.5 --> - <copy todir="${build.dist.dir}/lib/jboss-jdk1.5" overwrite="true"> + <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.dist.dir}/lib/jboss-jdk1.4" overwrite="true"> + <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.dist.dir}/lib/tomcat/common/endorsed" overwrite="true"> + <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.dist.dir}/lib/tomcat/common/lib" overwrite="true"> + <copy todir="${build.bin.dist}/lib/tomcat/common/lib" overwrite="true"> <fileset dir="${thirdparty.dir}"> <include name="activation.jar"/> <include name="log4j.jar"/> @@ -686,16 +699,26 @@ <include name="jbossws-thirdparty.jar"/> </fileset> </copy> - <copy todir="${build.dist.dir}/lib/tomcat/webapps" overwrite="true"> + <copy todir="${build.bin.dist}/lib/tomcat/webapps" overwrite="true"> <fileset dir="${build.lib.dir}" includes="jbossws.war"/> </copy> - - <!-- zip it --> - <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.dist.dir}"/> + + <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/> </target> - - <target name="build-docs" description="build the documentation"> - <ant antfile="${docs.userguide.dir}/build.xml" dir="${docs.userguide.dir}" target="all.doc"/> + + <!-- 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> </project> Modified: trunk/src/ant/build-thirdparty.xml =================================================================== --- trunk/src/ant/build-thirdparty.xml 2006-10-17 13:16:41 UTC (rev 1240) +++ trunk/src/ant/build-thirdparty.xml 2006-10-17 13:57:51 UTC (rev 1241) @@ -35,12 +35,13 @@ <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/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/remoting/${jboss-remoting}/lib/jboss-remoting.jar" dest="${thirdparty.dir}/jboss-remoting.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/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.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}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" 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}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/> @@ -107,6 +108,7 @@ <pathelement location="${jboss.server.deploy}/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/> + <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> </path> </target> Modified: trunk/src/test/build.xml =================================================================== --- trunk/src/test/build.xml 2006-10-17 13:16:41 UTC (rev 1240) +++ trunk/src/test/build.xml 2006-10-17 13:57:51 UTC (rev 1241) @@ -42,6 +42,16 @@ <isset property="HAVE_JDK_1.5"/> </condition> + <!-- Use -Ddebug=true for remote debugging --> + <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"> + <isset property="debug"/> + </condition> + <condition property="remote.debug.line" value=""> + <not> + <isset property="debug"/> + </not> + </condition> + <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> @@ -98,25 +108,27 @@ </target> <!-- - Init the various classpaths + Init the various classpaths --> <target name="init" depends="prepare,thirdparty"> - <condition property="jbossws.client.jar" value="jbossws14-client.jar"> + <condition property="jbossws.build" value="jbossws14"> <not> <isset property="HAVE_JDK_1.5"/> </not> </condition> - <condition property="jbossws.client.jar" value="jbossws-client.jar"> + <condition property="jbossws.build" value="jbossws"> <isset property="HAVE_JDK_1.5"/> </condition> - <!-- Check that the latest build has been deployed --> + <property name="jbossws.client.jar" value="${jbossws.build}-client.jar"/> + + <!-- Check that the latest build has been deployed --> <condition property="jbossws.deployed"> <filesmatch file1="${jboss.client}/${jbossws.client.jar}" file2="${build.lib.dir}/${jbossws.client.jar}"/> - </condition> - <fail message="jbossws not deployed, run 'ant deploy-jbossws'" unless="jbossws.deployed"/> - + </condition> + <fail message="jbossws not deployed, run 'ant deploy-jbossws'" unless="jbossws.deployed"/> + <!-- Define excluded tests --> <property name="jbossws.target.server.${jbossws.target.server}" value="true"/> <condition property="tests.excludesfile" value="${test.resources.dir}/tests-no-excludes.txt"> @@ -134,7 +146,6 @@ <pathelement location="${jboss.client}/jaxb-api.jar"/> <pathelement location="${jboss.client}/jaxb-impl.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> - <pathelement location="${jboss.client}/jboss-common.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.client}/jbossretro-rt.jar"/> <pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/> @@ -151,18 +162,18 @@ <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${build.lib.dir}/jbossws-jboss-integration.jar"/> - <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/> + <pathelement location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/> + <pathelement location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/> </path> - <!-- - The test client classpath which does not include the library classpath - The idea is that we test agains the jar versions in the target container + <!-- + The test client classpath which does not include the library classpath + The idea is that we test agains the jar versions in the target container --> <path id="test.client.classpath"> <path refid="jbossws.client.classpath"/> - <pathelement location="${build.lib.dir}/jbossws-jboss-integration.jar"/> - <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/> + <pathelement location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/> + <pathelement location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/> <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> <pathelement location="${jboss.lib}/jboss-system.jar"/> <pathelement location="${jboss.server.lib}/jboss.jar"/> @@ -173,7 +184,32 @@ <pathelement location="${thirdparty.dir}/stax-api-1.0.jar"/> </path> + <!-- 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" /> + + <!-- The jBPM BPEL classpath --> + <path id="jbpmbpel.classpath"> + <path refid="jbossws.client.classpath" /> + <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" /> + </fileset> + <path location="${jboss.server.deploy.jbpmbpel}" /> + <path location="${test.etc.dir}" /> + </path> </target> + + <target name="deploy-jbpmbpel" unless="jbpmbpel.available"> + <mkdir dir="${jboss.server.deploy.jbpmbpel}" /> + <unjar dest="${jboss.server.deploy.jbpmbpel}" src="${thirdparty.dir}/jbpm-bpel.sar" /> + </target> <!-- ================================================================== --> <!-- Compiling --> @@ -185,18 +221,8 @@ <mkdir dir="${build.test.dir}/classes"/> <javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <src path="${test.java.dir}"/> - <!-- TODO - Remove dynamichandler once Java 5.0 code is removed --> - <exclude name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/**"/> - <exclude name="org/jboss/test/ws/interop/**"/> - <exclude name="org/jboss/test/ws/jaxws/jsr181/**"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1123/**"/> - <exclude name="org/jboss/test/ws/jaxws/jbws860/**"/> - <exclude name="org/jboss/test/ws/jaxws/jbws871/**"/> - <exclude name="org/jboss/test/ws/jaxws/jbws944/**"/> - <exclude name="org/jboss/test/ws/jaxws/samples/jsr181ejb/**"/> - <exclude name="org/jboss/test/ws/jaxws/samples/jsr181pojo/**"/> - <exclude name="org/jboss/test/ws/jaxws/wsaddressing/**"/> - <exclude name="org/jboss/test/ws/jaxws/samples/wsaddressing/**"/> + <exclude name="org/jboss/test/ws/interop/**"/> + <exclude name="org/jboss/test/ws/jaxws/**"/> <exclude name="org/jboss/test/ws/tools/jsr181/**"/> <classpath refid="javac.classpath"/> </javac> @@ -207,6 +233,8 @@ <javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <src path="${test.java.dir}"/> <exclude name="org/jboss/test/ws/interop/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/> + <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/**"/> <classpath refid="javac.classpath"/> </javac> </target> @@ -215,6 +243,8 @@ <mkdir dir="${build.test.dir}/classes"/> <javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <src path="${build.test.dir}/wstools/java"/> + <src path="${test.java.dir}"/> + <exclude name="org/jboss/test/ws/interop/**"/> <classpath refid="javac.classpath"/> </javac> </target> @@ -253,13 +283,24 @@ <ant antfile="${test.dir}/ant/build-jars-jaxws.xml" target="build-jars" inheritall="true"/> </target> - <!-- - Generate samples sources - --> + <!-- + Generate samples sources + --> <target name="generate-sources" depends="compile" description="Generate the deployment resources."> + <!-- + <zip destfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"> + <fileset dir="${build.test.dir}/resources/jaxrpc/samples/wsbpel/hello/bpel" /> + </zip> + <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> + <classpath refid="jbpmbpel.classpath" /> + </taskdef> + <servicegen processfile="${build.test.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" + outputdir="${build.test.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" /> + --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="jbossws.client.classpath"/> - <classpath path="${build.test.dir}/classes"/> + <classpath location="${build.test.dir}/classes"/> + <classpath location="${build.test.dir}"/> </taskdef> <mkdir dir="${build.test.dir}/wstools/java"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> @@ -274,20 +315,16 @@ <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/> - <!-- wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/mtom/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/mtom/wstools-config.xml"/ --> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${test.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> - <!-- wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/swa/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/swa/wstools-config.xml"/--> <wstools dest="${build.test.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181ejb/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml"/> <wstools dest="${build.test.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF" config="${test.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/> - <move todir="${build.test.dir}/wstools/java"> <fileset dir="${build.test.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> - <fileset dir="${build.test.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" includes="org/**"/> </move> </target> @@ -356,7 +393,7 @@ </target> <!-- - Run a collection of unit tests. + Run a collection of unit tests. ant -Dtest=tools test --> <target name="test" if="test" description="Run all unit tests in a given directory"> @@ -406,7 +443,7 @@ --> <target name="one-test" depends="init" if="test" description="Run a single unit 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=5007"--/> + <jvmarg line="${remote.debug.line}"/> <jvmarg value="-Djava.security.manager"/> <sysproperty key="java.security.policy" value="${test.etc.dir}/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> Modified: trunk/version.properties =================================================================== --- trunk/version.properties 2006-10-17 13:16:41 UTC (rev 1240) +++ trunk/version.properties 2006-10-17 13:57:51 UTC (rev 1241) @@ -16,7 +16,7 @@ # thirdparty library versions that are referenced in component-info.xml apache-xmlsec=1.3.0 ibm-wsdl4j=1.5.2jboss -javassist=3.2.0.CR2 +javassist=3.3.0.GA jboss-common=1.0.2 jboss-jbossxb=snapshot jboss-microcontainer=snapshot @@ -28,7 +28,8 @@ apache-xalan=j_2.7.0 apache-xerces=2.7.1 jboss-backport-concurrent=2.1.0.GA -jboss-jbossretro=1.0.0.GA +jboss-jbossretro=1.0.2.GA +jbpm-bpel=1.1.Beta2 junit=3.8.1 oswego-concurrent=1.3.4 qdox=1.4