Author: handyande
Date: Mon Mar 5 03:48:15 2007
New Revision: 514652
URL: http://svn.apache.org/viewvc?view=rev&rev=514652
Log:
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
Modified:
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
Modified:
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=514652&r1=514651&r2=514652
==============================================================================
---
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
Mon Mar 5 03:48:15 2007
@@ -74,7 +74,7 @@
</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 @@
</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 @@
<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>
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?view=diff&rev=514652&r1=514651&r2=514652
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Mon Mar 5 03:48:15 2007
@@ -407,7 +407,7 @@
{
try
{
- artifactMetadataSource = (ArtifactMetadataSource)
container.lookup( ArtifactMetadataSource.ROLE, "maven" );
+ artifactMetadataSource = (ArtifactMetadataSource)
container.lookup( ArtifactMetadataSource.ROLE );
}
catch ( ComponentLookupException e )
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?view=diff&rev=514652&r1=514651&r2=514652
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
Mon Mar 5 03:48:15 2007
@@ -67,7 +67,7 @@
extends AbstractLogEnabled
implements ArtifactMetadataSource
{
- public static final String ROLE_HINT = "maven";
+ public static final String ROLE_HINT = "default";
private MavenProjectBuilder mavenProjectBuilder;
Modified:
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=514652&r1=514651&r2=514652
==============================================================================
---
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
Mon Mar 5 03:48:15 2007
@@ -331,6 +331,27 @@
</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>
<requirements>
