From 046666a7154ca2301c7f14a569d0298e53e82851 Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Sun, 24 Jan 2010 17:52:36 +0000
Subject: [PATCH] [MNG-3168] Correct error message when project descriptor not
 found

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@902614 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/maven/DefaultMaven.java   |  2 +-
 .../java/org/apache/maven/cli/MavenCli.java   | 26 ++++++++-----------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index c3bc9682d..f82cc30de 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -336,7 +336,7 @@ private List<MavenProject> getProjectsForMavenReactor( MavenExecutionRequest req
 
         // We have no POM file.
         //
-        if ( request.getPom() == null || !request.getPom().exists() )
+        if ( request.getPom() == null )
         {
             ModelSource modelSource = new UrlModelSource( getClass().getResource( "project/standalone.xml" ) );
             MavenProject project =
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index a177d70f9..80e0991d3 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -807,28 +807,24 @@ else if ( quiet )
 
         if ( alternatePomFile != null )
         {
-            request.setPom( resolveFile( new File( alternatePomFile ), workingDirectory ) );
+            File pom = resolveFile( new File( alternatePomFile ), workingDirectory );
+
+            request.setPom( pom );
         }
-        else if ( request.getPom() != null && !request.getPom().isAbsolute() )
+        else
         {
-            request.setPom( request.getPom().getAbsoluteFile() );
+            File pom = modelProcessor.locatePom( baseDirectory );
+
+            if ( pom.isFile() )
+            {
+                request.setPom( pom );
+            }
         }
 
         if ( ( request.getPom() != null ) && ( request.getPom().getParentFile() != null ) )
         {
             request.setBaseDirectory( request.getPom().getParentFile() );
         }
-        else if ( ( request.getPom() == null ) && ( request.getBaseDirectory() != null ) )
-        {
-            File pom = modelProcessor.locatePom( new File( request.getBaseDirectory() ) );
-
-            request.setPom( pom );
-        }
-        // TODO: Is this correct?
-        else if ( request.getBaseDirectory() == null )
-        {
-            request.setBaseDirectory( new File( System.getProperty( "user.dir" ) ) );
-        }
 
         if ( commandLine.hasOption( CLIManager.RESUME_FROM ) )
         {
@@ -887,7 +883,7 @@ else if ( file.getPath().startsWith( File.separator ) )
         }
         else
         {
-            return new File( workingDirectory, file.getPath() );
+            return new File( workingDirectory, file.getPath() ).getAbsoluteFile();
         }
     }