Return-Path: 
 <svn-return-1438-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 63497 invoked from network); 22 Dec 2004 02:49:48 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 22 Dec 2004 02:49:48 -0000
Received: (qmail 46997 invoked by uid 500); 22 Dec 2004 02:49:47 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 46930 invoked by uid 500); 22 Dec 2004 02:49:47 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
list-post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 46914 invoked by uid 99); 22 Dec 2004 02:49:47 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 21 Dec 2004 18:49:46 -0800
Received: (qmail 63470 invoked by uid 65534); 22 Dec 2004 02:49:45 -0000
Date: 22 Dec 2004 02:49:45 -0000
Message-ID: <20041222024945.63466.qmail@minotaur.apache.org>
From: rgardler@apache.org
To: svn@forrest.apache.org
Subject: svn commit: r123032 - /forrest/trunk/main/targets/plugins.xml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

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"