maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From handya...@apache.org
Subject svn commit: r514019 - in /maven/components/trunk: ./ maven-core/src/main/java/org/apache/maven/plugin/ maven-core/src/main/resources/META-INF/plexus/ maven-embedder/src/main/java/org/apache/maven/embedder/ maven-project/src/main/resources/META-INF/plexus/
Date Fri, 02 Mar 2007 23:43:52 GMT
Author: handyande
Date: Fri Mar  2 15:43:49 2007
New Revision: 514019

URL: http://svn.apache.org/viewvc?view=rev&rev=514019
Log:
More role-hint fixes

Modified:
    maven/components/trunk/build.properties
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
    maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
    maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml

Modified: maven/components/trunk/build.properties
URL: http://svn.apache.org/viewvc/maven/components/trunk/build.properties?view=diff&rev=514019&r1=514018&r2=514019
==============================================================================
--- maven/components/trunk/build.properties (original)
+++ maven/components/trunk/build.properties Fri Mar  2 15:43:49 2007
@@ -19,7 +19,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

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?view=diff&rev=514019&r1=514018&r2=514019
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Fri Mar  2 15:43:49 2007
@@ -1122,7 +1122,7 @@
             }
             else
             {
-                configurator = (ComponentConfigurator) pluginContainer.lookup( ComponentConfigurator.ROLE,
pluginRealm );
+                configurator = (ComponentConfigurator) pluginContainer.lookup( ComponentConfigurator.ROLE,
"basic", pluginRealm );
             }
 
             ConfigurationListener listener = new DebugConfigurationListener( getLogger()
);

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=514019&r1=514018&r2=514019
==============================================================================
--- 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 Fri
Mar  2 15:43:49 2007
@@ -63,6 +63,7 @@
         </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 @@
         </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 @@
         </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 @@
       <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 @@
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.components.interactivity.InputHandler</role>
+          <role-hint>default</role-hint>
         </requirement>
         <requirement>
           <role>org.apache.maven.project.MavenProjectBuilder</role>

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?view=diff&rev=514019&r1=514018&r2=514019
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Fri Mar  2 15:43:49 2007
@@ -598,7 +598,7 @@
 
             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 @@
 
             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 );

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=514019&r1=514018&r2=514019
==============================================================================
--- 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
Fri Mar  2 15:43:49 2007
@@ -178,6 +178,7 @@
         </requirement>
         <requirement>
           <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+          <role-hint>default</role-hint>
         </requirement>
         <requirement>
           <role>org.apache.maven.context.BuildContextManager</role>



Mime
View raw message