Return-Path: 
 <commits-return-187-apmail-velocity-commits-archive=velocity.apache.org@velocity.apache.org>
Delivered-To: apmail-velocity-commits-archive@locus.apache.org
Received: (qmail 39284 invoked from network); 7 Jan 2007 15:40:15 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Jan 2007 15:40:15 -0000
Received: (qmail 67560 invoked by uid 500); 7 Jan 2007 15:40:15 -0000
Delivered-To: apmail-velocity-commits-archive@velocity.apache.org
Received: (qmail 67538 invoked by uid 500); 7 Jan 2007 15:40:15 -0000
Mailing-List: contact commits-help@velocity.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@velocity.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@velocity.apache.org>
List-Post: <mailto:commits@velocity.apache.org>
List-Id: <commits.velocity.apache.org>
Reply-To: dev@velocity.apache.org
Delivered-To: mailing list commits@velocity.apache.org
Received: (qmail 67436 invoked by uid 99); 7 Jan 2007 15:40:14 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Jan 2007 07:40:14 -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 [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Jan 2007 07:39:32 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id AB1881A981A; Sun,  7 Jan 2007 07:38:33 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r493755 - /velocity/tools/trunk/download.xml
Date: Sun, 07 Jan 2007 15:38:33 -0000
To: commits@velocity.apache.org
From: cbrisson@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070107153833.AB1881A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cbrisson
Date: Sun Jan  7 07:38:33 2007
New Revision: 493755

URL: http://svn.apache.org/viewvc?view=rev&rev=493755
Log:
fix skip.jar.loading handling for test downloads

Modified:
    velocity/tools/trunk/download.xml

Modified: velocity/tools/trunk/download.xml
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/download.xml?view=diff&rev=493755&r1=493754&r2=493755
==============================================================================
--- velocity/tools/trunk/download.xml (original)
+++ velocity/tools/trunk/download.xml Sun Jan  7 07:38:33 2007
@@ -113,17 +113,19 @@
          ignoreerrors="false" />
   </target>
 
-  <target name="http-test-download" unless="skip.jar.loading">
-    <condition property="jar.present">
-      <and>
-        <isfalse value="${force.jar.loading}"/>
-        <available file="${test.lib.dir}/${download.name}-${download.version}.jar"/>
+  <target name="http-test-download">
+    <condition property="skip-download">
+      <or>
+        <istrue value="${skip.jar.loading}"/>
+        <and>
+          <isfalse value="${force.jar.loading}"/>
+          <available file="${test.lib.dir}/${download.name}-${download.version}.jar"/>
       </and>
     </condition>
     <antcall target="do-http-test-download"/>
   </target>
 
-  <target name="do-http-test-download" unless="jar.present">
+  <target name="do-http-test-download" unless="skip-download">
     <!-- set download.path if not set previously -->
     <property name="download.path" value="${download.name}/${download.name}/${download.version}" />
     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>