svn commit: r748341 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/ant/IvyPostResolveTask.java src/java/org/apache/ivy/ant/IvyResolve.java

[maartenc]

Author: maartenc
Date: Thu Feb 26 22:48:20 2009
New Revision: 748341

URL: http://svn.apache.org/viewvc?rev=748341&view=rev
Log:
IMPROVEMENT: ivy:resolve ant task does not support "branch" attribute (IVY-1035)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
    ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=748341&r1=748340&r2=748341&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Thu Feb 26 22:48:20 2009
@@ -85,6 +85,7 @@
        
    trunk
 =====================================
+- IMPROVEMENT: ivy:resolve ant task does not support "branch" attribute 
(IVY-1035)
 - IMPROVEMENT: Ability to strip revConstraint attribute from delivered Ivy 
files (IVY-989)
 - IMPROVEMENT: enhanced error message when defining an artifact for an unknown 
configuration.
 - IMPROVEMENT: display the revision of the resolved module in ivy-report.xsl 
(IVY-1024) (thanks to Carlton Brown)

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java?rev=748341&r1=748340&r2=748341&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java 
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyPostResolveTask.java Thu 
Feb 26 22:48:20 2009
@@ -49,6 +49,8 @@
     private boolean inline = false;
 
     private String organisation;
+    
+    private String branch = null;
 
     private String module;
 
@@ -131,6 +133,7 @@
                 IvyResolve resolve = createResolve(isHaltonfailure(), 
isUseOrigin());
                 resolve.setOrganisation(getOrganisation());
                 resolve.setModule(getModule());
+                resolve.setBranch(getBranch());
                 resolve.setRevision(getRevision());
                 resolve.setInline(true);
                 resolve.setConf(conf);
@@ -343,6 +346,14 @@
         this.organisation = organisation;
     }
 
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
+
     public boolean isHaltonfailure() {
         return haltOnFailure;
     }

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java?rev=748341&r1=748340&r2=748341&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyResolve.java Thu Feb 26 
22:48:20 2009
@@ -47,6 +47,8 @@
     private String organisation = null;
 
     private String module = null;
+    
+    private String branch = null;
 
     private String revision = null;
 
@@ -103,6 +105,14 @@
     public void setRevision(String revision) {
         this.revision = revision;
     }
+    
+    public String getBranch() {
+        return branch;
+    }
+
+    public void setBranch(String branch) {
+        this.branch = branch;
+    }
 
     public void setCache(File cache) {
         cacheAttributeNotSupported();
@@ -217,7 +227,7 @@
                     revision = "latest.integration";
                 }
                 report = ivy.resolve(ModuleRevisionId
-                        .newInstance(organisation, module, revision), 
+                        .newInstance(organisation, module, branch, revision), 
                         getResolveOptions(ivy, confs, settings), changing);
 
             } else {