Return-Path: 
 <svn-return-4343-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 65214 invoked from network); 26 Nov 2005 05:47:49 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 26 Nov 2005 05:47:49 -0000
Received: (qmail 4137 invoked by uid 500); 26 Nov 2005 05:47:49 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 4085 invoked by uid 500); 26 Nov 2005 05:47:48 -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>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 4074 invoked by uid 99); 26 Nov 2005 05:47:48 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Nov 2005 21:47:48 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Fri, 25 Nov 2005 21:49:19 -0800
Received: (qmail 65137 invoked by uid 65534); 26 Nov 2005 05:47:27 -0000
Message-ID: <20051126054727.65136.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r349086 - /forrest/trunk/plugins/build.xml
Date: Sat, 26 Nov 2005 05:47:27 -0000
To: svn@forrest.apache.org
From: rgardler@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: rgardler
Date: Fri Nov 25 21:47:17 2005
New Revision: 349086

URL: http://svn.apache.org/viewcvs?rev=349086&view=rev
Log:
put unversioned plugin in the versioned forrest directory (fixed FOR-742)

Modified:
    forrest/trunk/plugins/build.xml

Modified: forrest/trunk/plugins/build.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/build.xml?rev=349086&r1=349085&r2=349086&view=diff
==============================================================================
--- forrest/trunk/plugins/build.xml (original)
+++ forrest/trunk/plugins/build.xml Fri Nov 25 21:47:17 2005
@@ -20,7 +20,7 @@
   <!-- The minimum version of Forrest a plugin is known to work -->
   <!-- This should be overridden in the plugin build file when necessary
        i.e. when the plugin is being developed for a different Forrest version -->
-  <property name="forrest.version"					          value="0.8"/>
+  <property name="forrest.version"					          value="0.8-dev"/>
   <property name="forrest.home"                       location="${env.FORREST_HOME}"/>   
   <property name="forrest.core"                       location="${env.FORREST_HOME}/main" />  
   <property name="forrest.ant.lib.dir"                location="${forrest.home}/tools/ant/lib"/>  
@@ -265,10 +265,11 @@
     <copy todir="${deploy.plugins.svn-dir}/${forrest.version}" 
           overwrite="true" 
           file="${forrest.plugins.dist.dir}/${forrest.version}/${plugin-name}-${plugin-version}.zip"/>
-    <!-- FIXME: remove this duplication of content. It is here to allow a fallback to an
-         unversioned plugin, but the plugin install system should be intelligent enough to know
-         which to download as a fallback. -->
-    <copy tofile="${deploy.plugins.svn-dir}/${plugin-name}.zip" 
+    <!-- FIXME: remove this duplication of content. We currently have a copy of the
+    unversioned plugin in the version directory of Forrest as well as the versioned copy.
+    The plugin loading mechanism shouuld be intelligent enough to get the latest version
+    wehn an unversioned plugin is identified in forrest.properties-->
+    <copy tofile="${deploy.plugins.svn-dir}/${forrest.version}/${plugin-name}.zip" 
           overwrite="true" 
           file="${forrest.plugins.dist.dir}/${forrest.version}/${plugin-name}-${plugin-version}.zip"/>