svn commit: r777134 - in /maven/components/branches/MNG-2766: maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java

[bentmann]

Author: bentmann
Date: Thu May 21 14:37:03 2009
New Revision: 777134

URL: http://svn.apache.org/viewvc?rev=777134&view=rev
Log:
o Ensured we eventually work with absolute paths

Modified:
    
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
    
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java

Modified: 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=777134&r1=777133&r2=777134&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 Thu May 21 14:37:03 2009
@@ -185,7 +185,7 @@
     protected Map<String,MavenProject> getProjects( MavenExecutionRequest 
request )
         throws MavenExecutionException, ProjectBuildingException
     {
-        List<File> files = Arrays.asList( new File[] { request.getPom() } );
+        List<File> files = Arrays.asList( request.getPom().getAbsoluteFile() );
 
         Map<String,MavenProject> projects = collectProjects( files, request );
 

Modified: 
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=777134&r1=777133&r2=777134&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
 Thu May 21 14:37:03 2009
@@ -77,10 +77,15 @@
         // POM
         //
         // If we are not given a specific POM file, but passed a base directory
-        // then we will use a release POM in the directory provide, or and then
+        // then we will use a release POM in the directory provided, and then
         // look for the standard POM.
         // 
------------------------------------------------------------------------
 
+        if ( request.getPom() != null && !request.getPom().isAbsolute() )
+        {
+            request.setPom( request.getPom().getAbsoluteFile() );
+        }
+
         if ( ( request.getPom() != null ) && ( 
request.getPom().getParentFile() != null ) )
         {
             request.setBaseDirectory( request.getPom().getParentFile() );