You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/02/27 20:32:49 UTC
svn commit: r748649 - in /maven/components/trunk/maven-repository/src:
main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
main/java/org/apache/maven/repository/MirrorBuilder.java
test/java/org/apache/maven/repository/MirrorProcessorTest.java
Author: jvanzyl
Date: Fri Feb 27 19:32:49 2009
New Revision: 748649
URL: http://svn.apache.org/viewvc?rev=748649&view=rev
Log:
o slimming down the interface for the mirror builder
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java
maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java?rev=748649&r1=748648&r2=748649&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java (original)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java Fri Feb 27 19:32:49 2009
@@ -46,27 +46,7 @@
mirrors.put( mirrorOf, mirror );
}
-
- public ArtifactRepository getMirrorRepository( ArtifactRepository repository )
- {
- ArtifactRepository mirror = getMirror( repository );
- if ( mirror != null )
- {
- String id = mirror.getId();
- if ( id == null )
- {
- // TODO: this should be illegal in settings.xml
- id = repository.getId();
- }
-
- logger.debug( "Using mirror: " + mirror.getId() + " for repository: " + repository.getId() + "\n(mirror url: " + mirror.getUrl() + ")" );
- repository = repositoryFactory.createArtifactRepository( id, mirror.getUrl(),
- repository.getLayout(), repository.getSnapshots(),
- repository.getReleases() );
- }
- return repository;
- }
-
+
/**
* This method finds a matching mirror for the selected repository. If there is an exact match,
* this will be used. If there is no exact match, then the list of mirrors is examined to see if
@@ -98,6 +78,34 @@
return selectedMirror;
}
+ public void clearMirrors()
+ {
+ mirrors.clear();
+ anonymousMirrorIdSeed = 0;
+ }
+
+ // Make these available to tests
+
+ ArtifactRepository getMirrorRepository( ArtifactRepository repository )
+ {
+ ArtifactRepository mirror = getMirror( repository );
+ if ( mirror != null )
+ {
+ String id = mirror.getId();
+ if ( id == null )
+ {
+ // TODO: this should be illegal in settings.xml
+ id = repository.getId();
+ }
+
+ logger.debug( "Using mirror: " + mirror.getId() + " for repository: " + repository.getId() + "\n(mirror url: " + mirror.getUrl() + ")" );
+ repository = repositoryFactory.createArtifactRepository( id, mirror.getUrl(),
+ repository.getLayout(), repository.getSnapshots(),
+ repository.getReleases() );
+ }
+ return repository;
+ }
+
/**
* This method checks if the pattern matches the originalRepository. Valid patterns: * =
* everything external:* = everything not on the localhost and not file based. repo,repo1 = repo
@@ -107,7 +115,7 @@
* @param pattern used for match. Currently only '*' is supported.
* @return true if the repository is a match to this pattern.
*/
- public boolean matchPattern( ArtifactRepository originalRepository, String pattern )
+ boolean matchPattern( ArtifactRepository originalRepository, String pattern )
{
boolean result = false;
String originalId = originalRepository.getId();
@@ -162,7 +170,7 @@
* @param originalRepository
* @return true if external.
*/
- public boolean isExternalRepo( ArtifactRepository originalRepository )
+ boolean isExternalRepo( ArtifactRepository originalRepository )
{
try
{
@@ -175,10 +183,4 @@
return false;
}
}
-
- public void clearMirrors()
- {
- mirrors.clear();
- anonymousMirrorIdSeed = 0;
- }
}
Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java?rev=748649&r1=748648&r2=748649&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java (original)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java Fri Feb 27 19:32:49 2009
@@ -4,17 +4,9 @@
public interface MirrorBuilder
{
- ArtifactRepository getMirror( ArtifactRepository originalRepository );
+ ArtifactRepository getMirror( ArtifactRepository repository );
void addMirror( String id, String mirrorOf, String url );
- void clearMirrors();
-
- // These need to go
-
- boolean isExternalRepo( ArtifactRepository originalRepository );
-
- boolean matchPattern( ArtifactRepository originalRepository, String pattern );
-
- ArtifactRepository getMirrorRepository( ArtifactRepository repository );
+ void clearMirrors();
}
Modified: maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java?rev=748649&r1=748648&r2=748649&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java (original)
+++ maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java Fri Feb 27 19:32:49 2009
@@ -8,12 +8,12 @@
public class MirrorProcessorTest
extends PlexusTestCase
{
- private MirrorBuilder mirrorBuilder;
+ private DefaultMirrorBuilder mirrorBuilder;
protected void setUp()
throws Exception
{
- mirrorBuilder = lookup( MirrorBuilder.class );
+ mirrorBuilder = (DefaultMirrorBuilder) lookup( MirrorBuilder.class );
mirrorBuilder.clearMirrors();
}