Author: bentmann
Date: Tue Oct 20 09:50:35 2009
New Revision: 827020
URL: http://svn.apache.org/viewvc?rev=827020&view=rev
Log:
o Specialized exception
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java?rev=827020&r1=827019&r2=827020&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
Tue Oct 20 09:50:35 2009
@@ -24,10 +24,10 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultRepositoryRequest;
import org.apache.maven.artifact.repository.RepositoryRequest;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.model.Model;
import org.apache.maven.model.building.AbstractModelBuildingListener;
import org.apache.maven.model.building.ModelBuildingEvent;
+import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
/**
@@ -116,7 +116,7 @@
project.setClassRealm( record.realm );
project.setExtensionArtifactFilter(
record.extensionArtifactFilter );
}
- catch ( ArtifactResolutionException e )
+ catch ( PluginResolutionException e )
{
event.getProblems().addError( "Unresolveable build extensions:
" + e.getMessage(), e );
}
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java?rev=827020&r1=827019&r2=827020&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
Tue Oct 20 09:50:35 2009
@@ -50,6 +50,7 @@
import org.apache.maven.model.Repository;
import org.apache.maven.plugin.ExtensionRealmCache;
import org.apache.maven.plugin.PluginArtifactsCache;
+import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.plugin.version.DefaultPluginVersionRequest;
import org.apache.maven.plugin.version.PluginVersionRequest;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
@@ -135,7 +136,7 @@
public synchronized ProjectRealmCache.CacheRecord createProjectRealm(
MavenProject project, Model model,
RepositoryRequest repositoryRequest )
- throws ArtifactResolutionException, PluginVersionResolutionException
+ throws PluginResolutionException, PluginVersionResolutionException
{
ClassRealm projectRealm = null;
@@ -381,7 +382,7 @@
}
private List<Artifact> resolveExtensionArtifacts( Plugin extensionPlugin,
RepositoryRequest repositoryRequest )
- throws ArtifactResolutionException
+ throws PluginResolutionException
{
Artifact extensionArtifact = repositorySystem.createPluginArtifact(
extensionPlugin );
@@ -405,7 +406,14 @@
ArtifactResolutionResult result = repositorySystem.resolve( request );
- resolutionErrorHandler.throwErrors( request, result );
+ try
+ {
+ resolutionErrorHandler.throwErrors( request, result );
+ }
+ catch ( ArtifactResolutionException e )
+ {
+ throw new PluginResolutionException( extensionPlugin, e );
+ }
List<Artifact> extensionArtifacts = new ArrayList<Artifact>(
result.getArtifacts() );
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java?rev=827020&r1=827019&r2=827020&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingHelper.java
Tue Oct 20 09:50:35 2009
@@ -24,9 +24,9 @@
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.model.Model;
import org.apache.maven.model.Repository;
+import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
/**
@@ -62,10 +62,10 @@
* @param model The model to create the project realm for, must not be
{...@code null}
* @param repositoryRequest The repository request to use for artifact
resolution, must not be {...@code null}.
* @return The record with the project realm and extension artifact
filter, never {...@code null}.
- * @throws ArtifactResolutionException If any build extension could not be
resolved.
+ * @throws PluginResolutionException If any build extension could not be
resolved.
*/
ProjectRealmCache.CacheRecord createProjectRealm( MavenProject project,
Model model,
RepositoryRequest
repositoryRequest )
- throws ArtifactResolutionException, PluginVersionResolutionException;
+ throws PluginResolutionException, PluginVersionResolutionException;
}
Modified:
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java?rev=827020&r1=827019&r2=827020&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java
(original)
+++
maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java
Tue Oct 20 09:50:35 2009
@@ -22,10 +22,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryRequest;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.model.Model;
import org.apache.maven.model.Repository;
import org.codehaus.plexus.component.annotations.Component;
@@ -43,7 +41,6 @@
public List<ArtifactRepository> createArtifactRepositories(
List<Repository> pomRepositories,
List<ArtifactRepository> externalRepositories,
ProjectBuildingRequest request )
- throws InvalidRepositoryException
{
if ( externalRepositories != null )
{
@@ -57,7 +54,6 @@
public ProjectRealmCache.CacheRecord createProjectRealm( MavenProject
proejct, Model model,
RepositoryRequest
repositoryRequest )
- throws ArtifactResolutionException
{
return new ProjectRealmCache.CacheRecord( null, null );
}
