Repository: ant-ivy Updated Branches: refs/heads/master dcde20001 -> 2c03505da
ant workspace resolver: fix fileset injection Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/82bd5be8 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/82bd5be8 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/82bd5be8 Branch: refs/heads/master Commit: 82bd5be8735c01a767fc3ebc3eb92369ac68302d Parents: dcde200 Author: Nicolas Lalevée <nicolas.lale...@hibnet.org> Authored: Sun Feb 8 14:19:00 2015 +0100 Committer: Nicolas Lalevée <nicolas.lale...@hibnet.org> Committed: Sun Feb 8 14:19:00 2015 +0100 ---------------------------------------------------------------------- src/java/org/apache/ivy/ant/AntWorkspaceResolver.java | 2 +- test/java/org/apache/ivy/ant/AntBuildResolverTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/82bd5be8/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java b/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java index 27cf686..ca576b2 100644 --- a/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java +++ b/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java @@ -95,7 +95,7 @@ public class AntWorkspaceResolver extends DataType { this.haltOnError = haltOnError; } - public void addResourceCollection(ResourceCollection resources) { + public void addConfigured(ResourceCollection resources) { if (!resources.isFilesystemOnly()) { throw new BuildException("Only filesystem resource collection is supported"); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/82bd5be8/test/java/org/apache/ivy/ant/AntBuildResolverTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/ant/AntBuildResolverTest.java b/test/java/org/apache/ivy/ant/AntBuildResolverTest.java index 6eb3c79..23f8756 100644 --- a/test/java/org/apache/ivy/ant/AntBuildResolverTest.java +++ b/test/java/org/apache/ivy/ant/AntBuildResolverTest.java @@ -65,7 +65,7 @@ public class AntBuildResolverTest extends TestCase { fileset.setProject(project); fileset.setDir(new File("test/workspace")); fileset.setIncludes("*/ivy.xml"); - antWorkspaceResolver.addResourceCollection(fileset); + antWorkspaceResolver.addConfigured(fileset); antWorkspaceResolver.setProject(project); configure = new IvyConfigure();
