Author: thomas.diesler(a)jboss.com Date: 2008-02-14 07:16:41 -0500 (Thu, 14 Feb 2008) New Revision: 5670 Added: stack/native/trunk/ant-import/macros-deploy-framework.xml stack/native/trunk/ant-import/macros-deploy-native.xml Modified: stack/native/trunk/ant-import/ stack/native/trunk/ant-import/build-bin-dist.xml stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/build-thirdparty.xml stack/native/trunk/src/main/distro/bin-dist-build.xml stack/native/trunk/src/main/distro/bin-dist-deploy.xml stack/native/trunk/version.properties Log: Rollback: [JBWS-1982] Simplify deploy/undeploy cycles for different stacks Property changes on: stack/native/trunk/ant-import ___________________________________________________________________ Name: svn:ignore - macros-deploy-cxf.xml macros-deploy-framework.xml macros-deploy-native.xml macros-deploy-sunri.xml Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-14 11:58:21 UTC (rev 5669) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2008-02-14 12:16:41 UTC (rev 5670) @@ -51,10 +51,8 @@ <!-- build --> <copy todir="${bindist.build.dir}"> <fileset dir="${core.dir}/ant-import"> - <include name="macros-deploy-cxf.xml"/> - <include name="macros-deploy-sunri.xml"/> - <include name="macros-deploy-native.xml"/> <include name="macros-deploy-framework.xml"/> + <include name="macros-deploy-native.xml"/> </fileset> <fileset dir="${core.distro.dir}"> <include name="user-project-build.xml"/> Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2008-02-14 11:58:21 UTC (rev 5669) +++ stack/native/trunk/ant-import/build-deploy.xml 2008-02-14 12:16:41 UTC (rev 5670) @@ -13,10 +13,8 @@ <project> - <import file="${core.dir}/ant-import/macros-deploy-framework.xml" optional="true"/> - <import file="${core.dir}/ant-import/macros-deploy-cxf.xml" optional="true"/> - <import file="${core.dir}/ant-import/macros-deploy-sunri.xml" optional="true"/> - <import file="${core.dir}/ant-import/macros-deploy-native.xml" optional="true"/> + <import file="${core.dir}/ant-import/macros-deploy-framework.xml"/> + <import file="${core.dir}/ant-import/macros-deploy-native.xml"/> <!-- ================================================================== --> <!-- Deployment JBoss421 --> @@ -33,16 +31,14 @@ </target> <!-- Remove jbossws from jboss421 --> - <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws from jboss421"> + <target name="undeploy-jboss421" depends="prepare,undeploy-jboss421-endorsed" description="Remove jbossws from jboss421"> <macro-undeploy-native421/> - <macro-undeploy-endorsed jbosshome="${jboss421.home}"/> <macro-undeploy-framework jbosshome="${jboss421.home}"/> </target> + <target name="undeploy-jboss421-endorsed" depends="prepare"> + <macro-undeploy-endorsed jbosshome="${jboss421.home}"/> + </target> - <!-- ================================================================== --> - <!-- Deployment JBoss422 --> - <!-- ================================================================== --> - <!-- 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"/> @@ -55,19 +51,15 @@ </target> <!-- Remove jbossws from jboss422 --> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422"> + <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws from jboss422"> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> - <macro-undeploy-cxf422/> - <macro-undeploy-sunri422/> <macro-undeploy-native422/> <macro-undeploy-framework jbosshome="${jboss422.home}"/> + </target> + <target name="undeploy-jboss422-endorsed" depends="prepare"> <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> </target> - <!-- ================================================================== --> - <!-- Deployment JBoss423 --> - <!-- ================================================================== --> - <!-- 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"/> @@ -80,19 +72,15 @@ </target> <!-- Remove jbossws from jboss423 --> - <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423"> + <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws from jboss423"> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> - <macro-undeploy-cxf423/> - <macro-undeploy-sunri423/> <macro-undeploy-native423/> - <macro-undeploy-endorsed jbosshome="${jboss423.home}"/> <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> + <target name="undeploy-jboss423-endorsed" depends="prepare"> + <macro-undeploy-endorsed jbosshome="${jboss423.home}"/> + </target> - <!-- ================================================================== --> - <!-- Deployment JBoss500 --> - <!-- ================================================================== --> - <!-- 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"/> @@ -104,14 +92,15 @@ </target> <!-- Remove jbossws from jboss500 --> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500"> - <macro-undeploy-cxf500/> - <macro-undeploy-sunri500/> + <target name="undeploy-jboss500" depends="prepare,undeploy-jboss500-endorsed" description="Remove jbossws from jboss500"> <macro-undeploy-native500/> - <macro-undeploy-endorsed jbosshome="${jboss500.home}"/> <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> + <target name="undeploy-jboss500-endorsed" depends="prepare"> + <macro-undeploy-endorsed jbosshome="${jboss500.home}"/> + </target> + <!-- ================================================================== --> <!-- Deployment JBoss501 --> <!-- ================================================================== --> @@ -128,11 +117,13 @@ <!-- Remove jbossws from jboss501 --> <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501"> - <macro-undeploy-cxf501/> - <macro-undeploy-sunri501/> <macro-undeploy-native501/> <macro-undeploy-endorsed jbosshome="${jboss501.home}"/> <macro-undeploy-framework jbosshome="${jboss501.home}"/> </target> + <target name="undeploy-jboss501-endorsed" depends="prepare"> + <macro-undeploy-endorsed jbosshome="${jboss501.home}"/> + </target> + </project> Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-14 11:58:21 UTC (rev 5669) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-02-14 12:16:41 UTC (rev 5670) @@ -51,7 +51,6 @@ <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-src.zip" dest="${thirdparty.dir}/jbossws-framework-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-macros/${jbossws-macros}/lib/jbossws-macros-src.zip" dest="${thirdparty.dir}/jbossws-macros-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss40/${jbossws-jboss40}/lib/jbossws-jboss40.jar" dest="${thirdparty.dir}/jbossws-jboss40.jar" usetimestamp="true" verbose="true"/> @@ -124,7 +123,7 @@ <mkdir dir="${thirdparty.dir}/jbpm-bpel"/> <unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/> - <unzip dest="${core.dir}/ant-import" src="${thirdparty.dir}/jbossws-macros-src.zip"/> + <checksum file="${core.dir}/version.properties" fileext=".md5"/> </target> @@ -135,8 +134,9 @@ <!-- A stack MUST NOT have a compile time dependency on jbossws-framework.jar --> <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> - <pathelement location="${thirdparty.dir}/ant.jar"/> - <pathelement location="${thirdparty.dir}/activation.jar"/> + + <pathelement location="${thirdparty.dir}/ant.jar"/> + <pathelement location="${thirdparty.dir}/activation.jar"/> <pathelement location="${thirdparty.dir}/dom4j.jar"/> <pathelement location="${thirdparty.dir}/getopt.jar"/> <pathelement location="${thirdparty.dir}/javassist.jar"/> Copied: stack/native/trunk/ant-import/macros-deploy-framework.xml (from rev 5558, stack/native/trunk/ant-import/macros-deploy-framework.xml) =================================================================== --- stack/native/trunk/ant-import/macros-deploy-framework.xml (rev 0) +++ stack/native/trunk/ant-import/macros-deploy-framework.xml 2008-02-14 12:16:41 UTC (rev 5670) @@ -0,0 +1,72 @@ +<?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-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun(a)jboss.com $ --> + +<project> + + <macrodef name="macro-deploy-framework"> + <attribute name="thirdpartylibs"/> + <attribute name="jbosshome"/> + <sequential> + + <!-- BIN SCRIPTS --> + <unzip dest="@{jbosshome}/bin" src=&quot;(a){thirdpartylibs}/jbossws-framework-scripts.zip&quot;/&gt; + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS--> + <copy todir="@{jbosshome}/client"> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS--> + <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-framework"> + <attribute name="jbosshome"/> + <sequential> + <delete> + <!-- BIN SCRIPTS --> + <fileset dir="@{jbosshome}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + </fileset> + + <!-- CLIENT JARS--> + <fileset dir="@{jbosshome}/client"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + + <!-- SERVER JARS--> + <fileset dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/lib&quot;&gt; + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> + </fileset> + </delete> + </sequential> + </macrodef> + +</project> \ No newline at end of file Copied: stack/native/trunk/ant-import/macros-deploy-native.xml (from rev 5558, stack/native/trunk/ant-import/macros-deploy-native.xml) =================================================================== --- stack/native/trunk/ant-import/macros-deploy-native.xml (rev 0) +++ stack/native/trunk/ant-import/macros-deploy-native.xml 2008-02-14 12:16:41 UTC (rev 5670) @@ -0,0 +1,573 @@ +<?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> + + <!-- ================================================================== --> + <!-- Deploy Endorsed --> + <!-- ================================================================== --> + + <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 --> + <macrodef name="macro-deploy-endorsed"> + <attribute name="jbosshome"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <copy todir="@{jbosshome}/lib/endorsed" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + + <!-- Undeploy API jars from lib/endorsed --> + <macrodef name="macro-undeploy-endorsed"> + <attribute name="jbosshome"/> + <sequential> + <delete> + <fileset dir="@{jbosshome}/lib/endorsed"> + <include name="jaxb-api.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </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"/> + + <!-- BIN SCRIPTS --> + <unzip dest="${jboss421.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; + <chmod dir="${jboss421.home}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss421.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <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="jbossws-jboss421.jar"/> + <include name="jboss-xml-binding.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS --> + <copy todir="${jboss421.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> + <copy todir="${jboss421.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jbossws-jboss421.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; + <mkdir dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native421"> + <sequential> + <fail message="Not available: ${jboss421.available.file}" unless="jboss421.available"/> + <delete> + + <!-- BIN SCRIPTS --> + <fileset dir="${jboss421.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + + <!-- CLIENT JARS --> + <fileset dir="${jboss421.home}/client"> + <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="jbossws-jboss421.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + + <!-- SERVER JARS --> + <fileset dir="${jboss421.home}/lib/endorsed"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="${jboss421.home}/lib"> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + <fileset dir="${jboss421.home}/server/${jboss.server.instance}/lib"> + <include name="jbossws-jboss421.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + </delete> + <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss421.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deployment JBoss-4.2.2 --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-native422"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + + <!-- BIN SCRIPTS --> + <unzip dest="${jboss422.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; + <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss422.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <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="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS --> + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; + <mkdir dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native422"> + <sequential> + + <delete> + + <!-- BIN SCRIPTS --> + <fileset dir="${jboss422.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + + <!-- CLIENT JARS --> + <fileset dir="${jboss422.home}/client"> + <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="jbossws-client.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + + <!-- SERVER JARS --> + <fileset dir="${jboss422.home}/lib/endorsed"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="${jboss422.home}/lib"> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + <fileset dir="${jboss422.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + </delete> + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss422.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + + <!-- ================================================================== --> + <!-- Deployment JBoss-4.2.3 --> + <!-- ================================================================== --> + + <macrodef name="macro-deploy-native423"> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + + <!-- BIN SCRIPTS --> + <unzip dest="${jboss423.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; + <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss423.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <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="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS --> + <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native42.sar&quot;/&gt; + <mkdir dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native423"> + <sequential> + + <delete> + + <!-- BIN SCRIPTS --> + <fileset dir="${jboss423.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + + <!-- CLIENT JARS --> + <fileset dir="${jboss423.home}/client"> + <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="jbossws-client.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + + <!-- SERVER JARS --> + <fileset dir="${jboss423.home}/lib/endorsed"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="${jboss423.home}/lib"> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + <fileset dir="${jboss423.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <!-- Remove only, do not deploy --> + <include name="jbossws-integration.jar"/> + </fileset> + </delete> + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss423.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </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"/> + + <!-- BIN SCRIPTS --> + <unzip dest="${jboss500.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; + <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss500.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="policy.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="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + <copy todir="${jboss500.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS --> + <copy todir="${jboss500.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + + <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native50.sar&quot;/&gt; + <mkdir dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native500"> + <sequential> + <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + + <delete> + <!-- BIN SCRIPTS --> + <fileset dir="${jboss500.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + + <!-- CLIENT JARS --> + <fileset dir="${jboss500.home}/client"> + <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="jbossws-client.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + + <!-- SERVER JARS --> + <fileset dir="${jboss500.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss500.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </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"/> + + <!-- BIN SCRIPTS --> + <unzip dest="${jboss501.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; + <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> + + <!-- CLIENT JARS --> + <copy todir="${jboss501.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="policy.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="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + <copy todir="${jboss501.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + + <!-- SERVER JARS --> + <copy todir="${jboss501.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + + <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-native50.sar&quot;/&gt; + <mkdir dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native501"> + <sequential> + <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + + <delete> + <!-- BIN SCRIPTS --> + <fileset dir="${jboss501.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + + <!-- CLIENT JARS --> + <fileset dir="${jboss501.home}/client"> + <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="jbossws-client.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + + <!-- SERVER JARS --> + <fileset dir="${jboss501.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxws-ext.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + + <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss501.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + +</project> Modified: stack/native/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 11:58:21 UTC (rev 5669) +++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2008-02-14 12:16:41 UTC (rev 5670) @@ -96,10 +96,8 @@ <import file="${basedir}/build/build-deploy.xml"/> <import file="${basedir}/build/build-project-gen.xml"/> - <import file="${basedir}/build/macros-deploy-cxf.xml"/> - <import file="${basedir}/build/macros-deploy-sunri.xml"/> - <import file="${basedir}/build/macros-deploy-native.xml"/> <import file="${basedir}/build/macros-deploy-framework.xml"/> + <import file="${basedir}/build/macros-deploy-native.xml"/> <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> <!-- ================================================================== --> Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 11:58:21 UTC (rev 5669) +++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-14 12:16:41 UTC (rev 5670) @@ -26,16 +26,14 @@ <macro-deploy-endorsed jbosshome="${jboss421.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> - <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws/native from jboss421"> + <target name="undeploy-jboss421" depends="prepare,undeploy-jboss421-endorsed" description="Remove jbossws/native from jboss421"> <macro-undeploy-native421/> <macro-undeploy-framework jbosshome="${jboss421.home}"/> + </target> + <target name="undeploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-undeploy-endorsed jbosshome="${jboss421.home}"/> </target> - <!-- ================================================================== --> - <!-- Deployment JBoss422 --> - <!-- ================================================================== --> - <!-- Deploy jbossws/native to jboss422 --> <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/native to jboss422"> <macro-deploy-native422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> @@ -45,18 +43,14 @@ <macro-deploy-endorsed jbosshome="${jboss422.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> - <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422"> - <macro-undeploy-cxf422/> - <macro-undeploy-sunri422/> + <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/native from jboss422"> <macro-undeploy-native422/> - <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> + <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> + </target> - <!-- ================================================================== --> - <!-- Deployment JBoss423 --> - <!-- ================================================================== --> - <!-- Deploy jbossws/native to jboss423 --> <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/native to jboss423"> <macro-deploy-native423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> @@ -66,19 +60,15 @@ <macro-deploy-endorsed jbosshome="${jboss423.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> - <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423"> - <macro-undeploy-cxf423/> - <macro-undeploy-sunri423/> + <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/native from jboss423"> <macro-undeploy-native423/> - <macro-undeploy-endorsed jbosshome="${jboss423.home}"/> <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> + <target name="undeploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-undeploy-endorsed jbosshome="${jboss423.home}"/> + </target> - <!-- ================================================================== --> - <!-- Deployment JBoss500 --> - <!-- ================================================================== --> - - <!-- Deploy jbossws/native to jboss500 --> + <!-- Deploy jbossws/native to jboss50 --> <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/native to jboss500"> <macro-deploy-native500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss500.home}"/> @@ -87,11 +77,8 @@ <macro-deploy-endorsed jbosshome="${jboss500.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> - <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500"> - <macro-undeploy-cxf500/> - <macro-undeploy-sunri500/> + <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/native from jboss500"> <macro-undeploy-native500/> - <macro-undeploy-endorsed jbosshome="${jboss500.home}"/> <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target> Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2008-02-14 11:58:21 UTC (rev 5669) +++ stack/native/trunk/version.properties 2008-02-14 12:16:41 UTC (rev 5670) @@ -27,7 +27,6 @@ jbossws-spi=snapshot jbossws-common=snapshot jbossws-framework=snapshot -jbossws-macros=1.0.0.GA jbossws-jboss40=4.0.5.SP2 jbossws-jboss42=4.2.1.GA