Return-Path: Delivered-To: apmail-ant-notifications-archive@locus.apache.org Received: (qmail 20539 invoked from network); 17 Nov 2008 22:39:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Nov 2008 22:39:06 -0000 Received: (qmail 76348 invoked by uid 500); 17 Nov 2008 22:39:14 -0000 Delivered-To: apmail-ant-notifications-archive@ant.apache.org Received: (qmail 76326 invoked by uid 500); 17 Nov 2008 22:39:14 -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 76317 invoked by uid 99); 17 Nov 2008 22:39:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2008 14:39:14 -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; Mon, 17 Nov 2008 22:38:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 07912238889C; Mon, 17 Nov 2008 14:38:46 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r718421 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/plugins/resolver/BasicResolver.java Date: Mon, 17 Nov 2008 22:38:45 -0000 To: notifications@ant.apache.org From: maartenc@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081117223846.07912238889C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: maartenc Date: Mon Nov 17 14:38:45 2008 New Revision: 718421 URL: http://svn.apache.org/viewvc?rev=718421&view=rev Log: IMPROVEMENT: Support useOrigin for artifacts with a set url attribute (IVY-965) Modified: ant/ivy/core/trunk/CHANGES.txt ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java Modified: ant/ivy/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=718421&r1=718420&r2=718421&view=diff ============================================================================== --- ant/ivy/core/trunk/CHANGES.txt (original) +++ ant/ivy/core/trunk/CHANGES.txt Mon Nov 17 14:38:45 2008 @@ -83,6 +83,8 @@ trunk ===================================== +- IMPROVEMENT: Support useOrigin for artifacts with a set url attribute (IVY-965) (thanks to alex322) + - FIX: Log levels aren't respected in certain cases using the standalone functionality (IVY-960) (thanks to Patrick Woodworth) - FIX: Listing of URL's under a given URL does not handle fully specified URL's (IVY-959) (thanks to Randy Nott) - FIX: NPE in LogReportOutputter (IVY-961) Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java?rev=718421&r1=718420&r2=718421&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/BasicResolver.java Mon Nov 17 14:38:45 2008 @@ -64,6 +64,8 @@ import org.apache.ivy.plugins.repository.ArtifactResourceResolver; import org.apache.ivy.plugins.repository.Resource; import org.apache.ivy.plugins.repository.ResourceDownloader; +import org.apache.ivy.plugins.repository.file.FileRepository; +import org.apache.ivy.plugins.repository.file.FileResource; import org.apache.ivy.plugins.repository.url.URLRepository; import org.apache.ivy.plugins.repository.url.URLResource; import org.apache.ivy.plugins.resolver.util.MDResolvedResource; @@ -918,7 +920,13 @@ URL url = artifact.getUrl(); Message.verbose("\tusing url for " + artifact + ": " + url); logArtifactAttempt(artifact, url.toExternalForm()); - ret = new ResolvedResource(new URLResource(url), artifact.getModuleRevisionId() + Resource resource; + if ("file".equals(url.getProtocol())) { + resource = new FileResource(new FileRepository(), new File(url.getPath())); + } else { + resource = new URLResource(url); + } + ret = new ResolvedResource(resource, artifact.getModuleRevisionId() .getRevision()); } return ret;