You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/01/24 18:52:36 UTC
svn commit: r902614 - in /maven/maven-3/trunk:
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
Author: bentmann
Date: Sun Jan 24 17:52:36 2010
New Revision: 902614
URL: http://svn.apache.org/viewvc?rev=902614&view=rev
Log:
[MNG-3168] Correct error message when project descriptor not found
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.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=902614&r1=902613&r2=902614&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 Sun Jan 24 17:52:36 2010
@@ -336,7 +336,7 @@
// 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 =
Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=902614&r1=902613&r2=902614&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java Sun Jan 24 17:52:36 2010
@@ -807,28 +807,24 @@
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
{
- return new File( workingDirectory, file.getPath() );
+ return new File( workingDirectory, file.getPath() ).getAbsoluteFile();
}
}