Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-21 01:15:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

More role-hint fixes

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@514019 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Andrew Williams 2007-03-02 23:43:49 +00:00
parent 4116fe6192
commit 1f9709694d
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -19,7 +19,7 @@ classworlds.version=1.2-alpha-7
plexus.version=1.0-alpha-17
plexus-archiver.version=1.0-alpha-8
plexus-utils.version=1.4
plexus-interactivity-api.version=1.0-alpha-4
plexus-interactivity-api.version=1.0-alpha-6-SNAPSHOT
commons-cli.version=1.0
commons-lang.version=2.1
wagon.version=1.0-beta-3-SNAPSHOT

2
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
View File

@ -1122,7 +1122,7 @@ private void populatePluginFields( Mojo plugin,
}
else
{
configurator = (ComponentConfigurator) pluginContainer.lookup( ComponentConfigurator.ROLE, pluginRealm );
configurator = (ComponentConfigurator) pluginContainer.lookup( ComponentConfigurator.ROLE, "basic", pluginRealm );
}
ConfigurationListener listener = new DebugConfigurationListener( getLogger() );

5
maven-core/src/main/resources/META-INF/plexus/components.xml
View File

@ -63,6 +63,7 @@ under the License.
</requirement>
<requirement>
<role>org.apache.maven.plugin.version.PluginVersionManager</role>
<role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.artifact.factory.ArtifactFactory</role>
@ -73,6 +74,7 @@ under the License.
</requirement>
<requirement>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
<role-hint>maven</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.plugin.PluginMappingManager</role>
@ -102,6 +104,7 @@ under the License.
</requirement>
<requirement>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
<role-hint>maven</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.wagon.manager.WagonManager</role>
@ -605,6 +608,7 @@ under the License.
<requirements>
<requirement>
<role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
<role-hint>maven</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.plugin.registry.MavenPluginRegistryBuilder</role>
@ -614,6 +618,7 @@ under the License.
</requirement>
<requirement>
<role>org.codehaus.plexus.components.interactivity.InputHandler</role>
<role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.project.MavenProjectBuilder</role>

4
maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
View File

@ -598,7 +598,7 @@ private void start( Configuration configuration )
mavenProjectBuilder = (MavenProjectBuilder) container.lookup( MavenProjectBuilder.ROLE );
buildContextManager = (BuildContextManager) container.lookup( BuildContextManager.ROLE );
buildContextManager = (BuildContextManager) container.lookup( BuildContextManager.ROLE, "default" );
// ----------------------------------------------------------------------
// Artifact related components
@ -608,7 +608,7 @@ private void start( Configuration configuration )
artifactFactory = (ArtifactFactory) container.lookup( ArtifactFactory.ROLE );
artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE );
artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE, "default" );
defaultArtifactRepositoryLayout =
(ArtifactRepositoryLayout) container.lookup( ArtifactRepositoryLayout.ROLE, DEFAULT_LAYOUT_ID );

1
maven-project/src/main/resources/META-INF/plexus/components.xml
View File

@ -178,6 +178,7 @@ under the License.
</requirement>
<requirement>
<role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
<role-hint>default</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.context.BuildContextManager</role>