You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ni...@apache.org on 2008/02/25 11:19:34 UTC
svn commit: r630790 - in
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src:
main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
Author: nicolas
Date: Mon Feb 25 02:19:26 2008
New Revision: 630790
URL: http://svn.apache.org/viewvc?rev=630790&view=rev
Log:
MNG-3407 : improve mirrorOf to support pattern based repository URL
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=630790&r1=630789&r2=630790&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Mon Feb 25 02:19:26 2008
@@ -51,6 +51,7 @@
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.io.File;
@@ -714,9 +715,10 @@
if ( repository != null )
{
String url = repository.getUrl();
- if ( url.indexOf( "{0}" ) >= 0 )
+ if ( url.indexOf( "${mirrorOf}" ) >= 0 )
{
- url = MessageFormat.format( repository.getUrl(), new Object[] { mirrorOf } );
+ url = StringUtils.replace( url, "${mirrorOf}", "{0}" );
+ url = MessageFormat.format( url, new Object[] { mirrorOf } );
repository = new DefaultArtifactRepository( mirrorOf, url, null );
mirrors.put( mirrorOf, repository );
}
Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=630790&r1=630789&r2=630790&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java Mon Feb 25 02:19:26 2008
@@ -47,7 +47,7 @@
throws Exception
{
DefaultWagonManager manager = (DefaultWagonManager) wagonManager;
- manager.addMirror( "wildcar", "*", "http://archiva/repository/{0}" );
+ manager.addMirror( "wildcar", "*", "http://archiva/repository/${mirrorOf}" );
assertEquals( "http://archiva/repository/central", manager.getMirror( "central" ).getUrl() );
assertEquals( "http://archiva/repository/apache.snapshots", manager.getMirror( "apache.snapshots" ).getUrl() );
}