You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by br...@apache.org on 2005/03/01 07:28:57 UTC
cvs commit: maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/resolver ArtifactResolverTest.java
brett 2005/02/28 22:28:57
Modified: maven-artifact/src/main/java/org/apache/maven/artifact/installer
DefaultArtifactInstaller.java
maven-artifact/src/main/java/org/apache/maven/artifact/manager
DefaultWagonManager.java
maven-artifact/src/test/java/org/apache/maven/artifact/manager
DefaultWagonManagerTest.java
maven-artifact/src/test/java/org/apache/maven/artifact/resolver
ArtifactResolverTest.java
Log:
clean up exceptions
Revision Changes Path
1.3 +6 -1 maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
Index: DefaultArtifactInstaller.java
===================================================================
RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultArtifactInstaller.java 29 Sep 2004 11:20:38 -0000 1.2
+++ DefaultArtifactInstaller.java 1 Mar 2005 06:28:57 -0000 1.3
@@ -23,6 +23,7 @@
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
+import java.io.IOException;
/**
* @todo notions of snapshots should be dealt with in one single place.
@@ -64,7 +65,11 @@
FileUtils.copyFile( source, artifact.getFile() );
}
- catch ( Exception e )
+ catch ( IOException e )
+ {
+ throw new ArtifactInstallationException( "Error installing artifact: ", e );
+ }
+ catch ( ArtifactHandlerNotFoundException e )
{
throw new ArtifactInstallationException( "Error installing artifact: ", e );
}
1.11 +5 -14 maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Index: DefaultWagonManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultWagonManager.java 24 Feb 2005 05:33:17 -0000 1.10
+++ DefaultWagonManager.java 1 Mar 2005 06:28:57 -0000 1.11
@@ -65,7 +65,7 @@
}
catch ( ComponentLookupException e )
{
- throw new UnsupportedProtocolException( "Cannot find wagon which supports the requested protocol: " + protocol );
+ throw new UnsupportedProtocolException( "Cannot find wagon which supports the requested protocol: " + protocol, e );
}
return wagon;
@@ -121,22 +121,13 @@
public void get( Artifact artifact, File destination, Set repositories )
throws TransferFailedException
{
- boolean transfered = false;
-
File temp = null;
- try
- {
- // TODO [BP]: do this handling in Wagon itself
- temp = new File( destination + ".tmp" );
-
- temp.deleteOnExit();
- }
- catch ( Exception e )
- {
- throw new TransferFailedException( "Could not create temporary file for transfering artificat: " + artifact );
- }
+ // TODO [BP]: do this handling in Wagon itself
+ temp = new File( destination + ".tmp" );
+ temp.deleteOnExit();
+ // TODO [BP]: The exception handling here needs some work
for ( Iterator iter = repositories.iterator(); iter.hasNext(); )
{
ArtifactRepository repository = (ArtifactRepository) iter.next();
1.3 +2 -1 maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java
Index: DefaultWagonManagerTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultWagonManagerTest.java 1 Mar 2005 06:20:30 -0000 1.2
+++ DefaultWagonManagerTest.java 1 Mar 2005 06:28:57 -0000 1.3
@@ -60,6 +60,7 @@
catch ( UnsupportedProtocolException e )
{
//ok
+ assertTrue( true );
}
}
}
1.7 +3 -20 maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
Index: ArtifactResolverTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ArtifactResolverTest.java 8 Feb 2005 04:12:58 -0000 1.6
+++ ArtifactResolverTest.java 1 Mar 2005 06:28:57 -0000 1.7
@@ -19,7 +19,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactComponentTestCase;
import org.apache.maven.artifact.DefaultArtifact;
-import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -139,20 +138,12 @@
ArtifactMetadataSource mds = new ArtifactMetadataSource()
{
public Set retrieve( Artifact artifact, ArtifactRepository localRepository, Set remoteRepositories )
- throws ArtifactMetadataRetrievalException
{
Set dependencies = new HashSet();
if ( artifact.getArtifactId().equals( "g" ) )
{
- try
- {
- dependencies.add( new DefaultArtifact( "maven", "h", "1.0", "jar" ) );
- }
- catch ( Exception e )
- {
- throw new ArtifactMetadataRetrievalException( "Cannot retrieve metadata." );
- }
+ dependencies.add( new DefaultArtifact( "maven", "h", "1.0", "jar" ) );
}
return dependencies;
@@ -187,20 +178,12 @@
ArtifactMetadataSource mds = new ArtifactMetadataSource()
{
public Set retrieve( Artifact artifact, ArtifactRepository localRepository, Set remoteRepositories )
- throws ArtifactMetadataRetrievalException
{
Set dependencies = new HashSet();
if ( artifact.getArtifactId().equals( "i" ) )
{
- try
- {
- dependencies.add( new DefaultArtifact( "maven", "j", "1.0", "jar" ) );
- }
- catch ( Exception e )
- {
- throw new ArtifactMetadataRetrievalException( "Cannot retrieve metadata." );
- }
+ dependencies.add( new DefaultArtifact( "maven", "j", "1.0", "jar" ) );
}
return dependencies;