svn commit: r895291 - in /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven: DefaultMaven.java execution/DefaultMavenExecutionRequestPopulator.java

[bentmann]

Author: bentmann
Date: Sat Jan  2 21:13:54 2010
New Revision: 895291

URL: http://svn.apache.org/viewvc?rev=895291&view=rev
Log:
o Improved robustness

Modified:
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
    
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=895291&r1=895290&r2=895291&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java 
(original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java 
Sat Jan  2 21:13:54 2010
@@ -465,7 +465,15 @@
 
         Collection<MavenProject> activeProjects = sorter.getSortedProjects();
 
-        File reactorDirectory = 
request.getPom().getAbsoluteFile().getParentFile();
+        File reactorDirectory;
+        if ( request.getBaseDirectory() != null )
+        {
+            reactorDirectory = new File( request.getBaseDirectory() );
+        }
+        else
+        {
+            reactorDirectory = null;
+        }
 
         if ( !request.getSelectedProjects().isEmpty() )
         {
@@ -596,7 +604,7 @@
         }
 
         // relative path, e.g. "sub", "../sub" or "."
-        else
+        else if ( reactorDirectory != null )
         {
             File selectedProject = new File( new File( reactorDirectory, 
selector ).toURI().normalize() );
 

Modified: 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java?rev=895291&r1=895290&r2=895291&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
 (original)
+++ 
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
 Sat Jan  2 21:13:54 2010
@@ -240,9 +240,22 @@
         }
     }
 
+    private void baseDirectory( MavenExecutionRequest request )
+    {
+        if ( request.getBaseDirectory() == null )
+        {
+            if ( request.getPom() != null )
+            {
+                request.setBaseDirectory( 
request.getPom().getAbsoluteFile().getParentFile() );
+            }
+        }
+    }
+
     public MavenExecutionRequest populateDefaults( MavenExecutionRequest 
request )
         throws MavenExecutionRequestPopulationException
     {
+        baseDirectory( request );
+
         localRepository( request );
 
         populateDefaultPluginGroups( request );