svn commit: r613035 - in /maven/components/trunk: maven-core/src/test/java/org/apache/maven/extension/DefaultBuildExtensionScannerTest.java maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

[jd...@apache.org]

Author: jdcasey
Date: Thu Jan 17 17:38:37 2008
New Revision: 613035

URL: http://svn.apache.org/viewvc?rev=613035&view=rev
Log:
Fixing compilation errors.

Modified:
    maven/components/trunk/maven-core/src/test/java/org/apache/maven/extension/DefaultBuildExtensionScannerTest.java
    maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java

Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/extension/DefaultBuildExtensionScannerTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/extension/DefaultBuildExtensionScannerTest.java?rev=613035&r1=613034&r2=613035&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/extension/DefaultBuildExtensionScannerTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/extension/DefaultBuildExtensionScannerTest.java Thu Jan 17 17:38:37 2008
@@ -15,6 +15,7 @@
 import org.apache.maven.project.build.model.ModelLineageBuilder;
 import org.apache.maven.project.interpolation.ModelInterpolationException;
 import org.apache.maven.project.interpolation.ModelInterpolator;
+import org.apache.maven.reactor.MissingModuleException;
 import org.apache.maven.shared.tools.easymock.MockManager;
 import org.apache.maven.shared.tools.easymock.TestFileManager;
 import org.codehaus.plexus.logging.Logger;
@@ -87,7 +88,7 @@
 
     public void testIncludePluginWhenExtensionsFlagDirectlySet()
         throws ExtensionScanningException, ProjectBuildingException, ModelInterpolationException,
-        ExtensionManagerException
+        ExtensionManagerException, MissingModuleException
     {
         MavenExecutionRequest request = new DefaultMavenExecutionRequest();
         File pomFile = new File( "pom" );
@@ -140,7 +141,7 @@
 
     public void testIncludePluginWhenExtensionsFlagSetInPluginManagement()
         throws ExtensionScanningException, ProjectBuildingException, ModelInterpolationException,
-        ExtensionManagerException
+        ExtensionManagerException, MissingModuleException
     {
         MavenExecutionRequest request = new DefaultMavenExecutionRequest();
         File pomFile = new File( "pom" );
@@ -219,7 +220,7 @@
 
     public void testIncludePluginWithExtensionsFlagDeclaredInParentPluginManagementReferencedFromModule()
         throws ModelInterpolationException, ProjectBuildingException, ExtensionManagerException,
-        ExtensionScanningException, IOException
+        ExtensionScanningException, IOException, MissingModuleException
     {
         MavenExecutionRequest request = new DefaultMavenExecutionRequest();
         File projectDir = fileManager.createTempDir();

Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=613035&r1=613034&r2=613035&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Thu Jan 17 17:38:37 2008
@@ -59,6 +59,8 @@
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.MavenProjectBuildingResult;
 import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.reactor.MavenExecutionException;
+import org.apache.maven.reactor.MissingModuleException;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.SettingsConfigurationException;
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
@@ -330,7 +332,7 @@
     // ----------------------------------------------------------------------
 
     public MavenProject readProject( File mavenProject )
-    throws ProjectBuildingException, ExtensionScanningException
+    throws ProjectBuildingException, ExtensionScanningException, MavenExecutionException
     {
         CoreErrorReporter errorReporter = request.getErrorReporter();
         errorReporter.clearErrors();
@@ -341,7 +343,7 @@
     }
 
     private MavenProject readProject( File mavenProject, MavenExecutionRequest request )
-        throws ProjectBuildingException, ExtensionScanningException
+        throws ProjectBuildingException, ExtensionScanningException, MissingModuleException
     {
         getLogger().debug( "Scanning for extensions: " + mavenProject );
 
@@ -402,6 +404,10 @@
             return result.addException( e );
         }
         catch ( ExtensionScanningException e )
+        {
+            return result.addException( e );
+        }
+        catch ( MissingModuleException e )
         {
             return result.addException( e );
         }