svn commit: r491514 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

[jvanzyl]

Author: jvanzyl
Date: Sun Dec 31 16:46:11 2006
New Revision: 491514

URL: http://svn.apache.org/viewvc?view=rev&rev=491514
Log:
MNG-2729 use the basedir specified in the execution request, don't use the 
system property


Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?view=diff&rev=491514&r1=491513&r2=491514
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 Sun Dec 31 16:46:11 2006
@@ -764,13 +764,10 @@
     {
         List files = Collections.EMPTY_LIST;
 
-        File userDir = new File( System.getProperty( "user.dir" ) );
+        File userDir = new File( request.getBaseDirectory() );
+
         if ( request.useReactor() )
         {
-            // TODO: should we now include the pom.xml in the current 
directory?
-//            String includes = System.getProperty( "maven.reactor.includes", 
"**/" + POMv4 );
-//            String excludes = System.getProperty( "maven.reactor.excludes", 
POMv4 );
-
             String includes = System.getProperty( "maven.reactor.includes", 
"**/" + POMv4 + ",**/" + RELEASE_POMv4 );
             String excludes = System.getProperty( "maven.reactor.excludes", 
POMv4 + "," + RELEASE_POMv4 );