Author: heiko.braun(a)jboss.com Date: 2007-08-01 10:51:50 -0400 (Wed, 01 Aug 2007) New Revision: 4056 Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/integration/sunri/build.xml trunk/integration/xfire/ant-import/macros-deploy-xfire.xml trunk/integration/xfire/build.xml Log: jbossws-context deployed with jboss-*.sar Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-01 14:34:12 UTC (rev 4055) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-01 14:51:50 UTC (rev 4056) @@ -71,8 +71,7 @@ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){jbosslibs}/jbossws-jboss50-deployer.zip&quot;/&gt; <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri50.sar&quot;/&gt; - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file=&quot;(a){stacklibs}/jbossws-context.war&quot; overwrite="true"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){stacklibs}/jbossws-sunri50.sar&quot;/&gt; <!-- Deploy juddi-service.sar --> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-08-01 14:34:12 UTC (rev 4055) +++ trunk/integration/sunri/build.xml 2007-08-01 14:51:50 UTC (rev 4056) @@ -160,11 +160,11 @@ <!-- Build jbossws-sunri50.sar --> <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf"> - <!-- + <fileset dir="${sunri.output.lib.dir}"> <include name="jbossws-context.war"/> </fileset> - --> + <fileset dir="${spi.dir}/thirdparty"> <include name="jaxrpc-api.jar"/> </fileset> Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml =================================================================== --- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-01 14:34:12 UTC (rev 4055) +++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-01 14:51:50 UTC (rev 4056) @@ -63,8 +63,7 @@ <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){jbosslibs}/jbossws-jboss50-deployer.zip&quot;/&gt; <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src=&quot;(a){stacklibs}/jbossws-xfire50.sar&quot;/&gt; - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file=&quot;(a){stacklibs}/jbossws-context.war&quot; overwrite="true"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-xfire.sar" src=&quot;(a){stacklibs}/jbossws-xfire50.sar&quot;/&gt; <!-- Deploy juddi-service.sar --> <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-08-01 14:34:12 UTC (rev 4055) +++ trunk/integration/xfire/build.xml 2007-08-01 14:51:50 UTC (rev 4056) @@ -146,11 +146,11 @@ <!-- Build jbosswsri.sar --> <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire50.sar" manifest="${xfire.output.etc.dir}/default.mf"> - <!-- [JBAS-4379] MC beans deployed twice because of jacc service + <fileset dir="${xfire.output.lib.dir}"> - <include name="jbossws-context.war"/> + <include name="jbossws-context.war"/> </fileset> - --> + <fileset dir="${spi.dir}/thirdparty"> <include name="jaxrpc-api.jar"/> </fileset>