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/10/24 22:02:43 UTC
svn commit: r587991 - in /maven/artifact/trunk/src:
main/java/org/apache/maven/artifact/metadata/
test/java/org/apache/maven/artifact/resolver/
Author: carlos
Date: Wed Oct 24 13:02:42 2007
New Revision: 587991
URL: http://svn.apache.org/viewvc?rev=587991&view=rev
Log:
Add an artifact field to ArtifactMetadataRetrievalException to store the artifact causing the problem
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
Modified: maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java?rev=587991&r1=587990&r2=587991&view=diff
==============================================================================
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java (original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataRetrievalException.java Wed Oct 24 13:02:42 2007
@@ -19,6 +19,8 @@
* under the License.
*/
+import org.apache.maven.artifact.Artifact;
+
/**
* Error while retrieving repository metadata from the repository.
*
@@ -28,18 +30,41 @@
public class ArtifactMetadataRetrievalException
extends Exception
{
+
+ private Artifact artifact;
+
+ /**
+ * @deprecated use {@link #ArtifactMetadataRetrievalException(String, Throwable, Artifact)}
+ */
public ArtifactMetadataRetrievalException( String message )
{
- super( message );
+ this( message, null, null );
}
+ /**
+ * @deprecated use {@link #ArtifactMetadataRetrievalException(String, Throwable, Artifact)}
+ */
public ArtifactMetadataRetrievalException( Throwable cause )
{
- super( cause );
+ this( null, cause, null );
}
+ /**
+ * @deprecated use {@link #ArtifactMetadataRetrievalException(String, Throwable, Artifact)}
+ */
public ArtifactMetadataRetrievalException( String message, Throwable cause )
{
+ this( message, cause, null );
+ }
+
+ public ArtifactMetadataRetrievalException( String message, Throwable cause, Artifact artifact )
+ {
super( message, cause );
+ this.artifact = artifact;
+ }
+
+ public Artifact getArtifact()
+ {
+ return artifact;
}
}
Modified: maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java?rev=587991&r1=587990&r2=587991&view=diff
==============================================================================
--- maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java (original)
+++ maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java Wed Oct 24 13:02:42 2007
@@ -109,13 +109,15 @@
if ( "g".equals( artifact.getArtifactId() ) )
{
+ Artifact a = null;
try
{
- dependencies.add( createArtifact( "org.apache.maven", "h", "1.0", "jar" ) );
+ a = createArtifact( "org.apache.maven", "h", "1.0", "jar" );
+ dependencies.add( a );
}
catch ( Exception e )
{
- throw new ArtifactMetadataRetrievalException( e );
+ throw new ArtifactMetadataRetrievalException( "Error retrieving metadata", e, a );
}
}
@@ -163,13 +165,15 @@
if ( "i".equals( artifact.getArtifactId() ) )
{
+ Artifact a = null;
try
{
- dependencies.add( createArtifact( "org.apache.maven", "j", "1.0", "jar" ) );
+ a = createArtifact( "org.apache.maven", "j", "1.0", "jar" );
+ dependencies.add( a );
}
catch ( Exception e )
{
- throw new ArtifactMetadataRetrievalException( e );
+ throw new ArtifactMetadataRetrievalException( "Error retrieving metadata", e, a );
}
}
Modified: maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java
URL: http://svn.apache.org/viewvc/maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java?rev=587991&r1=587990&r2=587991&view=diff
==============================================================================
--- maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java (original)
+++ maven/artifact/trunk/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java Wed Oct 24 13:02:42 2007
@@ -828,7 +828,7 @@
}
catch ( InvalidVersionSpecificationException e )
{
- throw new ArtifactMetadataRetrievalException( e );
+ throw new ArtifactMetadataRetrievalException( "Invalid version creating artifacts", e, artifact );
}
}