Author: brianf
Date: Sat Mar 15 08:35:07 2008
New Revision: 637427
URL: http://svn.apache.org/viewvc?rev=637427&view=rev
Log:
MNG-3407 reverting this functionality until there is discussion
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=637427&r1=637426&r2=637427&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
Sat Mar 15 08:35:07 2008
@@ -51,7 +51,6 @@
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;
@@ -62,7 +61,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.text.MessageFormat;
public class DefaultWagonManager
extends AbstractLogEnabled
@@ -725,17 +723,6 @@
if ( repository == null )
{
repository = (ArtifactRepository) mirrors.get( WILDCARD );
- if ( repository != null )
- {
- String url = repository.getUrl();
- if ( url.indexOf( "${mirrorOf}" ) >= 0 )
- {
- url = StringUtils.replace( url,
"${mirrorOf}", "{0}" );
- url = MessageFormat.format( url, new
Object[] { mirrorOf } );
- repository = new DefaultArtifactRepository(
mirrorOf, url, null );
- mirrors.put( mirrorOf, repository );
- }
- }
}
return 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=637427&r1=637426&r2=637427&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
Sat Mar 15 08:35:07 2008
@@ -43,15 +43,6 @@
wagonManager = (WagonManager) lookup( WagonManager.ROLE );
}
- public void testMappedMirror()
- throws Exception
- {
- DefaultWagonManager manager = (DefaultWagonManager)
wagonManager;
- 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() );
- }
-
public void testDefaultWagonManager()
throws Exception
{
