Author: jvanzyl
Date: Fri Mar 31 18:26:07 2006
New Revision: 390570

URL: http://svn.apache.org/viewcvs?rev=390570&view=rev
Log: (empty)

Added:
    
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultMavenTools.java
   (contents, props changed)
      - copied, changed from r390553, 
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java
    
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/MavenTools.java
   (contents, props changed)
      - copied, changed from r390553, 
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/CommonMavenObjectFactory.java
Removed:
    
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/CommonMavenObjectFactory.java
    
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java
Modified:
    maven/components/branches/maven-embedder-refactor/maven-core/pom.xml
    
maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
    
maven/components/branches/maven-embedder-refactor/maven-core/src/main/resources/META-INF/plexus/components.xml
    maven/components/branches/maven-embedder-refactor/maven-embedder/pom.xml
    
maven/components/branches/maven-embedder-refactor/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
    maven/components/branches/maven-embedder-refactor/maven-project/pom.xml
    
maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    
maven/components/branches/maven-embedder-refactor/maven-project/src/main/resources/META-INF/plexus/components.xml
    
maven/components/branches/maven-embedder-refactor/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
    
maven/components/branches/maven-embedder-refactor/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
    maven/components/branches/maven-embedder-refactor/maven-tools/pom.xml
    
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/resources/META-INF/plexus/components.xml

Modified: maven/components/branches/maven-embedder-refactor/maven-core/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core/pom.xml?rev=390570&r1=390569&r2=390570&view=diff
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-core/pom.xml 
(original)
+++ maven/components/branches/maven-embedder-refactor/maven-core/pom.xml Fri 
Mar 31 18:26:07 2006
@@ -141,6 +141,11 @@
       <version>2.1-SNAPSHOT</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-tools</artifactId>
+      <version>2.1-SNAPSHOT</version>
+    </dependency>    
+    <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-ssh</artifactId>
       <scope>runtime</scope>

Modified: 
maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: 
http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=390570&r1=390569&r2=390570&view=diff
==============================================================================
--- 
maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 (original)
+++ 
maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 Fri Mar 31 18:26:07 2006
@@ -101,7 +101,7 @@
 
     protected LoggerManager loggerManager;
 
-    protected CommonMavenObjectFactory mavenObjectFactory;
+    protected MavenTools mavenTools;
 
     private static final long MB = 1024 * 1024;
 
@@ -116,7 +116,7 @@
     public void execute( MavenExecutionRequest request )
         throws MavenExecutionException
     {
-        request.setLocalRepository( mavenObjectFactory.createLocalRepository( 
request.getLocalRepositoryPath(),
+        request.setLocalRepository( mavenTools.createLocalRepository( 
request.getLocalRepositoryPath(),
                                                                               
request.isOffline(),
                                                                               
request.isUpdateSnapshots(),
                                                                               
request.getGlobalChecksumPolicy() ) );

Modified: 
maven/components/branches/maven-embedder-refactor/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=390570&r1=390569&r2=390570&view=diff
==============================================================================
--- 
maven/components/branches/maven-embedder-refactor/maven-core/src/main/resources/META-INF/plexus/components.xml
 (original)
+++ 
maven/components/branches/maven-embedder-refactor/maven-core/src/main/resources/META-INF/plexus/components.xml
 Fri Mar 31 18:26:07 2006
@@ -83,7 +83,7 @@
           <role>org.apache.maven.artifact.manager.WagonManager</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.CommonMavenObjectFactory</role>
+          <role>org.apache.maven.MavenTools</role>
         </requirement>
       </requirements>
     </component>

Modified: 
maven/components/branches/maven-embedder-refactor/maven-embedder/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-embedder/pom.xml?rev=390570&r1=390569&r2=390570&view=diff
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-embedder/pom.xml 
(original)
+++ maven/components/branches/maven-embedder-refactor/maven-embedder/pom.xml 
Fri Mar 31 18:26:07 2006
@@ -26,6 +26,11 @@
       <artifactId>maven-core</artifactId>
       <version>${mavenVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-tools</artifactId>
+      <version>${mavenVersion}</version>
+    </dependency>
   </dependencies>
   <reporting>
     <plugins>

Modified: 
maven/components/branches/maven-embedder-refactor/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: 
http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=390570&r1=390569&r2=390570&view=diff
==============================================================================
--- 
maven/components/branches/maven-embedder-refactor/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
 (original)
+++ 
maven/components/branches/maven-embedder-refactor/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
 Fri Mar 31 18:26:07 2006
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-import org.apache.maven.CommonMavenObjectFactory;
 import org.apache.maven.Maven;
+import org.apache.maven.MavenTools;
 import org.apache.maven.SettingsConfigurationException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
@@ -44,7 +44,6 @@
 import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.reactor.MavenExecutionException;
 import org.apache.maven.settings.MavenSettingsBuilder;
-import org.apache.maven.settings.RuntimeInfo;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.wagon.events.TransferListener;
 import org.codehaus.classworlds.ClassWorld;
@@ -119,7 +118,7 @@
 
     private Maven maven;
 
-    private CommonMavenObjectFactory mavenObjectFactory;
+    private MavenTools mavenTools;
 
     // ----------------------------------------------------------------------
     // Configuration
@@ -535,7 +534,7 @@
 
             maven = (Maven) embedder.lookup( Maven.ROLE );
 
-            mavenObjectFactory = (CommonMavenObjectFactory) embedder.lookup( 
CommonMavenObjectFactory.ROLE );
+            mavenTools = (MavenTools) embedder.lookup( MavenTools.ROLE );
 
             pluginDescriptorBuilder = new PluginDescriptorBuilder();
 
@@ -628,7 +627,7 @@
                                    Boolean pluginUpdateOverride )
         throws SettingsConfigurationException
     {
-        return mavenObjectFactory.buildSettings( userSettingsPath,
+        return mavenTools.buildSettings( userSettingsPath,
                                                  globalSettingsPath,
                                                  interactive,
                                                  offline,

Modified: 
maven/components/branches/maven-embedder-refactor/maven-project/pom.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-project/pom.xml?rev=390570&r1=390569&r2=390570&view=diff
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-project/pom.xml 
(original)
+++ maven/components/branches/maven-embedder-refactor/maven-project/pom.xml Fri 
Mar 31 18:26:07 2006
@@ -43,6 +43,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
+      <artifactId>maven-tools</artifactId>
+      <version>2.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
       <version>2.1-SNAPSHOT</version>
     </dependency>

Modified: 
maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=390570&r1=390569&r2=390570&view=diff
==============================================================================
--- 
maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/branches/maven-embedder-refactor/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Fri Mar 31 18:26:07 2006
@@ -60,6 +60,7 @@
 import org.apache.maven.project.validation.ModelValidationResult;
 import org.apache.maven.project.validation.ModelValidator;
 import org.apache.maven.wagon.events.TransferListener;
+import org.apache.maven.MavenTools;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
 import 
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -135,8 +136,7 @@
     extends AbstractLogEnabled
     implements MavenProjectBuilder, Initializable, Contextualizable
 {
-    // TODO: remove
-    private PlexusContainer container;
+    protected PlexusContainer container;
 
     protected MavenProfilesBuilder profilesBuilder;
 
@@ -165,6 +165,8 @@
 
     private ArtifactRepositoryFactory artifactRepositoryFactory;
 
+    private MavenTools mavenTools;
+
     // ----------------------------------------------------------------------
     // I am making this available for use with a new method that takes a
     // a monitor wagon monitor as a parameter so that tools can use the
@@ -653,7 +655,7 @@
                 ArtifactRepository artifactRepo = null;
                 try
                 {
-                    artifactRepo = ProjectUtils.buildArtifactRepository( 
mavenRepo, artifactRepositoryFactory, container );
+                    artifactRepo = mavenTools.buildArtifactRepository( 
mavenRepo );
                 }
                 catch ( InvalidRepositoryException e )
                 {
@@ -789,7 +791,9 @@
     {
         try
         {
-            return ProjectUtils.buildArtifactRepositories( 
model.getRepositories(), artifactRepositoryFactory, container );
+            System.out.println( "mavenTools = " + mavenTools );
+
+            return mavenTools.buildArtifactRepositories( 
model.getRepositories() );
         }
         catch ( InvalidRepositoryException e )
         {
@@ -867,22 +871,17 @@
                                                                         
project.getVersion(), project.getPackaging() );
         project.setArtifact( projectArtifact );
 
-        project.setPluginArtifactRepositories( 
ProjectUtils.buildArtifactRepositories( model.getPluginRepositories(),
-                                                                               
        artifactRepositoryFactory,
-                                                                               
        container ) );
+        project.setPluginArtifactRepositories( 
mavenTools.buildArtifactRepositories( model.getPluginRepositories() ) );
 
         DistributionManagement dm = model.getDistributionManagement();
         if ( dm != null )
         {
-            ArtifactRepository repo = 
ProjectUtils.buildDeploymentArtifactRepository( dm.getRepository(),
-                                                                               
       artifactRepositoryFactory,
-                                                                               
       container );
+            ArtifactRepository repo = 
mavenTools.buildDeploymentArtifactRepository( dm.getRepository() );
             project.setReleaseArtifactRepository( repo );
 
             if ( dm.getSnapshotRepository() != null )
             {
-                repo = ProjectUtils.buildDeploymentArtifactRepository( 
dm.getSnapshotRepository(),
-                                                                       
artifactRepositoryFactory, container );
+                repo = mavenTools.buildDeploymentArtifactRepository( 
dm.getSnapshotRepository() );
                 project.setSnapshotArtifactRepository( repo );
             }
         }
@@ -909,7 +908,7 @@
         }
 
         project.setRemoteArtifactRepositories(
-            ProjectUtils.buildArtifactRepositories( model.getRepositories(), 
artifactRepositoryFactory, container ) );
+            mavenTools.buildArtifactRepositories( model.getRepositories() ) );
 
         // TODO: these aren't taking active project artifacts into 
consideration in the reactor
         project.setPluginArtifacts( createPluginArtifacts( projectId, 
project.getBuildPlugins() ) );

Modified: 
maven/components/branches/maven-embedder-refactor/maven-project/src/main/resources/META-INF/plexus/components.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=390570&r1=390569&r2=390570&view=diff
==============================================================================
--- 
maven/components/branches/maven-embedder-refactor/maven-project/src/main/resources/META-INF/plexus/components.xml
 (original)
+++ 
maven/components/branches/maven-embedder-refactor/maven-project/src/main/resources/META-INF/plexus/components.xml
 Fri Mar 31 18:26:07 2006
@@ -83,6 +83,9 @@
         <requirement>
           <role>org.apache.maven.artifact.manager.WagonManager</role>
         </requirement>
+        <requirement>
+          <role>org.apache.maven.MavenTools</role>
+        </requirement>
       </requirements>
     </component>
 <!--

Modified: 
maven/components/branches/maven-embedder-refactor/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=390570&r1=390569&r2=390570&view=diff
==============================================================================
--- 
maven/components/branches/maven-embedder-refactor/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
 (original)
+++ 
maven/components/branches/maven-embedder-refactor/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
 Fri Mar 31 18:26:07 2006
@@ -73,6 +73,9 @@
         <requirement>
           
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
         </requirement>
+        <requirement>
+          <role>org.apache.maven.MavenTools</role>
+        </requirement>
       </requirements>
     </component>
   </components>

Modified: 
maven/components/branches/maven-embedder-refactor/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL: 
http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?rev=390570&r1=390569&r2=390570&view=diff
==============================================================================
--- 
maven/components/branches/maven-embedder-refactor/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
 (original)
+++ 
maven/components/branches/maven-embedder-refactor/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
 Fri Mar 31 18:26:07 2006
@@ -73,6 +73,9 @@
         <requirement>
           
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
         </requirement>
+        <requirement>
+          <role>org.apache.maven.MavenTools</role>
+        </requirement>
       </requirements>
     </component>
   </components>

Modified: 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=390570&r1=390569&r2=390570&view=diff
==============================================================================
--- maven/components/branches/maven-embedder-refactor/maven-tools/pom.xml 
(original)
+++ maven/components/branches/maven-embedder-refactor/maven-tools/pom.xml Fri 
Mar 31 18:26:07 2006
@@ -7,7 +7,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven</groupId>
-  <artifactId>maven-core</artifactId>
+  <artifactId>maven-tools</artifactId>
   <name>Maven Tools</name>
   <description>Tools for creating artifact repositories and 
settings.</description>
   <version>2.1-SNAPSHOT</version>

Copied: 
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultMavenTools.java
 (from r390553, 
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/DefaultMavenTools.java?p2=maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultMavenTools.java&p1=maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java&r1=390553&r2=390570&rev=390570&view=diff
==============================================================================
--- 
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultCommonMavenObjectFactory.java
 (original)
+++ 
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/DefaultMavenTools.java
 Fri Mar 31 18:26:07 2006
@@ -34,8 +34,8 @@
  *
  * @author Jason van Zyl
  */
-public class DefaultCommonMavenObjectFactory
-    implements CommonMavenObjectFactory,
+public class DefaultMavenTools
+    implements MavenTools,
     Contextualizable
 {
     private ArtifactRepositoryLayout repositoryLayout;
@@ -204,7 +204,7 @@
         }
     }
 
-    private ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( 
RepositoryPolicy policy )
+    public ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( 
RepositoryPolicy policy )
     {
         boolean enabled = true;
         String updatePolicy = null;

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

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

Copied: 
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/MavenTools.java
 (from r390553, 
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/MavenTools.java?p2=maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/MavenTools.java&p1=maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/CommonMavenObjectFactory.java&r1=390553&r2=390570&rev=390570&view=diff
==============================================================================
--- 
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/CommonMavenObjectFactory.java
 (original)
+++ 
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/java/org/apache/maven/MavenTools.java
 Fri Mar 31 18:26:07 2006
@@ -1,16 +1,22 @@
 package org.apache.maven;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.InvalidRepositoryException;
 import org.apache.maven.settings.Settings;
+import org.apache.maven.model.DeploymentRepository;
+import org.apache.maven.model.Repository;
+import org.apache.maven.model.RepositoryPolicy;
 
 import java.io.File;
+import java.util.List;
 
 /**
  * @author Jason van Zyl
  */
-public interface CommonMavenObjectFactory
+public interface MavenTools
 {
-    static String ROLE = CommonMavenObjectFactory.class.getName();
+    static String ROLE = MavenTools.class.getName();
 
     ArtifactRepository createLocalRepository( File localRepositoryPath,
                                               boolean offline,
@@ -31,4 +37,14 @@
                             boolean usePluginRegistry,
                             Boolean pluginUpdateOverride )
         throws SettingsConfigurationException;
+
+    List buildArtifactRepositories( List repositories )
+        throws InvalidRepositoryException;
+
+    ArtifactRepository buildDeploymentArtifactRepository( DeploymentRepository 
repo )
+        throws InvalidRepositoryException;
+
+    ArtifactRepository buildArtifactRepository( Repository repo )
+        throws InvalidRepositoryException;
+
 }

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

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

Modified: 
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=390570&r1=390569&r2=390570&view=diff
==============================================================================
--- 
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/resources/META-INF/plexus/components.xml
 (original)
+++ 
maven/components/branches/maven-embedder-refactor/maven-tools/src/main/resources/META-INF/plexus/components.xml
 Fri Mar 31 18:26:07 2006
@@ -1,8 +1,8 @@
 <component-set>
   <components>
     <component>
-      <role>org.apache.maven.CommonMavenObjectFactory</role>
-      
<implementation>org.apache.maven.DefaultCommonMavenObjectFactory</implementation>
+      <role>org.apache.maven.MavenTools</role>
+      <implementation>org.apache.maven.DefaultMavenTools</implementation>
       <requirements>
         <requirement>
           
<role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
@@ -13,463 +13,6 @@
         </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>


Reply via email to