You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by xa...@apache.org on 2007/12/02 16:55:08 UTC
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
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"
/>
</ivysettings>