From 94ba3924615efed113000a389a06d4a2d6b069e1 Mon Sep 17 00:00:00 2001
From: Andrew Williams <handyande@apache.org>
Date: Mon, 5 Mar 2007 11:48:15 +0000
Subject: [PATCH] Copy the ArtifactMetadataSource to use the 'default' hint as
 well as the, deprecated, 'maven' one. This will mean that with the new plexus
 components don't have to hint to get the default impl

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@514652 13f79535-47bb-0310-9956-ffa450edef68
---
 .../resources/META-INF/plexus/components.xml  |  6 +++---
 .../project/DefaultMavenProjectBuilder.java   |  2 +-
 .../project/artifact/MavenMetadataSource.java |  2 +-
 .../resources/META-INF/plexus/components.xml  | 21 +++++++++++++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/maven-core/src/main/resources/META-INF/plexus/components.xml b/maven-core/src/main/resources/META-INF/plexus/components.xml
index 6154060397..4c383929fb 100644
--- a/maven-core/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/components.xml
@@ -74,7 +74,7 @@ under the License.
         </requirement>
         <requirement>
           <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
-          <role-hint>maven</role-hint>
+          <role-hint>default</role-hint>
         </requirement>
         <requirement>
           <role>org.apache.maven.plugin.PluginMappingManager</role>
@@ -104,7 +104,7 @@ under the License.
         </requirement>
         <requirement>
           <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
-          <role-hint>maven</role-hint>
+          <role-hint>default</role-hint>
         </requirement>
         <requirement>
 	      <role>org.apache.maven.wagon.manager.WagonManager</role>
@@ -608,7 +608,7 @@ under the License.
       <requirements>
         <requirement>
           <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
-          <role-hint>maven</role-hint>
+          <role-hint>default</role-hint>
         </requirement>
         <requirement>
           <role>org.apache.maven.plugin.registry.MavenPluginRegistryBuilder</role>
diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
index 76c081924c..eafa9db38f 100644
--- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
+++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
@@ -407,7 +407,7 @@ public class DefaultMavenProjectBuilder
         {
             try
             {
-                artifactMetadataSource = (ArtifactMetadataSource) container.lookup( ArtifactMetadataSource.ROLE, "maven" );
+                artifactMetadataSource = (ArtifactMetadataSource) container.lookup( ArtifactMetadataSource.ROLE );
             }
             catch ( ComponentLookupException e )
             {
diff --git a/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index c6855ebfa4..93a2f324fb 100644
--- a/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -67,7 +67,7 @@ public class MavenMetadataSource
     extends AbstractLogEnabled
     implements ArtifactMetadataSource
 {
-    public static final String ROLE_HINT = "maven";
+    public static final String ROLE_HINT = "default";
 
     private MavenProjectBuilder mavenProjectBuilder;
 
diff --git a/maven-project/src/main/resources/META-INF/plexus/components.xml b/maven-project/src/main/resources/META-INF/plexus/components.xml
index d77652bade..8c22c30727 100644
--- a/maven-project/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-project/src/main/resources/META-INF/plexus/components.xml
@@ -330,6 +330,27 @@ under the License.
       </requirements>
     </component>
 
+    <component>
+      <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+      <role-hint>default</role-hint>
+      <implementation>org.apache.maven.project.artifact.MavenMetadataSource</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.project.MavenProjectBuilder</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.context.BuildContextManager</role>
+          <role-hint>default</role-hint>
+        </requirement>
+      </requirements>
+    </component>
+
     <component>
       <role>org.apache.maven.MavenTools</role>
       <implementation>org.apache.maven.DefaultMavenTools</implementation>