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 2006/02/21 17:39:13 UTC
svn commit: r379524 - in /maven/components/branches/maven-2.0.x:
maven-artifact/src/main/java/org/apache/maven/artifact/resolver/
maven-project/src/main/java/org/apache/maven/project/artifact/
Author: jdcasey
Date: Tue Feb 21 08:39:11 2006
New Revision: 379524
URL: http://svn.apache.org/viewcvs?rev=379524&view=rev
Log:
(merging from 379516.)
[MNG-2083] Correcting problem where cached projects result in missing downloadUrl for unresolvable artifacts.
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java?rev=379524&r1=379523&r2=379524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java Tue Feb 21 08:39:11 2006
@@ -194,7 +194,7 @@
sb.append( LS );
sb.append( LS );
sb.append( indentation );
- sb.append( "Try downloading the file manually from" );
+ sb.append( "Try downloading the file manually from: " );
sb.append( LS );
sb.append( indentation );
sb.append( " " );
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java?rev=379524&r1=379523&r2=379524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java Tue Feb 21 08:39:11 2006
@@ -16,34 +16,38 @@
private static String constructMessage( List artifacts )
{
- StringBuffer buffer = new StringBuffer();
-
- int size = artifacts.size();
-
- buffer.append( size ).append( " required artifact" );
-
- if ( size > 1 )
- {
- buffer.append( "s" );
- }
-
- buffer.append( " missing:\n" );
+ StringBuffer buffer = new StringBuffer( "Missing:\n" );
+
+ buffer.append( "----------\n" );
int counter = 0;
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact artifact = (Artifact) i.next();
- String message = "\n" + ( ++counter ) + ") " + artifact.getId();
+ String message = ( ++counter ) + ") " + artifact.getId();
buffer.append( constructMissingArtifactMessage( message, " ", artifact.getGroupId(), artifact
.getArtifactId(), artifact.getVersion(), artifact.getType(), artifact.getDownloadUrl(), artifact
.getDependencyTrail() ) );
+ }
+
+ buffer.append( "----------\n" );
+
+ int size = artifacts.size();
+
+ buffer.append( size ).append( " required artifact" );
- buffer.append( "\n" );
+ if ( size > 1 )
+ {
+ buffer.append( "s are" );
+ }
+ else
+ {
+ buffer.append( " is" );
}
- buffer.append( "\nfor the artifact:" );
+ buffer.append( " missing.\n\nfor artifact: " );
return buffer.toString();
}
Modified: maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=379524&r1=379523&r2=379524&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Tue Feb 21 08:39:11 2006
@@ -140,6 +140,9 @@
if ( distMgmt != null )
{
relocation = distMgmt.getRelocation();
+
+ artifact.setDownloadUrl( distMgmt.getDownloadUrl() );
+ pomArtifact.setDownloadUrl( distMgmt.getDownloadUrl() );
}
if ( relocation != null )
@@ -195,9 +198,13 @@
}
while ( !done );
- // TODO: this could come straight from the project, negating the need to set it in the project itself?
- artifact.setDownloadUrl( pomArtifact.getDownloadUrl() );
-
+ // last ditch effort to try to get this set...
+ if ( artifact.getDownloadUrl() == null )
+ {
+ // TODO: this could come straight from the project, negating the need to set it in the project itself?
+ artifact.setDownloadUrl( pomArtifact.getDownloadUrl() );
+ }
+
ResolutionGroup result;
if ( project == null )