Author: thomas.diesler(a)jboss.com Date: 2008-02-25 08:18:25 -0500 (Mon, 25 Feb 2008) New Revision: 5796 Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml Log: [JBWS-1982] Simplify deploy/undeploy cycles for different stacks Use jbossws.sar for all stacks Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-25 12:55:56 UTC (rev 5795) +++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-25 13:18:25 UTC (rev 5796) @@ -46,8 +46,8 @@ </copy> <!--SERVER JARS --> - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> - <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src=&quot;(a){stacklibs}/jbossws-cxf42.sar&quot;/&gt; + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-cxf42.sar&quot;/&gt; <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; @@ -110,8 +110,8 @@ </copy> <!--SERVER JARS --> - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> - <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src=&quot;(a){stacklibs}/jbossws-cxf42.sar&quot;/&gt; + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-cxf42.sar&quot;/&gt; <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; @@ -182,8 +182,8 @@ </fileset> </copy> - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> - <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src=&quot;(a){stacklibs}/jbossws-cxf50.sar&quot;/&gt; + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-cxf50.sar&quot;/&gt; <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; @@ -254,8 +254,8 @@ </fileset> </copy> - <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar"/> - <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws-cxf.sar" src=&quot;(a){stacklibs}/jbossws-cxf50.sar&quot;/&gt; + <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/jbossws.sar" src=&quot;(a){stacklibs}/jbossws-cxf50.sar&quot;/&gt; <mkdir dir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${cxf.output.deploy.dir}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt;