Return-Path: Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org Received: (qmail 40017 invoked from network); 26 Feb 2009 22:48:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Feb 2009 22:48:42 -0000 Received: (qmail 16812 invoked by uid 500); 26 Feb 2009 22:48:41 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 16786 invoked by uid 500); 26 Feb 2009 22:48:41 -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 16777 invoked by uid 99); 26 Feb 2009 22:48:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Feb 2009 14:48:41 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Feb 2009 22:48:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B01572388975; Thu, 26 Feb 2009 22:48:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Thu, 26 Feb 2009 22:48:20 -0000 To: notifications@ant.apache.org From: maartenc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090226224820.B01572388975@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 {