[jbossws-commits] JBossWS SVN: r5954 - in stack/cxf/trunk: ant-import and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-03-13 07:24:53 -0400 (Thu, 13 Mar 2008) New Revision: 5954 Added: stack/cxf/trunk/ant-import/build-prepare-deploy.xml stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml Removed: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml stack/cxf/trunk/ant-import/build-deploy.xml stack/cxf/trunk/ant-import/build-thirdparty.xml stack/cxf/trunk/build.xml stack/cxf/trunk/src/main/distro/ant.properties.example stack/cxf/trunk/src/main/distro/bin-dist-build.xml Log: Align deploy steps with native Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-03-13 08:42:17 UTC (rev 5953) +++ stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-03-13 11:24:53 UTC (rev 5954) @@ -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="${cxf.output.dir}/jbossws-cxf-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="${cxf.dir}/version.properties"/> <copy tofile="${bindist.dir}/build.xml" file="${cxf.distro.dir}/bin-dist-build.xml"/> - <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${cxf.distro.dir}/bin-dist-deploy.xml"/> <!-- build --> <copy todir="${bindist.build.dir}"> <fileset dir="${cxf.dir}/ant-import"> - <include name="jbossws.default.undeploy.files"/> - <include name="macros-deploy-cxf.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"/> + <!-- deploy --> + <copy todir="${bindist.deploy.dir}"> + <fileset dir="${deploy.artifacts.dir}"/> + </copy> - <copy todir="${bindist.bin.dir}"> - <fileset dir="${cxf.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="${cxf.output.dir}"> @@ -85,41 +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="${cxf.dir}/output/lib"> - <include name="jbossws-context.war/**"/> - <include name="jbossws-cxf.jar"/> - <include name="jbossws-cxf-client.jar"/> - <include name="jbossws-cxf42.sar"/> - <include name="jbossws-cxf50.sar"/> - </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="juddi-service.sar"/> - <include name="cxf-${cxf.version}.jar"/> - <include name="geronimo-javamail_${cxf.geronimo.javamail}.jar"/> - <include name="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> - <include name="jaxws-api-${cxf.jaxws.api}.jar"/> - <include name="jdom-${cxf.jdom}.jar"/> - <include name="neethi-${cxf.neethi}.jar"/> - <include name="saaj-api-${cxf.saaj}.jar"/> - <include name="saaj-impl-${cxf.saaj}.jar"/> - <include name="xml-resolver-${cxf.xml.resolver}.jar"/> - <include name="XmlSchema-${cxf.xmlschema}.jar"/> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="wsdl4j.jar"/> - <include name="wstx.jar"/> - </fileset> - </copy> - <!-- tests --> <copy todir="${bindist.tests.dir}" overwrite="true"> <fileset dir="${cxf.dir}/src/test-framework"/> Modified: stack/cxf/trunk/ant-import/build-deploy.xml =================================================================== --- stack/cxf/trunk/ant-import/build-deploy.xml 2008-03-13 08:42:17 UTC (rev 5953) +++ stack/cxf/trunk/ant-import/build-deploy.xml 2008-03-13 11:24:53 UTC (rev 5954) @@ -12,58 +12,123 @@ <!-- $Id$ --> <project> - - <import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml"/> - - <property name="deploy.dir" value="${int.cxf.dir}/output/deploy"/> - <property name="jbossws.default.undeploy.files" value="${int.cxf.dir}/ant-import/jbossws-default-deploy.conf"/> <!-- ================================================================== --> - <!-- Deployment JBoss422 --> + <!-- Prepare Deployment Structure JBoss-4.2.x --> <!-- ================================================================== --> - - <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/cxf to jboss42"> - <macro-deploy-cxf422 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> + + <target name="deploy-structure-jboss42" depends="prepare-deploy"> + <delete dir="${deploy.structure.jboss42}"/> + <antcall target="deploy-jbossws-cxf42" inheritall="false"> + <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/> + <param name="resourcesdir" value="${deploy.artifacts.dir}/resources/jbossws-jboss42.sar"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + </antcall> + <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/> </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss422 --> + <!-- ================================================================== --> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss42"> - <macro-undeploy-cxf422/> + <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422"> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <copy todir="${jboss422.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss42}"/> + </copy> + <unzip dest="${jboss422.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/> + <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> </target> + + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422"> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <delete dir="${jboss422.server.deploy}/juddi-service.sar"/> + </target> <!-- ================================================================== --> - <!-- Deployment JBoss423 --> + <!-- Deployment JBoss423 --> <!-- ================================================================== --> - <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/cxf to jboss42"> - <macro-deploy-cxf423 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> + <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423"> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <copy todir="${jboss423.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss42}"/> + </copy> + <unzip dest="${jboss423.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/> + <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> </target> - - <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/cxf from jboss42"> - <macro-undeploy-cxf423/> + + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423"> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <delete dir="${jboss423.server.deploy}/juddi-service.sar"/> </target> - + <!-- ================================================================== --> - <!-- Deployment JBoss500 --> + <!-- Prepare Deployment Structure JBoss-5.0.x --> <!-- ================================================================== --> - - <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/cxf to jboss50"> - <macro-deploy-cxf500 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> + + <target name="deploy-structure-jboss50" depends="prepare-deploy"> + <delete dir="${deploy.structure.jboss50}"/> + <antcall target="deploy-jbossws-cxf50" inheritall="false"> + <param name="installserver" value="${deploy.structure.jboss50}/server/${jboss.server.instance}"/> + <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + </antcall> + <macro-create-deploy-conf deploystructure="${deploy.structure.jboss50}"/> </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss500 --> + <!-- ================================================================== --> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss50"> - <macro-undeploy-cxf500/> + <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500"> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <copy todir="${jboss500.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss50}"/> + </copy> + <unzip dest="${jboss500.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/> + <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> </target> - + + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500"> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <delete dir="${jboss500.server.deploy}/juddi-service.sar"/> + </target> + <!-- ================================================================== --> - <!-- Deployment JBoss501 --> + <!-- Deployment JBoss501 --> <!-- ================================================================== --> - <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501" description="Deploy jbossws/cxf to jboss50"> - <macro-deploy-cxf501 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> + <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <copy todir="${jboss501.home}" overwrite="true"> + <fileset dir="${deploy.structure.jboss50}"/> + </copy> + <unzip dest="${jboss501.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/> + <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> </target> - - <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/cxf from jboss50"> - <macro-undeploy-cxf501/> + + <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/> + <delete dir="${jboss501.server.deploy}/juddi-service.sar"/> </target> - + + <!-- ================================================================== --> + <!-- Create jbossws-deploy.conf --> + <!-- ================================================================== --> + + <macrodef name="macro-create-deploy-conf"> + <attribute name="deploystructure"/> + <sequential> + <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/> + <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> + <property name="jbossws.sar.dir" value=&quot;(a){deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; + <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> + <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/> + </sequential> + </macrodef> + </project> Added: stack/cxf/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/cxf/trunk/ant-import/build-prepare-deploy.xml (rev 0) +++ stack/cxf/trunk/ant-import/build-prepare-deploy.xml 2008-03-13 11:24:53 UTC (rev 5954) @@ -0,0 +1,52 @@ +<?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> + + <!-- ================================================================== --> + <!-- Prepare Deployment Source --> + <!-- ================================================================== --> + + <target name="prepare-deploy" depends="jars"> + + <delete dir="${deploy.artifacts.dir}"/> + + <unzip dest="${deploy.artifacts.dir}/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> + <copy todir="${deploy.artifacts.dir}/lib"> + <fileset dir="${thirdparty.dir}"> + <patternset refid="jbossws.client.patternset"/> + <patternset refid="jbossws.lib.patternset"/> + <patternset refid="jbossws.lib.endorsed.patternset"/> + <patternset refid="jbossws.server.lib.patternset"/> + <patternset refid="jbossws.service.lib.patternset"/> + <include name="juddi-service.sar"/> + </fileset> + <fileset dir="${cxf.output.lib.dir}"> + <patternset refid="jbossws.client.patternset"/> + <patternset refid="jbossws.lib.patternset"/> + <patternset refid="jbossws.lib.endorsed.patternset"/> + <patternset refid="jbossws.server.lib.patternset"/> + <patternset refid="jbossws.service.lib.patternset"/> + </fileset> + </copy> + <copy todir="${deploy.artifacts.dir}/resources"> + <fileset dir="${cxf.output.resources.dir}"> + <include name="jbossws-cxf42-beans.xml"/> + <include name="jbossws-cxf50-beans.xml"/> + <include name="jbossws-jboss42.sar/**"/> + <include name="jbossws-cxf.sar/**"/> + </fileset> + </copy> + </target> + +</project> Property changes on: stack/cxf/trunk/ant-import/build-prepare-deploy.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-03-13 08:42:17 UTC (rev 5953) +++ stack/cxf/trunk/ant-import/build-thirdparty.xml 2008-03-13 11:24:53 UTC (rev 5954) @@ -134,7 +134,7 @@ </target> <!-- SVN update the Apache CXF sources --> - <target name="cxf-update-required" depends="thirdparty-init" if="apache.cxf.available"> + <target name="cxf-update-required" depends="thirdparty-init" if="apache.cxf.available" unless="skip-cxf-update"> <exec dir="${apache.cxf.dir}" executable="svn" failonerror="true" output="${apache.cxf.dir}/svn-info.xml"> <arg line="info"/> <arg line="--xml"/> Copied: stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml (from rev 5919, stack/cxf/trunk/ant-import/macros-deploy-cxf.xml) =================================================================== --- stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml (rev 0) +++ stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-13 11:24:53 UTC (rev 5954) @@ -0,0 +1,284 @@ +<?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> + + <!-- + These patterns should be common for all supported containers. + All jars must also be declared in component-info.xml to ensure + that the AS build uses the same version. + --> + <patternset id="jbossws.bin.patternset"> + <include name="**/wsconsume.bat"/> + <include name="**/wsconsume.sh"/> + <include name="**/wsprovide.bat"/> + <include name="**/wsprovide.sh"/> + </patternset> + + <patternset id="jbossws.client.patternset"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/jaxb-xjc.jar"/> + <include name="**/jaxws-api-${cxf.jaxws.api}.jar"/> + <include name="**/saaj-api-${cxf.saaj}.jar"/> + </patternset> + + <patternset id="jbossws.lib.patternset"> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + </patternset> + + <patternset id="jbossws.lib.endorsed.patternset"> + <include name="**/jboss-jaxrpc.jar"/> + <include name="**/jboss-jaxws.jar"/> + <include name="**/jboss-jaxws-ext.jar"/> + <include name="**/jboss-saaj.jar"/> + <include name="**/jaxb-api.jar"/> + </patternset> + + <patternset id="jbossws.server.lib.patternset"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/jaxws-api-${cxf.jaxws.api}.jar"/> + <include name="**/saaj-api-${cxf.saaj}.jar"/> + </patternset> + + <patternset id="jbossws.service.lib.patternset"> + <include name="**/cxf-${cxf.version}.jar"/> + <include name="**/jbossws-cxf.jar"/> + <include name="**/geronimo-javamail_${cxf.geronimo.javamail}.jar"/> + <include name="**/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/> + <include name="**/jaxws-api-${cxf.jaxws.api}.jar"/> + <include name="**/jdom-${cxf.jdom}.jar"/> + <include name="**/neethi-${cxf.neethi}.jar"/> + <include name="**/saaj-api-${cxf.saaj}.jar"/> + <include name="**/saaj-impl-${cxf.saaj}.jar"/> + <include name="**/spring-beans-${cxf.spring}.jar"/> + <include name="**/spring-context-${cxf.spring}.jar"/> + <include name="**/spring-core-${cxf.spring}.jar"/> + <include name="**/xbean-${cxf.xbean}.jar"/> + <include name="**/xml-resolver-${cxf.xml.resolver}.jar"/> + <include name="**/XmlSchema-${cxf.xmlschema}.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/jaxrpc-api.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/wstx.jar"/> + </patternset> + + <!-- ================================================================== --> + <!-- Deploy Bin --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-bin"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.bin.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Lib --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-lib"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Lib Endorsed --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-endorsed"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.lib.endorsed.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Client --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-client"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.client.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Server Lib --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-server-lib"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.server.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy JBossWS Service --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-cxf42-sar"> + <attribute name="thirdpartydir"/> + <attribute name="resourcesdir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.service.lib.patternset"/> + <include name="**/jbossws-deploy.conf"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + </fileset> + </copy> + <unzip dest=&quot;(a){targetdir}/jbossws-context.war&quot;&gt; + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-context.war"/> + </fileset> + </unzip> + <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf42-beans.xml"/> + </fileset> + </copy> + <move file=&quot;(a){targetdir}/jbossws.beans/META-INF/jbossws-cxf42-beans.xml&quot; tofile=&quot;(a){targetdir}/jbossws.beans/META-INF/jboss-beans.xml&quot;/&gt; + <copy todir="@{targetdir}/META-INF"> + <fileset dir=&quot;(a){thirdpartydir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; + </copy> + <copy todir="@{targetdir}/META-INF"> + <fileset dir="@{resourcesdir}/META-INF"/> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-jbossws-cxf50-sar"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.service.lib.patternset"/> + <include name="**/jbossws-deploy.conf"/> + </fileset> + </copy> + <unzip dest=&quot;(a){targetdir}/jbossws-context.war&quot; overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-context.war"/> + </fileset> + </unzip> + <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true"> + <fileset dir="@{thirdpartydir}"> + <include name="**/jbossws-cxf50-beans.xml"/> + </fileset> + </copy> + <move file=&quot;(a){targetdir}/jbossws.beans/META-INF/jbossws-cxf50-beans.xml&quot; tofile=&quot;(a){targetdir}/jbossws.beans/META-INF/jboss-beans.xml&quot;/&gt; + <copy todir="@{targetdir}/META-INF"> + <fileset dir=&quot;(a){thirdpartydir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy JBossWS --> + <!-- ================================================================== --> + + <!-- JDK Detection --> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <target name="deploy-jbossws-cxf42" depends="deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/> + </target> + + <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/> + <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/> + </target> + + <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> + </target> + + <!-- ================================================================== --> + <!-- Undeploy JBossWS --> + <!-- ================================================================== --> + + <macrodef name="macro-undeploy-jbossws"> + <attribute name="defaultconf"/> + <attribute name="targetdir"/> + <sequential> + <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> + <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> + + <property name="jboss.undeploy.home" value="@{targetdir}/../../../.."/> + <available property="jboss.undeploy.client" file="${jboss.undeploy.home}/client"/> + <fail message="Cannot find ${jboss.undeploy.home}/client" unless="jboss.undeploy.client"/> + + <delete> + <fileset dir="${jboss.undeploy.home}" includes="${jbossws.deploy.conf}"/> + </delete> + <delete dir="@{targetdir}"/> + </sequential> + </macrodef> + +</project> \ No newline at end of file Deleted: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-03-13 08:42:17 UTC (rev 5953) +++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-03-13 11:24:53 UTC (rev 5954) @@ -1,286 +0,0 @@ -<?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> - - <!-- - These patterns should be common for all supported containers - Exceptions must be defined in the individual deploy macros. - --> - <patternset id="client.patternset"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - <include name="jaxws-api-${cxf.jaxws.api}.jar"/> - <include name="saaj-api-${cxf.saaj}.jar"/> - </patternset> - - <patternset id="lib.patternset"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </patternset> - - <patternset id="server.lib.patternset"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - <include name="jaxws-api-${cxf.jaxws.api}.jar"/> - <include name="saaj-api-${cxf.saaj}.jar"/> - </patternset> - - <!-- ================================================================== --> - <!-- Deploy Framework --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-framework"> - <attribute name="thirdpartylibs"/> - <sequential> - - <!-- BIN SCRIPTS --> - <unzip dest="${deploy.dir}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; - - <!-- CLIENT JARS--> - <copy todir="${deploy.dir}/client"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> - </fileset> - </copy> - - <!-- SERVER LIB JARS--> - <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="server.lib.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy JBossWS --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws"> - <attribute name="jbosshome"/> - <attribute name="sarname"/> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - - <!-- Deploy the sars --> - <mkdir dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; - <unjar dest=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; src="@{stacklibs}/@{sarname}"/> - <mkdir dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot;/&gt; - <unzip dest=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot; src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - - <!-- Deploy the jars --> - <fileset id="jbossws.deploy.files" dir="${deploy.dir}" excludes="jbossws-deploy.conf"/> - <copy todir="@{jbosshome}" overwrite="true"> - <fileset refid="jbossws.deploy.files"/> - </copy> - <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> - - <!-- Write jbossws-deploy.conf --> - <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${deploy.dir}/jbossws-deploy.conf" message="${jbossws.deploy.files}"/> - <replace file="${deploy.dir}/jbossws-deploy.conf" token=";" value=" "/> - <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; file="${deploy.dir}/jbossws-deploy.conf" overwrite="true"/> - - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Undeploy JBossWS --> - <!-- ================================================================== --> - - <macrodef name="macro-undeploy-jbossws"> - <attribute name="jbosshome"/> - <sequential> - - <delete dir="${deploy.dir}"/> - - <loadfile property="jbossws.undeploy.files" srcfile=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws-deploy.conf&quot; failonerror="false"/> - <loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/> - <delete dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; - <delete dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot;/&gt; - <delete> - <fileset dir="@{jbosshome}" includes="${jbossws.undeploy.files}"/> - </delete> - - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deployment JBoss-4.2.x --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-cxf42x"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - - <!-- CLIENT JARS --> - <mkdir dir="${deploy.dir}/client"/> - <copy todir="${deploy.dir}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <patternset refid="client.patternset"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> - </fileset> - </copy> - - <!-- LIB JARS --> - <mkdir dir="${deploy.dir}/lib"/> - <copy todir="${deploy.dir}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> - </fileset> - </copy> - - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deployment JBoss-4.2.2 --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-cxf422"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-cxf42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-jbossws jbosshome="${jboss422.home}" sarname="jbossws-cxf42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - </sequential> - </macrodef> - - <!-- Remove jbossws/cxf from jboss422 --> - <macrodef name="macro-undeploy-cxf422"> - <sequential> - <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-undeploy-jbossws jbosshome="${jboss422.home}"/> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deployment JBoss-4.2.3 --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-cxf423"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-cxf42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-jbossws jbosshome="${jboss423.home}" sarname="jbossws-cxf42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - </sequential> - </macrodef> - - <!-- Remove jbossws/cxf from jboss423 --> - <macrodef name="macro-undeploy-cxf423"> - <sequential> - <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <macro-undeploy-jbossws jbosshome="${jboss423.home}"/> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deployment JBoss-5.0.x --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-cxf50x"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - - <!-- CLIENT JARS --> - <mkdir dir="${deploy.dir}/client"/> - <copy todir="${deploy.dir}/client" overwrite="true"> - <fileset dir="@{stacklibs}"> - <patternset refid="client.patternset"/> - </fileset> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="client.patternset"/> - </fileset> - </copy> - - <!-- LIB JARS --> - <mkdir dir="${deploy.dir}/lib"/> - <copy todir="${deploy.dir}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> - </fileset> - </copy> - - <!-- SERVER JARS --> - <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{stacklibs}"> - <patternset refid="server.lib.patternset"/> - </fileset> - </copy> - - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deployment JBoss-5.0.0 --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-cxf500"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-cxf50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-jbossws jbosshome="${jboss500.home}" sarname="jbossws-cxf50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - </sequential> - </macrodef> - - <!-- Remove jbossws/cxf from jboss500 --> - <macrodef name="macro-undeploy-cxf500"> - <sequential> - <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - <macro-undeploy-jbossws jbosshome="${jboss500.home}"/> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deployment JBoss-5.0.1 --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-cxf501"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-cxf50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-jbossws jbosshome="${jboss501.home}" sarname="jbossws-cxf50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - </sequential> - </macrodef> - - <!-- Remove jbossws/cxf from jboss501 --> - <macrodef name="macro-undeploy-cxf501"> - <sequential> - <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws jbosshome="${jboss501.home}"/> - </sequential> - </macrodef> - -</project> \ No newline at end of file Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-03-13 08:42:17 UTC (rev 5953) +++ stack/cxf/trunk/build.xml 2008-03-13 11:24:53 UTC (rev 5954) @@ -17,10 +17,12 @@ <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-bin-dist.xml"/> + <import file="${basedir}/ant-import/build-prepare-deploy.xml"/> <import file="${basedir}/ant-import/build-deploy.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> <import file="${basedir}/ant-import/build-testsuite.xml"/> <import file="${basedir}/ant-import/build-thirdparty.xml"/> + <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/> <!-- ================================================================== --> <!-- Setup --> @@ -38,6 +40,12 @@ <property name="cxf.output.deploy.dir" value="${cxf.output.dir}/deploy"/> <property name="cxf.output.etc.dir" value="${cxf.output.dir}/etc"/> <property name="cxf.output.lib.dir" value="${cxf.output.dir}/lib"/> + <property name="cxf.output.resources.dir" value="${cxf.output.dir}/resources"/> + + <property name="deploy.artifacts.dir" value="${cxf.output.deploy.dir}-artifacts"/> + <property name="deploy.structure.jboss42" value="${cxf.output.deploy.dir}-jboss42"/> + <property name="deploy.structure.jboss50" value="${cxf.output.deploy.dir}-jboss50"/> + <property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/> <!-- ================================================================== --> <!-- Initialization --> @@ -59,7 +67,7 @@ | documentation compiles. --> - <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> + <target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/> <!-- Compile java sources --> <target name="compile-classes" depends="compile-classes-cxf"/> @@ -90,6 +98,42 @@ </copy> </target> + <!-- Compile resource files --> + <target name="compile-resources" depends="init"> + + <!-- Concat jbossws-cxf50-beans.xml --> + <mkdir dir="${cxf.output.resources.dir}"/> + <concat destfile="${cxf.output.resources.dir}/jbossws-cxf50-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; + </header> + <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; + </footer> + </concat> + + <!-- Concat jboss-beans.xml --> + <unzip dest="${cxf.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> + <concat destfile="${cxf.output.resources.dir}/jbossws-cxf42-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"&gt; + </header> + <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/> + <fileset file="${cxf.output.resources.dir}/jbossws-jboss42-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; + </footer> + </concat> + + <copy todir="${cxf.output.resources.dir}"> + <fileset dir="${cxf.resources.dir}"> + <include name="jbossws-cxf.jar/**"/> + <include name="jbossws-cxf.sar/**"/> + </fileset> + </copy> + </target> + <!-- ================================================================== --> <!-- Archives --> <!-- ================================================================== --> @@ -97,10 +141,7 @@ <!-- | Build all jar files. --> - <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files."> - </target> - - <target name="jars-common" depends="compile"> + <target name="jars" depends="compile" description="Builds all jar files."> <!-- Build jbossws-cxf.jar --> <mkdir dir="${cxf.output.lib.dir}"/> @@ -145,7 +186,7 @@ </zip> </target> - <target name="jars-jboss50" depends="jars-common"> + <target name="jars-jboss50" depends="jars"> <!-- Concat jbossws-beans.xml --> <concat destfile="${cxf.output.lib.dir}/jbossws-cxf50/jbossws-beans.xml"> @@ -192,7 +233,7 @@ </target> - <target name="jars-jboss42" depends="jars-common"> + <target name="jars-jboss42" depends="jars"> <unzip dest="${cxf.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> Modified: stack/cxf/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/src/main/distro/ant.properties.example 2008-03-13 08:42:17 UTC (rev 5953) +++ stack/cxf/trunk/src/main/distro/ant.properties.example 2008-03-13 11:24:53 UTC (rev 5954) @@ -4,11 +4,12 @@ # $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ # Optional JBoss Home -jboss500.home=(a)jboss500.home@ jboss422.home=(a)jboss422.home@ jboss423.home=(a)jboss423.home@ +jboss500.home=(a)jboss500.home@ +jboss501.home=(a)jboss501.home@ -# The JBoss server under test. This can be [jboss422|jboss423|jboss500] +# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501] jbossws.integration.target=jboss422 # The JBoss settings Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-03-13 08:42:17 UTC (rev 5953) +++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-03-13 11:24:53 UTC (rev 5954) @@ -18,14 +18,15 @@ <!-- ================================================================== --> <property name="build.dir" value="${basedir}/build"/> - <property name="bin.dir" value="${basedir}/bin"/> - <property name="deploy.dir" value="${basedir}/output/deploy"/> <property name="docs.dir" value="${basedir}/docs"/> - <property name="lib.dir" value="${basedir}/lib"/> + <property name="thirdparty.dir" value="${basedir}/deploy/lib"/> <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${basedir}/output"/> - <property name="jbossws.default.undeploy.files" value="${build.dir}/jbossws.default.undeploy.files"/> + <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> + <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/> + <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/> + <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> <property file="${basedir}/ant.properties"/> <property file="${basedir}/version.properties"/> @@ -70,14 +71,14 @@ <condition property="jbossws.integration.jboss42" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss422"/> <equals arg1="${jbossws.integration.target}" arg2="jboss423"/> </or> </condition> <condition property="jbossws.integration.jboss50" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> </or> </condition> @@ -88,7 +89,7 @@ <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-cxf.xml"/> + <import file="${basedir}/build/jbossws-deploy-macros.xml"/> <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> <!-- ================================================================== --> @@ -164,9 +165,8 @@ <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"/> + <!-- dummy targets --> + <target name="prepare-deploy" depends="prepare"/> <!-- ================================================================== --> <!-- Miscellaneous --> Deleted: stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml 2008-03-13 08:42:17 UTC (rev 5953) +++ stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml 2008-03-13 11:24:53 UTC (rev 5954) @@ -1,84 +0,0 @@ -<?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: bin-dist-deploy.xml 3576 2007-06-14 09:23:52Z thomas.diesler(a)jboss.com $ --> - -<project> - - <!-- ================================================================== --> - <!-- Deployment JBoss-4.2.2 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws/cxf to jboss422 --> - <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/cxf to jboss422"> - <macro-deploy-cxf422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - </target> - <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss422.home}" thirdpartylibs="${lib.dir}"/> - </target> - - <!-- Remove jbossws/cxf from jboss422 --> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss422"> - <macro-undeploy-cxf422/> - </target> - - <!-- ================================================================== --> - <!-- Deployment JBoss-4.2.3 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws/cxf to jboss423 --> - <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/cxf to jboss423"> - <macro-deploy-cxf423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - </target> - <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss423.home}" thirdpartylibs="${lib.dir}"/> - </target> - - <!-- Remove jbossws/cxf from jboss423 --> - <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/cxf from jboss423"> - <macro-undeploy-cxf423/> - </target> - - <!-- ================================================================== --> - <!-- Deployment JBoss-5.0.0 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws/cxf to jboss500 --> - <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/cxf to jboss500"> - <macro-deploy-cxf500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - </target> - <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss500.home}" thirdpartylibs="${lib.dir}"/> - </target> - - <!-- Remove jbossws/cxf from jboss500 --> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss500"> - <macro-undeploy-cxf500/> - </target> - - <!-- ================================================================== --> - <!-- Deployment JBoss-5.0.1 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws/cxf to jboss501 --> - <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/cxf to jboss501"> - <macro-deploy-cxf501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - </target> - <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss501.home}" thirdpartylibs="${lib.dir}"/> - </target> - - <!-- Remove jbossws/cxf from jboss501 --> - <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/cxf from jboss501"> - <macro-undeploy-cxf501/> - </target> - -</project>