svn commit: r1138239 - in /maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project: DefaultProjectLoader.java ProjectLoader.java session/DefaultSessionInjector.java

[jd...@apache.org]

Author: jdcasey
Date: Tue Jun 21 23:02:02 2011
New Revision: 1138239

URL: http://svn.apache.org/viewvc?rev=1138239&view=rev
Log:
allow control over whether project modules are processed while building project instances.

Modified:
    maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/DefaultProjectLoader.java
    maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/ProjectLoader.java
    maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/session/DefaultSessionInjector.java

Modified: maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/DefaultProjectLoader.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/DefaultProjectLoader.java?rev=1138239&r1=1138238&r2=1138239&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/DefaultProjectLoader.java (original)
+++ maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/DefaultProjectLoader.java Tue Jun 21 23:02:02 2011
@@ -77,7 +77,7 @@ public class DefaultProjectLoader
     private SessionInjector sessionInjector;
 
     @Override
-    public List<MavenProject> buildReactorProjectInstances( final ProjectToolsSession session, final File... rootPoms )
+    public List<MavenProject> buildReactorProjectInstances( final ProjectToolsSession session, final boolean recursive, final File... rootPoms )
         throws ProjectToolsException
     {
         final ProjectBuildingRequest pbr = sessionInjector.getProjectBuildingRequest( session );
@@ -85,7 +85,7 @@ public class DefaultProjectLoader
         try
         {
             final List<File> pomFiles = Arrays.asList( rootPoms );
-            final List<ProjectBuildingResult> results = projectBuilder.build( pomFiles, true, pbr );
+            final List<ProjectBuildingResult> results = projectBuilder.build( pomFiles, recursive, pbr );
 
             final List<MavenProject> projects = new ArrayList<MavenProject>( results.size() );
             for ( final ProjectBuildingResult result : results )

Modified: maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/ProjectLoader.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/ProjectLoader.java?rev=1138239&r1=1138238&r2=1138239&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/ProjectLoader.java (original)
+++ maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/ProjectLoader.java Tue Jun 21 23:02:02 2011
@@ -26,7 +26,7 @@ import java.util.Set;
 public interface ProjectLoader
 {
 
-    List<MavenProject> buildReactorProjectInstances( final ProjectToolsSession session, final File... rootPoms )
+    List<MavenProject> buildReactorProjectInstances( final ProjectToolsSession session, final boolean recursive, final File... rootPoms )
         throws ProjectToolsException;
 
     MavenProject buildProjectInstance( final File pomFile, final ProjectToolsSession session )

Modified: maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/session/DefaultSessionInjector.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/session/DefaultSessionInjector.java?rev=1138239&r1=1138238&r2=1138239&view=diff
==============================================================================
--- maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/session/DefaultSessionInjector.java (original)
+++ maven/sandbox/trunk/mae/mae-components/mae-project-tools/src/main/java/org/apache/maven/mae/project/session/DefaultSessionInjector.java Tue Jun 21 23:02:02 2011
@@ -103,7 +103,6 @@ public class DefaultSessionInjector
         throws MAEException
     {
         final File localRepo = session.getLocalRepositoryDirectory();
-        localRepo.mkdirs();
 
         RepositorySystemSession sess = session.getRepositorySystemSession();
         if ( sess == null )
@@ -114,7 +113,13 @@ public class DefaultSessionInjector
 
             // session.setWorkspaceReader( new ImportWorkspaceReader( workspace ) );
             rss.setConfigProperty( ProjectToolsSession.SESSION_KEY, session );
-            rss.setLocalRepositoryManager( new EnhancedLocalRepositoryManager( localRepo ) );
+            
+            if ( localRepo != null )
+            {
+                localRepo.mkdirs();
+                rss.setLocalRepositoryManager( new EnhancedLocalRepositoryManager( localRepo ) );
+            }
+            
             rss.setWorkspaceReader( new SessionWorkspaceReader( session ) );
 
             sess = rss;