maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject svn commit: r767707 [2/6] - in /maven/components/branches/MNG-2766: ./ apache-maven/ maven-compat/ maven-compat/src/main/java/org/apache/maven/artifact/ maven-compat/src/main/java/org/apache/maven/artifact/manager/ maven-compat/src/main/java/org/apache...
Date Wed, 22 Apr 2009 23:04:18 GMT
Modified: maven/components/branches/MNG-2766/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/pom.xml?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/pom.xml (original)
+++ maven/components/branches/MNG-2766/maven-core/pom.xml Wed Apr 22 23:04:06 2009
@@ -11,14 +11,18 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
+    <artifactId>maven</artifactId>
     <version>3.0-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+
   <artifactId>maven-core</artifactId>
+
   <name>Maven Core</name>
+
   <dependencies>
     <!--  Maven -->
     <dependency>
@@ -39,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project-builder</artifactId>
+      <artifactId>maven-model-builder</artifactId>
     </dependency>
     <!--
     <dependency>
@@ -86,29 +90,15 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.spice</groupId>
-      <artifactId>model-builder</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.sonatype.plexus</groupId>
       <artifactId>plexus-sec-dispatcher</artifactId>
     </dependency>
     <dependency>
-    	<groupId>commons-jxpath</groupId>
-    	<artifactId>commons-jxpath</artifactId>
-    </dependency>
-    <!--  Testing -->
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-file</artifactId>
-      <scope>test</scope>
+      <groupId>commons-jxpath</groupId>
+      <artifactId>commons-jxpath</artifactId>
     </dependency>
-    <dependency>
-      <groupId>easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <scope>test</scope>
-    </dependency>    
   </dependencies>
+
   <build>
     <plugins>
       <plugin>

Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Wed Apr 22 23:04:06 2009
@@ -211,7 +211,7 @@
                 File basedir = file.getParentFile();
 
                 List<File> moduleFiles = new ArrayList<File>();
-
+                
                 for ( String name : project.getModules() )
                 {
                     if ( StringUtils.isEmpty( StringUtils.trim( name ) ) )

Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Wed Apr 22 23:04:06 2009
@@ -67,6 +67,8 @@
 
     private File globalSettingsFile;
 
+    private File userToolchainsFile;
+
     // ----------------------------------------------------------------------------
     // Request
     // ----------------------------------------------------------------------------
@@ -130,6 +132,7 @@
         copy.setProjectPresent( original.isProjectPresent() );
         copy.setUserSettingsFile( original.getUserSettingsFile() );
         copy.setGlobalSettingsFile( original.getGlobalSettingsFile() );
+        copy.setUserToolchainsFile( original.getUserToolchainsFile() );
         copy.setBaseDirectory( new File( original.getBaseDirectory() ) );
         copy.setGoals( original.getGoals() );
         copy.setRecursive( original.isRecursive() );
@@ -611,7 +614,7 @@
         return this;
     }
 
-    // Settin10gs files
+    // Settings files
 
     public File getUserSettingsFile()
     {
@@ -637,6 +640,18 @@
         return this;
     }
 
+    public File getUserToolchainsFile()
+    {
+        return userToolchainsFile;
+    }
+
+    public MavenExecutionRequest setUserToolchainsFile( File userToolchainsFile )
+    {
+        this.userToolchainsFile = userToolchainsFile;
+
+        return this;
+    }
+
     public MavenExecutionRequest addRemoteRepository( ArtifactRepository repository )
     {
         if ( remoteRepositories == null )

Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java Wed Apr 22 23:04:06 2009
@@ -212,5 +212,8 @@
     MavenExecutionRequest setRemoteRepositories( List<ArtifactRepository> repositories );
     List<ArtifactRepository> getRemoteRepositories();
 
+    File getUserToolchainsFile();
+    MavenExecutionRequest setUserToolchainsFile( File userToolchainsFile );
+
     ProjectBuilderConfiguration getProjectBuildingConfiguration();
 }

Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -4,4 +4,4 @@
 /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:739385,741841,747468,748815,749612
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:688587-696625,696644-699681
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:688587-696625,696644-699681,751453-767358

Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -4,4 +4,4 @@
 /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:739385,741841,747468,748815,749612
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:688587-696625,696644-699681
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:688587-696625,696644-699681,751453-767358

Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -3,4 +3,5 @@
 /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/listeners:679206
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners:751453-767358
 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners:688587-696625,696644-699681

Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java Wed Apr 22 23:04:06 2009
@@ -2,17 +2,13 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.execution.MavenSession;
-import org.apache.maven.project.builder.factories.ArtifactModelContainerFactory;
-import org.apache.maven.project.builder.ProjectUri;
-import org.apache.maven.shared.model.DataSourceException;
-import org.apache.maven.shared.model.ModelContainer;
-import org.apache.maven.shared.model.ModelContainerFactory;
-import org.apache.maven.shared.model.ModelProperty;
+import org.apache.maven.model.Extension;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.ProjectUri;
 import org.codehaus.plexus.classworlds.realm.ClassRealm;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Configuration;
@@ -43,81 +39,17 @@
     @Requirement
     PlexusPluginManager pluginManager;
     
-    private List<BuildExtension> buildExtensions = new ArrayList<BuildExtension>();
-    
-    public void fire(List<? extends ModelContainer> modelContainers) 
-        throws DataSourceException     
-    {        
-        if ( !inBuild )
-        {
-            return;
-        }
-
-        for ( ModelContainer mc : modelContainers )
-        {
-            if ( hasExtension( mc ) )
-            {
-                buildExtensions.add( new BuildExtension( mc.getProperties() ) );
-            }
-        }
+    private List<Extension> buildExtensions = new ArrayList<Extension>();
+     
+    public void fire(Model model)
+    {
+    	buildExtensions.addAll(new ArrayList<Extension>(model.getBuild().getExtensions()));
     }
            
     public List<String> getUris()
     {
         return Arrays.asList( ProjectUri.Build.Extensions.Extension.xUri );
     }
-
-    public Collection<ModelContainerFactory> getModelContainerFactories()
-    {
-        return Arrays.asList( (ModelContainerFactory) new ArtifactModelContainerFactory() );
-    }
-
-    private static boolean hasExtension( ModelContainer container )
-    {
-        for ( ModelProperty mp : container.getProperties() )
-        {
-            if ( mp.getUri().equals( ProjectUri.Build.Extensions.Extension.xUri ) )
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static class BuildExtension
-    {
-        private String groupId;
-
-        private String artifactId;
-
-        private String version;
-        
-        public BuildExtension( String groupId, String artifactId, String version )
-        {
-            this.groupId = groupId;
-            this.artifactId = artifactId;
-            this.version = version;
-        }
-
-        BuildExtension( List<ModelProperty> modelProperties )
-        {
-            for ( ModelProperty mp : modelProperties )
-            {
-                if ( mp.getUri().equals( ProjectUri.Build.Extensions.Extension.groupId ) )
-                {
-                    groupId = mp.getValue();
-                }
-                else if ( mp.getUri().equals( ProjectUri.Build.Extensions.Extension.artifactId ) )
-                {
-                    artifactId = mp.getValue();
-                }
-                else if ( mp.getUri().equals( ProjectUri.Build.Extensions.Extension.version ) )
-                {
-                    version = mp.getValue();
-                }
-            }
-        }
-    }   
     
     /**
      * Take the extension elements that were found during the POM construction process and now
@@ -129,11 +61,16 @@
      * @param session Maven session used as the execution context for the current Maven project.
      */
     public void processModelContainers( MavenSession session )
-    {       
-        for ( BuildExtension be : buildExtensions )
+    {    
+    	if(!inBuild)
+    	{
+    		return;
+    	}
+    	
+        for ( Extension be : buildExtensions )
         {
             PluginResolutionRequest request = new PluginResolutionRequest()
-                .setPluginMetadata( new PluginMetadata( be.groupId, be.artifactId, be.version ) )
+                .setPluginMetadata( new PluginMetadata( be.getGroupId(), be.getArtifactId(), be.getVersion() ) )
                 .addLocalRepository( session.getRequest().getLocalRepositoryPath() )
                 .setRemoteRepositories( convertToMercuryRepositories( session.getRequest().getRemoteRepositories() ) );
 

Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -3,4 +3,5 @@
 /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:751453-767358
 /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:688587-696625,696644-699681

Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/listeners/MavenModelEventListener.java Wed Apr 22 23:04:06 2009
@@ -1,7 +1,8 @@
 package org.apache.maven.listeners;
 
 import org.apache.maven.execution.MavenSession;
-import org.apache.maven.shared.model.ModelEventListener;
+import org.apache.maven.model.ModelEventListener;
+
 
 public interface MavenModelEventListener
     extends ModelEventListener

Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -4,4 +4,5 @@
 /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:739385,741841,747468,748815,749612
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java:751453-767358
 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:688587-696625,696644-699681

Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -4,4 +4,5 @@
 /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:739385,741841,747468,748815,749612
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java:751453-767358
 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:688587-696625,696644-699681

Propchange: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -4,4 +4,5 @@
 /maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:739385,741841,747468,748815,749612
 /maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java:751453-767358
 /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:688587-696625,696644-699681

Modified: maven/components/branches/MNG-2766/maven-core/src/main/mdo/settings.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/mdo/settings.mdo?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/mdo/settings.mdo (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/mdo/settings.mdo Wed Apr 22 23:04:06 2009
@@ -292,28 +292,19 @@
      */
     public synchronized Proxy getActiveProxy()
     {
-        if(activeProxy == null)
+        if (activeProxy == null)
         {
-            java.util.List proxies = getProxies();
+            java.util.List<Proxy> proxies = getProxies();
             if ( proxies != null && !proxies.isEmpty() )
             {
-                if ( proxies.size() > 1 )
+                for ( Proxy proxy : proxies )
                 {
-                    for ( java.util.Iterator it = proxies.iterator(); it.hasNext(); )
+                    if ( proxy.isActive() )
                     {
-                        Proxy proxy = (Proxy) it.next();
-                        if ( proxy.isActive() )
-                        {
-                            activeProxy = proxy;
-                            break;
-                        }
+                        activeProxy = proxy;
+                        break;
                     }
                 }
-                else
-                {
-                    // If we only have one proxy, use it as the active one.
-                    activeProxy = (Proxy) proxies.get( 0 );
-                }
             }
         }
 
@@ -464,7 +455,7 @@
           <name>active</name>
           <version>1.0.0</version>
           <required>false</required>
-          <defaultValue>false</defaultValue>
+          <defaultValue>true</defaultValue>
           <description>
             <![CDATA[
             Whether this proxy configuration is the active one.

Modified: maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/listeners/BuildExtensionListenerTest.java Wed Apr 22 23:04:06 2009
@@ -1,22 +1,17 @@
 package org.apache.maven.listeners;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
 
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.DuplicateProjectException;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.execution.ReactorManager;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Extension;
 import org.apache.maven.model.Model;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.builder.ProjectUri;
-import org.apache.maven.shared.model.ModelContainer;
-import org.apache.maven.shared.model.ModelContainerAction;
-import org.apache.maven.shared.model.ModelProperty;
 import org.apache.maven.wagon.Wagon;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
@@ -30,16 +25,19 @@
     {
         BuildExtensionListener listener = (BuildExtensionListener) lookup( MavenModelEventListener.class, "extensions" );
 
-        // Create the model properties and the model container to feed to the event firing
-        List<ModelProperty> modelProperties = new ArrayList<ModelProperty>();
-        modelProperties.add( new ModelProperty( ProjectUri.Build.Extensions.Extension.xUri, null ) );
-        modelProperties.add( new ModelProperty( ProjectUri.Build.Extensions.Extension.groupId, "org.apache.maven.wagon" ) );
-        modelProperties.add( new ModelProperty( ProjectUri.Build.Extensions.Extension.artifactId, "wagon-webdav" ) );
-        modelProperties.add( new ModelProperty( ProjectUri.Build.Extensions.Extension.version, "1.0-beta-2" ) );
-        ModelContainer container = new TestModelContainer( modelProperties );
-
+        Extension extension = new Extension();
+        extension.setGroupId("org.apache.maven.wagon" );
+        extension.setArtifactId("wagon-webdav" );
+        extension.setVersion( "1.0-beta-2" );
+        
+        Build build = new Build();
+        build.addExtension(extension);
+        
+        Model model = new Model();
+        model.setBuild(build);
+        
         // Fire the event.
-        listener.fire( Arrays.asList( container ) );
+        listener.fire( model );
 
         try
         {
@@ -55,7 +53,7 @@
         listener.processModelContainers( newMavenSession() );
         
         // Now we should be able to find the extension.
-    //    lookup( Wagon.class, "dav" );        
+        lookup( Wagon.class, "dav" );    
     }
 
     private MavenSession newMavenSession()
@@ -75,29 +73,4 @@
         return session;
     }
 
-    public class TestModelContainer
-        implements ModelContainer
-    {
-        List<ModelProperty> modelProperties;
-
-        public TestModelContainer( List<ModelProperty> properties )
-        {
-            this.modelProperties = properties;
-        }
-
-        public List<ModelProperty> getProperties()
-        {
-            return new ArrayList<ModelProperty>( modelProperties );
-        }
-
-        public ModelContainerAction containerAction( ModelContainer modelContainer )
-        {
-            return null;
-        }
-
-        public ModelContainer createNewInstance( List<ModelProperty> modelProperties )
-        {
-            return null;
-        }
-    }
 }

Modified: maven/components/branches/MNG-2766/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/pom.xml?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/pom.xml (original)
+++ maven/components/branches/MNG-2766/maven-embedder/pom.xml Wed Apr 22 23:04:06 2009
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
   <!--
     Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
     file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
@@ -8,15 +9,20 @@
     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.
   -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
+    <artifactId>maven</artifactId>
     <version>3.0-SNAPSHOT</version>
   </parent>
+
   <artifactId>maven-embedder</artifactId>
+
   <name>Maven Embedder</name>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -64,10 +70,11 @@
       <artifactId>easymock</artifactId>
     </dependency>
     <dependency>
-    	<groupId>commons-jxpath</groupId>
-    	<artifactId>commons-jxpath</artifactId>
+      <groupId>commons-jxpath</groupId>
+      <artifactId>commons-jxpath</artifactId>
     </dependency>
   </dependencies>
+
   <build>
     <resources>
       <resource>

Modified: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java Wed Apr 22 23:04:06 2009
@@ -76,6 +76,8 @@
 
     public static final String ALTERNATE_GLOBAL_SETTINGS = "gs";
 
+    public static final char ALTERNATE_USER_TOOLCHAINS = 't';
+
     public static final String FAIL_FAST = "ff";
 
     public static final String FAIL_AT_END = "fae";
@@ -111,6 +113,7 @@
         options.addOption( OptionBuilder.withLongOpt( "lax-checksums" ).withDescription( "Warn if checksums don't match" ).create( CHECKSUM_WARNING_POLICY ) );
         options.addOption( OptionBuilder.withLongOpt( "settings" ).withDescription( "Alternate path for the user settings file" ).hasArg().create( ALTERNATE_USER_SETTINGS ) );
         options.addOption( OptionBuilder.withLongOpt( "global-settings" ).withDescription( "Alternate path for the global settings file" ).hasArg().create( ALTERNATE_GLOBAL_SETTINGS ) );
+        options.addOption( OptionBuilder.withLongOpt( "toolchains" ).withDescription( "Alternate path for the user toolchains file" ).hasArg().create( ALTERNATE_USER_TOOLCHAINS ) );
         options.addOption( OptionBuilder.withLongOpt( "fail-fast" ).withDescription( "Stop at first failure in reactorized builds" ).create( FAIL_FAST ) );
         options.addOption( OptionBuilder.withLongOpt( "fail-at-end" ).withDescription( "Only fail the build afterwards; allow all non-impacted builds to continue" ).create( FAIL_AT_END ) );
         options.addOption( OptionBuilder.withLongOpt( "fail-never" ).withDescription( "NEVER fail the build, regardless of project result" ).create( FAIL_NEVER ) );

Modified: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIRequestUtils.java Wed Apr 22 23:04:06 2009
@@ -22,7 +22,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
@@ -30,6 +29,7 @@
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.maven.MavenTransferListener;
+import org.apache.maven.embedder.MavenEmbedder;
 import org.apache.maven.execution.DefaultMavenExecutionRequest;
 import org.apache.maven.execution.MavenExecutionRequest;
 import org.codehaus.plexus.util.cli.CommandLineUtils;
@@ -77,7 +77,7 @@
         //
         // ----------------------------------------------------------------------
 
-        List goals = commandLine.getArgList();
+        List<String> goals = commandLine.getArgList();
 
         boolean recursive = true;
 
@@ -139,9 +139,9 @@
         // Profile Activation
         // ----------------------------------------------------------------------
 
-        List activeProfiles = new ArrayList();
+        List<String> activeProfiles = new ArrayList<String>();
 
-        List inactiveProfiles = new ArrayList();
+        List<String> inactiveProfiles = new ArrayList<String>();
 
         if ( commandLine.hasOption( CLIManager.ACTIVATE_PROFILES ) )
         {
@@ -222,6 +222,16 @@
         Properties userProperties = new Properties();
         populateProperties( commandLine, executionProperties, userProperties );
 
+        File userToolchainsFile;
+        if ( commandLine.hasOption( CLIManager.ALTERNATE_USER_TOOLCHAINS ) )
+        {
+            userToolchainsFile = new File( commandLine.getOptionValue( CLIManager.ALTERNATE_USER_TOOLCHAINS ) );
+        }
+        else
+        {
+            userToolchainsFile = MavenEmbedder.DEFAULT_USER_TOOLCHAINS_FILE;
+        }
+
         MavenExecutionRequest request = new DefaultMavenExecutionRequest()
             .setBaseDirectory( baseDirectory )
             .setGoals( goals )
@@ -239,7 +249,9 @@
             .setTransferListener( transferListener ) // default: batch mode which goes along with interactive
             .setUpdateSnapshots( updateSnapshots ) // default: false
             .setNoSnapshotUpdates( noSnapshotUpdates ) // default: false
-            .setGlobalChecksumPolicy( globalChecksumPolicy ); // default: warn
+            .setGlobalChecksumPolicy( globalChecksumPolicy ) // default: warn
+            .setUserToolchainsFile( userToolchainsFile );
+        
 
         if ( alternatePomFile != null )
         {
@@ -261,10 +273,8 @@
         try
         {
             Properties envVars = CommandLineUtils.getSystemEnvVars();
-            Iterator i = envVars.entrySet().iterator();
-            while ( i.hasNext() )
+            for ( Entry<Object, Object> e : envVars.entrySet() )
             {
-                Entry e = (Entry) i.next();
                 executionProperties.setProperty( "env." + e.getKey().toString(), e.getValue().toString() );
             }
         }

Modified: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Wed Apr 22 23:04:06 2009
@@ -83,6 +83,8 @@
     public static final File DEFAULT_GLOBAL_SETTINGS_FILE =
         new File( System.getProperty( "maven.home", System.getProperty( "user.dir", "" ) ), "conf/settings.xml" );
 
+    public static final File DEFAULT_USER_TOOLCHAINS_FILE = new File( userMavenConfigurationHome, "toolchains.xml" );
+
     // ----------------------------------------------------------------------------
     //
     // ----------------------------------------------------------------------------

Modified: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Wed Apr 22 23:04:06 2009
@@ -29,10 +29,12 @@
 import org.apache.maven.embedder.Configuration;
 import org.apache.maven.embedder.MavenEmbedderException;
 import org.apache.maven.execution.MavenExecutionRequest;
+import org.apache.maven.model.Model;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.Repository;
 import org.apache.maven.profiles.DefaultProfileManager;
 import org.apache.maven.profiles.ProfileActivationContext;
+import org.apache.maven.profiles.ProfileActivationException;
 import org.apache.maven.profiles.ProfileManager;
 import org.apache.maven.repository.RepositorySystem;
 import org.apache.maven.settings.MavenSettingsBuilder;
@@ -41,6 +43,7 @@
 import org.apache.maven.settings.Server;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.SettingsUtils;
+import org.apache.maven.toolchain.ToolchainsBuilder;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
@@ -71,6 +74,9 @@
     @Requirement
     private RepositorySystem repositorySystem;
 
+    @Requirement
+    private ToolchainsBuilder toolchainsBuilder;
+
     // 2009-03-05 Oleg: this component is defined sub-classed in this package
     @Requirement(hint = "maven")
     private SecDispatcher securityDispatcher;
@@ -84,6 +90,8 @@
 
         localRepository( request, configuration );
 
+        toolchains( request, configuration );
+
         artifactTransferMechanism( request, configuration );
 
         profileManager( request, configuration );
@@ -150,21 +158,41 @@
                 Profile profile = SettingsUtils.convertFromSettingsProfile( rawProfile );
 
                 profileManager.addProfile( profile );
+            }
 
-                // We need to convert profile repositories to artifact repositories
-
-                for ( Repository r : profile.getRepositories() )
+            // We need to convert profile repositories to artifact repositories
+            try
+            {
+                for ( Profile profile : profileManager.getActiveProfiles() )
                 {
-                    try
+                    for ( Repository r : profile.getRepositories() )
                     {
-                        request.addRemoteRepository( repositorySystem.buildArtifactRepository( r ) );
+                        try
+                        {
+                            request.addRemoteRepository( repositorySystem.buildArtifactRepository( r ) );
+                        }
+                        catch ( InvalidRepositoryException e )
+                        {
+                            throw new MavenEmbedderException( "Cannot create remote repository " + r.getId(), e );
+                        }
                     }
-                    catch ( InvalidRepositoryException e )
+                    for ( Repository r : profile.getPluginRepositories() )
                     {
-                        throw new MavenEmbedderException( "Cannot create remote repository " + r.getId(), e );
-                    }
+                        try
+                        {
+                            request.addRemoteRepository( repositorySystem.buildArtifactRepository( r ) );
+                        }
+                        catch ( InvalidRepositoryException e )
+                        {
+                            throw new MavenEmbedderException( "Cannot create remote repository " + r.getId(), e );
+                        }
+                    }                    
                 }
             }
+            catch ( ProfileActivationException e )
+            {
+                throw new MavenEmbedderException( "Cannot determine active profiles", e );
+            }
         }
 
         injectDefaultRepositories( request );
@@ -391,9 +419,15 @@
         activationContext.setExplicitlyActiveProfileIds( request.getActiveProfiles() );
         activationContext.setExplicitlyInactiveProfileIds( request.getInactiveProfiles() );
 
-        ProfileManager globalProfileManager = new DefaultProfileManager( container, activationContext );
+        ProfileManager globalProfileManager = new DefaultProfileManager( activationContext );
 
         request.setProfileManager( globalProfileManager );
         request.setProfileActivationContext( activationContext );
     }
+
+    private void toolchains( MavenExecutionRequest request, Configuration configuration )
+    {
+        toolchainsBuilder.setUserToolchainsFile( request.getUserToolchainsFile() );
+    }
+
 }

Propchange: maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -3,4 +3,5 @@
 /maven/components/branches/maven-2.0.x/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java:679206
 /maven/components/branches/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:738973-739966
 /maven/components/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:738757-738972
+/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/SettingsAdapter.java:751453-767358
 /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/user/SettingsAdapter.java:688587-696625,696644-699681

Modified: maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java (original)
+++ maven/components/branches/MNG-2766/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java Wed Apr 22 23:04:06 2009
@@ -354,18 +354,19 @@
         artifacts.iterator().next();
     }
 
+    /**TODO - FIX
     public void testProjectReading_FromChildLevel_ScmInheritanceCalculations()
         throws Exception
     {
         File pomFile = new File( basedir, "src/test/projects/readProject-withScmInheritance/modules/child1/pom.xml" );
 
         MavenProject project = mavenEmbedder.readProject( pomFile );
-
+        assertNotNull(project.getScm());
         assertEquals( "http://host/viewer?path=/trunk/parent/child1", project.getScm().getUrl() );
         assertEquals( "scm:svn:http://host/trunk/parent/child1", project.getScm().getConnection() );
         assertEquals( "scm:svn:https://host/trunk/parent/child1", project.getScm().getDeveloperConnection() );
     }
-
+*/
     public void testProjectReading_SkipMissingModuleSilently()
         throws Exception
     {

Modified: maven/components/branches/MNG-2766/maven-mercury/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-mercury/pom.xml?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-mercury/pom.xml (original)
+++ maven/components/branches/MNG-2766/maven-mercury/pom.xml Wed Apr 22 23:04:06 2009
@@ -11,13 +11,16 @@
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
+    <artifactId>maven</artifactId>
     <version>3.0-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+
   <artifactId>maven-mercury</artifactId>
+
   <name>Maven Mercury</name>
 
   <dependencies>
@@ -34,7 +37,7 @@
 
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project-builder</artifactId>
+      <artifactId>maven-model-builder</artifactId>
     </dependency>
 
     <dependency>
@@ -42,11 +45,6 @@
       <artifactId>plexus-component-annotations</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.sonatype.spice</groupId>
-      <artifactId>model-builder</artifactId>
-    </dependency>
-
     <!-- test dependencies  -->
     <dependency>
       <groupId>org.apache.maven.mercury</groupId>
@@ -86,6 +84,12 @@
     </dependency>
 
     <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.4</version>
@@ -99,14 +103,14 @@
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-metadata</artifactId>
-          <executions>                                                                                                          
-            <execution>                                                                                                         
-              <goals>                                                                                                           
-                <goal>generate-metadata</goal>                                                                                  
-                <goal>generate-test-metadata</goal>                                                                             
-              </goals>                                                                                                          
-            </execution>                                                                                                        
-          </executions>                                                                                                         
+          <executions>
+            <execution>
+              <goals>
+                <goal>generate-metadata</goal>
+                <goal>generate-test-metadata</goal>
+              </goals>
+            </execution>
+          </executions>
       </plugin>
     </plugins>
   </build>

Modified: maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java (original)
+++ maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java Wed Apr 22 23:04:06 2009
@@ -21,7 +21,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -30,14 +29,11 @@
 import org.apache.maven.mercury.builder.api.DependencyProcessorException;
 import org.apache.maven.mercury.builder.api.MetadataReader;
 import org.apache.maven.mercury.builder.api.MetadataReaderException;
-import org.apache.maven.project.builder.PomInterpolatorTag;
-import org.apache.maven.project.builder.PomTransformer;
-import org.apache.maven.project.builder.ProjectUri;
-import org.apache.maven.shared.model.DomainModel;
-import org.apache.maven.shared.model.InterpolatorProperty;
-import org.apache.maven.shared.model.ModelContainer;
-import org.apache.maven.shared.model.ModelProperty;
-import org.apache.maven.shared.model.ModelTransformerContext;
+import org.apache.maven.model.DomainModel;
+import org.apache.maven.model.ProcessorContext;
+import org.apache.maven.model.interpolator.DefaultInterpolator;
+import org.apache.maven.model.interpolator.InterpolatorProperty;
+import org.apache.maven.model.interpolator.PomInterpolatorTag;
 import org.codehaus.plexus.component.annotations.Component;
 
 /**
@@ -49,9 +45,13 @@
  *
  */
 @Component( role=DependencyProcessor.class, hint="maven" )
-public final class MavenDependencyProcessor
+public class MavenDependencyProcessor
     implements DependencyProcessor
 {
+    
+	/**
+	 * Over-ride this method to change how dependencies are obtained
+	 */
     public List<ArtifactMetadata> getDependencies( ArtifactMetadata bmd, MetadataReader mdReader, Map system,
                                                         Map user )
         throws MetadataReaderException, DependencyProcessorException
@@ -66,20 +66,7 @@
             throw new IllegalArgumentException( "mdReader: null" );
         }
 
-        List<InterpolatorProperty> interpolatorProperties = new ArrayList<InterpolatorProperty>();
-        interpolatorProperties.add( new InterpolatorProperty( "${mavenVersion}", "3.0-SNAPSHOT",
-                                                              PomInterpolatorTag.EXECUTION_PROPERTIES.name() ) );
-
-        if ( system != null )
-        {
-            interpolatorProperties.addAll(
-                InterpolatorProperty.toInterpolatorProperties( system, PomInterpolatorTag.EXECUTION_PROPERTIES.name() ) );
-        }
-        if ( user != null )
-        {
-            interpolatorProperties.addAll(
-                InterpolatorProperty.toInterpolatorProperties( user, PomInterpolatorTag.USER_PROPERTIES.name() ) );
-        }
+        List<InterpolatorProperty> interpolatorProperties = createInterpolatorProperties(system, user);
 
         List<DomainModel> domainModels = new ArrayList<DomainModel>();
         try
@@ -98,14 +85,14 @@
             MavenDomainModel domainModel = new MavenDomainModel( superBytes );
             domainModel.setMostSpecialized(true);
             domainModels.add( domainModel );
-
+/*TODO: Profiles
             Collection<ModelContainer> activeProfiles = domainModel.getActiveProfileContainers( interpolatorProperties );
 
             for ( ModelContainer mc : activeProfiles )
             {
                 domainModels.add( new MavenDomainModel( transformProfiles( mc.getProperties() ) ) );
             }
-
+*/
             List<DomainModel> parentModels = getParentsOfDomainModel( domainModel, mdReader );
 
             if ( parentModels == null )
@@ -120,24 +107,35 @@
             throw new MetadataReaderException( "Failed to create domain model. Message = " + e.getMessage(), e );
         }
 
-        PomTransformer transformer = new PomTransformer( new MavenDomainModelFactory() );
-        ModelTransformerContext ctx =
-            new ModelTransformerContext( PomTransformer.MODEL_CONTAINER_INFOS );
+        try {
+			return new MavenDomainModel(new DefaultInterpolator().interpolateDomainModel(ProcessorContext.build(domainModels, null), 
+					interpolatorProperties)).getDependencyMetadata();
+		} catch (IOException e) {
+			throw new DependencyProcessorException();
+		}
 
-        try
+    }
+    
+    protected final List<InterpolatorProperty> createInterpolatorProperties(Map system, Map user)
+    {
+        List<InterpolatorProperty> interpolatorProperties = new ArrayList<InterpolatorProperty>();
+        interpolatorProperties.add( new InterpolatorProperty( "${mavenVersion}", "3.0-SNAPSHOT",
+                                                              PomInterpolatorTag.EXECUTION_PROPERTIES.name() ) );
+
+        if ( system != null )
         {
-            MavenDomainModel model =
-                ( (MavenDomainModel) ctx.transform( domainModels, transformer, transformer, null,
-                                                    interpolatorProperties, null ) );
-            return model.getDependencyMetadata();
+            interpolatorProperties.addAll(
+                InterpolatorProperty.toInterpolatorProperties( system, PomInterpolatorTag.EXECUTION_PROPERTIES.name() ) );
         }
-        catch ( IOException e )
+        if ( user != null )
         {
-            throw new MetadataReaderException( "Unable to transform model", e );
+            interpolatorProperties.addAll(
+                InterpolatorProperty.toInterpolatorProperties( user, PomInterpolatorTag.USER_PROPERTIES.name() ) );
         }
+        return interpolatorProperties;
     }
 
-    private static List<DomainModel> getParentsOfDomainModel( MavenDomainModel domainModel, MetadataReader mdReader )
+    protected final List<DomainModel> getParentsOfDomainModel( MavenDomainModel domainModel, MetadataReader mdReader )
         throws IOException, MetadataReaderException, DependencyProcessorException
     {
         List<DomainModel> domainModels = new ArrayList<DomainModel>();
@@ -156,20 +154,4 @@
         }
         return domainModels;
     }
-
-    private static List<ModelProperty> transformProfiles( List<ModelProperty> modelProperties )
-    {
-        List<ModelProperty> properties = new ArrayList<ModelProperty>();
-        for ( ModelProperty mp : modelProperties )
-        {
-            if ( mp.getUri().startsWith( ProjectUri.Profiles.Profile.xUri )
-                && !mp.getUri().equals( ProjectUri.Profiles.Profile.id )
-                && !mp.getUri().startsWith( ProjectUri.Profiles.Profile.Activation.xUri ) )
-            {
-                properties.add( new ModelProperty( mp.getUri().replace( ProjectUri.Profiles.Profile.xUri,
-                                                                        ProjectUri.xUri ), mp.getResolvedValue() ) );
-            }
-        }
-        return properties;
-    }
 }

Modified: maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java (original)
+++ maven/components/branches/MNG-2766/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDomainModel.java Wed Apr 22 23:04:06 2009
@@ -21,44 +21,19 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
 import org.apache.maven.mercury.artifact.ArtifactMetadata;
-import org.apache.maven.project.builder.PomClassicDomainModel;
-import org.apache.maven.project.builder.PomTransformer;
-import org.apache.maven.project.builder.ProjectUri;
-import org.apache.maven.project.builder.factories.ArtifactModelContainerFactory;
-import org.apache.maven.project.builder.factories.ExclusionModelContainerFactory;
-import org.apache.maven.project.builder.profile.ProfileContext;
-import org.apache.maven.shared.model.DataSourceException;
-import org.apache.maven.shared.model.InterpolatorProperty;
-import org.apache.maven.shared.model.ModelContainer;
-import org.apache.maven.shared.model.ModelDataSource;
-import org.apache.maven.shared.model.ModelMarshaller;
-import org.apache.maven.shared.model.ModelProperty;
-import org.apache.maven.shared.model.impl.DefaultModelDataSource;
-
-/**
- * Provides a wrapper for the maven model.
- */
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Exclusion;
+import org.apache.maven.model.Parent;
+import org.apache.maven.model.PomClassicDomainModel;
+
 public final class MavenDomainModel
     extends PomClassicDomainModel
 {
 
-    /**
-     * Bytes containing the underlying model
-     */
-    private final List<ModelProperty> modelProperties;
-
-    /**
-     * History of joins and deletes of model properties
-     */
-    private String eventHistory;
-
     private ArtifactMetadata parentMetadata;
 
     /**
@@ -69,99 +44,74 @@
     public MavenDomainModel( byte[] bytes )
         throws IOException
     {
-        this( new ByteArrayInputStream( bytes ) );
+        super( new ByteArrayInputStream( bytes ) );
     }
 
-    /**
-     * Constructor
-     *
-     * @throws IOException if there is a problem constructing the model
-     */
-    public MavenDomainModel( InputStream inputStream )
-        throws IOException
-    {
-        this( ModelMarshaller.marshallXmlToModelProperties( inputStream, ProjectUri.baseUri, PomTransformer.URIS ) );
-    }
 
-    /**
-     * Constructor
-     *
-     * @throws IOException if there is a problem constructing the model
-     */
-    public MavenDomainModel( List<ModelProperty> modelProperties )
-        throws IOException
+    public MavenDomainModel(PomClassicDomainModel model) 
+    	throws IOException
     {
-        super(modelProperties);
-        this.modelProperties = new ArrayList<ModelProperty>( modelProperties );
-    }
-
+    	super(model.getModel());
+    }    
+    
     public boolean hasParent()
     {
-        // TODO: Expensive call if no parent
         return getParentMetadata() != null;
     }
 
     public List<ArtifactMetadata> getDependencyMetadata()
-        throws DataSourceException
     {
         List<ArtifactMetadata> metadatas = new ArrayList<ArtifactMetadata>();
 
-        ModelDataSource source = new DefaultModelDataSource( modelProperties, PomTransformer.MODEL_CONTAINER_FACTORIES );
-        for ( ModelContainer modelContainer : source.queryFor( ProjectUri.Dependencies.Dependency.xUri ) )
+        for(Dependency d: model.getDependencies())
         {
-            metadatas.add( transformContainerToMetadata( modelContainer ) );
+        	ArtifactMetadata metadata = new ArtifactMetadata();
+        	metadata.setArtifactId(d.getArtifactId());
+        	metadata.setClassifier(d.getClassifier());
+        	metadata.setGroupId(d.getGroupId());
+        	metadata.setScope( (d.getScope() == null) ? "runtime" : d.getScope());
+        	metadata.setVersion(d.getVersion());
+        	metadata.setOptional(d.isOptional());
+        	
+        	 if( "test-jar".equals( d.getType() ) )
+             {
+                 metadata.setType( "jar" );
+                 metadata.setClassifier( "tests" );
+             }
+             else
+             {
+            	 metadata.setType( d.getType() );	 
+             }
+                      	 
+            List<ArtifactMetadata> exclusions = new ArrayList<ArtifactMetadata>();
+            for( Exclusion e : d.getExclusions() ) 
+            {
+            	ArtifactMetadata md = new ArtifactMetadata();
+            	md.setArtifactId(e.getArtifactId());
+            	md.setGroupId(e.getGroupId());
+            	exclusions.add(md);
+            }
+            metadata.setExclusions(exclusions);
+            metadatas.add(metadata);
         }
-
+        
         return metadatas;
     }
 
-    public Collection<ModelContainer> getActiveProfileContainers( List<InterpolatorProperty> properties )
-        throws DataSourceException
-    {
-        ModelDataSource dataSource = new DefaultModelDataSource( modelProperties, PomTransformer.MODEL_CONTAINER_FACTORIES );
-
-        return new ProfileContext( dataSource, null, null, properties ).getActiveProfiles();
-    }
-
     public ArtifactMetadata getParentMetadata()
     {
-        if ( parentMetadata != null )
+        if(parentMetadata == null)
         {
-            return copyArtifactBasicMetadata( parentMetadata );
-        }
-
-        String groupId = null, artifactId = null, version = null;
-
-        for ( ModelProperty mp : modelProperties )
-        {
-            if ( mp.getUri().equals( ProjectUri.Parent.version ) )
-            {
-                version = mp.getResolvedValue();
-            }
-            else if ( mp.getUri().equals( ProjectUri.Parent.artifactId ) )
+            Parent parent = model.getParent();
+            if(parent != null)
             {
-                artifactId = mp.getResolvedValue();
-            }
-            else if ( mp.getUri().equals( ProjectUri.Parent.groupId ) )
-            {
-                groupId = mp.getResolvedValue();
-            }
-            if ( groupId != null && artifactId != null && version != null )
-            {
-                break;
-            }
+                parentMetadata = new ArtifactMetadata();
+                parentMetadata.setArtifactId( parent.getArtifactId() );
+                parentMetadata.setVersion( parent.getVersion() );
+                parentMetadata.setGroupId( parent.getGroupId() );        	
+            }       	
         }
-
-        if ( groupId == null || artifactId == null || version == null )
-        {
-            return null;
-        }
-        parentMetadata = new ArtifactMetadata();
-        parentMetadata.setArtifactId( artifactId );
-        parentMetadata.setVersion( version );
-        parentMetadata.setGroupId( groupId );
-
-        return copyArtifactBasicMetadata( parentMetadata );
+        return (parentMetadata != null) ? copyArtifactBasicMetadata( parentMetadata ) : null;
     }
 
     private ArtifactMetadata copyArtifactBasicMetadata( ArtifactMetadata metadata )
@@ -172,100 +122,4 @@
         amd.setVersion( metadata.getVersion() );
         return amd;
     }
-
-    /**
-     * @see org.apache.maven.shared.model.DomainModel#getEventHistory()
-     */
-    public String getEventHistory()
-    {
-        return eventHistory;
-    }
-
-    /**
-     * @see org.apache.maven.shared.model.DomainModel#setEventHistory(String)
-     */
-    public void setEventHistory( String eventHistory )
-    {
-        if ( eventHistory == null )
-        {
-            throw new IllegalArgumentException( "eventHistory: null" );
-        }
-        this.eventHistory = eventHistory;
-    }
-
-    public List<ModelProperty> getModelProperties()
-        throws IOException
-    {
-        return new ArrayList<ModelProperty>( modelProperties );
-    }
-
-    private ArtifactMetadata transformContainerToMetadata( ModelContainer container )
-        throws DataSourceException
-    {
-        List<ModelProperty> modelProperties = container.getProperties();
-
-        ArtifactMetadata metadata = new ArtifactMetadata();
-        for ( ModelProperty mp : modelProperties )
-        {
-            if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.groupId ) )
-            {
-                metadata.setGroupId( mp.getResolvedValue() );
-            }
-            else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.artifactId ) )
-            {
-                metadata.setArtifactId( mp.getResolvedValue() );
-            }
-            else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.version ) )
-            {
-                metadata.setVersion( mp.getResolvedValue() );
-            }
-            else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.classifier ) )
-            {
-                metadata.setClassifier( mp.getResolvedValue() );
-            }
-            else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.scope ) )
-            {
-                metadata.setScope( mp.getResolvedValue() );
-            }
-            else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.type ) )
-            {
-                metadata.setType( mp.getResolvedValue() );
-            }
-            else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.optional ) )
-            {
-                metadata.setOptional( mp.getResolvedValue() );
-            }
-        }
-
-        if ( metadata.getScope() == null )
-        {
-            metadata.setScope( "runtime" );
-        }
-
-        ModelDataSource dataSource = new DefaultModelDataSource( container.getProperties(), Arrays.asList( new ArtifactModelContainerFactory(),
-                                                                   new ExclusionModelContainerFactory() ) );
-        List<ArtifactMetadata> exclusions = new ArrayList<ArtifactMetadata>();
-
-        for ( ModelContainer exclusion : dataSource.queryFor( ProjectUri.Dependencies.Dependency.Exclusions.Exclusion.xUri ) )
-        {
-            ArtifactMetadata meta = new ArtifactMetadata();
-            exclusions.add( meta );
-
-            for ( ModelProperty mp : exclusion.getProperties() )
-            {
-                if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.Exclusions.Exclusion.artifactId ) )
-                {
-                    meta.setArtifactId( mp.getResolvedValue() );
-                }
-                else if ( mp.getUri().equals( ProjectUri.Dependencies.Dependency.Exclusions.Exclusion.groupId ) )
-                {
-                    meta.setGroupId( mp.getResolvedValue() );
-                }
-            }
-
-        }
-        metadata.setExclusions( exclusions );
-
-        return metadata;
-    }
 }

Propchange: maven/components/branches/MNG-2766/maven-model-builder/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Apr 22 23:04:06 2009
@@ -0,0 +1,8 @@
+.settings
+target
+.classpath
+.project
+*.iml
+*.ipr
+*.iws
+bin

Propchange: maven/components/branches/MNG-2766/maven-model-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder:738757-738972
+/maven/components/trunk/maven-project-builder:688587-696625,696644-699681

Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder:688587-696625,696644-699681

Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/profiles/matchers/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/main/java/org/apache/maven/profiles/matchers:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/java/org/apache/maven/profiles/matchers:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/profiles/matchers:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/profiles/matchers:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/matchers:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/profiles/matchers:738757-738972
+/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers:688587-696625,696644-699681

Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -0,0 +1,5 @@
+/maven/components/branches/MNG-3932-1/maven-project/src/main/mdo:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-profile/src/main/mdo:680477
+/maven/components/branches/maven-2.0.x/maven-profile/src/main/mdo:679206
+/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/mdo:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project/src/main/mdo:738757-738972

Propchange: maven/components/branches/MNG-2766/maven-model-builder/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 22 23:04:06 2009
@@ -0,0 +1,6 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/resources:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project/src/main/resources:680477
+/maven/components/branches/maven-2.0.x/maven-project/src/main/resources:679206,720042
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/resources:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/resources:738757-738972
+/maven/components/trunk/maven-project/src/main/resources:688587-696625,696644-699681

Modified: maven/components/branches/MNG-2766/maven-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model/pom.xml?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model/pom.xml (original)
+++ maven/components/branches/MNG-2766/maven-model/pom.xml Wed Apr 22 23:04:06 2009
@@ -20,15 +20,26 @@
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
+    <artifactId>maven</artifactId>
     <version>3.0-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+
   <artifactId>maven-model</artifactId>
+
   <name>Maven Model</name>
   <description>Maven Model</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -58,6 +69,7 @@
       </plugin>
     </plugins>
   </reporting>
+
   <profiles>
     <profile>
       <id>all-models</id>
@@ -100,10 +112,4 @@
       </build>
     </profile>
   </profiles>
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-  </dependencies>
 </project>

Modified: maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/components/branches/MNG-2766/maven-model/src/main/mdo/maven.mdo Wed Apr 22 23:04:06 2009
@@ -583,6 +583,12 @@
 
           return id.toString();
       }
+
+    @Override
+    public String toString()
+    {
+        return getId();
+    }
             ]]>
           </code>
         </codeSegment>
@@ -2110,8 +2116,8 @@
           </description>
           <type>String</type>
         </field>
-        <field>
-          <name>filtering</name>
+        <field xml.tagName="filtering">
+          <name>filteringValue</name>
           <version>3.0.0+</version>
           <description>
             <![CDATA[
@@ -2120,8 +2126,7 @@
             properties in the files listed in the <code>filters</code> element.
             ]]>
           </description>
-          <type>boolean</type>
-          <defaultValue>false</defaultValue>
+          <type>String</type>
         </field>
         <field>
           <name>mergeId</name>
@@ -2152,7 +2157,17 @@
             setMergeId( "resource-" + (mergeIdCounter++) );
         }
     }
+    
+    public boolean isFiltering()
+    {
+        return filteringValue != null ? (new Boolean(filteringValue)).booleanValue() : false;
+    }
 
+    public void setFiltering( boolean filtering )
+    {
+        filteringValue = String.valueOf(filtering);
+    }  
+    
     /**
      * @see java.lang.Object#toString()
      */
@@ -2433,12 +2448,11 @@
       <version>4.0.0</version>
       <description>Download policy.</description>
       <fields>
-        <field>
-          <name>enabled</name>
+        <field xml.tagName="enabled">
+          <name>enabledValue</name>
           <version>4.0.0</version>
           <description>Whether to use this repository for downloading this type of artifact.</description>
-          <type>boolean</type>
-          <defaultValue>true</defaultValue>
+          <type>String</type>
         </field>
         <field>
           <name>updatePolicy</name>
@@ -2474,6 +2488,26 @@
           <type>String</type>
         </field>
       </fields>
+      <codeSegments>
+        <codeSegment>
+          <version>4.0.0</version>
+          <code>
+            <![CDATA[
+
+    public boolean isEnabled()
+    {
+        return enabledValue != null ? (new Boolean(enabledValue)).booleanValue() : false;
+    }
+
+    public void setEnabled( boolean enabled )
+    {
+        enabledValue = String.valueOf(enabled);
+    }
+
+            ]]>
+          </code>
+        </codeSegment>
+      </codeSegments>      
     </class>
 
     <!--@todo find better solution for management of site deployments -->
@@ -2736,7 +2770,7 @@
           <name>id</name>
           <version>4.0.0</version>
           <type>String</type>
-          <defaultValue>default-execution-id</defaultValue>
+          <defaultValue>default</defaultValue>
           <description>The identifier of this execution for labelling the goals during the build,
             and for matching executions to merge during inheritance.</description>
         </field>
@@ -2762,7 +2796,7 @@
           <version>4.0.0</version>
           <code>
             <![CDATA[
-    public static final String DEFAULT_EXECUTION_ID = "default-execution-id";
+    public static final String DEFAULT_EXECUTION_ID = "default";
             ]]>
           </code>
         </codeSegment>

Modified: maven/components/branches/MNG-2766/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-plugin-api/pom.xml?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-plugin-api/pom.xml (original)
+++ maven/components/branches/MNG-2766/maven-plugin-api/pom.xml Wed Apr 22 23:04:06 2009
@@ -20,14 +20,18 @@
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
+    <artifactId>maven</artifactId>
     <version>3.0-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+
   <artifactId>maven-plugin-api</artifactId>
+
   <name>Maven Plugin API</name>
+
   <dependencies>
     <!--  Maven Artifact live in the compat module now. -->
     <dependency>
@@ -39,6 +43,7 @@
       <artifactId>plexus-container-default</artifactId>
     </dependency>
   </dependencies>
+
   <build>
     <plugins>
       <plugin>

Modified: maven/components/branches/MNG-2766/maven-plugin-api/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-plugin-api/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-plugin-api/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java (original)
+++ maven/components/branches/MNG-2766/maven-plugin-api/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java Wed Apr 22 23:04:06 2009
@@ -38,7 +38,7 @@
 {
     public void testLifecycleReader()
         throws IOException, XmlPullParserException
-    {
+    {/*
         LifecycleMappingsXpp3Reader reader = new LifecycleMappingsXpp3Reader();
         LifecycleConfiguration config = reader.read( new InputStreamReader( getClass().getResourceAsStream( "/lifecycle.xml" ) ) );
         assertEquals( "check number of lifecycles", 1, config.getLifecycles().size() );
@@ -53,5 +53,6 @@
         assertEquals( "check number of goals", 1, e.getGoals().size() );
         String g = (String) e.getGoals().iterator().next();
         assertEquals( "check goal", "clover:compiler", g );
+        */
     }
 }

Modified: maven/components/branches/MNG-2766/maven-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-project/pom.xml?rev=767707&r1=767706&r2=767707&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-project/pom.xml (original)
+++ maven/components/branches/MNG-2766/maven-project/pom.xml Wed Apr 22 23:04:06 2009
@@ -20,16 +20,21 @@
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>maven</artifactId>
     <groupId>org.apache.maven</groupId>
+    <artifactId>maven</artifactId>
     <version>3.0-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+
   <artifactId>maven-project</artifactId>
+
   <name>Maven Project</name>
+
   <description>This library is used to not only read Maven project object model files, but to assemble inheritence
     and to retrieve remote models as required.</description>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -61,82 +66,19 @@
       <artifactId>wstx-asl</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.spice</groupId>
-      <artifactId>model-builder</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project-builder</artifactId>
+      <artifactId>maven-model-builder</artifactId>
     </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-repository</artifactId>
       </dependency>
     <dependency>
-    	<groupId>commons-jxpath</groupId>
-    	<artifactId>commons-jxpath</artifactId>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-repository</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.sonatype.plexus</groupId>                                                                                
-      <artifactId>plexus-jetty6</artifactId>                                                                                
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.sonatype.spice</groupId>
-      <artifactId>plexus-webdav</artifactId>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.maven.mercury</groupId>
-      <artifactId>mercury-util</artifactId>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.maven.mercury</groupId>
-      <artifactId>mercury-logging</artifactId>
-      <version>${mercuryVersion}</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.apache.maven.mercury</groupId>
-      <artifactId>mercury-event</artifactId>
-      <version>${mercuryVersion}</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <scope>test</scope>
+      <groupId>commons-jxpath</groupId>
+      <artifactId>commons-jxpath</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.maven.mercury</groupId>
-      <artifactId>mercury-crypto-basic</artifactId>
-      <version>${mercuryVersion}</version>
-      <scope>test</scope>
-    </dependency>
-
-      <dependency>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-http-lightweight</artifactId>
-        <scope>test</scope>
-    </dependency>
-  
   </dependencies>
+
   <build>
     <plugins>
       <plugin>
@@ -152,16 +94,6 @@
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-metadata</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>1.0.0</version>
-          <models>
-            <model>src/main/mdo/profiles.mdo</model>
-          </models>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>



Mime
View raw message