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

Author: thomas.diesler(a)jboss.com Date: 2008-03-11 10:02:15 -0400 (Tue, 11 Mar 2008) New Revision: 5915 Added: stack/native/trunk/ant-import/build-deploy42.xml stack/native/trunk/ant-import/build-deploy50.xml stack/native/trunk/ant-import/jbossws-deploy-macros.xml Removed: stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/macros-deploy-native.xml Modified: stack/native/trunk/ant-import/build-release.xml stack/native/trunk/ant-import/jbossws.default.undeploy.files stack/native/trunk/build.xml stack/native/trunk/src/main/etc/component-info.xml Log: Share deploy macros with AS build Deleted: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2008-03-11 10:52:40 UTC (rev 5914) +++ stack/native/trunk/ant-import/build-deploy.xml 2008-03-11 14:02:15 UTC (rev 5915) @@ -1,98 +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> - - <import file="${core.dir}/ant-import/macros-deploy-native.xml"/> - - <property name="deploy.dir" value="${core.dir}/output/deploy"/> - <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws.default.undeploy.files"/> - - <!-- ================================================================== --> - <!-- Deployment JBoss421 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws to jboss421 --> - <target name="deploy-jboss421" depends="jars-jboss42,undeploy-jboss421,deploy-jboss421-endorsed" description="Deploy jbossws to jboss421"> - <macro-deploy-native421 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - </target> - <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - </target> - - <!-- Remove jbossws from jboss421 --> - <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws from jboss421"> - <macro-undeploy-native421/> - </target> - - <!-- Deploy jbossws to jboss422 --> - <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws to jboss422"> - <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-deploy-native422 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - </target> - <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - </target> - - <!-- Remove jbossws from jboss422 --> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422"> - <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-undeploy-native422/> - </target> - - <!-- Deploy jbossws to jboss423 --> - <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws to jboss423"> - <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <macro-deploy-native423 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - </target> - <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - </target> - - <!-- Remove jbossws from jboss423 --> - <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423"> - <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <macro-undeploy-native423/> - </target> - - <!-- Deploy jbossws to jboss500 --> - <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws to jboss500"> - <macro-deploy-native500 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - </target> - <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - </target> - - <!-- Remove jbossws from jboss500 --> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500"> - <macro-undeploy-native500/> - </target> - - <!-- ================================================================== --> - <!-- Deployment JBoss501 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws to jboss501 --> - <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws to jboss501"> - <macro-deploy-native501 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - </target> - <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> - </target> - - <!-- Remove jbossws from jboss501 --> - <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> - <macro-undeploy-native501/> - </target> - -</project> Copied: stack/native/trunk/ant-import/build-deploy42.xml (from rev 5910, stack/native/trunk/ant-import/build-deploy.xml) =================================================================== --- stack/native/trunk/ant-import/build-deploy42.xml (rev 0) +++ stack/native/trunk/ant-import/build-deploy42.xml 2008-03-11 14:02:15 UTC (rev 5915) @@ -0,0 +1,133 @@ +<?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> + + <import file="${core.dir}/ant-import/jbossws-deploy-macros.xml"/> + + <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws.default.undeploy.files"/> + + <!-- ================================================================== --> + <!-- Deployment JBoss421 --> + <!-- ================================================================== --> + + <target name="deploy-jboss421" depends="undeploy-jboss421,prepare-deploy42" description="Deploy jbossws to jboss421"> + <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> + <copy todir="${jboss421.home}" overwrite="true"> + <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/> + </copy> + <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/> + + <!-- Extras for jboss-4.2.1 --> + <copy todir="${jboss421.home}/lib" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> + <copy todir="${jboss421.home}/client" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> + </target> + + <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws from jboss421"> + <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> + <macro-undeploy-jbossws targetdir="${jboss421.server.deploy}/jbossws.sar"/> + </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss422 --> + <!-- ================================================================== --> + + <target name="deploy-jboss422" depends="undeploy-jboss422,prepare-deploy42" description="Deploy jbossws to jboss422"> + <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <copy todir="${jboss422.home}" overwrite="true"> + <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/> + </copy> + <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"/> + </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss423 --> + <!-- ================================================================== --> + + <target name="deploy-jboss423" depends="undeploy-jboss423,prepare-deploy42" description="Deploy jbossws to jboss423"> + <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <copy todir="${jboss423.home}" overwrite="true"> + <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/> + </copy> + <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <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"/> + </target> + + <!-- ================================================================== --> + <!-- Prepare Deployment JBoss-4.2.x --> + <!-- ================================================================== --> + + <target name="prepare-deploy42" depends="jars"> + + <delete dir="${core.output.deploy.dir}-src"/> + <delete dir="${core.output.deploy.dir}"/> + + <!-- Copy all artifacts to a flat deploy src --> + <unzip dest="${core.output.deploy.dir}-src/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> + <unzip dest="${core.output.deploy.dir}-src/bin" src="${core.output.lib.dir}/jbossws-core-scripts.zip"/> + <copy todir="${core.output.deploy.dir}-src/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"/> + </fileset> + <fileset dir="${core.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"/> + <include name="jbossws-context.war"/> + </fileset> + </copy> + <copy todir="${core.output.deploy.dir}-src/resources"> + <fileset dir="${core.output.resources.dir}"> + <include name="standard-*-config.xml"/> + <include name="jbossws-native42-beans.xml"/> + </fileset> + </copy> + + <!-- Create the deployment structure --> + <antcall target="deploy-jbossws-native42" inheritall="false"> + <param name="installserver" value="${core.output.deploy.dir}/server/${jboss.server.instance}"/> + <param name="thirdpartylibs" value="${core.output.deploy.dir}-src"/> + </antcall> + + <!-- Create jbossws.deployed.files --> + <fileset id="jbossws.deploy.fileset" dir="${core.output.deploy.dir}" excludes="**/jbossws.deployed.files,**/jbossws.sar/**"/> + <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> + <property name="jbossws.sar.dir" value="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <echo file="${jbossws.sar.dir}/jbossws.deployed.files" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/> + <replace file="${jbossws.sar.dir}/jbossws.deployed.files" token=";" value=" "/> + </target> + +</project> Added: stack/native/trunk/ant-import/build-deploy50.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy50.xml (rev 0) +++ stack/native/trunk/ant-import/build-deploy50.xml 2008-03-11 14:02:15 UTC (rev 5915) @@ -0,0 +1,104 @@ +<?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> + + <import file="${core.dir}/ant-import/jbossws-deploy-macros.xml"/> + + <property name="jbossws.default.undeploy.files" value="${core.dir}/ant-import/jbossws.default.undeploy.files"/> + + <!-- ================================================================== --> + <!-- Deployment JBoss500 --> + <!-- ================================================================== --> + + <target name="deploy-jboss500" depends="undeploy-jboss500,prepare-deploy50" description="Deploy jbossws to jboss500"> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <copy todir="${jboss500.home}" overwrite="true"> + <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/> + </copy> + <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"/> + </target> + + <!-- ================================================================== --> + <!-- Deployment JBoss501 --> + <!-- ================================================================== --> + + <target name="deploy-jboss501" depends="undeploy-jboss501,prepare-deploy50" description="Deploy jbossws to jboss501"> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <copy todir="${jboss501.home}" overwrite="true"> + <fileset dir="${core.output.deploy.dir}" excludes="jbossws.deployed.files"/> + </copy> + <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> + </target> + + <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"/> + </target> + + <!-- ================================================================== --> + <!-- Prepare Deployment JBoss-5.0.x --> + <!-- ================================================================== --> + + <target name="prepare-deploy50" depends="jars"> + + <delete dir="${core.output.deploy.dir}-src"/> + <delete dir="${core.output.deploy.dir}"/> + + <!-- Copy all artifacts to a flat deploy src --> + <unzip dest="${core.output.deploy.dir}-src/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> + <unzip dest="${core.output.deploy.dir}-src/bin" src="${core.output.lib.dir}/jbossws-core-scripts.zip"/> + <copy todir="${core.output.deploy.dir}-src/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"/> + </fileset> + <fileset dir="${core.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"/> + <include name="jbossws-context.war"/> + </fileset> + </copy> + <copy todir="${core.output.deploy.dir}-src/resources"> + <fileset dir="${core.output.resources.dir}"> + <include name="standard-*-config.xml"/> + <include name="jbossws-native50-beans.xml"/> + </fileset> + </copy> + + <!-- Create the deployment structure --> + <antcall target="deploy-jbossws-native50" inheritall="false"> + <param name="installserver" value="${core.output.deploy.dir}/server/${jboss.server.instance}"/> + <param name="thirdpartylibs" value="${core.output.deploy.dir}-src"/> + </antcall> + + <!-- Create jbossws.deployed.files --> + <fileset id="jbossws.deploy.fileset" dir="${core.output.deploy.dir}" excludes="**/jbossws.deployed.files,**/jbossws.sar/**"/> + <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> + <property name="jbossws.sar.dir" value="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <echo file="${jbossws.sar.dir}/jbossws.deployed.files" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/> + <replace file="${jbossws.sar.dir}/jbossws.deployed.files" token=";" value=" "/> + </target> + +</project> Property changes on: stack/native/trunk/ant-import/build-deploy50.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/ant-import/build-release.xml =================================================================== --- stack/native/trunk/ant-import/build-release.xml 2008-03-11 10:52:40 UTC (rev 5914) +++ stack/native/trunk/ant-import/build-release.xml 2008-03-11 14:02:15 UTC (rev 5915) @@ -35,7 +35,7 @@ <echo message="*********************************************"/> </target> - <target name="release-to-repository" depends="jars,check-svn-externals,warn-svn-externals" + <target name="release-to-repository" depends="prepare-deploy50,check-svn-externals,warn-svn-externals" description="Release to jboss.local.repository"> <!-- jboss/jbossws-native --> @@ -46,8 +46,8 @@ <copy todir="${jboss.repository.dir}/jbossws/${repository.id}/bin" overwrite="true"> <fileset dir="${core.output.etc.dir}"> <include name="wsrunclient.bat"/> + <include name="wsrunclient.sh"/> <include name="wstools.bat"/> - <include name="wsrunclient.sh"/> <include name="wstools.sh"/> </fileset> </copy> @@ -64,12 +64,19 @@ </fileset> </copy> <copy todir="${jboss.repository.dir}/jbossws/${repository.id}/resources" overwrite="true"> - <fileset dir="${core.resources.dir}/standard-config"> + <fileset dir="${core.output.resources.dir}"> <include name="standard-*-config.xml"/> </fileset> - <fileset dir="${core.resources.dir}"> - <include name="jbossws-native-config.xml"/> + <fileset dir="${core.output.resources.dir}"> + <include name="jbossws-native42-beans.xml"/> + <include name="jbossws-native50-beans.xml"/> </fileset> + <fileset dir="${basedir}/ant-import"> + <include name="jbossws-deploy-macros.xml"/> + </fileset> + <fileset dir="${core.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"> + <include name="jbossws.deployed.files"/> + </fileset> </copy> <copy tofile="${jboss.repository.dir}/jbossws/${repository.id}/component-info.xml" file="${core.output.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> Added: stack/native/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/ant-import/jbossws-deploy-macros.xml (rev 0) +++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-11 14:02:15 UTC (rev 5915) @@ -0,0 +1,267 @@ +<?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="jbossws.bin.patternset"> + <include name="**/wsconsume.bat"/> + <include name="**/wsconsume.sh"/> + <include name="**/wsprovide.bat"/> + <include name="**/wsprovide.sh"/> + <include name="**/wsrunclient.bat"/> + <include name="**/wsrunclient.sh"/> + <include name="**/wstools.bat"/> + <include name="**/wstools.sh"/> + </patternset> + + <patternset id="jbossws.client.patternset"> + <include name="**/jbossws-client.jar"/> + <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-tools.jar"/> + <include name="**/jaxws-rt.jar"/> + <include name="**/jboss-jaxrpc.jar"/> + <include name="**/jboss-jaxws.jar"/> + <include name="**/jboss-jaxws-ext.jar"/> + <include name="**/jboss-saaj.jar"/> + <include name="**/policy.jar"/> + <include name="**/stax-ex.jar"/> + <include name="**/streambuffer.jar"/> + <include name="**/wsdl4j.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="**/jboss-jaxrpc.jar"/> + <include name="**/jboss-jaxws.jar"/> + <include name="**/jboss-jaxws-ext.jar"/> + <include name="**/jboss-saaj.jar"/> + </patternset> + + <patternset id="jbossws.service.lib.patternset"> + <include name="**/jboss-jaxb-intros.jar"/> + <include name="**/jbossws-core.jar"/> + <include name="**/policy.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/xmlsec.jar"/> + </patternset> + + <!-- ================================================================== --> + <!-- Deploy Bin --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-bin"> + <attribute name="thirdpartylibs"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="jbossws.bin.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Lib --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-lib"> + <attribute name="thirdpartylibs"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="jbossws.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Lib Endorsed --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-endorsed"> + <attribute name="thirdpartylibs"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="jbossws.lib.endorsed.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Client --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-client"> + <attribute name="thirdpartylibs"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="jbossws.client.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Server Lib --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-server-lib"> + <attribute name="thirdpartylibs"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="jbossws.server.lib.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy JBossWS Service --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-native42-sar"> + <attribute name="thirdpartylibs"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="jbossws.service.lib.patternset"/> + </fileset> + </copy> + <unzip dest=&quot;(a){targetdir}/jbossws-context.war&quot; overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="**/jbossws-context.war"/> + </fileset> + </unzip> + <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="**/jbossws-native42-beans.xml"/> + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="**/standard-jaxrpc-*-config.xml"/> + <include name="**/standard-jaxws-*-config.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-jbossws-native50-sar"> + <attribute name="thirdpartylibs"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <patternset refid="jbossws.service.lib.patternset"/> + </fileset> + </copy> + <unzip dest=&quot;(a){targetdir}/jbossws-context.war&quot; overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="**/jbossws-context.war"/> + </fileset> + </unzip> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="**/standard-jaxrpc-*-config.xml"/> + <include name="**/standard-jaxws-*-config.xml"/> + <include name="**/jbossws-native50-beans.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy JBossWS --> + <!-- ================================================================== --> + + <!-- JDK Detection --> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <target name="deploy-jbossws-native42" depends="deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartylibs="${thirdpartylibs}"/> + <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartylibs="${thirdpartylibs}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartylibs="${thirdpartylibs}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartylibs="${thirdpartylibs}"/> + <macro-deploy-jbossws-native42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartylibs="${thirdpartylibs}"/> + </target> + + <target name="deploy-jbossws-native50" depends="deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartylibs="${thirdpartylibs}"/> + <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartylibs="${thirdpartylibs}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartylibs="${thirdpartylibs}"/> + <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartylibs="${thirdpartylibs}"/> + <macro-deploy-jbossws-native50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartylibs="${thirdpartylibs}"/> + </target> + + <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartylibs="${thirdpartylibs}"/> + </target> + + <!-- ================================================================== --> + <!-- Undeploy JBossWS --> + <!-- ================================================================== --> + + <macrodef name="macro-undeploy-jbossws"> + <attribute name="targetdir"/> + <sequential> + <loadfile property="jbossws.undeploy.files" srcfile=&quot;(a){targetdir}/jbossws.deployed.files&quot; failonerror="false"/> + <loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/> + <delete> + <fileset dir="@{targetdir}/../../../.." includes="${jbossws.undeploy.files}"/> + </delete> + </sequential> + </macrodef> + +</project> \ No newline at end of file Property changes on: stack/native/trunk/ant-import/jbossws-deploy-macros.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/ant-import/jbossws.default.undeploy.files =================================================================== --- stack/native/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 10:52:40 UTC (rev 5914) +++ stack/native/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 14:02:15 UTC (rev 5915) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar \ No newline at end of file +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-client.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/default/lib/jboss-jaxrpc.jar server/default/lib/jboss-jaxws-ext.jar server/default/lib/jboss-jaxws.jar server/default/lib/jboss-saaj.jar server/default/lib/jbossws-common.jar server/default/lib/jbossws-framework.jar server/default/lib/jbossws-spi.jar server/default/deploy/jbossws.sar \ No newline at end of file Deleted: stack/native/trunk/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/trunk/ant-import/macros-deploy-native.xml 2008-03-11 10:52:40 UTC (rev 5914) +++ stack/native/trunk/ant-import/macros-deploy-native.xml 2008-03-11 14:02:15 UTC (rev 5915) @@ -1,380 +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: macros-deploy-native.xml 4081 2007-08-02 09:23:17Z thomas.diesler(a)jboss.com $ --> - -<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-client.jar"/> - <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-tools.jar"/> - <include name="jaxws-rt.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - <include name="policy.jar"/> - <include name="stax-ex.jar"/> - <include name="streambuffer.jar"/> - <include name="wsdl4j.jar"/> - </patternset> - - <patternset id="lib.patternset"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </patternset> - - <patternset id="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="server.lib.patternset"> - <include name="jbossws-common.jar"/> - <include name="jbossws-framework.jar"/> - <include name="jbossws-spi.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-saaj.jar"/> - </patternset> - - <!-- ================================================================== --> - <!-- Deploy Endorsed --> - <!-- ================================================================== --> - - <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 --> - <macrodef name="macro-deploy-endorsed"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <mkdir dir="${deploy.dir}/lib/endorsed"/> - <copy todir="${deploy.dir}/lib/endorsed" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.endorsed.patternset"/> - </fileset> - <fileset dir="@{stacklibs}"> - <patternset refid="lib.endorsed.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- 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.deployed.files"/> - <copy todir="@{jbosshome}" overwrite="true"> - <fileset refid="jbossws.deploy.files"/> - </copy> - <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> - - <!-- Write jbossws.deployed.files --> - <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> - <replace file="${deploy.dir}/jbossws.deployed.files" token=";" value=" "/> - <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; file="${deploy.dir}/jbossws.deployed.files" 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.deployed.files&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.1 --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-native421"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> - - <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> - - <!-- BIN SCRIPTS --> - <mkdir dir="${deploy.dir}/bin"/> - <unzip dest="${deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; - - <!-- 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"/> - <include name="jbossws-jboss421.jar"/> - <include name="jboss-xml-binding.jar"/> - </fileset> - </copy> - - <!-- LIB JARS --> - <mkdir dir="${deploy.dir}/lib"/> - <copy todir="${deploy.dir}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <patternset refid="lib.patternset"/> - <include name="jboss-xml-binding.jar"/> - </fileset> - </copy> - - <!-- SERVER LIB JARS --> - <mkdir dir="${deploy.dir}/server/${jboss.server.instance}/lib"/> - <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jbossws-jboss421.jar"/> - </fileset> - </copy> - - <macro-deploy-jbossws jbosshome="${jboss421.home}" sarname="jbossws-native42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-native421"> - <sequential> - <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> - <macro-undeploy-jbossws jbosshome="${jboss421.home}"/> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deployment JBoss-4.2.x --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-native42x"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - - <!-- BIN SCRIPTS --> - <mkdir dir="${deploy.dir}/bin"/> - <unzip dest="${deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; - - <!-- 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> - - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deployment JBoss-4.2.2 --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-native422"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-native42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-jbossws jbosshome="${jboss422.home}" sarname="jbossws-native42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-native422"> - <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-native423"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-native42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-jbossws jbosshome="${jboss423.home}" sarname="jbossws-native42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-native423"> - <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-native50x"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - - <!-- BIN SCRIPTS --> - <mkdir dir="${deploy.dir}/bin"/> - <unzip dest="${deploy.dir}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; - - <!-- 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-native500"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> - <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-native50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-jbossws jbosshome="${jboss500.home}" sarname="jbossws-native50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-native500"> - <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-native501"> - <attribute name="stacklibs"/> - <attribute name="thirdpartylibs"/> - <sequential> - <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-native50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - <macro-deploy-jbossws jbosshome="${jboss501.home}" sarname="jbossws-native50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> - </sequential> - </macrodef> - - <macrodef name="macro-undeploy-native501"> - <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/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-03-11 10:52:40 UTC (rev 5914) +++ stack/native/trunk/build.xml 2008-03-11 14:02:15 UTC (rev 5915) @@ -93,7 +93,8 @@ <import file="${basedir}/ant-import/build-setup.xml"/> <import file="${basedir}/ant-import/build-bin-dist.xml"/> - <import file="${basedir}/ant-import/build-deploy.xml"/> + <import file="${basedir}/ant-import/build-deploy42.xml"/> + <import file="${basedir}/ant-import/build-deploy50.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> <import file="${basedir}/ant-import/build-thirdparty.xml"/> <import file="${basedir}/ant-import-tests/build-testsuite.xml"/> @@ -110,6 +111,7 @@ <property name="core.output.classes.dir" value="${core.output.dir}/classes"/> <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> + <property name="core.output.resources.dir" value="${core.output.dir}/resources"/> <target name="init" depends="prepare,thirdparty"> </target> @@ -126,7 +128,7 @@ | documentation compiles. --> - <target name="compile" depends="init,compile-classes,compile-etc" + <target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/> <!-- Compile java sources --> @@ -171,6 +173,41 @@ </copy> </target> + <!-- Compile resource files --> + <target name="compile-resources" depends="init"> + + <!-- Concat jbossws-native50-beans.xml --> + <mkdir dir="${core.output.resources.dir}"/> + <concat destfile="${core.output.resources.dir}/jbossws-native50-beans.xml"> + <header trimleading="yes"> + &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; + </header> + <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; + </footer> + </concat> + + <!-- Concat jboss-beans.xml --> + <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> + <concat destfile="${core.output.resources.dir}/jbossws-native42-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="${core.resources.dir}/jbossws-native-config.xml"/> + <fileset file="${core.output.resources.dir}/jbossws-jboss42-config.xml"/> + <footer trimleading="yes"> + &lt;/deployment&gt; + </footer> + </concat> + + <copy todir="${core.output.resources.dir}"> + <fileset dir="${core.resources.dir}/standard-config"> + <include name="standard-*-config.xml"/> + </fileset> + </copy> + </target> + <!-- ================================================================== --> <!-- Archives --> <!-- ================================================================== --> @@ -178,14 +215,8 @@ <!-- | Build all jar files. --> - <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files."> - </target> + <target name="jars" depends="compile" description="Builds all jar files."> - <!-- - | Build all jar files. - --> - <target name="jars-common" depends="compile"> - <!-- Build jboss-jaxrpc.jar --> <mkdir dir="${core.output.lib.dir}"/> <jar jarfile="${core.output.lib.dir}/jboss-jaxrpc.jar" manifest="${core.output.etc.dir}/default.mf"> @@ -332,89 +363,6 @@ </target> - <target name="jars-jboss50" depends="jars-common"> - - <!-- Concat jbossws-beans.xml --> - <concat destfile="${core.output.lib.dir}/jbossws-native50/jbossws-beans.xml"> - <header trimleading="yes"> - &lt;deployment xmlns="urn:jboss:bean-deployer:2.0"&gt; - </header> - <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> - </concat> - - <!-- Build jbossws-native50.sar --> - <jar jarfile="${core.output.lib.dir}/jbossws-native50.sar" manifest="${core.output.etc.dir}/default.mf"> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-context.war"/> - <include name="jbossws-core.jar"/> - </fileset> - <fileset dir="${core.dir}/thirdparty"> - <include name="policy.jar"/> - <include name="wsdl4j.jar"/> - <include name="xmlsec.jar"/> - <include name="jboss-jaxb-intros.jar"/> - </fileset> - <metainf dir="${core.dir}/src/main/resources/standard-config"> - <include name="standard-*-config.xml"/> - </metainf> - <metainf dir="${core.output.lib.dir}/jbossws-native50"> - <include name="jbossws-beans.xml"/> - </metainf> - </jar> - - </target> - - <target name="jars-jboss42" depends="jars-common"> - - <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> - - <!-- Concat jboss-beans.xml --> - <concat destfile="${core.output.lib.dir}/jbossws-native42/jbossws.beans/META-INF/jboss-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="${core.resources.dir}/jbossws-native-config.xml"/> - <fileset file="${core.output.dir}/resources/jbossws-jboss42-config.xml"/> - <footer trimleading="yes"> - &lt;/deployment&gt; - </footer> - </concat> - - <!-- Build jbossws-native42.sar --> - <jar jarfile="${core.output.lib.dir}/jbossws-native42.sar" manifest="${core.output.etc.dir}/default.mf"> - <fileset dir="${core.output.lib.dir}"> - <include name="jbossws-context.war"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-jaxws-ext.jar"/> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-core.jar"/> - </fileset> - <fileset dir="${core.dir}/thirdparty"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="policy.jar"/> - <include name="stax-api.jar"/> - <include name="wsdl4j.jar"/> - <include name="xmlsec.jar"/> - <include name="wstx.jar"/> - <include name="jboss-jaxb-intros.jar"/> - </fileset> - <fileset dir="${core.output.lib.dir}/jbossws-native42"> - <include name="jbossws.beans/**"/> - </fileset> - <metainf dir="${core.output.dir}/resources/jbossws-jboss42.sar/META-INF"> - <include name="jboss-service.xml"/> - </metainf> - <metainf dir="${core.dir}/src/main/resources/standard-config"> - <include name="standard-*-config.xml"/> - </metainf> - </jar> - </target> - <!-- ================================================================== --> <!-- Documentation --> <!-- ================================================================== --> Modified: stack/native/trunk/src/main/etc/component-info.xml =================================================================== --- stack/native/trunk/src/main/etc/component-info.xml 2008-03-11 10:52:40 UTC (rev 5914) +++ stack/native/trunk/src/main/etc/component-info.xml 2008-03-11 14:02:15 UTC (rev 5915) @@ -17,7 +17,8 @@ <artifact id="standard-jaxrpc-endpoint-config.xml"/> <artifact id="standard-jaxws-client-config.xml"/> <artifact id="standard-jaxws-endpoint-config.xml"/> - <artifact id="jbossws-native-config.xml"/> + <artifact id="jbossws-native50-beans.xml"/> + <artifact id="jbossws-deploy-macros.xml"/> <artifact id="wsrunclient.bat"/> <artifact id="wsrunclient.sh"/> <artifact id="wstools.bat"/>