geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r720805 - /geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/
Date Wed, 26 Nov 2008 11:04:06 GMT
Author: jdillon
Date: Wed Nov 26 03:04:05 2008
New Revision: 720805

URL: http://svn.apache.org/viewvc?rev=720805&view=rev
Log:
Tidy up some throwable muck

Removed:
    geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactManagerException.java
    geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/InvalidRepositoryException.java
Modified:
    geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactRepositoryManager.java
    geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactRepositoryManager.java
    geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java
    geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactRepositoryManager.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactRepositoryManager.java?rev=720805&r1=720804&r2=720805&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactRepositoryManager.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ArtifactRepositoryManager.java
Wed Nov 26 03:04:05 2008
@@ -20,6 +20,7 @@
 package org.apache.geronimo.gshell.artifact.maven;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.InvalidRepositoryException;
 
 import java.io.File;
 import java.net.URI;

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactRepositoryManager.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactRepositoryManager.java?rev=720805&r1=720804&r2=720805&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactRepositoryManager.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/DefaultArtifactRepositoryManager.java
Wed Nov 26 03:04:05 2008
@@ -22,6 +22,7 @@
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.InvalidRepositoryException;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.slf4j.Logger;
@@ -29,6 +30,7 @@
 
 import java.io.File;
 import java.net.URI;
+import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -65,13 +67,8 @@
     public void setLocalRepository(final File dir) throws InvalidRepositoryException {
         assert dir != null;
 
-        try {
-            ArtifactRepository repo = repositoryFactory.createLocalRepository(dir);
-            setLocalRepository(repo);
-        }
-        catch (Exception e) {
-            throw new InvalidRepositoryException(e);
-        }
+        ArtifactRepository repo = repositoryFactory.createLocalRepository(dir);
+        setLocalRepository(repo);
     }
 
     public List<ArtifactRepository> getRemoteRepositories() {
@@ -109,8 +106,8 @@
 
             addRemoteRepository(repo);
         }
-        catch (Exception e) {
-            throw new InvalidRepositoryException(e);
+        catch (MalformedURLException e) {
+            throw new InvalidRepositoryException(e.getMessage(), id, e);
         }
     }
 }
\ No newline at end of file

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java?rev=720805&r1=720804&r2=720805&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/GShellArtifactResolver.java
Wed Nov 26 03:04:05 2008
@@ -53,10 +53,6 @@
     @Requirement
     private ArtifactRepositoryManager repositoryManager;
 
-    //
-    // ArtifactResolver
-    //
-
     @Deprecated
     public void resolve(final Artifact artifact, final List<ArtifactRepository> remoteRepositories,
final ArtifactRepository localRepository) throws ArtifactResolutionException, ArtifactNotFoundException
{
         assert delegate != null;

Modified: geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java?rev=720805&r1=720804&r2=720805&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java
(original)
+++ geronimo/gshell/trunk/gshell-support/gshell-artifact-maven/src/main/java/org/apache/geronimo/gshell/artifact/maven/ResolutionException.java
Wed Nov 26 03:04:05 2008
@@ -28,7 +28,7 @@
  * @version $Rev$ $Date$
  */
 public class ResolutionException
-    extends ArtifactManagerException
+    extends Exception
 {
     private static final long serialVersionUID = 1;
 



Mime
View raw message