svn commit: r345109 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

[jdcasey]

Author: jdcasey
Date: Wed Nov 16 12:35:36 2005
New Revision: 345109

URL: http://svn.apache.org/viewcvs?rev=345109&view=rev
Log:
PR: MNG-1394
Submitted By: Edwin Punzalan
Reviewed By: John Casey

Applied. Thanks, Edwin!

NOTE: I added a debug statement in the case where relativePath refers to a 
directory, to tell the user that we're looking for 'pom.xml' in that dir.

Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=345109&r1=345108&r2=345109&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Wed Nov 16 12:35:36 2005
@@ -880,6 +880,23 @@
             {
                 parentDescriptor = new File( projectDir, parentRelativePath );
 
+                if ( parentDescriptor.isDirectory() )
+                {
+                    if ( getLogger().isDebugEnabled() )
+                    {
+                        getLogger().debug(
+                                           "Path specified in <relativePath/> 
(" + parentRelativePath
+                                               + ") is a directory. Searching 
for 'pom.xml' within this directory." );
+                    }
+                    
+                    parentDescriptor = new File( parentDescriptor, "pom.xml" );
+
+                    if ( !parentDescriptor.exists() )
+                    {
+                        throw new ProjectBuildingException( projectId, 
"missing parent project descriptor: " + parentDescriptor.getAbsolutePath() );
+                    }
+                }
+
                 try
                 {
                     parentDescriptor = parentDescriptor.getCanonicalFile();