svn commit: r769552 - in /maven/components/branches/MNG-2766: maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

[sisbell]

Author: sisbell
Date: Tue Apr 28 21:34:36 2009
New Revision: 769552

URL: http://svn.apache.org/viewvc?rev=769552&view=rev
Log:
Compile exceptions.

Modified:
    
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
    
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

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=769552&r1=769551&r2=769552&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
 Tue Apr 28 21:34:36 2009
@@ -31,6 +31,7 @@
 import org.apache.maven.execution.RuntimeInformation;
 import org.apache.maven.lifecycle.LifecycleExecutionException;
 import org.apache.maven.lifecycle.LifecycleExecutor;
+import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
@@ -110,7 +111,12 @@
 
             return result;
         }
+        catch ( MojoExecutionException e )
+        {
+            result.addException( e );
 
+            return result;
+        }
         result.setTopologicallySortedProjects( 
session.getReactorManager().getSortedProjects() );
 
         result.setProject( session.getReactorManager().getTopLevelProject() );

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=769552&r1=769551&r2=769552&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
 Tue Apr 28 21:34:36 2009
@@ -577,7 +577,7 @@
 
         int oldThreshold = loggerManager.getThreshold();
 
-        request.setPlugins(lifecycleExecutor.lifecyclePlugins("default", 
"jar"));
+        
         
         try
         {
@@ -585,6 +585,7 @@
 
             try
             {
+               request.setPlugins(lifecycleExecutor.lifecyclePlugins("jar"));
                 request = populator.populateDefaults( request, configuration );
             }
             catch ( MavenEmbedderException e )