Author: thomas.diesler(a)jboss.com Date: 2008-03-13 09:35:12 -0400 (Thu, 13 Mar 2008) New Revision: 5961 Modified: stack/metro/trunk/ant-import/build-bin-dist.xml Log: format xml Modified: stack/metro/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/metro/trunk/ant-import/build-bin-dist.xml 2008-03-13 13:17:12 UTC (rev 5960) +++ stack/metro/trunk/ant-import/build-bin-dist.xml 2008-03-13 13:35:12 UTC (rev 5961) @@ -17,19 +17,18 @@ <!-- Binary distribution --> <!-- ================================================================== --> - <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution"> - + <target name="build-bin-dist" depends="jars,javadoc,prepare-deploy" description="Build the binary distribution"> + <property name="bindist.dir" value="${metro.output.dir}/jbossws-metro-dist"/> <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.deploy.dir" value="${bindist.dir}/deploy"/> <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.deploy.dir}"/> <mkdir dir="${bindist.docs.dir}"/> <mkdir dir="${bindist.tests.dir}"/> <mkdir dir="${bindist.tools.dir}"/> @@ -42,27 +41,21 @@ </copy> <copy tofile="${bindist.dir}/version.properties" file="${metro.dir}/version.properties"/> <copy tofile="${bindist.dir}/build.xml" file="${metro.distro.dir}/bin-dist-build.xml"/> - <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${metro.distro.dir}/bin-dist-deploy.xml"/> <!-- build --> <copy todir="${bindist.build.dir}"> <fileset dir="${metro.dir}/ant-import"> - <include name="jbossws.default.undeploy.files"/> - <include name="macros-deploy-metro.xml"/> + <include name="build-deploy.xml"/> + <include name="jbossws-deploy-macros.xml"/> + <include name="jbossws-default-deploy.conf"/> </fileset> </copy> - <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> - - <copy todir="${bindist.bin.dir}"> - <fileset dir="${metro.dir}/src/main/etc"> - <include name="*.sh"/> - <include name="*.bat"/> - </fileset> + <!-- deploy --> + <copy todir="${bindist.deploy.dir}"> + <fileset dir="${deploy.artifacts.dir}"/> </copy> - <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> - <!-- docs --> <copy todir="${bindist.docs.dir}"> <fileset dir="${metro.output.dir}"> @@ -85,47 +78,6 @@ </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="${metro.dir}/output/lib"> - <include name="jbossws-context.war"/> - <include name="jbossws-metro.jar"/> - <include name="jbossws-metro-client.jar"/> - <include name="jbossws-metro42.sar"/> - <include name="jbossws-metro50.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="mimepull.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="${metro.dir}/src/test-framework"/>