You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/01/12 03:04:47 UTC
svn commit: r368221 - in /maven/components/branches/maven-2.0.x:
maven-artifact/src/main/java/org/apache/maven/artifact/resolver/
maven-core/src/main/java/org/apache/maven/
maven-core/src/main/java/org/apache/maven/extension/
maven-core/src/main/java/o...
Author: jvanzyl
Date: Wed Jan 11 18:04:38 2006
New Revision: 368221
URL: http://svn.apache.org/viewcvs?rev=368221&view=rev
Log:
o merge from trunk
Added:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java (props changed)
- copied unchanged from r368218, maven/components/trunk/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Modified: maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java?rev=368221&r1=368220&r2=368221&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java (original)
+++ maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java Wed Jan 11 18:04:38 2006
@@ -32,6 +32,7 @@
*
* @author <a href="michal.maczka@dimatics.com">Michal Maczka </a>
* @version $Id$
+ * @todo possibly fix the signatures, it's unfortunate that in some methods the local repo is listed first and second in others.
*/
public interface ArtifactResolver
{
@@ -40,33 +41,53 @@
void resolve( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException;
- ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, List remoteRepositories,
- ArtifactRepository localRepository, ArtifactMetadataSource source )
+ ArtifactResolutionResult resolveTransitively( Set artifacts,
+ Artifact originatingArtifact,
+ List remoteRepositories,
+ ArtifactRepository localRepository,
+ ArtifactMetadataSource source )
throws ArtifactResolutionException, ArtifactNotFoundException;
- ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, List remoteRepositories,
- ArtifactRepository localRepository, ArtifactMetadataSource source,
+ ArtifactResolutionResult resolveTransitively( Set artifacts,
+ Artifact originatingArtifact,
+ List remoteRepositories,
+ ArtifactRepository localRepository,
+ ArtifactMetadataSource source,
List listeners )
throws ArtifactResolutionException, ArtifactNotFoundException;
- ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact,
- ArtifactRepository localRepository, List remoteRepositories,
- ArtifactMetadataSource source, ArtifactFilter filter )
+ ArtifactResolutionResult resolveTransitively( Set artifacts,
+ Artifact originatingArtifact,
+ ArtifactRepository localRepository,
+ List remoteRepositories,
+ ArtifactMetadataSource source,
+ ArtifactFilter filter )
throws ArtifactResolutionException, ArtifactNotFoundException;
- ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, Map managedVersions,
- ArtifactRepository localRepository, List remoteRepositories,
+ ArtifactResolutionResult resolveTransitively( Set artifacts,
+ Artifact originatingArtifact,
+ Map managedVersions,
+ ArtifactRepository localRepository,
+ List remoteRepositories,
ArtifactMetadataSource source )
throws ArtifactResolutionException, ArtifactNotFoundException;
- ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, Map managedVersions,
- ArtifactRepository localRepository, List remoteRepositories,
+ ArtifactResolutionResult resolveTransitively( Set artifacts,
+ Artifact originatingArtifact,
+ Map managedVersions,
+ ArtifactRepository localRepository,
+ List remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter )
throws ArtifactResolutionException, ArtifactNotFoundException;
- ArtifactResolutionResult resolveTransitively( Set artifacts, Artifact originatingArtifact, Map managedVersions,
- ArtifactRepository localRepository, List remoteRepositories,
- ArtifactMetadataSource source, ArtifactFilter filter, List listeners )
+ ArtifactResolutionResult resolveTransitively( Set artifacts,
+ Artifact originatingArtifact,
+ Map managedVersions,
+ ArtifactRepository localRepository,
+ List remoteRepositories,
+ ArtifactMetadataSource source,
+ ArtifactFilter filter,
+ List listeners )
throws ArtifactResolutionException, ArtifactNotFoundException;
void resolveAlways( Artifact artifact, List remoteRepositories, ArtifactRepository localRepository )
Propchange: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?rev=368221&r1=368220&r2=368221&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java Wed Jan 11 18:04:38 2006
@@ -24,8 +24,10 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Extension;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.MavenArtifactFilterManager;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
@@ -40,6 +42,7 @@
* Used to locate extensions.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
+ * @author Jason van Zyl
* @version $Id$
*/
public class DefaultExtensionManager
@@ -51,6 +54,8 @@
private PlexusContainer container;
+ private ArtifactFilter artifactFilter = MavenArtifactFilterManager.createStandardFilter();
+
public void addExtension( Extension extension, MavenProject project, ArtifactRepository localRepository )
throws ArtifactResolutionException, PlexusContainerException, ArtifactNotFoundException
{
@@ -62,9 +67,10 @@
{
ArtifactResolutionResult result = artifactResolver.resolveTransitively( Collections.singleton( artifact ),
project.getArtifact(),
- project.getRemoteArtifactRepositories(),
localRepository,
- artifactMetadataSource );
+ project.getRemoteArtifactRepositories(),
+ artifactMetadataSource,
+ artifactFilter );
for ( Iterator i = result.getArtifacts().iterator(); i.hasNext(); )
{
Artifact a = (Artifact) i.next();
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=368221&r1=368220&r2=368221&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Wed Jan 11 18:04:38 2006
@@ -55,6 +55,7 @@
import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.reporting.MavenReport;
import org.apache.maven.settings.Settings;
+import org.apache.maven.MavenArtifactFilterManager;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
@@ -1092,36 +1093,7 @@
public void initialize()
{
- // TODO: configure this from bootstrap or scan lib
- Set artifacts = new HashSet();
- artifacts.add( "classworlds" );
- artifacts.add( "commons-cli" );
- artifacts.add( "doxia-sink-api" );
- artifacts.add( "jsch" );
- artifacts.add( "maven-artifact" );
- artifacts.add( "maven-artifact-manager" );
- artifacts.add( "maven-core" );
- artifacts.add( "maven-error-diagnoser" );
- artifacts.add( "maven-model" );
- artifacts.add( "maven-monitor" );
- artifacts.add( "maven-plugin-api" );
- artifacts.add( "maven-plugin-descriptor" );
- artifacts.add( "maven-plugin-parameter-documenter" );
- artifacts.add( "maven-plugin-registry" );
- artifacts.add( "maven-profile" );
- artifacts.add( "maven-project" );
- artifacts.add( "maven-reporting-api" );
- artifacts.add( "maven-repository-metadata" );
- artifacts.add( "maven-settings" );
- artifacts.add( "plexus-container-default" );
- artifacts.add( "plexus-interactivity-api" );
- artifacts.add( "plexus-utils" );
- artifacts.add( "wagon-provider-api" );
- artifacts.add( "wagon-file" );
- artifacts.add( "wagon-http-lightweight" );
- artifacts.add( "wagon-ssh" );
- artifacts.add( "wagon-ssh-external" );
- artifactFilter = new ExclusionSetFilter( artifacts );
+ artifactFilter = MavenArtifactFilterManager.createStandardFilter();
}
// ----------------------------------------------------------------------