You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/07/28 22:27:55 UTC
svn commit: r680483 - in /maven/components/branches/maven-2.0.x: ./
maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/
maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/
Author: jdcasey
Date: Mon Jul 28 13:27:54 2008
New Revision: 680483
URL: http://svn.apache.org/viewvc?rev=680483&view=rev
Log:
Merging from 680477 on 2.0.10-RC branch, for MNG-2739.
Modified:
maven/components/branches/maven-2.0.x/ (props changed)
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
Propchange: maven/components/branches/maven-2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 28 13:27:54 2008
@@ -1,2 +1,2 @@
-/maven/components/branches/maven-2.0.10-RC:679193-679867
+/maven/components/branches/maven-2.0.10-RC:679193-679867,680477
/maven/components/branches/maven-2.0.x:679552-679867
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=680483&r1=680482&r2=680483&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 Jul 28 13:27:54 2008
@@ -81,6 +81,8 @@
private static final String MAVEN_ARTIFACT_PROPERTIES = "META-INF/maven/org.apache.maven/maven-artifact/pom.properties";
+ private static int anonymousMirrorIdSeed = 0;
+
private PlexusContainer container;
// TODO: proxies, authentication and mirrors are via settings, and should come in via an alternate method - perhaps
@@ -110,7 +112,7 @@
private RepositoryPermissions defaultRepositoryPermissions;
private String httpUserAgent;
-
+
// TODO: this leaks the component in the public api - it is never released back to the container
public Wagon getWagon( Repository repository )
throws UnsupportedProtocolException, WagonConfigurationException
@@ -957,6 +959,12 @@
String mirrorOf,
String url )
{
+ if ( id == null )
+ {
+ id = "mirror-" + anonymousMirrorIdSeed++;
+ getLogger().warn( "You are using a mirror that doesn't declare an <id/> element. Using \'" + id + "\' instead:\nId: " + id + "\nmirrorOf: " + mirrorOf + "\nurl: " + url + "\n" );
+ }
+
ArtifactRepository mirror = new DefaultArtifactRepository( id, url, null );
mirrors.put( mirrorOf, mirror );
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=680483&r1=680482&r2=680483&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 Jul 28 13:27:54 2008
@@ -95,6 +95,11 @@
return artifact;
}
+ public void testAddMirrorWithNullRepositoryId()
+ {
+ wagonManager.addMirror( null, "test", "http://www.nowhere.com/" );
+ }
+
public void testGetArtifactSha1MissingMd5Present()
throws IOException, UnsupportedProtocolException, TransferFailedException, ResourceDoesNotExistException
{