[jbossws-commits] JBossWS SVN: r7537 - in stack/cxf/trunk: modules/resources/src/main/resources and 4 other directories.

Author: richard.opalka(a)jboss.com Date: 2008-06-13 11:01:27 -0400 (Fri, 13 Jun 2008) New Revision: 7537 Added: stack/cxf/trunk/modules/resources/src/main/resources/resources/ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Removed: stack/cxf/trunk/modules/resources/src/main/resources/bin/jbossws-default-deploy.conf stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/src/main/distro/build.xml stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml Log: [JBWS-2231] sync trunk with QA branch - 'svn merge -r 7530:7534 https://svn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws-cxf-3.0.2&... Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2008-06-13 14:59:39 UTC (rev 7536) +++ stack/cxf/trunk/build.xml 2008-06-13 15:01:27 UTC (rev 7537) @@ -24,14 +24,14 @@ <property name="stack.management.dir" value="${stack.modules.dir}/management"/> <property name="stack.client.dir" value="${stack.modules.dir}/client"/> <property name="stack.server.dir" value="${stack.modules.dir}/server"/> - + <property name="stack.resources.dir" value="${stack.dir}/modules/resources/src/main/resources"/> <property name="deploy.artifacts.dir" value="${stack.output.dir}/deploy-artifacts"/> <import file="${stack.distro.dir}/build-setup.xml"/> <import file="${stack.distro.dir}/build-deploy.xml"/> - <import file="${stack.distro.dir}/jbossws-deploy-macros.xml"/> + <import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/> - <property name="jbossws.default.deploy.conf" value="${stack.dir}/modules/resources/src/main/resources/bin/jbossws-default-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/jbossws-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> <!-- ================================================================== --> Deleted: stack/cxf/trunk/modules/resources/src/main/resources/bin/jbossws-default-deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/bin/jbossws-default-deploy.conf 2008-06-13 14:59:39 UTC (rev 7536) +++ stack/cxf/trunk/modules/resources/src/main/resources/bin/jbossws-default-deploy.conf 2008-06-13 15:01:27 UTC (rev 7537) @@ -1 +0,0 @@ -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 Copied: stack/cxf/trunk/modules/resources/src/main/resources/resources (from rev 7534, stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/resources) Deleted: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-06-13 14:53:20 UTC (rev 7534) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-06-13 15:01:27 UTC (rev 7537) @@ -1 +0,0 @@ -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 Copied: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf (from rev 7534, stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf) =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-default-deploy.conf 2008-06-13 15:01:27 UTC (rev 7537) @@ -0,0 +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 server/default/deploy/jbossws.sar \ No newline at end of file Deleted: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-13 14:53:20 UTC (rev 7534) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-13 15:01:27 UTC (rev 7537) @@ -1,387 +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. - 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="**/cxf-*.jar"/> - <include name="**/geronimo-javamail*.jar"/> - <include name="**/geronimo-ws-metadata*.jar"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/jaxb-xjc.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-cxf-client*.jar"/> - <include name="**/jbossws-framework.jar"/> - <include name="**/jbossws-spi.jar"/> - <include name="**/jdom.jar"/> - <include name="**/neethi.jar"/> - <include name="**/saaj-api.jar"/> - <include name="**/saaj-impl.jar"/> - <include name="**/spring-beans.jar"/> - <include name="**/spring-context.jar"/> - <include name="**/spring-core.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/wsdl4j.jar"/> - <include name="**/wss4j.jar"/> - <include name="**/wstx.jar"/> - <include name="**/xml-resolver.jar"/> - <include name="**/XmlSchema.jar"/> - <include name="**/FastInfoset.jar"/> - </patternset> - - <patternset id="jbossws.lib.patternset"> - <include name="**/nothing-to-deploy"/> - </patternset> - - <patternset id="jbossws.lib.endorsed.patternset"> - <include name="**/jaxb-api.jar"/> - </patternset> - - <patternset id="jbossws.server.lib.patternset"> - <include name="**/jaxws-api.jar"/> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> - <include name="**/jbossws-spi.jar"/> - <include name="**/saaj-api.jar"/> - </patternset> - - <patternset id="jbossws.service.lib.patternset"> - <include name="**/cxf-*.jar"/> - <include name="**/geronimo-javamail*.jar"/> - <include name="**/geronimo-ws-metadata*.jar"/> - <include name="**/jaxrpc-api.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/jbossws-cxf-client*.jar"/> - <include name="**/jbossws-cxf-server*.jar"/> - <include name="**/jdom.jar"/> - <include name="**/neethi.jar"/> - <include name="**/saaj-api.jar"/> - <include name="**/saaj-impl.jar"/> - <include name="**/spring-beans.jar"/> - <include name="**/spring-context.jar"/> - <include name="**/spring-core.jar"/> - <include name="**/wsdl4j.jar"/> - <include name="**/wss4j.jar"/> - <include name="**/xml-resolver.jar"/> - <include name="**/xmlsec.jar"/> - <include name="**/XmlSchema.jar"/> - <include name="**/FastInfoset.jar"/> - </patternset> - - <!-- ================================================================== --> - <!-- Deploy Bin --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-bin"> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/bin"> - <patternset refid="jbossws.bin.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Lib --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-lib42"> - <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> - - <macrodef name="macro-deploy-jbossws-lib50"> - <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"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/wstx.jar"/> - </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"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.client.patternset"/> - <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Server Lib --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-server-lib42"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.server.lib.patternset"/> - <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-server-lib50"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <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="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true"> - <fileset dir="@{artifactsdir}/lib"> - <patternset refid="jbossws.service.lib.patternset"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/wstx.jar"/> - </fileset> - </copy> - <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; - <fileset dir="@{artifactsdir}/lib"> - <include name="**/jbossws-cxf-management.war"/> - </fileset> - </unzip> - <copy todir=&quot;(a){targetdir}/jbossws.beans&quot;&gt; - <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; - <include name="META-INF/**"/> - </fileset> - </copy> - <copy todir="@{targetdir}/META-INF"> - <fileset dir=&quot;(a){artifactsdir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; - </copy> - <copy todir="@{targetdir}/META-INF"> - <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF&quot;/&gt; - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-cxf50-sar"> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/lib"> - <patternset refid="jbossws.service.lib.patternset"/> - </fileset> - </copy> - <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; - <fileset dir="@{artifactsdir}/lib"> - <include name="**/jbossws-cxf-management.war"/> - </fileset> - </unzip> - <copy todir="@{targetdir}"> - <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; - <include name="META-INF/**"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Deployers --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-deployers50"> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/lib"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> - <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - </fileset> - </copy> - <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> - <include name="**/jbossws-deployer-beans.xml"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Deploy --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-deploy50"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest=&quot;(a){targetdir}/jbossws.sar&quot; src=&quot;@{thirdpartydir}/jbossws-(a){jbossid}-container.jar&quot;&gt; - <patternset> - <include name="META-INF/jbossws-container-beans.xml"/> - </patternset> - </unzip> - <move file=&quot;(a){targetdir}/jbossws.sar/META-INF/jbossws-container-beans.xml&quot; todir="@{targetdir}"/> - </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" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - </target> - - <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - </target> - - <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${artifactsdir}/lib"/> - </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.server.home" value="@{targetdir}/../.."/> - <property name="jboss.home" value="${jboss.server.home}/../.."/> - <available property="jboss.undeploy.client" file="${jboss.home}/client"/> - <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - - <!-- delete stale container integration jars --> - <delete> - <fileset dir="${jboss.server.home}"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - <fileset dir="${jboss.home}/client"> - <include name="jbossws-jboss*.jar"/> - </fileset> - </delete> - - <!-- delete content of last deployment --> - <delete> - <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> - </delete> - - <!-- delete jbossws.sar --> - <delete dir="@{targetdir}"/> - - </sequential> - </macrodef> - -</project> Copied: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml (from rev 7534, stack/cxf/branches/jbossws-cxf-3.0.2/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml) =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml (rev 0) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-06-13 15:01:27 UTC (rev 7537) @@ -0,0 +1,387 @@ +<?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="**/cxf-*.jar"/> + <include name="**/geronimo-javamail*.jar"/> + <include name="**/geronimo-ws-metadata*.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/jaxb-xjc.jar"/> + <include name="**/jaxws-api.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-cxf-client*.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/jdom.jar"/> + <include name="**/neethi.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/saaj-impl.jar"/> + <include name="**/spring-beans.jar"/> + <include name="**/spring-context.jar"/> + <include name="**/spring-core.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/wss4j.jar"/> + <include name="**/wstx.jar"/> + <include name="**/xml-resolver.jar"/> + <include name="**/XmlSchema.jar"/> + <include name="**/FastInfoset.jar"/> + </patternset> + + <patternset id="jbossws.lib.patternset"> + <include name="**/nothing-to-deploy"/> + </patternset> + + <patternset id="jbossws.lib.endorsed.patternset"> + <include name="**/jaxb-api.jar"/> + </patternset> + + <patternset id="jbossws.server.lib.patternset"> + <include name="**/jaxws-api.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/saaj-api.jar"/> + </patternset> + + <patternset id="jbossws.service.lib.patternset"> + <include name="**/cxf-*.jar"/> + <include name="**/geronimo-javamail*.jar"/> + <include name="**/geronimo-ws-metadata*.jar"/> + <include name="**/jaxrpc-api.jar"/> + <include name="**/jaxws-api.jar"/> + <include name="**/jbossws-cxf-client*.jar"/> + <include name="**/jbossws-cxf-server*.jar"/> + <include name="**/jdom.jar"/> + <include name="**/neethi.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/saaj-impl.jar"/> + <include name="**/spring-beans.jar"/> + <include name="**/spring-context.jar"/> + <include name="**/spring-core.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/wss4j.jar"/> + <include name="**/xml-resolver.jar"/> + <include name="**/xmlsec.jar"/> + <include name="**/XmlSchema.jar"/> + <include name="**/FastInfoset.jar"/> + </patternset> + + <!-- ================================================================== --> + <!-- Deploy Bin --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-bin"> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/bin"> + <patternset refid="jbossws.bin.patternset"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Lib --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-lib42"> + <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> + + <macrodef name="macro-deploy-jbossws-lib50"> + <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"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> + </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"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.client.patternset"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Server Lib --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-server-lib42"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{thirdpartydir}"> + <patternset refid="jbossws.server.lib.patternset"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + </fileset> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-jbossws-server-lib50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <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="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true"> + <fileset dir="@{artifactsdir}/lib"> + <patternset refid="jbossws.service.lib.patternset"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> + </fileset> + </copy> + <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-cxf-management.war"/> + </fileset> + </unzip> + <copy todir=&quot;(a){targetdir}/jbossws.beans&quot;&gt; + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; + <include name="META-INF/**"/> + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF"> + <fileset dir=&quot;(a){artifactsdir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; + </copy> + <copy todir="@{targetdir}/META-INF"> + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF&quot;/&gt; + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-jbossws-cxf50-sar"> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/lib"> + <patternset refid="jbossws.service.lib.patternset"/> + </fileset> + </copy> + <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-cxf-management.war"/> + </fileset> + </unzip> + <copy todir="@{targetdir}"> + <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; + <include name="META-INF/**"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Deployers --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deployers50"> + <attribute name="artifactsdir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <copy todir="@{targetdir}" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/lib"> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; + </fileset> + </copy> + <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> + <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> + <include name="**/jbossws-deployer-beans.xml"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deploy Deploy --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-jbossws-deploy50"> + <attribute name="thirdpartydir"/> + <attribute name="targetdir"/> + <attribute name="jbossid"/> + <sequential> + <mkdir dir="@{targetdir}"/> + <unzip dest=&quot;(a){targetdir}/jbossws.sar&quot; src=&quot;@{thirdpartydir}/jbossws-(a){jbossid}-container.jar&quot;&gt; + <patternset> + <include name="META-INF/jbossws-container-beans.xml"/> + </patternset> + </unzip> + <move file=&quot;(a){targetdir}/jbossws.sar/META-INF/jbossws-container-beans.xml&quot; todir="@{targetdir}"/> + </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" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + </target> + + <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed"> + <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> + <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> + <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> + </target> + + <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> + <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${artifactsdir}/lib"/> + </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.server.home" value="@{targetdir}/../.."/> + <property name="jboss.home" value="${jboss.server.home}/../.."/> + <available property="jboss.undeploy.client" file="${jboss.home}/client"/> + <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> + + <!-- delete stale container integration jars --> + <delete> + <fileset dir="${jboss.server.home}"> + <include name="**/jbossws-jboss*.jar"/> + </fileset> + <fileset dir="${jboss.home}/client"> + <include name="jbossws-jboss*.jar"/> + </fileset> + </delete> + + <!-- delete content of last deployment --> + <delete> + <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> + </delete> + + <!-- delete jbossws.sar --> + <delete dir="@{targetdir}"/> + + </sequential> + </macrodef> + +</project> Modified: stack/cxf/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml 2008-06-13 14:59:39 UTC (rev 7536) +++ stack/cxf/trunk/src/main/distro/build.xml 2008-06-13 15:01:27 UTC (rev 7537) @@ -23,9 +23,8 @@ <property name="thirdparty.dir" value="${basedir}/deploy/lib"/> <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${output.dir}"/> - <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="jbossws.default.deploy.conf" value="${basedir}/../../../modules/resources/src/main/resources/bin/jbossws-default-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> <!-- Check if ant.properties is available --> Deleted: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-06-13 14:59:39 UTC (rev 7536) +++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-06-13 15:01:27 UTC (rev 7537) @@ -1,387 +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. - 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="**/cxf-*.jar"/> - <include name="**/geronimo-javamail*.jar"/> - <include name="**/geronimo-ws-metadata*.jar"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/jaxb-xjc.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-cxf-client*.jar"/> - <include name="**/jbossws-framework.jar"/> - <include name="**/jbossws-spi.jar"/> - <include name="**/jdom.jar"/> - <include name="**/neethi.jar"/> - <include name="**/saaj-api.jar"/> - <include name="**/saaj-impl.jar"/> - <include name="**/spring-beans.jar"/> - <include name="**/spring-context.jar"/> - <include name="**/spring-core.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/wsdl4j.jar"/> - <include name="**/wss4j.jar"/> - <include name="**/wstx.jar"/> - <include name="**/xml-resolver.jar"/> - <include name="**/XmlSchema.jar"/> - <include name="**/FastInfoset.jar"/> - </patternset> - - <patternset id="jbossws.lib.patternset"> - <include name="**/nothing-to-deploy"/> - </patternset> - - <patternset id="jbossws.lib.endorsed.patternset"> - <include name="**/jaxb-api.jar"/> - </patternset> - - <patternset id="jbossws.server.lib.patternset"> - <include name="**/jaxws-api.jar"/> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> - <include name="**/jbossws-spi.jar"/> - <include name="**/saaj-api.jar"/> - </patternset> - - <patternset id="jbossws.service.lib.patternset"> - <include name="**/cxf-*.jar"/> - <include name="**/geronimo-javamail*.jar"/> - <include name="**/geronimo-ws-metadata*.jar"/> - <include name="**/jaxrpc-api.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/jbossws-cxf-client*.jar"/> - <include name="**/jbossws-cxf-server*.jar"/> - <include name="**/jdom.jar"/> - <include name="**/neethi.jar"/> - <include name="**/saaj-api.jar"/> - <include name="**/saaj-impl.jar"/> - <include name="**/spring-beans.jar"/> - <include name="**/spring-context.jar"/> - <include name="**/spring-core.jar"/> - <include name="**/wsdl4j.jar"/> - <include name="**/wss4j.jar"/> - <include name="**/xml-resolver.jar"/> - <include name="**/xmlsec.jar"/> - <include name="**/XmlSchema.jar"/> - <include name="**/FastInfoset.jar"/> - </patternset> - - <!-- ================================================================== --> - <!-- Deploy Bin --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-bin"> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/bin"> - <patternset refid="jbossws.bin.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Lib --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-lib42"> - <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> - - <macrodef name="macro-deploy-jbossws-lib50"> - <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"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/wstx.jar"/> - </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"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.client.patternset"/> - <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Server Lib --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-server-lib42"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.server.lib.patternset"/> - <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - </fileset> - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-server-lib50"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <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="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true"> - <fileset dir="@{artifactsdir}/lib"> - <patternset refid="jbossws.service.lib.patternset"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/wstx.jar"/> - </fileset> - </copy> - <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; - <fileset dir="@{artifactsdir}/lib"> - <include name="**/jbossws-cxf-management.war"/> - </fileset> - </unzip> - <copy todir=&quot;(a){targetdir}/jbossws.beans&quot;&gt; - <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; - <include name="META-INF/**"/> - </fileset> - </copy> - <copy todir="@{targetdir}/META-INF"> - <fileset dir=&quot;(a){artifactsdir}/resources/jbossws-cxf.sar/META-INF&quot;/&gt; - </copy> - <copy todir="@{targetdir}/META-INF"> - <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws-jboss42.sar/META-INF&quot;/&gt; - </copy> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-cxf50-sar"> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/lib"> - <patternset refid="jbossws.service.lib.patternset"/> - </fileset> - </copy> - <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; - <fileset dir="@{artifactsdir}/lib"> - <include name="**/jbossws-cxf-management.war"/> - </fileset> - </unzip> - <copy todir="@{targetdir}"> - <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; - <include name="META-INF/**"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Deployers --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-deployers50"> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/lib"> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-framework.jar"/> - <include name=&quot;**/jbossws-(a){jbossid}.jar&quot;/&gt; - </fileset> - </copy> - <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}"> - <include name="**/jbossws-deployer-beans.xml"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Deploy --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-deploy50"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest=&quot;(a){targetdir}/jbossws.sar&quot; src=&quot;@{thirdpartydir}/jbossws-(a){jbossid}-container.jar&quot;&gt; - <patternset> - <include name="META-INF/jbossws-container-beans.xml"/> - </patternset> - </unzip> - <move file=&quot;(a){targetdir}/jbossws.sar/META-INF/jbossws-container-beans.xml&quot; todir="@{targetdir}"/> - </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" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - </target> - - <target name="deploy-jbossws-cxf50" depends="deploy-jbossws-endorsed"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${artifactsdir}/lib"/> - <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${artifactsdir}/lib" jbossid="${jbossid}"/> - </target> - - <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6"> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${artifactsdir}/lib"/> - </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.server.home" value="@{targetdir}/../.."/> - <property name="jboss.home" value="${jboss.server.home}/../.."/> - <available property="jboss.undeploy.client" file="${jboss.home}/client"/> - <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - - <!-- delete stale container integration jars --> - <delete> - <fileset dir="${jboss.server.home}"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - <fileset dir="${jboss.home}/client"> - <include name="jbossws-jboss*.jar"/> - </fileset> - </delete> - - <!-- delete content of last deployment --> - <delete> - <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> - </delete> - - <!-- delete jbossws.sar --> - <delete dir="@{targetdir}"/> - - </sequential> - </macrodef> - -</project> Modified: stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-06-13 14:59:39 UTC (rev 7536) +++ stack/cxf/trunk/src/main/scripts/assembly-bin-dist.xml 2008-06-13 15:01:27 UTC (rev 7537) @@ -31,16 +31,16 @@ <includes> <include>build-deploy.xml</include> <include>build-setup.xml</include> - <include>jbossws-deploy-macros.xml</include> <include>build-project-gen.xml</include> <include>user-project-build.xml</include> </includes> </fileSet> <fileSet> - <directory>modules/resources/src/main/resources/bin</directory> + <directory>modules/resources/src/main/resources/resources</directory> <outputDirectory>build</outputDirectory> <includes> <include>jbossws-default-deploy.conf</include> + <include>jbossws-deploy-macros.xml</include> </includes> </fileSet> <!-- docs -->