Author: rgardler Date: Tue Dec 21 18:49:43 2004 New Revision: 123032 URL: http://svn.apache.org/viewcvs?view=rev&rev=123032 Log: Provide an error message if we cannot download the plugin install file [FIXES FOR-415, reported by Johannes Schaefer] Modified: forrest/trunk/main/targets/plugins.xml
Modified: forrest/trunk/main/targets/plugins.xml Url: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/plugins.xml?view=diff&rev=123032&p1=forrest/trunk/main/targets/plugins.xml&r1=123031&p2=forrest/trunk/main/targets/plugins.xml&r2=123032 ============================================================================== --- forrest/trunk/main/targets/plugins.xml (original) +++ forrest/trunk/main/targets/plugins.xml Tue Dec 21 18:49:43 2004 @@ -52,17 +52,38 @@ </target> <target name="unpack-plugin" + if="plugin.unavailable" depends="init-props"> - <unzip dest="${forrest.plugins-dir}/${plugin.name}"> - <fileset dir="${forrest.plugins-dir}/"> - <include name="${plugin.name}.zip"/> - </fileset> - </unzip> - <delete> - <fileset dir="${forrest.plugins-dir}/"> - <include name="${plugin.name}.zip"/> - </fileset> - </delete> + <if> + <available file="${forrest.plugins-dir}/${plugin.name}.zip"/> + <then> + <unzip dest="${forrest.plugins-dir}/${plugin.name}"> + <fileset dir="${forrest.plugins-dir}/"> + <include name="${plugin.name}.zip"/> + </fileset> + </unzip> + <delete> + <fileset dir="${forrest.plugins-dir}/"> + <include name="${plugin.name}.zip"/> + </fileset> + </delete> + </then> + <else> + <echo> +ERROR +===== + +Unable to retrive the ${plugin.name} plugin. +There may be more information about the reason for this in ouput +above. The usual cause is that Forrest has been unable to download +the plugin descriptor file that indicates where this plugin is to be +downloaded from. Please check the value of the +forrest.plugins.descriptors property in the forrest.properties file +and ensure that the locations indicated by that value are accessible +(note there should be no spaces in this property). + </echo> + </else> + </if> </target> <target name="configure-plugin"
