[jbossws-commits] JBossWS SVN: r5919 - stack/cxf/trunk/ant-import.

Author: thomas.diesler(a)jboss.com Date: 2008-03-11 10:44:08 -0400 (Tue, 11 Mar 2008) New Revision: 5919 Added: stack/cxf/trunk/ant-import/jbossws-default-deploy.conf Removed: stack/cxf/trunk/ant-import/jbossws.default.undeploy.files Modified: stack/cxf/trunk/ant-import/build-deploy.xml stack/cxf/trunk/ant-import/macros-deploy-cxf.xml Log: Use jbossws-deploy.conf Modified: stack/cxf/trunk/ant-import/build-deploy.xml =================================================================== --- stack/cxf/trunk/ant-import/build-deploy.xml 2008-03-11 14:44:00 UTC (rev 5918) +++ stack/cxf/trunk/ant-import/build-deploy.xml 2008-03-11 14:44:08 UTC (rev 5919) @@ -16,7 +16,7 @@ <import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml"/> <property name="deploy.dir" value="${int.cxf.dir}/output/deploy"/> - <property name="jbossws.default.undeploy.files" value="${int.cxf.dir}/ant-import/jbossws.default.undeploy.files"/> + <property name="jbossws.default.undeploy.files" value="${int.cxf.dir}/ant-import/jbossws-default-deploy.conf"/> <!-- ================================================================== --> <!-- Deployment JBoss422 --> Copied: stack/cxf/trunk/ant-import/jbossws-default-deploy.conf (from rev 5836, stack/cxf/trunk/ant-import/jbossws.default.undeploy.files) =================================================================== --- stack/cxf/trunk/ant-import/jbossws-default-deploy.conf (rev 0) +++ stack/cxf/trunk/ant-import/jbossws-default-deploy.conf 2008-03-11 14:44:08 UTC (rev 5919) @@ -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/ant-import/jbossws.default.undeploy.files =================================================================== --- stack/cxf/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 14:44:00 UTC (rev 5918) +++ stack/cxf/trunk/ant-import/jbossws.default.undeploy.files 2008-03-11 14:44:08 UTC (rev 5919) @@ -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 \ No newline at end of file Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-03-11 14:44:00 UTC (rev 5918) +++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-03-11 14:44:08 UTC (rev 5919) @@ -86,17 +86,17 @@ <unzip dest=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot; src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; <!-- Deploy the jars --> - <fileset id="jbossws.deploy.files" dir="${deploy.dir}" excludes="jbossws.deployed.files"/> + <fileset id="jbossws.deploy.files" dir="${deploy.dir}" excludes="jbossws-deploy.conf"/> <copy todir="@{jbosshome}" overwrite="true"> <fileset refid="jbossws.deploy.files"/> </copy> <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/> - <!-- Write jbossws.deployed.files --> + <!-- Write jbossws-deploy.conf --> <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> - <replace file="${deploy.dir}/jbossws.deployed.files" token=";" value=" "/> - <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; file="${deploy.dir}/jbossws.deployed.files" overwrite="true"/> + <echo file="${deploy.dir}/jbossws-deploy.conf" message="${jbossws.deploy.files}"/> + <replace file="${deploy.dir}/jbossws-deploy.conf" token=";" value=" "/> + <copy todir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot; file="${deploy.dir}/jbossws-deploy.conf" overwrite="true"/> </sequential> </macrodef> @@ -111,7 +111,7 @@ <delete dir="${deploy.dir}"/> - <loadfile property="jbossws.undeploy.files" srcfile=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files&quot; failonerror="false"/> + <loadfile property="jbossws.undeploy.files" srcfile=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws-deploy.conf&quot; failonerror="false"/> <loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/> <delete dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; <delete dir=&quot;(a){jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar&quot;/&gt;