Author: maartenc
Date: Wed Mar 4 21:38:59 2009
New Revision: 750165
URL: http://svn.apache.org/viewvc?rev=750165&view=rev
Log:
FIX: Buildnumber task does not work for chained resolvers (IVY-1037)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=750165&r1=750164&r2=750165&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Wed Mar 4 21:38:59 2009
@@ -99,6 +99,7 @@
- IMPROVEMENT: Error message is not clear when specifying an invalid value for
checksums (IVY-977)
- IMPROVEMENT: catch AccessControlException on System.getProperties()
(IVY-1015)
+- FIX: Buildnumber task does not work for chained resolvers (IVY-1037)
- FIX: Dependencies don't inherit exclusions from dependencyManagement
(IVY-974) (thanks to John Gibson)
- FIX: Dependency Configuration Negation does not work (IVY-982)
- FIX: Ivy retrieve does not honor validate="false" from ivysettings (IVY-992)
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java?rev=750165&r1=750164&r2=750165&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java
Wed Mar 4 21:38:59 2009
@@ -22,8 +22,12 @@
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.ivy.core.cache.ArtifactOrigin;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -207,6 +211,17 @@
return null;
}
+
+ public Map[] listTokenValues(String[] tokens, Map criteria) {
+ Set result = new HashSet();
+ for (Iterator iter = chain.iterator(); iter.hasNext();) {
+ DependencyResolver resolver = (DependencyResolver) iter.next();
+ Map[] temp = resolver.listTokenValues(tokens, new
HashMap(criteria));
+ result.addAll(Arrays.asList(temp));
+ }
+
+ return (Map[]) result.toArray(new Map[result.size()]);
+ }
public void reportFailure() {
for (Iterator iter = chain.iterator(); iter.hasNext();) {
