Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 71947 invoked from network); 11 Aug 2009 10:24:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Aug 2009 10:24:58 -0000 Received: (qmail 16436 invoked by uid 500); 11 Aug 2009 10:25:05 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 16338 invoked by uid 500); 11 Aug 2009 10:25:05 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 16329 invoked by uid 99); 11 Aug 2009 10:25:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Aug 2009 10:25:05 +0000 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; Tue, 11 Aug 2009 10:24:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F0C4C23888CF; Tue, 11 Aug 2009 10:24:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r803057 - in /maven/components/trunk/maven-compat/src: main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java test/java/org/apache/maven/repository/MirrorProcessorTest.java Date: Tue, 11 Aug 2009 10:24:33 -0000 To: commits@maven.apache.org From: bentmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090811102433.F0C4C23888CF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bentmann Date: Tue Aug 11 10:24:33 2009 New Revision: 803057 URL: http://svn.apache.org/viewvc?rev=803057&view=rev Log: o Fixed bad protocol & basedir after mirroring Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java?rev=803057&r1=803056&r2=803057&view=diff ============================================================================== --- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java (original) +++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java Tue Aug 11 10:24:33 2009 @@ -187,18 +187,11 @@ public void setUrl( String url ) { this.url = url; - } - public void setBasedir( String basedir ) - { - this.basedir = basedir; + this.protocol = protocol( url ); + this.basedir = basedir( url ); } - public void setProtocol( String protocol ) - { - this.protocol = protocol; - } - // Path Utils /** Modified: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java?rev=803057&r1=803056&r2=803057&view=diff ============================================================================== --- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java (original) +++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java Tue Aug 11 10:24:33 2009 @@ -1,5 +1,8 @@ package org.apache.maven.repository; +import java.util.Arrays; +import java.util.List; + import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.DefaultArtifactRepository; @@ -172,7 +175,20 @@ assertFalse( mirrorBuilder.matchPattern( getRepo( "c", "http://localhost" ), "!a,external:*" ) ); assertTrue( mirrorBuilder.matchPattern( getRepo( "c", "http://somehost" ), "!a,external:*" ) ); } - + + public void testMirrorProperUrlAndProtocolAndBasedir() + { + mirrorBuilder.addMirror( "mirror-id", "central", "file:///tmp", null ); + + List repos = Arrays.asList( getRepo( "central", "http://repo1.maven.org" ) ); + repos = mirrorBuilder.getMirrors( repos ); + + ArtifactRepository repo = repos.get( 0 ); + assertEquals( "file:///tmp", repo.getUrl() ); + assertEquals( "file", repo.getProtocol() ); + assertEquals( "/tmp", repo.getBasedir() ); + } + /** * Build an ArtifactRepository object. *