svn commit: r637435 - in /maven/artifact/trunk/src: main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java

[jdcasey]

Author: jdcasey
Date: Sat Mar 15 08:49:32 2008
New Revision: 637435

URL: http://svn.apache.org/viewvc?rev=637435&view=rev
Log:
[MNG-3407] Reverting changes until we can discuss this a bit more.

Modified:
    
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
    
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java

Modified: 
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=637435&r1=637434&r2=637435&view=diff
==============================================================================
--- 
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
 (original)
+++ 
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
 Sat Mar 15 08:49:32 2008
@@ -52,7 +52,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;
@@ -816,17 +815,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/artifact/trunk/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=637435&r1=637434&r2=637435&view=diff
==============================================================================
--- 
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
 (original)
+++ 
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
 Sat Mar 15 08:49:32 2008
@@ -57,15 +57,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
     {