Author: thomas.diesler(a)jboss.com Date: 2008-03-12 03:11:50 -0400 (Wed, 12 Mar 2008) New Revision: 5927 Modified: stack/native/trunk/ant-import/build-deploy.xml stack/native/trunk/ant-import/jbossws-default-deploy.conf stack/native/trunk/ant-import/jbossws-deploy-macros.xml Log: Explicitly delete jbossws.sar Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2008-03-12 00:52:02 UTC (rev 5926) +++ stack/native/trunk/ant-import/build-deploy.xml 2008-03-12 07:11:50 UTC (rev 5927) @@ -145,7 +145,7 @@ <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/> <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> <property name="jbossws.sar.dir" value=&quot;(a){deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar&quot;/&gt; - <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset} server/${jboss.server.instance}/deploy/jbossws.sar"/> + <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/> </sequential> </macrodef> Modified: stack/native/trunk/ant-import/jbossws-default-deploy.conf =================================================================== --- stack/native/trunk/ant-import/jbossws-default-deploy.conf 2008-03-12 00:52:02 UTC (rev 5926) +++ stack/native/trunk/ant-import/jbossws-default-deploy.conf 2008-03-12 07:11:50 UTC (rev 5927) @@ -1 +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 +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/native/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-12 00:52:02 UTC (rev 5926) +++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-12 07:11:50 UTC (rev 5927) @@ -259,7 +259,9 @@ <!-- ================================================================== --> <macrodef name="macro-undeploy-jbossws"> + <!-- The location of the default file list --> <attribute name="defaultconf"/> + <!-- The jbossws.sar directory --> <attribute name="targetdir"/> <sequential> <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/jbossws-deploy.conf&quot; failonerror="false"/> @@ -267,6 +269,7 @@ <delete> <fileset dir="@{targetdir}/../../../.." includes="${jbossws.deploy.conf}"/> </delete> + <delete dir="@{targetdir}"/> </sequential> </macrodef>