Author: thomas.diesler(a)jboss.com Date: 2007-05-24 11:59:04 -0400 (Thu, 24 May 2007) New Revision: 3237 Added: trunk/integration/jbws/ant-import/build-distro.xml trunk/integration/jbws/src/main/etc/bindist-build.xml trunk/integration/jbws/version.properties Modified: trunk/integration/jbws/ant-import/build-deploy.xml trunk/integration/jbws/ant-import/build-release.xml trunk/integration/jbws/ant-import/build-thirdparty.xml trunk/integration/jbws/ant-import/macros-deploy-native.xml trunk/integration/jbws/build.xml trunk/integration/sunri/src/main/etc/bindist-build.xml trunk/integration/xfire/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/macros-deploy-xfire.xml Log: Native dist Modified: trunk/integration/jbws/ant-import/build-deploy.xml =================================================================== --- trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -20,7 +20,7 @@ <!-- ================================================================== --> <!-- Deploy jbossws to jboss50 --> - <target name="deploy-jboss50" depends="jars-jbws50" description="Deploy jbossws to jboss50"> + <target name="deploy-jboss50" depends="jars-native50" description="Deploy jbossws to jboss50"> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <macro-deploy-native50 @@ -37,7 +37,7 @@ </target> <!-- Deploy jbossws to jboss42 --> - <target name="deploy-jboss42" depends="jars-jbws42" description="Deploy jbossws to jboss42"> + <target name="deploy-jboss42" depends="jars-native42" description="Deploy jbossws to jboss42"> <macro-deploy-native42 spilibs="${spi.dir}/output/lib" jbosslibs="${int.jboss42.dir}/output/lib" Added: trunk/integration/jbws/ant-import/build-distro.xml =================================================================== --- trunk/integration/jbws/ant-import/build-distro.xml (rev 0) +++ trunk/integration/jbws/ant-import/build-distro.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -0,0 +1,105 @@ +<?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> + + <!-- ================================================================== --> + <!-- Binary distribution JBossWS/XFire --> + <!-- ================================================================== --> + + <target name="binary-dist" depends="jars" description="Build the binary distribution"> + + <property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/> + <property name="bindist.build.dir" value="${bindist.dir}/build"/> + <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"/> + + <delete dir="${bindist.dir}"/> + <mkdir dir="${bindist.build.dir}"/> + <mkdir dir="${bindist.lib.dir}/thirdparty"/> + <mkdir dir="${bindist.docs.dir}"/> + <mkdir dir="${bindist.tests.dir}"/> + + <!-- root --> + <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/etc/bindist.properties"/> + <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bindist-build.xml"/> + <copy todir="${bindist.dir}" file="${native.dir}/version.properties"/> + + <!-- build --> + <copy todir="${bindist.build.dir}"> + <fileset dir="${build.dir}"> + <include name="version.properties"/> + </fileset> + <fileset dir="${build.dir}/ant-import"> + <include name="build-testsuite.xml"/> + </fileset> + <fileset dir="${int.native.dir}/ant-import"> + <include name="macros-deploy-native.xml"/> + </fileset> + <fileset dir="${testsuite.dir}/ant-import"> + <include name="build-jars-jaxws.xml"/> + </fileset> + </copy> + + <!-- docs --> + <copy todir="${bindist.docs.dir}"> + <fileset dir="${build.dir}/etc"> + <include name="JBossORG-EULA.txt"/> + </fileset> + </copy> + + <!-- lib --> + <copy todir="${bindist.lib.dir}" overwrite="true"> + <fileset dir="${spi.dir}/output/lib"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-core.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="${int.native.dir}/output/lib"> + <include name="jbossws-context.war"/> + <include name="jbossws-native42.sar"/> + <include name="jbossws-native50.sar"/> + <include name="jbossws-native50-deployer.zip"/> + </fileset> + </copy> + <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> + <fileset dir="${core.dir}/thirdparty"> + <include name="juddi-service.sar"/> + <include name="policy.jar"/> + </fileset> + </copy> + + <!-- tests --> + <copy todir="${bindist.tests.dir}" overwrite="true"> + <fileset dir="${testsuite.dir}/src"/> + <fileset dir="${int.native.dir}/src/test"/> + </copy> + + <zip destfile="${native.output.dir}/jbossws-native-${version.id}.zip"> + <fileset dir="${native.output.dir}" includes="jbossws-native-${version.id}/**"/> + </zip> + </target> + +</project> Property changes on: trunk/integration/jbws/ant-import/build-distro.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/jbws/ant-import/build-release.xml =================================================================== --- trunk/integration/jbws/ant-import/build-release.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/jbws/ant-import/build-release.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -26,7 +26,7 @@ <include name="jbossws-native50-deployer.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml" file="${native.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> @@ -40,7 +40,7 @@ <include name="jbossws-native42.sar"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-native42/${repository.id}/component-info.xml" file="${jbws.etc.dir}/component-info42.xml" filtering="true" overwrite="true"> + <copy tofile="${jboss.repository.dir}/jbossws-native42/${repository.id}/component-info.xml" file="${native.etc.dir}/component-info42.xml" filtering="true" overwrite="true"> <filterset> <filtersfile file="${build.dir}/version.properties"/> </filterset> Modified: trunk/integration/jbws/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jbws/ant-import/build-thirdparty.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/jbws/ant-import/build-thirdparty.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -31,7 +31,7 @@ <target name="thirdparty-classpath" depends="thirdparty-init"> <!-- The compile classpath for jboss50 integration --> - <path id="jbws50.integration.classpath"> + <path id="native50.integration.classpath"> </path> </target> Modified: trunk/integration/jbws/ant-import/macros-deploy-native.xml =================================================================== --- trunk/integration/jbws/ant-import/macros-deploy-native.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/jbws/ant-import/macros-deploy-native.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -69,7 +69,7 @@ <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){stacklibs}/jbossws-native50-deployer.zip&quot;/&gt; <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native50.sar&quot;/&gt; - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file="${jbws.output.lib.dir}/jbossws-context.war" overwrite="true"/> + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file=&quot;(a){stacklibs}/jbossws-context.war&quot; overwrite="true"/> <!-- Deploy juddi-service.sar --> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; Modified: trunk/integration/jbws/build.xml =================================================================== --- trunk/integration/jbws/build.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/jbws/build.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -16,6 +16,7 @@ <import file="${basedir}/build/ant-import/build-setup.xml"/> <import file="${int.native.dir}/ant-import/build-deploy.xml"/> + <import file="${int.native.dir}/ant-import/build-distro.xml"/> <import file="${int.native.dir}/ant-import/build-release.xml"/> <import file="${int.native.dir}/ant-import/build-testsuite.xml"/> <import file="${int.native.dir}/ant-import/build-thirdparty.xml"/> @@ -24,15 +25,15 @@ <!-- Setup --> <!-- ================================================================== --> - <property name="jbws.dir" value="${int.native.dir}"/> - <property name="jbws.src.dir" value="${jbws.dir}/src/main"/> - <property name="jbws.etc.dir" value="${jbws.src.dir}/etc"/> - <property name="jbws.java.dir" value="${jbws.src.dir}/java"/> - <property name="jbws.resources.dir" value="${jbws.src.dir}/resources"/> - <property name="jbws.output.dir" value="${jbws.dir}/output"/> - <property name="jbws.output.classes.dir" value="${jbws.output.dir}/classes"/> - <property name="jbws.output.etc.dir" value="${jbws.output.dir}/etc"/> - <property name="jbws.output.lib.dir" value="${jbws.output.dir}/lib"/> + <property name="native.dir" value="${int.native.dir}"/> + <property name="native.src.dir" value="${native.dir}/src/main"/> + <property name="native.etc.dir" value="${native.src.dir}/etc"/> + <property name="native.java.dir" value="${native.src.dir}/java"/> + <property name="native.resources.dir" value="${native.src.dir}/resources"/> + <property name="native.output.dir" value="${native.dir}/output"/> + <property name="native.output.classes.dir" value="${native.output.dir}/classes"/> + <property name="native.output.etc.dir" value="${native.output.dir}/etc"/> + <property name="native.output.lib.dir" value="${native.output.dir}/lib"/> <!-- ================================================================== --> <!-- Initialization --> @@ -62,9 +63,9 @@ <!-- Compile etc files (manifests and such) --> <target name="compile-etc" depends="init"> - <mkdir dir="${jbws.output.etc.dir}"/> - <copy todir="${jbws.output.etc.dir}" filtering="yes"> - <fileset dir="${jbws.etc.dir}"> + <mkdir dir="${native.output.etc.dir}"/> + <copy todir="${native.output.etc.dir}" filtering="yes"> + <fileset dir="${native.etc.dir}"> <include name="component-info-*.xml"/> </fileset> <fileset dir="${build.dir}/etc"> @@ -87,33 +88,33 @@ <!-- | Build all jar files. --> - <target name="jars" depends="compile,jars-jbws50,jars-jbws42" description="Builds all jar files."> + <target name="jars" depends="compile,jars-native42,jars-native50" description="Builds all jar files."> </target> <!-- | Build all jar files. --> - <target name="jars-jbws50" depends="compile" if="jboss50.home"> + <target name="jars-native50" depends="compile" if="jboss50.home"> <ant antfile="${int.jboss50.dir}/build.xml" target="main" inheritall="false"/> - <mkdir dir="${jbws.output.lib.dir}"/> + <mkdir dir="${native.output.lib.dir}"/> <!-- Build jbossws-context.war --> - <war warfile="${jbws.output.lib.dir}/jbossws-context.war" webxml="${jbws.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> - <fileset dir="${jbws.resources.dir}/jbossws-context.war"> + <war warfile="${native.output.lib.dir}/jbossws-context.war" webxml="${native.resources.dir}/jbossws-context.war/WEB-INF/web.xml"> + <fileset dir="${native.resources.dir}/jbossws-context.war"> <include name="index.html"/> <include name="styles.css"/> </fileset> - <webinf dir="${jbws.resources.dir}/jbossws-context.war/WEB-INF"> + <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> - <!-- Build jbossws-jbws50.sar --> - <jar jarfile="${jbws.output.lib.dir}/jbossws-native50.sar" manifest="${jbws.output.etc.dir}/default.mf"> + <!-- Build jbossws-native50.sar --> + <jar jarfile="${native.output.lib.dir}/jbossws-native50.sar" manifest="${native.output.etc.dir}/default.mf"> <!-- [JBAS-4379] MC beans deployed twice because of jacc service - <fileset dir="${jbws.output.lib.dir}"> + <fileset dir="${native.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> --> @@ -129,14 +130,14 @@ <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${jbws.resources.dir}/jbossws-native50.sar/META-INF"> + <metainf dir="${native.resources.dir}/jbossws-native50.sar/META-INF"> <include name="jbossws-beans.xml"/> </metainf> </jar> - <!-- Build jbossws-jbws50.deployer --> - <zip zipfile="${jbws.output.lib.dir}/jbossws-native50-deployer.zip"> - <fileset dir="${jbws.resources.dir}/jbossws-native50.deployer"> + <!-- Build jbossws-native50.deployer --> + <zip zipfile="${native.output.lib.dir}/jbossws-native50-deployer.zip"> + <fileset dir="${native.resources.dir}/jbossws-native50.deployer"> <include name="META-INF/jbossws-deployer-beans.xml"/> </fileset> </zip> @@ -146,15 +147,15 @@ <!-- | Build all jar files. --> - <target name="jars-jbws42" depends="compile" if="jboss42.home"> + <target name="jars-native42" depends="compile" if="jboss42.home"> <ant antfile="${int.jboss42.dir}/build.xml" target="main" inheritall="false"/> - <mkdir dir="${jbws.output.lib.dir}"/> + <mkdir dir="${native.output.lib.dir}"/> - <!-- Build jbossws-jbws42.sar --> - <jar jarfile="${jbws.output.lib.dir}/jbossws-native42.sar" manifest="${jbws.output.etc.dir}/default.mf"> - <fileset dir="${jbws.output.lib.dir}"> + <!-- Build jbossws-native42.sar --> + <jar jarfile="${native.output.lib.dir}/jbossws-native42.sar" manifest="${native.output.etc.dir}/default.mf"> + <fileset dir="${native.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> <fileset dir="${spi.dir}/output/lib"> @@ -173,13 +174,13 @@ <include name="xmlsec.jar"/> <include name="wstx.jar"/> </fileset> - <fileset dir="${jbws.resources.dir}/jbossws-native42.sar"> + <fileset dir="${native.resources.dir}/jbossws-native42.sar"> <include name="jbossws.beans/**"/> </fileset> <metainf dir="${core.dir}/src/main/resources/standard-config"> <include name="standard-*-config.xml"/> </metainf> - <metainf dir="${jbws.resources.dir}/jbossws-native42.sar/META-INF"> + <metainf dir="${native.resources.dir}/jbossws-native42.sar/META-INF"> <include name="jboss-service.xml"/> <include name="jboss-beans.xml"/> </metainf> @@ -192,7 +193,7 @@ <!-- ================================================================== --> <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${jbws.output.dir}"/> + <delete dir="${native.output.dir}"/> </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> Added: trunk/integration/jbws/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/jbws/src/main/etc/bindist-build.xml (rev 0) +++ trunk/integration/jbws/src/main/etc/bindist-build.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -0,0 +1,152 @@ +<?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 default="main" basedir="." name="JBossWS/XFire"> + + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> + + <property name="build.dir" value="${basedir}/build"/> + <property name="docs.dir" value="${basedir}/docs"/> + <property name="lib.dir" value="${basedir}/lib"/> + <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> + <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${tests.dir}/output"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + <property file="${build.dir}/version.properties"/> + + <property name="jboss50.lib" value="${jboss50.home}/lib"/> + <property name="jboss50.client" value="${jboss50.home}/client"/> + <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> + <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> + <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> + <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + + <property name="jboss42.lib" value="${jboss42.home}/lib"/> + <property name="jboss42.client" value="${jboss42.home}/client"/> + <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> + <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> + <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> + + <available property="jboss50.available" file="${jboss50.available.file}"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> + + <import file="${basedir}/build/build-testsuite.xml"/> + <import file="${basedir}/build/macros-deploy-native.xml"/> + + <!-- ================================================================== --> + <!-- Initialization --> + <!-- ================================================================== --> + + <target name="prepare"> + + <!-- Define jboss.home --> + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + + <!-- Define excludesfile --> + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${tests.dir}/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> + + <path id="ws.stack.classpath"> + <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/> + <pathelement location="${lib.dir}/jboss-jaxws.jar"/> + <pathelement location="${lib.dir}/jboss-saaj.jar"/> + <pathelement location="${lib.dir}/jbossws-core.jar"/> + <pathelement location="${lib.dir}/jbossws-client.jar"/> + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${thirdparty.dir}/policy.jar"/> + </path> + + </target> + + <!-- ================================================================== --> + <!-- Compile --> + <!-- ================================================================== --> + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java"/> + </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="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> + + <!-- ================================================================== --> + <!-- Deployment --> + <!-- ================================================================== --> + + <!-- Deploy jbossws/native to jboss50 --> + <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/native to jboss50"> + <macro-undeploy-native50/> + <macro-deploy-native50 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + corelibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + </target> + + <!-- Remove jbossws/native from jboss50 --> + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50"> + <macro-undeploy-native50/> + </target> + + <!-- ================================================================== --> + <!-- Miscellaneous --> + <!-- ================================================================== --> + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + </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> Property changes on: trunk/integration/jbws/src/main/etc/bindist-build.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/integration/jbws/version.properties =================================================================== --- trunk/integration/jbws/version.properties (rev 0) +++ trunk/integration/jbws/version.properties 2007-05-24 15:59:04 UTC (rev 3237) @@ -0,0 +1,5 @@ + +# $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ + +native.implementation.title=JBoss Web Services - JBossWS/Native + Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -50,7 +50,7 @@ <available property="jboss42.available" file="${jboss42.available.file}"/> <import file="${basedir}/build/build-testsuite.xml"/> - <import file="${basedir}/build/macros-deploy-jbws.xml"/> + <import file="${basedir}/build/macros-deploy-native.xml"/> <import file="${basedir}/build/macros-deploy-sunri.xml"/> <!-- ================================================================== --> Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -13,6 +13,8 @@ <project> + <import file="${int.xfire.dir}/ant-import/macros-deploy-xfire.xml"/> + <!-- ================================================================== --> <!-- Deployment JBoss50 --> <!-- ================================================================== --> @@ -21,12 +23,16 @@ <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws/xfire to jboss50"> <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> - + <macro-deploy-xfire50 + spilibs="${spi.dir}/output/lib" + jbosslibs="${int.jboss50.dir}/output/lib" + stacklibs="${int.xfire.dir}/output/lib" + thirdpartylibs="${int.xfire.dir}/thirdparty"/> </target> <!-- Remove jbossws/xfire from jboss50 --> <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50"> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> + <macro-undeploy-xfire50/> </target> </project> Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-05-24 15:12:38 UTC (rev 3236) +++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-05-24 15:59:04 UTC (rev 3237) @@ -60,7 +60,7 @@ </macrodef> <!-- Remove jbossws/xfire from jboss50 --> - <macrodef name="macro-undeploy-xfire"> + <macrodef name="macro-undeploy-xfire50"> <sequential> <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> </sequential>