Author: bentmann
Date: Mon Aug 31 10:41:55 2009
New Revision: 809532
URL: http://svn.apache.org/viewvc?rev=809532&view=rev
Log:
o Simplified code
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java?rev=809532&r1=809531&r2=809532&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
Mon Aug 31 10:41:55 2009
@@ -35,7 +35,6 @@
// Just hide the one method we want behind the RepositorySystem interface.
public interface ArtifactResolver
{
- ArtifactResolutionResult collect( ArtifactResolutionRequest request );
ArtifactResolutionResult resolve( ArtifactResolutionRequest request );
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=809532&r1=809531&r2=809532&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Mon Aug 31 10:41:55 2009
@@ -363,18 +363,8 @@
//
// ------------------------------------------------------------------------
- public ArtifactResolutionResult collect( ArtifactResolutionRequest request
)
- {
- return resolve( request, true );
- }
-
public ArtifactResolutionResult resolve( ArtifactResolutionRequest request
)
{
- return resolve( request, false );
- }
-
- private ArtifactResolutionResult resolve( ArtifactResolutionRequest
request, boolean collectOnly )
- {
Artifact rootArtifact = request.getArtifact();
Set<Artifact> artifacts = request.getArtifactDependencies();
Map managedVersions = request.getManagedVersionMap();
@@ -414,7 +404,7 @@
// file reference. But this may be a Maven Plugin that we need to
resolve from a remote repository
// as well as its dependencies.
- if ( !collectOnly && request.isResolveRoot() /* &&
rootArtifact.getFile() == null */ )
+ if ( request.isResolveRoot() /* && rootArtifact.getFile() == null */ )
{
try
{
@@ -503,7 +493,7 @@
return result;
}
- if ( !collectOnly && result.getArtifacts() != null )
+ if ( result.getArtifacts() != null )
{
for ( Artifact artifact : result.getArtifacts() )
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java?rev=809532&r1=809531&r2=809532&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
Mon Aug 31 10:41:55 2009
@@ -261,57 +261,6 @@
return url;
}
- public ArtifactResolutionResult collect( ArtifactResolutionRequest request
)
- {
- /*
- * Probably is not worth it, but here I make sure I restore request
- * to its original state.
- */
- try
- {
- LocalArtifactRepository ideWorkspace = plexus.lookup(
LocalArtifactRepository.class, LocalArtifactRepository.IDE_WORKSPACE );
-
- if ( request.getLocalRepository() instanceof
DelegatingLocalArtifactRepository )
- {
- DelegatingLocalArtifactRepository delegatingLocalRepository =
(DelegatingLocalArtifactRepository) request.getLocalRepository();
-
- LocalArtifactRepository orig =
delegatingLocalRepository.getIdeWorspace();
-
- delegatingLocalRepository.setIdeWorkspace( ideWorkspace );
-
- try
- {
- return artifactResolver.collect( request );
- }
- finally
- {
- delegatingLocalRepository.setIdeWorkspace( orig );
- }
- }
- else
- {
- ArtifactRepository localRepository =
request.getLocalRepository();
- DelegatingLocalArtifactRepository delegatingLocalRepository =
new DelegatingLocalArtifactRepository( localRepository );
- delegatingLocalRepository.setIdeWorkspace( ideWorkspace );
- request.setLocalRepository( delegatingLocalRepository );
- try
- {
- return artifactResolver.collect( request );
- }
- finally
- {
- request.setLocalRepository( localRepository );
- }
- }
- }
- catch ( ComponentLookupException e )
- {
- // no ide workspace artifact resolution
- }
-
- return artifactResolver.collect( request );
- }
-
public ArtifactResolutionResult resolve( ArtifactResolutionRequest request
)
{
/*
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java?rev=809532&r1=809531&r2=809532&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/RepositorySystem.java
Mon Aug 31 10:41:55 2009
@@ -90,8 +90,6 @@
*/
List<ArtifactRepository> getEffectiveRepositories(
List<ArtifactRepository> repositories );
- ArtifactResolutionResult collect( ArtifactResolutionRequest request );
-
ArtifactResolutionResult resolve( ArtifactResolutionRequest request );
MetadataResolutionResult resolveMetadata( MetadataResolutionRequest
request );
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java?rev=809532&r1=809531&r2=809532&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
Mon Aug 31 10:41:55 2009
@@ -392,16 +392,19 @@
overrideArtifacts.add( repositorySystem.createDependencyArtifact(
dependency ) );
}
- ArtifactFilter filter = new ScopeArtifactFilter(
Artifact.SCOPE_RUNTIME_PLUS_SYSTEM );
+ ArtifactFilter collectionFilter = new ScopeArtifactFilter(
Artifact.SCOPE_RUNTIME_PLUS_SYSTEM );
+
+ ArtifactFilter resolutionFilter =
artifactFilterManager.getCoreArtifactFilter();
ArtifactResolutionRequest request = new ArtifactResolutionRequest(
repositoryRequest );
request.setArtifact( pluginArtifact );
request.setArtifactDependencies( overrideArtifacts );
- request.setCollectionFilter( filter );
+ request.setCollectionFilter( collectionFilter );
+ request.setResolutionFilter( resolutionFilter );
request.setResolveRoot( true );
request.setResolveTransitively( true );
- ArtifactResolutionResult result = repositorySystem.collect( request );
+ ArtifactResolutionResult result = repositorySystem.resolve( request );
try
{
resolutionErrorHandler.throwErrors( request, result );
@@ -413,31 +416,6 @@
List<Artifact> pluginArtifacts = new ArrayList<Artifact>(
result.getArtifacts() );
- request.setResolveRoot( true ).setResolveTransitively( false
).setArtifactDependencies( null );
-
- filter = artifactFilterManager.getCoreArtifactFilter();
-
- for ( Artifact artifact : pluginArtifacts )
- {
- if ( filter.include( artifact ) )
- {
- result = repositorySystem.resolve( request.setArtifact(
artifact ) );
- try
- {
- resolutionErrorHandler.throwErrors( request, result );
- }
- catch ( ArtifactResolutionException e )
- {
- throw new PluginResolutionException( plugin, e );
- }
- }
- else
- {
- artifact.setFile( null );
- artifact.setResolved( false );
- }
- }
-
return pluginArtifacts;
}
