Author: jdcasey
Date: Tue Feb 5 13:28:56 2008
New Revision: 618781
URL: http://svn.apache.org/viewvc?rev=618781&view=rev
Log:
[MNG-1493] Porting fix from trunk revId: 618780 back to 2.0.x branch. This
permits <module>dir/pom-alt.xml</module> syntax, instead of being limited to
just the dir name and implied pom.xml filename.
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=618781&r1=618780&r2=618781&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Tue Feb 5 13:28:56 2008
@@ -491,15 +491,18 @@
continue;
}
- File moduleFile;
+ File moduleFile = new File( basedir, name );
- if ( usingReleasePom )
+ if ( moduleFile.exists() && moduleFile.isDirectory() )
{
- moduleFile = new File( basedir, name + "/" +
Maven.RELEASE_POMv4 );
- }
- else
- {
- 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( "windows" ) )
