Author: thomas.diesler(a)jboss.com Date: 2007-12-07 10:18:26 -0500 (Fri, 07 Dec 2007) New Revision: 5239 Modified: stack/metro/trunk/ant-import/build-bin-dist.xml stack/metro/trunk/src/main/distro/bin-dist-build.xml Log: Remove thirdparty.dir Modified: stack/metro/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/metro/trunk/ant-import/build-bin-dist.xml 2007-12-07 15:15:18 UTC (rev 5238) +++ stack/metro/trunk/ant-import/build-bin-dist.xml 2007-12-07 15:18:26 UTC (rev 5239) @@ -12,142 +12,142 @@ <!-- $Id$ --> <project> - - <!-- ================================================================== --> - <!-- Binary distribution --> - <!-- ================================================================== --> - - <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution"> - - <property name="bindist.dir" value="${sunri.output.dir}/jbossws-metro-${version.id}"/> - <property name="bindist.build.dir" value="${bindist.dir}/build"/> - <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> - <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> - <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> - <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> - <property name="bindist.tools.dir" value="${bindist.dir}/tools"/> - - <delete dir="${bindist.dir}"/> - <mkdir dir="${bindist.build.dir}"/> - <mkdir dir="${bindist.bin.dir}"/> - <mkdir dir="${bindist.docs.dir}"/> - <mkdir dir="${bindist.tests.dir}"/> - <mkdir dir="${bindist.tools.dir}"/> - - <!-- root --> - <copy tofile="${bindist.dir}/ant.properties" file="${sunri.distro.dir}/ant.properties.example" > - <filterset> - <filtersfile file="${sunri.dir}/ant.properties"/> - </filterset> - </copy> - <copy tofile="${bindist.dir}/version.properties" file="${sunri.dir}/version.properties"/> - <copy tofile="${bindist.dir}/build.xml" file="${sunri.distro.dir}/bin-dist-build.xml"/> - <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${sunri.distro.dir}/bin-dist-deploy.xml"/> - - <!-- build --> - <copy todir="${bindist.build.dir}"> - <fileset dir="${sunri.dir}/ant-import"> - <include name="macros-deploy-framework.xml"/> - <include name="macros-deploy-sunri.xml"/> - </fileset> - </copy> - - <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> - - <copy todir="${bindist.bin.dir}"> - <fileset dir="${sunri.dir}/src/main/etc"> - <include name="*.sh"/> - <include name="*.bat"/> - </fileset> - </copy> - - <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> - - <!-- docs --> - <copy todir="${bindist.docs.dir}" > - <fileset dir="${sunri.output.dir}"> - <include name="apidocs/**"/> - </fileset> - </copy> - <copy todir="${bindist.docs.dir}" filtering="yes"> - <fileset dir="${sunri.distro.dir}"> - <include name="Install.txt"/> - <include name="ReleaseNotes.txt"/> - </fileset> - <filterset> - <filtersfile file="${sunri.dir}/version.properties"/> - </filterset> - </copy> - - <copy todir="${bindist.docs.dir}"> - <fileset dir="${sunri.etc.dir}"> - <include name="JBossORG-EULA.txt"/> - </fileset> - </copy> - - <!-- lib --> - <copy todir="${bindist.lib.dir}" overwrite="true"> - <fileset dir="${thirdparty.dir}"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-framework-scripts.zip"/> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="${sunri.dir}/output/lib"> - <include name="jbossws-context.war"/> - <include name="jbossws-sunri.jar"/> - <include name="jbossws-sunri-client.jar"/> - <include name="jbossws-sunri42.sar"/> - <include name="jbossws-sunri50.sar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="FastInfoset.jar"/> - <include name="http.jar"/> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxrpc-api.jar"/> - <include name="jaxws-api.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jaxws-tools.jar"/> - <include name="jsr173_api.jar"/> - <include name="jsr181-api.jar"/> - <include name="jsr250-api.jar"/> - <include name="juddi-service.sar"/> - <include name="resolver.jar"/> - <include name="saaj-api.jar"/> - <include name="saaj-impl.jar"/> - <include name="sjsxp.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wstx.jar"/> - <include name="wsdl4j.jar"/> - </fileset> - </copy> - - <!-- tests --> - <copy todir="${bindist.tests.dir}" overwrite="true"> - <fileset dir="${sunri.dir}/src/test-framework"/> - <fileset dir="${sunri.dir}/src/test"> - <include name="resources/test-excludes-*.txt"/> - </fileset> - </copy> - - <!-- build tools --> - <copy todir="${bindist.tools.dir}" overwrite="true"> - <fileset dir="${sunri.dir}/tools/ant"/> - </copy> - <copy todir="${bindist.dir}" overwrite="true"> - <fileset dir="${sunri.dir}"> - <include name="build.bat"/> - <include name="build.sh"/> - </fileset> - </copy> - <chmod file="${bindist.dir}/build.sh" perm="+x"/> - - <zip destfile="${sunri.output.dir}/jbossws-metro-${version.id}.zip"> - <fileset dir="${sunri.output.dir}" includes="jbossws-metro-${version.id}/**"/> - </zip> - </target> - -</project> + + <!-- ================================================================== --> + <!-- Binary distribution --> + <!-- ================================================================== --> + + <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution"> + + <property name="bindist.dir" value="${sunri.output.dir}/jbossws-metro-${version.id}"/> + <property name="bindist.build.dir" value="${bindist.dir}/build"/> + <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> + <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> + <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> + <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + <property name="bindist.tools.dir" value="${bindist.dir}/tools"/> + + <delete dir="${bindist.dir}"/> + <mkdir dir="${bindist.build.dir}"/> + <mkdir dir="${bindist.bin.dir}"/> + <mkdir dir="${bindist.docs.dir}"/> + <mkdir dir="${bindist.tests.dir}"/> + <mkdir dir="${bindist.tools.dir}"/> + + <!-- root --> + <copy tofile="${bindist.dir}/ant.properties" file="${sunri.distro.dir}/ant.properties.example"> + <filterset> + <filtersfile file="${sunri.dir}/ant.properties"/> + </filterset> + </copy> + <copy tofile="${bindist.dir}/version.properties" file="${sunri.dir}/version.properties"/> + <copy tofile="${bindist.dir}/build.xml" file="${sunri.distro.dir}/bin-dist-build.xml"/> + <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${sunri.distro.dir}/bin-dist-deploy.xml"/> + + <!-- build --> + <copy todir="${bindist.build.dir}"> + <fileset dir="${sunri.dir}/ant-import"> + <include name="macros-deploy-framework.xml"/> + <include name="macros-deploy-sunri.xml"/> + </fileset> + </copy> + + <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> + + <copy todir="${bindist.bin.dir}"> + <fileset dir="${sunri.dir}/src/main/etc"> + <include name="*.sh"/> + <include name="*.bat"/> + </fileset> + </copy> + + <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> + + <!-- docs --> + <copy todir="${bindist.docs.dir}"> + <fileset dir="${sunri.output.dir}"> + <include name="apidocs/**"/> + </fileset> + </copy> + <copy todir="${bindist.docs.dir}" filtering="yes"> + <fileset dir="${sunri.distro.dir}"> + <include name="Install.txt"/> + <include name="ReleaseNotes.txt"/> + </fileset> + <filterset> + <filtersfile file="${sunri.dir}/version.properties"/> + </filterset> + </copy> + + <copy todir="${bindist.docs.dir}"> + <fileset dir="${sunri.etc.dir}"> + <include name="JBossORG-EULA.txt"/> + </fileset> + </copy> + + <!-- lib --> + <copy todir="${bindist.lib.dir}" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-framework-scripts.zip"/> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${sunri.dir}/output/lib"> + <include name="jbossws-context.war"/> + <include name="jbossws-sunri.jar"/> + <include name="jbossws-sunri-client.jar"/> + <include name="jbossws-sunri42.sar"/> + <include name="jbossws-sunri50.sar"/> + </fileset> + <fileset dir="${thirdparty.dir}"> + <include name="FastInfoset.jar"/> + <include name="http.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxrpc-api.jar"/> + <include name="jaxws-api.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jsr173_api.jar"/> + <include name="jsr181-api.jar"/> + <include name="jsr250-api.jar"/> + <include name="juddi-service.sar"/> + <include name="resolver.jar"/> + <include name="saaj-api.jar"/> + <include name="saaj-impl.jar"/> + <include name="sjsxp.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wstx.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + + <!-- tests --> + <copy todir="${bindist.tests.dir}" overwrite="true"> + <fileset dir="${sunri.dir}/src/test-framework"/> + <fileset dir="${sunri.dir}/src/test"> + <include name="resources/test-excludes-*.txt"/> + </fileset> + </copy> + + <!-- build tools --> + <copy todir="${bindist.tools.dir}" overwrite="true"> + <fileset dir="${sunri.dir}/tools/ant"/> + </copy> + <copy todir="${bindist.dir}" overwrite="true"> + <fileset dir="${sunri.dir}"> + <include name="build.bat"/> + <include name="build.sh"/> + </fileset> + </copy> + <chmod file="${bindist.dir}/build.sh" perm="+x"/> + + <zip destfile="${sunri.output.dir}/jbossws-metro-${version.id}.zip"> + <fileset dir="${sunri.output.dir}" includes="jbossws-metro-${version.id}/**"/> + </zip> + </target> + +</project> \ No newline at end of file Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2007-12-07 15:15:18 UTC (rev 5238) +++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2007-12-07 15:18:26 UTC (rev 5239) @@ -12,87 +12,85 @@ <!-- $Id: bin-dist-build.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ --> <project default="main" basedir="." name="JBossWS-sunri"> - - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> - - <property name="build.dir" value="${basedir}/build"/> - <property name="bin.dir" value="${basedir}/bin"/> - <property name="docs.dir" value="${basedir}/docs"/> - <property name="lib.dir" value="${basedir}/lib"/> - <property name="thirdparty.dir" value="${basedir}/lib"/> - <property name="tests.dir" value="${basedir}/tests"/> - <property name="tests.output.dir" value="${basedir}/output"/> - - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.properties"/> - - <property name="jboss500.lib" value="${jboss500.home}/lib"/> - <property name="jboss500.client" value="${jboss500.home}/client"/> - <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> - <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> - <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> - <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> - - <property name="jboss422.lib" value="${jboss422.home}/lib"/> - <property name="jboss422.client" value="${jboss422.home}/client"/> - <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> - <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> - <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> - - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> - - <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/> - <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> - - <available property="jboss500.available" file="${jboss500.available.file}"/> - <available property="jboss422.available" file="${jboss422.available.file}"/> - - <condition property="jbossws.integration.jboss42" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - </or> - </condition> - <condition property="jbossws.integration.jboss50" value="true"> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - </condition> - - - <!-- JDK Detection --> + + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> + + <property name="build.dir" value="${basedir}/build"/> + <property name="bin.dir" value="${basedir}/bin"/> + <property name="docs.dir" value="${basedir}/docs"/> + <property name="lib.dir" value="${basedir}/lib"/> + <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${basedir}/output"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + + <property name="jboss500.lib" value="${jboss500.home}/lib"/> + <property name="jboss500.client" value="${jboss500.home}/client"/> + <property name="jboss500.server" value="${jboss500.home}/server/${jboss.server.instance}"/> + <property name="jboss500.server.lib" value="${jboss500.server}/lib"/> + <property name="jboss500.server.deploy" value="${jboss500.server}/deploy"/> + <property name="jboss500.server.deployers" value="${jboss500.server}/deployers"/> + + <property name="jboss422.lib" value="${jboss422.home}/lib"/> + <property name="jboss422.client" value="${jboss422.home}/client"/> + <property name="jboss422.server" value="${jboss422.home}/server/${jboss.server.instance}"/> + <property name="jboss422.server.lib" value="${jboss422.server}/lib"/> + <property name="jboss422.server.deploy" value="${jboss422.server}/deploy"/> + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + + <property name="jboss500.available.file" value="${jboss500.client}/jboss-ejb3-client.jar"/> + <property name="jboss422.available.file" value="${jboss422.client}/jboss-client.jar"/> + + <available property="jboss500.available" file="${jboss500.available.file}"/> + <available property="jboss422.available" file="${jboss422.available.file}"/> + + <condition property="jbossws.integration.jboss42" value="true"> + <or> + <equals arg1="${jbossws.integration.target}" arg2="jboss421"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + </or> + </condition> + <condition property="jbossws.integration.jboss50" value="true"> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + </condition> + + <!-- JDK Detection --> <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> <available classname="java.io.Console" property="HAVE_JDK_1.6"/> <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> - - <import file="${basedir}/build/build-deploy.xml"/> - <import file="${basedir}/build/macros-deploy-framework.xml"/> - <import file="${basedir}/build/macros-deploy-sunri.xml"/> - <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> - - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> - - <target name="prepare"> - - <!-- Define jboss.home --> - <condition property="jboss.home" value="${jboss500.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - </condition> - <condition property="jboss.home" value="${jboss422.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> - </condition> - - <!-- Define excludesfile --> + + <import file="${basedir}/build/build-deploy.xml"/> + <import file="${basedir}/build/macros-deploy-framework.xml"/> + <import file="${basedir}/build/macros-deploy-sunri.xml"/> + <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="prepare"> + + <!-- Define jboss.home --> + <condition property="jboss.home" value="${jboss500.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + </condition> + <condition property="jboss.home" value="${jboss422.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + </condition> + + <!-- Define excludesfile --> <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> - - </target> - - <target name="tests-init" depends="prepare,tests-classpath"> - - <path id="ws.stack.classpath"> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> + + <path id="ws.stack.classpath"> <pathelement location="${lib.dir}/jbossws-common.jar"/> <pathelement location="${lib.dir}/jbossws-spi.jar"/> <pathelement location="${lib.dir}/FastInfoset.jar"/> @@ -112,56 +110,56 @@ <pathelement location="${lib.dir}/streambuffer.jar"/> <pathelement location="${lib.dir}/wstx.jar"/> <pathelement location="${lib.dir}/wsdl4j.jar"/> - </path> - - <path id="tests.extra.classpath"> - <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/> - <pathelement location="${thirdparty.dir}/jbossws-sunri-client.jar"/> - <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> - </path> - - </target> - - <!-- ================================================================== --> - <!-- Compile --> - <!-- ================================================================== --> - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> - </target> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init"> - <macro-copy-resources srcdir="${tests.dir}"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources"> - <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> - + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${lib.dir}/jbossws-sunri-client.jar"/> + <pathelement location="${lib.dir}/jbossws-framework.jar"/> + <pathelement location="${lib.dir}/jaxws-tools.jar"/> + </path> + + </target> + + <!-- ================================================================== --> + <!-- Compile --> + <!-- ================================================================== --> + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> + </target> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <!-- Copy resources --> + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> + <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> + <!-- dummy jar targets --> - <target name="jars-jboss50" depends="prepare"/> - <target name="jars-jboss42" depends="prepare"/> + <target name="jars-jboss50" depends="prepare"/> + <target name="jars-jboss42" depends="prepare"/> - <!-- ================================================================== --> - <!-- Miscellaneous --> - <!-- ================================================================== --> - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${tests.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - </target> - - <target name="main" depends="most" description="Executes the default target (most)."/> - - <target name="most" depends="tests-main" description="Builds almost everything."/> - -</project> + <!-- ================================================================== --> + <!-- Miscellaneous --> + <!-- ================================================================== --> + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${tests.output.dir}"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + </target> + + <target name="main" depends="most" description="Executes the default target (most)."/> + + <target name="most" depends="tests-main" description="Builds almost everything."/> + +</project> \ No newline at end of file