Prevent scanning of modules that are not in the current reactor, and simplify the API usage for scanning in a reactor scenario.

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@509715 13f79535-47bb-0310-9956-ffa450edef68

maven-core/src/main/java/org/apache/maven/DefaultMaven.java

@@ -343,18 +343,13 @@ public class DefaultMaven
         
         // TODO: We should probably do this discovery just-in-time, if we can move to building project
         // instances just-in-time.
-        for ( Iterator it = files.iterator(); it.hasNext(); )
-        {
-            File pom = (File) it.next();
-
         try
         {
-                buildExtensionScanner.scanForBuildExtensions( pom, request.getLocalRepository(), globalProfileManager );
+            buildExtensionScanner.scanForBuildExtensions( files, request.getLocalRepository(), globalProfileManager );
         }
         catch ( ExtensionScanningException e )
         {
-                throw new MavenExecutionException( "Error scanning: " + pom + " for extensions: " + e.getMessage(), e );
+            throw new MavenExecutionException( "Error scanning for extensions: " + e.getMessage(), e );
-            }
         }
         
         try

maven-core/src/main/java/org/apache/maven/extension/BuildExtensionScanner.java

@@ -4,12 +4,16 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.profiles.ProfileManager;
 
 import java.io.File;
+import java.util.List;
 
 public interface BuildExtensionScanner
 {
     
     String ROLE = BuildExtensionScanner.class.getName();
     
+    void scanForBuildExtensions( List files, ArtifactRepository localRepository, ProfileManager globalProfileManager )
+        throws ExtensionScanningException;
+
     void scanForBuildExtensions( File pom, ArtifactRepository localRepository, ProfileManager globalProfileManager )
         throws ExtensionScanningException;
 

maven-core/src/main/java/org/apache/maven/extension/DefaultBuildExtensionScanner.java

@@ -27,6 +27,7 @@ import org.codehaus.plexus.logging.console.ConsoleLogger;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -49,15 +50,31 @@ public class DefaultBuildExtensionScanner
 
     private ModelInterpolator modelInterpolator;
 
+    public void scanForBuildExtensions( List files, ArtifactRepository localRepository,
+                                        ProfileManager globalProfileManager )
+        throws ExtensionScanningException
+    {
+        List visited = new ArrayList();
+
+        for ( Iterator it = files.iterator(); it.hasNext(); )
+        {
+            File pom = (File) it.next();
+
+            scanInternal( pom, localRepository, globalProfileManager, visited, files );
+        }
+    }
+
     public void scanForBuildExtensions( File pom, ArtifactRepository localRepository,
                                         ProfileManager globalProfileManager )
         throws ExtensionScanningException
     {
-        scanInternal( pom, localRepository, globalProfileManager, new ArrayList() );
+        scanInternal( pom, localRepository, globalProfileManager, new ArrayList(), Collections.singletonList( pom ) );
     }
 
+    // TODO: Use a build-context cache object for visitedModelIdx and reactorFiles, 
+    //       once we move to just-in-time project scanning.
     private void scanInternal( File pom, ArtifactRepository localRepository, ProfileManager globalProfileManager,
-                               List visitedModelIds )
+                               List visitedModelIds, List reactorFiles )
         throws ExtensionScanningException
     {
 
@@ -81,6 +98,8 @@ public class DefaultBuildExtensionScanner
             for ( ModelLineageIterator lineageIterator = lineage.reversedLineageIterator(); lineageIterator.hasNext(); )
             {
                 Model model = (Model) lineageIterator.next();
+                File modelPom = lineageIterator.getPOMFile();
+
                 String key = createKey( model );
 
                 if ( visitedModelIds.contains( key ) )
@@ -91,9 +110,9 @@ public class DefaultBuildExtensionScanner
 
                 visitedModelIds.add( key );
 
-                File modelPom = lineageIterator.getPOMFile();
+                getLogger().debug(
-
+                                   "Checking: " + model.getId() + " for extensions. (It has "
-                getLogger().debug( "Checking: " + model.getId() + " for extensions. (It has " + model.getModules().size() + " modules.)" );
+                                       + model.getModules().size() + " modules.)" );
 
                 if ( inheritedInterpolationValues == null )
                 {
@@ -104,7 +123,17 @@ public class DefaultBuildExtensionScanner
 
                 checkModelBuildForExtensions( model, localRepository, lineageIterator.getArtifactRepositories() );
 
-                checkModulesForExtensions( modelPom, model, localRepository, originalRemoteRepositories, globalProfileManager, visitedModelIds );
+                if ( !reactorFiles.contains( modelPom ) )
+                {
+                    getLogger().debug(
+                                       "POM: " + modelPom
+                                           + " is not in the current reactor. Its modules will not be scanned." );
+                }
+                else
+                {
+                    checkModulesForExtensions( modelPom, model, localRepository, originalRemoteRepositories,
+                                               globalProfileManager, visitedModelIds, reactorFiles );
+                }
 
                 Properties modelProps = model.getProperties();
                 if ( modelProps != null )
@@ -119,7 +148,8 @@ public class DefaultBuildExtensionScanner
         }
         catch ( ModelInterpolationException e )
         {
-            throw new ExtensionScanningException( "Failed to interpolate model from: " + pom + " prior to scanning for extensions.", e );
+            throw new ExtensionScanningException( "Failed to interpolate model from: " + pom
+                + " prior to scanning for extensions.", e );
         }
         finally
         {
@@ -145,7 +175,7 @@ public class DefaultBuildExtensionScanner
 
     private void checkModulesForExtensions( File containingPom, Model model, ArtifactRepository localRepository,
                                             List originalRemoteRepositories, ProfileManager globalProfileManager,
-                                            List visitedModelIds )
+                                            List visitedModelIds, List reactorFiles )
         throws ExtensionScanningException
     {
         // FIXME: This gets a little sticky, because modules can be added by profiles that require
@@ -206,11 +236,12 @@ public class DefaultBuildExtensionScanner
                 {
                     getLogger().debug(
                                        "Cannot find POM for module: " + moduleSubpath
-                                           + "; continuing scan with next module. (Full path was: " + modulePomDirectory + ")" );
+                                           + "; continuing scan with next module. (Full path was: "
+                                           + modulePomDirectory + ")" );
                     continue;
                 }
 
-                scanInternal( modulePomDirectory, localRepository, globalProfileManager, visitedModelIds );
+                scanInternal( modulePomDirectory, localRepository, globalProfileManager, visitedModelIds, reactorFiles );
             }
         }
     }