Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 23673 invoked from network); 2 Mar 2007 23:44:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Mar 2007 23:44:14 -0000 Received: (qmail 99734 invoked by uid 500); 2 Mar 2007 23:44:22 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 99662 invoked by uid 500); 2 Mar 2007 23:44:22 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 99627 invoked by uid 99); 2 Mar 2007 23:44:22 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2007 15:44:22 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Mar 2007 15:44:13 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id F0C871A981A; Fri, 2 Mar 2007 15:43:52 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@maven.apache.org From: handyande@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070302234352.F0C871A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ org.apache.maven.plugin.version.PluginVersionManager + default org.apache.maven.artifact.factory.ArtifactFactory @@ -73,6 +74,7 @@ org.apache.maven.artifact.metadata.ArtifactMetadataSource + maven org.apache.maven.plugin.PluginMappingManager @@ -102,6 +104,7 @@ org.apache.maven.artifact.metadata.ArtifactMetadataSource + maven org.apache.maven.wagon.manager.WagonManager @@ -605,6 +608,7 @@ org.apache.maven.artifact.metadata.ArtifactMetadataSource + maven org.apache.maven.plugin.registry.MavenPluginRegistryBuilder @@ -614,6 +618,7 @@ org.codehaus.plexus.components.interactivity.InputHandler + default org.apache.maven.project.MavenProjectBuilder 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 @@ org.apache.maven.artifact.resolver.ArtifactResolver + default org.apache.maven.context.BuildContextManager