Author: thomas.diesler(a)jboss.com Date: 2008-03-12 05:57:55 -0400 (Wed, 12 Mar 2008) New Revision: 5936 Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml Log: Improve error reporting on undeploy Modified: stack/native/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-12 09:45:27 UTC (rev 5935) +++ stack/native/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-12 09:57:55 UTC (rev 5936) @@ -266,15 +266,18 @@ <!-- ================================================================== --> <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"/> <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> + + <property name="jboss.undeploy.home" value="@{targetdir}/../../../.."/> + <available property="jboss.undeploy.client" file="${jboss.undeploy.home}/client"/> + <fail message="Cannot find ${jboss.undeploy.home}/client" unless="jboss.undeploy.client"/> + <delete> - <fileset dir="@{targetdir}/../../../.." includes="${jbossws.deploy.conf}"/> + <fileset dir="${jboss.undeploy.home}" includes="${jbossws.deploy.conf}"/> </delete> <delete dir="@{targetdir}"/> </sequential>