You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2006/04/01 02:44:30 UTC

svn commit: r390553 [1/2] - in /maven/components/branches/maven-embedder-refactor/maven-tools: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main/resources/ src/main/resources/META-INF...

Author: jvanzyl
Date: Fri Mar 31 16:44:28 2006
New Revision: 390553

URL: http://svn.apache.org/viewcvs?rev=390553&view=rev
Log:
adding little tool for settings and artifact repository creation

Added:
    maven/components/branches/maven-embedder-refactor/maven-tools/
    maven/components/branches/maven-embedder-refactor/maven-tools/LICENSE.txt   (with props)
    maven/components/branches/maven-embedder-refactor/maven-tools/NOTICE.txt   (with props)
    maven/components/branches/maven-embedder-refactor/maven-tools/README.txt   (with props)
    maven/components/branches/maven-embedder-refactor/maven-tools/checkstyle-license.txt   (with props)
    maven/components/branches/maven-embedder-refactor/maven-tools/pom.xml   (with props)
    maven/components/branches/maven-embedder-refactor/maven-tools/src/
    maven/components/branches/maven-embedder-refactor/maven-tools/src/main/
    maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/
    maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/
    maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/
    maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/
    maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/CommonMavenObjectFactory.java   (with props)
    maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java   (with props)
    maven/components/branches/maven-embedder-refactor/maven-tools/src/main/resources/
    maven/components/branches/maven-embedder-refactor/maven-tools/src/main/resources/META-INF/
    maven/components/branches/maven-embedder-refactor/maven-tools/src/main/resources/META-INF/plexus/
    maven/components/branches/maven-embedder-refactor/maven-tools/src/main/resources/META-INF/plexus/components.xml   (with props)
    maven/components/branches/maven-embedder-refactor/maven-tools/target/
    maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/
    maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/META-INF/
    maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/META-INF/plexus/
    maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/META-INF/plexus/components.xml   (with props)
    maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/
    maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/
    maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/maven/
    maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/maven/CommonMavenObjectFactory$1.class   (with props)
    maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/maven/CommonMavenObjectFactory.class   (with props)
    maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/maven/DefaultCommonMavenObjectFactory.class   (with props)
    maven/components/branches/maven-embedder-refactor/maven-tools/target/exported-pom.xml   (with props)
    maven/components/branches/maven-embedder-refactor/maven-tools/target/maven-core-2.1-SNAPSHOT.jar   (with props)

Added: maven/components/branches/maven-embedder-refactor/maven-tools/LICENSE.txt
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-tools/LICENSE.txt?rev=390553&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-tools/LICENSE.txt (added)
+++ maven/components/branches/maven-embedder-refactor/maven-tools/LICENSE.txt Fri Mar 31 16:44:28 2006
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-tools/NOTICE.txt
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-tools/NOTICE.txt?rev=390553&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-tools/NOTICE.txt (added)
+++ maven/components/branches/maven-embedder-refactor/maven-tools/NOTICE.txt Fri Mar 31 16:44:28 2006
@@ -0,0 +1,2 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-tools/README.txt
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-tools/README.txt?rev=390553&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-tools/README.txt (added)
+++ maven/components/branches/maven-embedder-refactor/maven-tools/README.txt Fri Mar 31 16:44:28 2006
@@ -0,0 +1,23 @@
+Installing Maven 2
+==================
+
+The following instructions show how to install Maven 2:
+
+1) Unpack the archive where you would like to store the binaries, eg:
+  tar zxvf maven-2.0.tar.gz
+or
+  unzip maven-2.0.zip
+
+2) A directory called "maven-2.0" will be created.
+
+3) Add the bin directory to your PATH, eg:
+  export PATH=/usr/local/maven-2.0/bin:$PATH
+or
+  set PATH="c:\program files\maven-2.0\bin";%PATH%
+
+4) Make sure JAVA_HOME is set to the location of your JDK
+
+5) Run "mvn --version" to verify that it is correctly installed.
+
+For more information, please see http://maven.apache.org
+

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/README.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/README.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-tools/checkstyle-license.txt
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-tools/checkstyle-license.txt?rev=390553&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-tools/checkstyle-license.txt (added)
+++ maven/components/branches/maven-embedder-refactor/maven-tools/checkstyle-license.txt Fri Mar 31 16:44:28 2006
@@ -0,0 +1,18 @@
+
+
+/* ====================================================================
+ *   Copyright 2001-2004 The Apache Software Foundation.
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ * ====================================================================
+ */

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/checkstyle-license.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/checkstyle-license.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-tools/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-tools/pom.xml?rev=390553&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-tools/pom.xml (added)
+++ maven/components/branches/maven-embedder-refactor/maven-tools/pom.xml Fri Mar 31 16:44:28 2006
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <parent>
+    <artifactId>maven</artifactId>
+    <groupId>org.apache.maven</groupId>
+    <version>2.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven</groupId>
+  <artifactId>maven-core</artifactId>
+  <name>Maven Tools</name>
+  <description>Tools for creating artifact repositories and settings.</description>
+  <version>2.1-SNAPSHOT</version>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings</artifactId>
+      <version>2.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <version>2.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <version>2.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact-manager</artifactId>
+      <version>2.1-SNAPSHOT</version>
+    </dependency>    
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/CommonMavenObjectFactory.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/CommonMavenObjectFactory.java?rev=390553&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/CommonMavenObjectFactory.java (added)
+++ maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/CommonMavenObjectFactory.java Fri Mar 31 16:44:28 2006
@@ -0,0 +1,34 @@
+package org.apache.maven;
+
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.settings.Settings;
+
+import java.io.File;
+
+/**
+ * @author Jason van Zyl
+ */
+public interface CommonMavenObjectFactory
+{
+    static String ROLE = CommonMavenObjectFactory.class.getName();
+
+    ArtifactRepository createLocalRepository( File localRepositoryPath,
+                                              boolean offline,
+                                              boolean updateSnapshots,
+                                              String globalChecksumPolicy );
+
+    ArtifactRepository createRepository( String repositoryId,
+                                         String repositoryUrl,
+                                         boolean offline,
+                                         boolean updateSnapshots,
+                                         String globalChecksumPolicy );
+
+
+    Settings buildSettings( File userSettingsPath,
+                            File globalSettingsPath,
+                            boolean interactive,
+                            boolean offline,
+                            boolean usePluginRegistry,
+                            Boolean pluginUpdateOverride )
+        throws SettingsConfigurationException;
+}

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/CommonMavenObjectFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/CommonMavenObjectFactory.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java?rev=390553&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java (added)
+++ maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java Fri Mar 31 16:44:28 2006
@@ -0,0 +1,256 @@
+package org.apache.maven;
+
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.artifact.InvalidRepositoryException;
+import org.apache.maven.settings.MavenSettingsBuilder;
+import org.apache.maven.settings.RuntimeInfo;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.model.Repository;
+import org.apache.maven.model.DeploymentRepository;
+import org.apache.maven.model.RepositoryPolicy;
+import org.apache.maven.model.RepositoryBase;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.codehaus.plexus.PlexusContainer;
+import org.codehaus.plexus.PlexusConstants;
+import org.codehaus.plexus.context.Context;
+import org.codehaus.plexus.context.ContextException;
+import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * A small utility that provides a common place for creating object instances that are used frequently in Maven:
+ * ArtifactRepositories, Artifacts .... A facade for all factories we have lying around. This could very well
+ * belong somewhere else but is here for the maven-embedder-refactor.
+ *
+ * @author Jason van Zyl
+ */
+public class DefaultCommonMavenObjectFactory
+    implements CommonMavenObjectFactory,
+    Contextualizable
+{
+    private ArtifactRepositoryLayout repositoryLayout;
+
+    private ArtifactRepositoryFactory artifactRepositoryFactory;
+
+    private MavenSettingsBuilder settingsBuilder;
+
+    private PlexusContainer container;
+
+    // ----------------------------------------------------------------------------
+    // ArtifactRepository
+    // ----------------------------------------------------------------------------
+
+    public ArtifactRepository createLocalRepository( File directory,
+                                                     boolean offline,
+                                                     boolean updateSnapshots,
+                                                     String globalChecksumPolicy )
+    {
+        String localRepositoryUrl = directory.getAbsolutePath();
+
+        if ( !localRepositoryUrl.startsWith( "file:" ) )
+        {
+            localRepositoryUrl = "file://" + localRepositoryUrl;
+        }
+
+        return createRepository( "local", localRepositoryUrl, false, true, ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
+    }
+
+    public ArtifactRepository createRepository( String repositoryId,
+                                                String repositoryUrl,
+                                                boolean offline,
+                                                boolean updateSnapshots,
+                                                String globalChecksumPolicy )
+    {
+        ArtifactRepository localRepository =
+            new DefaultArtifactRepository( repositoryId, repositoryUrl, repositoryLayout );
+
+        boolean snapshotPolicySet = false;
+
+        if ( offline )
+        {
+            snapshotPolicySet = true;
+        }
+
+        if ( !snapshotPolicySet && updateSnapshots )
+        {
+            artifactRepositoryFactory.setGlobalUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS );
+        }
+
+        artifactRepositoryFactory.setGlobalChecksumPolicy( globalChecksumPolicy );
+
+        return localRepository;
+    }
+
+    // ----------------------------------------------------------------------------
+    // Settings
+    // ----------------------------------------------------------------------------
+
+    public Settings buildSettings( File userSettingsPath,
+                                   File globalSettingsPath,
+                                   boolean interactive,
+                                   boolean offline,
+                                   boolean usePluginRegistry,
+                                   Boolean pluginUpdateOverride )
+        throws SettingsConfigurationException
+    {
+        Settings settings;
+
+        try
+        {
+            settings = settingsBuilder.buildSettings( userSettingsPath, globalSettingsPath );
+        }
+        catch ( IOException e )
+        {
+            throw new SettingsConfigurationException( "Error reading settings file", e );
+        }
+        catch ( XmlPullParserException e )
+        {
+            throw new SettingsConfigurationException( e.getMessage(), e.getDetail(), e.getLineNumber(),
+                                                      e.getColumnNumber() );
+        }
+
+        if ( offline )
+        {
+            settings.setOffline( true );
+        }
+
+        settings.setInteractiveMode( interactive );
+
+        settings.setUsePluginRegistry( usePluginRegistry );
+
+        RuntimeInfo runtimeInfo = new RuntimeInfo( settings );
+
+        runtimeInfo.setPluginUpdateOverride( pluginUpdateOverride );
+
+        settings.setRuntimeInfo( runtimeInfo );
+
+        return settings;
+    }
+
+    // ----------------------------------------------------------------------------
+    // Code snagged from ProjectUtils: this will have to be moved somewhere else
+    // but just trying to collect it all in one place right now.
+    // ----------------------------------------------------------------------------
+
+    public List buildArtifactRepositories( List repositories )
+        throws InvalidRepositoryException
+    {
+
+        List repos = new ArrayList();
+
+        for ( Iterator i = repositories.iterator(); i.hasNext(); )
+        {
+            Repository mavenRepo = (Repository) i.next();
+
+            ArtifactRepository artifactRepo = buildArtifactRepository( mavenRepo );
+
+            if ( !repos.contains( artifactRepo ) )
+            {
+                repos.add( artifactRepo );
+            }
+        }
+        return repos;
+    }
+
+    public ArtifactRepository buildDeploymentArtifactRepository( DeploymentRepository repo )
+        throws InvalidRepositoryException
+    {
+        if ( repo != null )
+        {
+            String id = repo.getId();
+            String url = repo.getUrl();
+
+            // TODO: make this a map inside the factory instead, so no lookup needed
+            ArtifactRepositoryLayout layout = getRepositoryLayout( repo );
+
+            return artifactRepositoryFactory.createDeploymentArtifactRepository( id, url, layout,
+                                                                                 repo.isUniqueVersion() );
+        }
+        else
+        {
+            return null;
+        }
+    }
+
+    public ArtifactRepository buildArtifactRepository( Repository repo )
+        throws InvalidRepositoryException
+    {
+        if ( repo != null )
+        {
+            String id = repo.getId();
+            String url = repo.getUrl();
+
+            // TODO: make this a map inside the factory instead, so no lookup needed
+            ArtifactRepositoryLayout layout = getRepositoryLayout( repo );
+
+            ArtifactRepositoryPolicy snapshots = buildArtifactRepositoryPolicy( repo.getSnapshots() );
+            ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy( repo.getReleases() );
+
+            return artifactRepositoryFactory.createArtifactRepository( id, url, layout, snapshots, releases );
+        }
+        else
+        {
+            return null;
+        }
+    }
+
+    private ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( RepositoryPolicy policy )
+    {
+        boolean enabled = true;
+        String updatePolicy = null;
+        String checksumPolicy = null;
+
+        if ( policy != null )
+        {
+            enabled = policy.isEnabled();
+            if ( policy.getUpdatePolicy() != null )
+            {
+                updatePolicy = policy.getUpdatePolicy();
+            }
+            if ( policy.getChecksumPolicy() != null )
+            {
+                checksumPolicy = policy.getChecksumPolicy();
+            }
+        }
+
+        return new ArtifactRepositoryPolicy( enabled, updatePolicy, checksumPolicy );
+    }
+
+    private ArtifactRepositoryLayout getRepositoryLayout( RepositoryBase mavenRepo )
+        throws InvalidRepositoryException
+    {
+        String layout = mavenRepo.getLayout();
+
+        ArtifactRepositoryLayout repositoryLayout;
+        try
+        {
+            repositoryLayout = (ArtifactRepositoryLayout) container.lookup( ArtifactRepositoryLayout.ROLE, layout );
+        }
+        catch ( ComponentLookupException e )
+        {
+            throw new InvalidRepositoryException( "Cannot find layout implementation corresponding to: \'" + layout +
+                "\' for remote repository with id: \'" + mavenRepo.getId() + "\'.", e );
+        }
+        return repositoryLayout;
+    }
+
+    // ----------------------------------------------------------------------------
+    // Lifecycle
+    // ----------------------------------------------------------------------------
+
+    public void contextualize( Context context )
+        throws ContextException
+    {
+        container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
+    }
+}

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-tools/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-tools/src/main/resources/META-INF/plexus/components.xml?rev=390553&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-tools/src/main/resources/META-INF/plexus/components.xml (added)
+++ maven/components/branches/maven-embedder-refactor/maven-tools/src/main/resources/META-INF/plexus/components.xml Fri Mar 31 16:44:28 2006
@@ -0,0 +1,477 @@
+<component-set>
+  <components>
+    <component>
+      <role>org.apache.maven.CommonMavenObjectFactory</role>
+      <implementation>org.apache.maven.DefaultCommonMavenObjectFactory</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+          <role-hint>default</role-hint>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.settings.MavenSettingsBuilder</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>MojoExecutionExceptionDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.MojoExecutionExceptionDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |MojoFailureExceptionDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>MojoFailureExceptionDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.MojoFailureExceptionDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |ProjectBuildDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>ProjectBuildDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.ProjectBuildDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |ProfileActivationDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>ProfileActivationDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.ProfileActivationDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |PluginConfigurationDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>PluginConfigurationDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.PluginConfigurationDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |ArtifactNotFoundDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>ArtifactNotFoundDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.ArtifactNotFoundDiagnoser</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+      </requirements>
+    </component>
+    <!--
+     |
+     |ArtifactResolverDiagnoser
+     |
+     -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>ArtifactResolverDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.ArtifactResolverDiagnoser</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+      </requirements>
+    </component>
+    <!--
+     |
+     |InvalidArtifactDiagnoser
+     |
+     -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>InvalidArtifactDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.InvalidArtifactDiagnoser</implementation>
+    </component>
+
+    <!--
+     |
+     | Lifecycle executor
+     |
+     -->
+    <component>
+      <role>org.apache.maven.lifecycle.LifecycleExecutor</role>
+      <implementation>org.apache.maven.lifecycle.DefaultLifecycleExecutor</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.plugin.PluginManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.extension.ExtensionManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
+        </requirement>
+      </requirements>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: lifecycle -->
+            <phases>
+              <phase>validate</phase>
+              <phase>initialize</phase>
+              <phase>generate-sources</phase>
+              <phase>process-sources</phase>
+              <phase>generate-resources</phase>
+              <phase>process-resources</phase>
+              <phase>compile</phase>
+              <phase>process-classes</phase>
+              <phase>generate-test-sources</phase>
+              <phase>process-test-sources</phase>
+              <phase>generate-test-resources</phase>
+              <phase>process-test-resources</phase>
+              <phase>test-compile</phase>
+              <phase>test</phase>
+              <phase>package</phase>
+              <phase>pre-integration-test</phase>
+              <phase>integration-test</phase>
+              <phase>post-integration-test</phase>
+              <phase>verify</phase>
+              <phase>install</phase>
+              <phase>deploy</phase>
+            </phases>
+            <!-- END SNIPPET: lifecycle -->
+          </lifecycle>
+          <lifecycle>
+            <id>clean</id>
+            <phases>
+              <phase>pre-clean</phase>
+              <phase>clean</phase>
+              <phase>post-clean</phase>
+            </phases>
+            <default-phases>
+              <clean>org.apache.maven.plugins:maven-clean-plugin:clean</clean>
+            </default-phases>
+          </lifecycle>
+          <lifecycle>
+            <id>site</id>
+            <phases>
+              <phase>pre-site</phase>
+              <phase>site</phase>
+              <phase>post-site</phase>
+              <phase>site-deploy</phase>
+            </phases>
+            <default-phases>
+              <site>org.apache.maven.plugins:maven-site-plugin:site</site>
+              <site-deploy>org.apache.maven.plugins:maven-site-plugin:deploy</site-deploy>
+            </default-phases>
+          </lifecycle>
+        </lifecycles>
+        <!-- START SNIPPET: default-reports -->
+        <defaultReports>
+          <report>org.apache.maven.plugins:maven-project-info-reports-plugin</report>
+          <!-- TODO: currently in mojo - should they be defaults any more?
+          <report>org.apache.maven.plugins:maven-checkstyle-plugin</report>
+          <report>org.apache.maven.plugins:maven-javadoc-plugin</report>
+                    <report>org.apache.maven.plugins:maven-changelog-plugin</report>
+                    <report>org.apache.maven.plugins:maven-surefire-report-plugin</report>
+                    <report>org.apache.maven.plugins:maven-jdepend-plugin</report>
+                    <report>org.apache.maven.plugins:maven-jxr-plugin</report>
+                    <report>org.apache.maven.plugins:maven-taglist-plugin</report>
+          -->
+        </defaultReports>
+        <!-- END SNIPPET: default-reports -->
+        <!-- START SNIPPET: default-lifecycle -->
+        <!-- NOT USED, ACCORDING TO CODE.
+        <defaultPhases>
+          <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+          <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+          <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+          <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+          <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+          <package>
+            org.apache.maven.plugins:maven-jar-plugin:jar,
+            org.apache.maven.plugins:maven-source-plugin:jar
+          </package>
+          <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+          <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+        </defaultPhases>
+        -->
+        <!-- END SNIPPET: default-lifecycle -->
+      </configuration>
+    </component>
+
+    <!-- TODO: issues with the lifecycle:
+     - manually configured lifecycles will not pick up any later additions to the defaults where they are intended to extend defaults (have configuration <includeDefaults/> ?)
+     -->
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>pom</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: pom-lifecycle -->
+            <phases>
+              <package>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</package>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+            </phases>
+            <optional-mojos>
+              <optional-mojo>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</optional-mojo>
+            </optional-mojos>
+            <!-- END SNIPPET: pom-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>jar</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: jar-lifecycle -->
+            <phases>
+              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+              <process-test-resources>
+                org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+              <package>
+                org.apache.maven.plugins:maven-jar-plugin:jar
+              </package>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+            </phases>
+            <!-- END SNIPPET: jar-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>maven-plugin</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: maven-plugin-lifecycle -->
+            <phases>
+              <generate-resources>org.apache.maven.plugins:maven-plugin-plugin:descriptor</generate-resources>
+              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+              <process-test-resources>
+                org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+              <package>
+                org.apache.maven.plugins:maven-jar-plugin:jar,
+                org.apache.maven.plugins:maven-plugin-plugin:addPluginArtifactMetadata
+              </package>
+              <install>
+                org.apache.maven.plugins:maven-install-plugin:install,
+                org.apache.maven.plugins:maven-plugin-plugin:updateRegistry
+              </install>
+              <deploy>
+                org.apache.maven.plugins:maven-deploy-plugin:deploy
+              </deploy>
+            </phases>
+            <!-- END SNIPPET: maven-plugin-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>ejb</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: ejb-lifecycle -->
+            <phases>
+              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+              <process-test-resources>
+                org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+              <package>
+                org.apache.maven.plugins:maven-ejb-plugin:ejb
+              </package>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+            </phases>
+            <!-- END SNIPPET: ejb-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>war</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: war-lifecycle -->
+            <phases>
+              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+              <process-test-resources>
+                org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+              <package>org.apache.maven.plugins:maven-war-plugin:war</package>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+            </phases>
+            <!-- END SNIPPET: war-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>ear</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: ear-lifecycle -->
+            <phases>
+              <generate-resources>
+                org.apache.maven.plugins:maven-ear-plugin:generate-application-xml</generate-resources>
+              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+              <package>org.apache.maven.plugins:maven-ear-plugin:ear</package>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+            </phases>
+            <!-- END SNIPPET: ear-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>rar</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: rar-lifecycle -->
+            <phases>
+              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+              <process-test-resources>
+                org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+              <package>org.apache.maven.plugins:maven-rar-plugin:rar</package>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+            </phases>
+            <!-- END SNIPPET: rar-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+    
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>par</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <!-- START SNIPPET: par-lifecycle -->
+        <phases>
+          <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+          <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+          <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+          <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+          <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+          <package>
+            org.apache.maven.plugins:maven-par-plugin:par
+          </package>
+          <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+          <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+        </phases>
+        <!-- END SNIPPET: par-lifecycle -->
+      </configuration>
+    </component>
+    
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>ejb3</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <!-- START SNIPPET: ejb3-lifecycle -->
+        <phases>
+          <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+          <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+          <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+          <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+          <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+          <package>
+            org.apache.maven.plugins:maven-ejb3-plugin:ejb3
+          </package>
+          <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+          <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+        </phases>
+        <!-- END SNIPPET: ejb3-lifecycle -->
+      </configuration>
+    </component>
+ 
+    <component>
+      <role>org.apache.maven.plugin.version.PluginVersionManager</role>
+      <role-hint>default</role-hint>
+      <implementation>org.apache.maven.plugin.version.DefaultPluginVersionManager</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.plugin.registry.MavenPluginRegistryBuilder</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.components.interactivity.InputHandler</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.project.MavenProjectBuilder</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.execution.RuntimeInformation</role>
+        </requirement>
+      </requirements>
+    </component>
+  </components>
+</component-set>

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/META-INF/plexus/components.xml?rev=390553&view=auto
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/META-INF/plexus/components.xml (added)
+++ maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/META-INF/plexus/components.xml Fri Mar 31 16:44:28 2006
@@ -0,0 +1,477 @@
+<component-set>
+  <components>
+    <component>
+      <role>org.apache.maven.CommonMavenObjectFactory</role>
+      <implementation>org.apache.maven.DefaultCommonMavenObjectFactory</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
+          <role-hint>default</role-hint>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.settings.MavenSettingsBuilder</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>MojoExecutionExceptionDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.MojoExecutionExceptionDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |MojoFailureExceptionDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>MojoFailureExceptionDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.MojoFailureExceptionDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |ProjectBuildDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>ProjectBuildDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.ProjectBuildDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |ProfileActivationDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>ProfileActivationDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.ProfileActivationDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |PluginConfigurationDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>PluginConfigurationDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.PluginConfigurationDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |ArtifactNotFoundDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>ArtifactNotFoundDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.ArtifactNotFoundDiagnoser</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+      </requirements>
+    </component>
+    <!--
+     |
+     |ArtifactResolverDiagnoser
+     |
+     -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>ArtifactResolverDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.ArtifactResolverDiagnoser</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+      </requirements>
+    </component>
+    <!--
+     |
+     |InvalidArtifactDiagnoser
+     |
+     -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>InvalidArtifactDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.InvalidArtifactDiagnoser</implementation>
+    </component>
+
+    <!--
+     |
+     | Lifecycle executor
+     |
+     -->
+    <component>
+      <role>org.apache.maven.lifecycle.LifecycleExecutor</role>
+      <implementation>org.apache.maven.lifecycle.DefaultLifecycleExecutor</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.plugin.PluginManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.extension.ExtensionManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
+        </requirement>
+      </requirements>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: lifecycle -->
+            <phases>
+              <phase>validate</phase>
+              <phase>initialize</phase>
+              <phase>generate-sources</phase>
+              <phase>process-sources</phase>
+              <phase>generate-resources</phase>
+              <phase>process-resources</phase>
+              <phase>compile</phase>
+              <phase>process-classes</phase>
+              <phase>generate-test-sources</phase>
+              <phase>process-test-sources</phase>
+              <phase>generate-test-resources</phase>
+              <phase>process-test-resources</phase>
+              <phase>test-compile</phase>
+              <phase>test</phase>
+              <phase>package</phase>
+              <phase>pre-integration-test</phase>
+              <phase>integration-test</phase>
+              <phase>post-integration-test</phase>
+              <phase>verify</phase>
+              <phase>install</phase>
+              <phase>deploy</phase>
+            </phases>
+            <!-- END SNIPPET: lifecycle -->
+          </lifecycle>
+          <lifecycle>
+            <id>clean</id>
+            <phases>
+              <phase>pre-clean</phase>
+              <phase>clean</phase>
+              <phase>post-clean</phase>
+            </phases>
+            <default-phases>
+              <clean>org.apache.maven.plugins:maven-clean-plugin:clean</clean>
+            </default-phases>
+          </lifecycle>
+          <lifecycle>
+            <id>site</id>
+            <phases>
+              <phase>pre-site</phase>
+              <phase>site</phase>
+              <phase>post-site</phase>
+              <phase>site-deploy</phase>
+            </phases>
+            <default-phases>
+              <site>org.apache.maven.plugins:maven-site-plugin:site</site>
+              <site-deploy>org.apache.maven.plugins:maven-site-plugin:deploy</site-deploy>
+            </default-phases>
+          </lifecycle>
+        </lifecycles>
+        <!-- START SNIPPET: default-reports -->
+        <defaultReports>
+          <report>org.apache.maven.plugins:maven-project-info-reports-plugin</report>
+          <!-- TODO: currently in mojo - should they be defaults any more?
+          <report>org.apache.maven.plugins:maven-checkstyle-plugin</report>
+          <report>org.apache.maven.plugins:maven-javadoc-plugin</report>
+                    <report>org.apache.maven.plugins:maven-changelog-plugin</report>
+                    <report>org.apache.maven.plugins:maven-surefire-report-plugin</report>
+                    <report>org.apache.maven.plugins:maven-jdepend-plugin</report>
+                    <report>org.apache.maven.plugins:maven-jxr-plugin</report>
+                    <report>org.apache.maven.plugins:maven-taglist-plugin</report>
+          -->
+        </defaultReports>
+        <!-- END SNIPPET: default-reports -->
+        <!-- START SNIPPET: default-lifecycle -->
+        <!-- NOT USED, ACCORDING TO CODE.
+        <defaultPhases>
+          <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+          <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+          <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+          <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+          <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+          <package>
+            org.apache.maven.plugins:maven-jar-plugin:jar,
+            org.apache.maven.plugins:maven-source-plugin:jar
+          </package>
+          <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+          <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+        </defaultPhases>
+        -->
+        <!-- END SNIPPET: default-lifecycle -->
+      </configuration>
+    </component>
+
+    <!-- TODO: issues with the lifecycle:
+     - manually configured lifecycles will not pick up any later additions to the defaults where they are intended to extend defaults (have configuration <includeDefaults/> ?)
+     -->
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>pom</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: pom-lifecycle -->
+            <phases>
+              <package>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</package>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+            </phases>
+            <optional-mojos>
+              <optional-mojo>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</optional-mojo>
+            </optional-mojos>
+            <!-- END SNIPPET: pom-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>jar</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: jar-lifecycle -->
+            <phases>
+              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+              <process-test-resources>
+                org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+              <package>
+                org.apache.maven.plugins:maven-jar-plugin:jar
+              </package>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+            </phases>
+            <!-- END SNIPPET: jar-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>maven-plugin</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: maven-plugin-lifecycle -->
+            <phases>
+              <generate-resources>org.apache.maven.plugins:maven-plugin-plugin:descriptor</generate-resources>
+              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+              <process-test-resources>
+                org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+              <package>
+                org.apache.maven.plugins:maven-jar-plugin:jar,
+                org.apache.maven.plugins:maven-plugin-plugin:addPluginArtifactMetadata
+              </package>
+              <install>
+                org.apache.maven.plugins:maven-install-plugin:install,
+                org.apache.maven.plugins:maven-plugin-plugin:updateRegistry
+              </install>
+              <deploy>
+                org.apache.maven.plugins:maven-deploy-plugin:deploy
+              </deploy>
+            </phases>
+            <!-- END SNIPPET: maven-plugin-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>ejb</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: ejb-lifecycle -->
+            <phases>
+              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+              <process-test-resources>
+                org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+              <package>
+                org.apache.maven.plugins:maven-ejb-plugin:ejb
+              </package>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+            </phases>
+            <!-- END SNIPPET: ejb-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>war</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: war-lifecycle -->
+            <phases>
+              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+              <process-test-resources>
+                org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+              <package>org.apache.maven.plugins:maven-war-plugin:war</package>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+            </phases>
+            <!-- END SNIPPET: war-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>ear</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: ear-lifecycle -->
+            <phases>
+              <generate-resources>
+                org.apache.maven.plugins:maven-ear-plugin:generate-application-xml</generate-resources>
+              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+              <package>org.apache.maven.plugins:maven-ear-plugin:ear</package>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+            </phases>
+            <!-- END SNIPPET: ear-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>rar</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: rar-lifecycle -->
+            <phases>
+              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+              <process-test-resources>
+                org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+              <package>org.apache.maven.plugins:maven-rar-plugin:rar</package>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+            </phases>
+            <!-- END SNIPPET: rar-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+    
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>par</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <!-- START SNIPPET: par-lifecycle -->
+        <phases>
+          <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+          <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+          <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+          <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+          <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+          <package>
+            org.apache.maven.plugins:maven-par-plugin:par
+          </package>
+          <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+          <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+        </phases>
+        <!-- END SNIPPET: par-lifecycle -->
+      </configuration>
+    </component>
+    
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>ejb3</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <!-- START SNIPPET: ejb3-lifecycle -->
+        <phases>
+          <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+          <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+          <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+          <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+          <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+          <package>
+            org.apache.maven.plugins:maven-ejb3-plugin:ejb3
+          </package>
+          <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+          <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+        </phases>
+        <!-- END SNIPPET: ejb3-lifecycle -->
+      </configuration>
+    </component>
+ 
+    <component>
+      <role>org.apache.maven.plugin.version.PluginVersionManager</role>
+      <role-hint>default</role-hint>
+      <implementation>org.apache.maven.plugin.version.DefaultPluginVersionManager</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.plugin.registry.MavenPluginRegistryBuilder</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.components.interactivity.InputHandler</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.project.MavenProjectBuilder</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.execution.RuntimeInformation</role>
+        </requirement>
+      </requirements>
+    </component>
+  </components>
+</component-set>

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/maven/CommonMavenObjectFactory$1.class
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/maven/CommonMavenObjectFactory%241.class?rev=390553&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/maven/CommonMavenObjectFactory$1.class
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/maven/CommonMavenObjectFactory.class
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/maven/CommonMavenObjectFactory.class?rev=390553&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/maven/CommonMavenObjectFactory.class
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/maven/DefaultCommonMavenObjectFactory.class
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/maven/DefaultCommonMavenObjectFactory.class?rev=390553&view=auto
==============================================================================
Binary file - no diff available.

Propchange: maven/components/branches/maven-embedder-refactor/maven-tools/target/classes/org/apache/maven/DefaultCommonMavenObjectFactory.class
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream