You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/08/20 17:07:10 UTC
svn commit: r567724 -
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Author: carlos
Date: Mon Aug 20 08:07:10 2007
New Revision: 567724
URL: http://svn.apache.org/viewvc?rev=567724&view=rev
Log:
Merged 566134-566135 from https://svn.apache.org/repos/asf/maven/components/trunk/maven-artifact
Add resolved artifacts to MutipleArtifactsNotFoundException
Add a check for null files in system dependencies
Align with trunk
Modified:
maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Modified: maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=567724&r1=567723&r2=567724&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java Mon Aug 20 08:07:10 2007
@@ -89,6 +89,12 @@
{
File systemFile = artifact.getFile();
+ if ( systemFile == null )
+ {
+ throw new ArtifactNotFoundException(
+ "System artifact: " + artifact + " has no file attached", artifact );
+ }
+
if ( !systemFile.exists() )
{
throw new ArtifactNotFoundException(
@@ -285,6 +291,7 @@
localRepository, remoteRepositories, source, filter,
listeners );
+ List resolvedArtifacts = new ArrayList();
List missingArtifacts = new ArrayList();
for ( Iterator i = artifactResolutionResult.getArtifactResolutionNodes().iterator(); i.hasNext(); )
{
@@ -292,25 +299,20 @@
try
{
resolve( node.getArtifact(), node.getRemoteRepositories(), localRepository );
+ resolvedArtifacts.add( node.getArtifact() );
}
catch ( ArtifactNotFoundException anfe )
{
- getLogger().debug( anfe.getMessage() );
+ getLogger().debug( anfe.getMessage(), anfe );
+
missingArtifacts.add( node.getArtifact() );
}
}
if ( missingArtifacts.size() > 0 )
{
- throw new MultipleArtifactsNotFoundException( originatingArtifact, missingArtifacts, remoteRepositories );
-// String message = "required artifacts missing:\n";
-// for ( Iterator i = missingArtifacts.iterator(); i.hasNext(); )
-// {
-// Artifact missingArtifact = (Artifact) i.next();
-// message += " " + missingArtifact.getId() + "\n";
-// }
-// message += "\nfor the artifact:";
-// throw new ArtifactResolutionException( message, originatingArtifact, remoteRepositories );
+ throw new MultipleArtifactsNotFoundException( originatingArtifact, resolvedArtifacts, missingArtifacts,
+ remoteRepositories );
}
return artifactResolutionResult;