Return-Path: 
 <svn-return-9056-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
X-Original-To: apmail-forrest-svn-archive@www.apache.org
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 356F1E094
	for <apmail-forrest-svn-archive@www.apache.org>;
 Sun, 23 Dec 2012 07:17:05 +0000 (UTC)
Received: (qmail 46585 invoked by uid 500); 23 Dec 2012 07:17:05 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 46438 invoked by uid 500); 23 Dec 2012 07:17:00 -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 46379 invoked by uid 99); 23 Dec 2012 07:16:58 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Dec 2012 07:16:58 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 23 Dec 2012 07:16:57 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4C10C23888FE;
	Sun, 23 Dec 2012 07:16:37 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1425427 - /forrest/trunk/main/targets/plugins.xml
Date: Sun, 23 Dec 2012 07:16:37 -0000
To: svn@forrest.apache.org
From: crossley@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121223071637.4C10C23888FE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: crossley
Date: Sun Dec 23 07:16:36 2012
New Revision: 1425427

URL: http://svn.apache.org/viewvc?rev=1425427&view=rev
Log:
If property "project.plugins.override=true" then use the already deployed plugins by skipping the "install-plugin" step.
Issue: FOR-1235

Modified:
    forrest/trunk/main/targets/plugins.xml

Modified: forrest/trunk/main/targets/plugins.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/targets/plugins.xml?rev=1425427&r1=1425426&r2=1425427&view=diff
==============================================================================
--- forrest/trunk/main/targets/plugins.xml (original)
+++ forrest/trunk/main/targets/plugins.xml Sun Dec 23 07:16:36 2012
@@ -410,13 +410,27 @@ to be installed again unless you delete 
               select="\2"
               casesensitive="false"
               defaultvalue=""/>
-        <antcall target="install-plugin">
-          <param name="plugin.name" value="${plugin.name}"/>
-          <param name="plugin.version" value="${plugin.version}"/>
-          <param name="versioned.name" value="@{name}"/>
-          <param name="plugins.desc.already.fetched" value="true"/>
-          <param name="proxy.already.set" value="true"/>
-        </antcall>
+        <condition property="project.plugins.overridden">
+          <and>
+            <isset property="project.plugins.override"/>
+            <istrue value="${project.plugins.override}"/>
+          </and>
+        </condition>
+        <if>
+          <isset property="project.plugins.overridden"/>
+          <then>
+            <echo level="info">Using already installed plugin because 'project.plugins.override' property is ${project.plugins.override}.</echo>
+          </then>
+          <else>
+            <antcall target="install-plugin">
+              <param name="plugin.name" value="${plugin.name}"/>
+              <param name="plugin.version" value="${plugin.version}"/>
+              <param name="versioned.name" value="@{name}"/>
+              <param name="plugins.desc.already.fetched" value="true"/>
+              <param name="proxy.already.set" value="true"/>
+            </antcall>
+          </else>
+        </if>
         <antcall target="configure-plugin">
           <param name="plugin.name" value="${plugin.name}"/>
           <param name="plugin.version" value="${plugin.version}"/>