You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/02/05 22:27:56 UTC
svn commit: r618780 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Author: jdcasey
Date: Tue Feb 5 13:27:53 2008
New Revision: 618780
URL: http://svn.apache.org/viewvc?rev=618780&view=rev
Log:
[MNG-1493] Modifying to allow <module> to specify a full path, including alternate pom file, rather than just a directory wherein a normal 'pom.xml' is expected to reside. This works more like <relativePath> has worked for awhile now.
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?rev=618780&r1=618779&r2=618780&view=diff
==============================================================================
--- 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 Tue Feb 5 13:27:53 2008
@@ -350,15 +350,21 @@
continue;
}
- File moduleFile;
-
- if ( usingReleasePom )
+ File moduleFile = new File( basedir, name );
+ if ( !moduleFile.exists() )
{
- moduleFile = new File( basedir, name + "/" + Maven.RELEASE_POMv4 );
+ throw new MissingModuleException( name, moduleFile, file );
}
- else
+ else if ( moduleFile.isDirectory() )
{
- moduleFile = new File( basedir, name + "/" + Maven.POMv4 );
+ if ( usingReleasePom )
+ {
+ moduleFile = new File( basedir, name + "/" + Maven.RELEASE_POMv4 );
+ }
+ else
+ {
+ moduleFile = new File( basedir, name + "/" + Maven.POMv4 );
+ }
}
if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
@@ -379,14 +385,7 @@
moduleFile = new File( moduleFile.toURI().normalize() );
}
- if ( !moduleFile.exists() )
- {
- throw new MissingModuleException( name, moduleFile, file );
- }
- else
- {
- moduleFiles.add( moduleFile );
- }
+ moduleFiles.add( moduleFile );
}
List collectedProjects = collectProjects( moduleFiles, localRepository, recursive,