Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 21220 invoked from network); 2 Dec 2007 15:55:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Dec 2007 15:55:26 -0000 Received: (qmail 72349 invoked by uid 500); 2 Dec 2007 15:55:14 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 72324 invoked by uid 500); 2 Dec 2007 15:55:14 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 72315 invoked by uid 99); 2 Dec 2007 15:55:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Dec 2007 07:55:14 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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, 02 Dec 2007 15:55:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 95C341A9832; Sun, 2 Dec 2007 07:55:08 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r600317 - in /ant/ivy/core/trunk: src/java/org/apache/ivy/core/settings/XmlSettingsParser.java test/java/org/apache/ivy/core/settings/ivysettings-cache.xml Date: Sun, 02 Dec 2007 15:55:08 -0000 To: notifications@ant.apache.org From: xavier@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071202155508.95C341A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xavier Date: Sun Dec 2 07:55:07 2007 New Revision: 600317 URL: http://svn.apache.org/viewvc?rev=600317&view=rev Log: use lockStrategy instead of lockingStrategy as attribute on cache, for consistency reason Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-cache.xml Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java?rev=600317&r1=600316&r2=600317&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java Sun Dec 2 07:55:07 2007 @@ -308,7 +308,7 @@ defaultCircular = (String) attributes.get("circularDependencyStrategy"); } else if ("cache".equals(qName)) { - String lockingStrategy = (String) attributes.get("lockingStrategy"); + String lockingStrategy = (String) attributes.get("lockStrategy"); if (lockingStrategy != null) { ivy.setDefaultLockStrategy( ivy.getLockStrategy(ivy.substitute(lockingStrategy))); Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-cache.xml URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-cache.xml?rev=600317&r1=600316&r2=600317&view=diff ============================================================================== --- ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-cache.xml (original) +++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-cache.xml Sun Dec 2 07:55:07 2007 @@ -22,6 +22,6 @@ repositoryDir="repository" repositoryIvyPattern="[module]/ivys/ivy-[revision].xml" repositoryArtifactPattern="[module]/[type]s/[artifact]-[revision].[ext]" - lockingStrategy="artifact-lock" + lockStrategy="artifact-lock" />