Author: thomas.diesler(a)jboss.com Date: 2007-01-05 11:10:17 -0500 (Fri, 05 Jan 2007) New Revision: 1825 Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-samples.xml trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/build.xml trunk/build/etc/jbossws-component-info.xml trunk/build/version.properties Log: Fix jbossws-samples Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/ant-import/build-release.xml 2007-01-05 16:10:17 UTC (rev 1825) @@ -13,6 +13,9 @@ <project default="release" name="JBossWS Release"> + <property name="build.bin.dist" value="${build.output.dir}/bin-dist"/> + <property name="build.src.dist" value="${build.output.dir}/src-dist"/> + <target name="release" depends="all,release-to-repository,release-to-portal" description="Release JBossWS"> <echo message="*********************************************"/> <echo message="* Released: jbossws-${version.id}"/> @@ -26,7 +29,7 @@ <echo message="* 5) Verify release notes and install instructions"/> <echo message="* 6) Commit the portal-content"/> <echo message="* 7) Commit the repository jars"/> - <echo message="* 8) Write a stick post on the user forum"/> + <echo message="* 8) Write a sticky post on the user forum"/> <echo message="* 9) Release the jbossws-${version.id} version in JIRA"/> <echo message="* 10) Post a message to jbossws-announce(a)lists.jboss.org&quot;/&gt; <echo message="* 11) Post a message to thecore(a)jboss.org&quot;/&gt; @@ -35,12 +38,13 @@ </target> <!-- Release to jboss.local.repository --> - <target name="release-to-repository" depends="jars" description="Release to jboss.local.repository"> + <target name="release-to-repository" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14" + description="Release to jboss.local.repository"> <!-- jbossws --> - <property name="target.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> - <mkdir dir="${target.dir}/lib"/> - <copy todir="${target.dir}/lib" overwrite="true"> + <property name="jbossws.repository.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/> + <mkdir dir="${jbossws.repository.dir}/lib"/> + <copy todir="${jbossws.repository.dir}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jbossws-client.jar"/> <include name="jboss-jaxrpc.jar"/> @@ -49,19 +53,41 @@ </fileset> <fileset dir="${jboss50.output.lib.dir}"> <include name="jbossws50.sar"/> - <include name="jbossws50-deployer.jar"/> - <include name="jbossws-jboss50-integration.jar"/> + <include name="jbossws50-deployer.zip"/> </fileset> <fileset dir="${jboss42.output.lib.dir}"> <include name="jbossws42.sar"/> - <include name="jbossws-jboss42-integration.jar"/> </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws40.sar"/> + </fileset> </copy> - <copy tofile="${target.dir}/component-info.xml" file="${build.dir}/etc/jbossws-component-info.xml" filtering="true" overwrite="true"> + <copy tofile="${jbossws.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> <filterset> - <filtersfile file="version.properties"/> + <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> + + <!-- jbossws14 --> + <property name="jbossws14.repository.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/> + <mkdir dir="${jbossws14.repository.dir}/lib"/> + <copy todir="${jbossws14.repository.dir}/lib" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws40-jdk14.sar"/> + <include name="jbossws14-client.jar"/> + <include name="jboss-jaxws14.jar"/> + </fileset> + </copy> + <copy tofile="${jbossws.repository.dir}/component-info.xml" file="${etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true"> + <filterset> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> + </target> <!-- Release to portal content --> @@ -85,7 +111,7 @@ <!-- Copy downloads --> <copy todir="${portal.downloads}" overwrite="true"> - <fileset dir="${build.dir}"> + <fileset dir="${build.output.dir}"> <include name="jbossws-${version.id}.zip"/> <include name="jbossws-src-${version.id}.zip"/> <include name="jbossws-samples-${version.id}.zip"/> @@ -103,33 +129,33 @@ <!-- Build the bin dist --> <target name="build-bin-dist" description="Build the binary distribution" - depends="main,tomcat-thirdparty-jar,build-samples,build-docs"> + depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,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/jboss-jdk14"/> + <mkdir dir="${build.bin.dist}/lib/jboss-jdk15"/> <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="${build.etc.dir}/JBossORG-EULA.txt" overwrite="true"/> + <copy todir="${build.bin.dist}" file="${etc.dir}/JBossORG-EULA.txt" overwrite="true"/> <copy todir="${build.bin.dist}" filtering="true" overwrite="true"> - <fileset dir="${src.dist.dir}"/> + <fileset dir="${core.resources.dir}/dist"/> <filterset> - <filtersfile file="version.properties"/> + <filtersfile file="${build.dir}/version.properties"/> </filterset> </copy> <copy todir="${build.bin.dist}/bin"> - <fileset dir="${build.etc.dir}"> + <fileset dir="${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"/> + <copy todir="${build.bin.dist}" file="${build.output.dir}/${samples.target}.zip" overwrite="true"/> <!-- documentation --> <copy todir="${build.bin.dist}/docs/html" overwrite="true"> @@ -139,11 +165,39 @@ <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"/> + <!-- lib/jboss-jdk15 --> + <copy todir="${build.bin.dist}/lib/jboss-jdk15" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-client.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + <fileset dir="${jboss50.output.lib.dir}"> + <include name="jbossws50.sar"/> + <include name="jbossws50-deployer.zip"/> + </fileset> + <fileset dir="${jboss42.output.lib.dir}"> + <include name="jbossws42.sar"/> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws40.sar"/> + </fileset> </copy> + <!-- lib/jboss-jdk14 --> + <copy todir="${build.bin.dist}/lib/jboss-jdk14" overwrite="true"> + <fileset dir="${core.output.lib.dir}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws40-jdk14.sar"/> + <include name="jbossws14-client.jar"/> + <include name="jboss-jaxws14.jar"/> + </fileset> + </copy> + <!-- lib/tomcat --> <copy todir="${build.bin.dist}/lib/tomcat/common/endorsed" overwrite="true"> <fileset dir="${thirdparty.dir}"> @@ -158,35 +212,51 @@ <include name="log4j.jar"/> <include name="mailapi.jar"/> </fileset> - <fileset dir="${build.lib.dir}"> + <fileset dir="${core.output.lib.dir}"> <include name="jbossws-core.jar"/> - <include name="jbossws-tomcat-integration.jar"/> - <include name="jbossws-thirdparty.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${tomcat.output.lib.dir}"> + <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"/> + <fileset dir="${tomcat.output.lib.dir}" includes="jbossws.war"/> </copy> - <zip destfile="${build.dir}/jbossws-${version.id}.zip" basedir="${build.bin.dist}"/> + <zip destfile="${build.output.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 dir="${basedir}/.."> + <include name="build/ant.properties.example"/> + <include name="build/version.properties"/> + <include name="build/build.xml"/> + <include name="build/ant-import/**"/> + <include name="build/etc/**"/> + <include name="jbossws-core/src/**"/> + <include name="jbossws-core/build.xml"/> + <include name="jbossws-docs/user-guide/**"/> + <include name="jbossws-tests/ant-import/**"/> + <include name="jbossws-tests/src/**"/> + <include name="jbossws-tests/build.xml"/> + <include name="integration-jboss50/src/**"/> + <include name="integration-jboss50/build.xml"/> + <include name="integration-jboss42/src/**"/> + <include name="integration-jboss42/build.xml"/> + <include name="integration-jboss40/src/**"/> + <include name="integration-jboss40/build.xml"/> + <include name="integration-tomcat/src/**"/> + <include name="integration-tomcat/build.xml"/> </fileset> </copy> - <zip destfile="${build.dir}/jbossws-src-${version.id}.zip" basedir="${build.src.dist}" + <zip destfile="${build.output.dir}/jbossws-src-${version.id}.zip" basedir="${build.src.dist}" includes="jbossws-src-${version.id}/**"/> </target> Modified: trunk/build/ant-import/build-samples.xml =================================================================== --- trunk/build/ant-import/build-samples.xml 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/ant-import/build-samples.xml 2007-01-05 16:10:17 UTC (rev 1825) @@ -19,28 +19,33 @@ <target name="build-samples" description="Builds the samples." depends="prepare"> <property name="samples.target" value="jbossws-samples-${version.id}"/> - <property name="build.src.samples.dir" value="${build.dir}/${samples.target}"/> + <property name="build.src.samples.dir" value="${build.output.dir}/${samples.target}"/> <copy todir="${build.src.samples.dir}"> - <fileset dir="${src.samples.dir}"> + <fileset dir="${core.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="${build.dir}/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 dir="${jboss50.output.lib.dir}"> + <include name="jbossws-jboss50-integration.jar"/> </fileset> - <fileset dir="${build.lib.dir}"> - <include name="jbossws-jboss-integration.jar"/> + <fileset dir="${jboss42.output.lib.dir}"> + <include name="jbossws-jboss42-integration.jar"/> + </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jbossws-jboss40-integration.jar"/> + </fileset> + <fileset dir="${tomcat.output.lib.dir}"> <include name="jbossws-tomcat-integration.jar"/> </fileset> </copy> @@ -50,18 +55,18 @@ <mkdir dir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples"/> <copy todir="${build.src.samples.dir}/common/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/*.java"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/common/resources"> - <fileset dir="${src.samples.dir}/common"> + <fileset dir="${core.samples.dir}/common"> <include name="jndi.properties"/> <include name="log4j.xml"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/common/resources/overrides/jaxrpc/samples"> - <fileset dir="${test.resources.dir}/jaxrpc/samples-override"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples-override"/> </copy> <!-- samples/docstyle --> @@ -69,12 +74,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/docstyle/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/docstyle/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/docstyle"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/docstyle"/> </copy> <!-- samples/dynamichandler --> @@ -82,12 +87,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/dynamichandler/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/dynamichandler"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/dynamichandler"/> </copy> <!-- samples/exception --> @@ -95,12 +100,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/exception/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/exception/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/exception/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/exception/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/exception"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/exception"/> </copy> <!-- samples/handler --> @@ -108,12 +113,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/handler/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/handler/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/handler/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/handler/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/handler"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/handler"/> </copy> <!-- samples/holder --> @@ -121,12 +126,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/holder/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/holder/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/holder/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/holder/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/holder"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/holder"/> </copy> <!-- samples/jmstransport --> @@ -134,12 +139,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/jmstransport/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/jmstransport/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/jmstransport"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/jmstransport"/> </copy> <!-- samples/jsr109ejb --> @@ -147,12 +152,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/jsr109ejb/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/jsr109ejb"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/jsr109ejb"/> </copy> <!-- samples/jsr109pojo --> @@ -160,12 +165,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/**/*"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/jsr109pojo/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/jsr109pojo"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/jsr109pojo"/> </copy> <!-- samples/message --> @@ -173,12 +178,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/message/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/message/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/message/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/message/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/message"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/message"/> </copy> <!-- samples/mtom --> @@ -186,12 +191,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/mtom/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/mtom/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/mtom/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/mtom"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/mtom"/> </copy> <!-- samples/oneway --> @@ -199,12 +204,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/oneway/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/oneway/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/oneway/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/oneway/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/oneway"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/oneway"/> </copy> <!-- samples/rpcstyle --> @@ -212,12 +217,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/rpcstyle/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/rpcstyle"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/rpcstyle"/> </copy> <!-- samples/secureejb --> @@ -225,12 +230,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/secureejb/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/secureejb/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/secureejb"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/secureejb"/> </copy> <!-- samples/swa --> @@ -238,12 +243,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/swa/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/swa/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/swa/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/swa/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/swa"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/swa"/> </copy> <!-- samples/wsbpel --> @@ -251,12 +256,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/wsbpel/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/wsbpel" /> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel" /> </copy> <!-- samples/wseventing --> @@ -264,12 +269,12 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/wseventing/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/wseventing/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/wseventing/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/wseventing/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/wseventing"/> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/wseventing"/> </copy> <!-- samples/wssecurity --> @@ -277,13 +282,13 @@ <mkdir dir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"/> <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/**"/> <exclude name="org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.java"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxrpc/wssecurity/resources"> - <fileset dir="${test.resources.dir}/jaxrpc/samples/wssecurity"> + <fileset dir="${tests.resources.dir}/jaxrpc/samples/wssecurity"> <exclude name="store-pass-encrypt/**"/> </fileset> </copy> @@ -295,12 +300,12 @@ <mkdir dir="${build.src.samples.dir}/jaxws/jsr181ejb/resources"/> <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxws/jsr181ejb/resources"> - <fileset dir="${test.resources.dir}/jaxws/samples/jsr181ejb"/> + <fileset dir="${tests.resources.dir}/jaxws/samples/jsr181ejb"/> </copy> <!-- samples/jsr181pojo --> @@ -308,44 +313,47 @@ <mkdir dir="${build.src.samples.dir}/jaxws/jsr181pojo/resources"/> <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxws/jsr181pojo/resources"> - <fileset dir="${test.resources.dir}/jaxws/samples/jsr181pojo"/> + <fileset dir="${tests.resources.dir}/jaxws/samples/jsr181pojo"/> </copy> + <!-- samples/retail --> + <mkdir dir="${build.src.samples.dir}/jaxws/retail/java"/> + <mkdir dir="${build.src.samples.dir}/jaxws/retail/resources"/> + + <copy todir="${build.src.samples.dir}/jaxws/retail/java"> + <fileset dir="${tests.java.dir}"> + <include name="org/jboss/test/ws/jaxws/samples/retail/**"/> + </fileset> + </copy> + <copy todir="${build.src.samples.dir}/jaxws/retail/resources"> + <fileset dir="${tests.resources.dir}/jaxws/samples/retail"/> + </copy> + <!-- samples/wsaddressing --> <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/java"/> <mkdir dir="${build.src.samples.dir}/jaxws/wsaddressing/resources"/> <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/java"> - <fileset dir="${test.java.dir}"> + <fileset dir="${tests.java.dir}"> <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/**"/> </fileset> </copy> <copy todir="${build.src.samples.dir}/jaxws/wsaddressing/resources"> - <fileset dir="${test.resources.dir}/jaxws/samples/wsaddressing"/> + <fileset dir="${tests.resources.dir}/jaxws/samples/wsaddressing"/> </copy> - - <!-- samples/retail --> - <mkdir dir="${build.src.samples.dir}/jaxws/retail/java"/> - <mkdir dir="${build.src.samples.dir}/jaxws/retail/resources"/> - - <copy todir="${build.src.samples.dir}/jaxws/retail/java"> - <fileset dir="${test.java.dir}"> - <include name="org/jboss/test/ws/jaxws/samples/retail/**"/> + <!-- Build the samples zip --> + <zip destfile="${build.output.dir}/${samples.target}.zip"> + <fileset dir="${build.output.dir}"> + <include name="${samples.target}/**"/> + <exclude name="${samples.target}/output/**"/> + <exclude name="${samples.target}/thirdparty/**"/> </fileset> - </copy> - <copy todir="${build.src.samples.dir}/jaxws/retail/resources"> - <fileset dir="${test.resources.dir}/jaxws/samples/retail"/> - </copy> - - <!-- Build the samples zip --> - <zip destfile="${build.dir}/${samples.target}.zip"> - <fileset dir="${build.dir}" includes="${samples.target}/**"/> </zip> </target> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/ant-import/build-setup.xml 2007-01-05 16:10:17 UTC (rev 1825) @@ -22,7 +22,8 @@ <property environment="env"/> <property name="build.dir" value="${basedir}/../build"/> - <property name="docs.dir" value="${basedir}/../docs"/> + <property name="build.output.dir" value="${build.dir}/output"/> + <property name="docs.dir" value="${basedir}/../jbossws-docs"/> <property name="integration.jboss40.dir" value="${basedir}/../integration-jboss40"/> <property name="integration.jboss42.dir" value="${basedir}/../integration-jboss42"/> <property name="integration.jboss50.dir" value="${basedir}/../integration-jboss50"/> @@ -30,8 +31,8 @@ <property name="core.dir" value="${basedir}/../jbossws-core"/> <property name="tests.dir" value="${basedir}/../jbossws-tests"/> + <property name="etc.dir" value="${build.dir}/output/etc"/> <property name="docs.userguide.dir" value="${docs.dir}/user-guide/project"/> - <property name="output.etc.dir" value="${build.dir}/output/etc"/> <property name="thirdparty.dir" value="${build.dir}/thirdparty"/> <property name="jboss50.lib" value="${jboss50.home}/lib"/> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/ant-import/build-thirdparty.xml 2007-01-05 16:10:17 UTC (rev 1825) @@ -26,6 +26,7 @@ <mkdir dir="${thirdparty.dir}"/> <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-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"/> Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/build.xml 2007-01-05 16:10:17 UTC (rev 1825) @@ -21,6 +21,7 @@ <import file="${basedir}/../integration-jboss50/build.xml"/> <import file="${basedir}/../integration-tomcat/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> + <import file="${basedir}/../jbossws-tests/build.xml"/> <target name="init" depends="prepare, thirdparty"> </target> Modified: trunk/build/etc/jbossws-component-info.xml =================================================================== --- trunk/build/etc/jbossws-component-info.xml 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/etc/jbossws-component-info.xml 2007-01-05 16:10:17 UTC (rev 1825) @@ -13,9 +13,6 @@ <artifact id="jbossws50.sar"/> <artifact id="jbossws50-deployer.zip"/> <artifact id="jbossws-client.jar"/> - <artifact id="jbossws-jboss42-integration.jar"/> - <artifact id="jbossws-jboss50-integration.jar"/> - <artifact id="jbossws-tomcat-integration.jar"/> <import componentref="apache-xmlsec"> <compatible version="@apache-xmlsec@"/> Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-01-05 16:10:13 UTC (rev 1824) +++ trunk/build/version.properties 2007-01-05 16:10:17 UTC (rev 1825) @@ -25,6 +25,7 @@ # thirdparty library versions apache-ant=1.6.5 apache-log4j=1.2.8 +apache-logging=1.0.5.GA-jboss apache-xalan=j_2.7.0 apache-xerces=2.7.1 hibernate=3.2.0.CR2