svn commit: r722374 - /maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java

[sisbell]

Author: sisbell
Date: Mon Dec  1 21:03:30 2008
New Revision: 722374

URL: http://svn.apache.org/viewvc?rev=722374&view=rev
Log:
Fix: MNG-3822

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

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java?rev=722374&r1=722373&r2=722374&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
 Mon Dec  1 21:03:30 2008
@@ -157,7 +157,8 @@
             {
                 if( mp.getValue() != null && !mp.getUri().contains( 
"#property" ) && !mp.getUri().contains( "#collection" ))
                 {
-                    if( !buildProperty.isParentOf( mp ) || 
mp.getUri().equals(ProjectUri.Build.finalName ) )
+                    if( (!buildProperty.isParentOf( mp ) && 
!mp.getUri().equals(ProjectUri.Reporting.outputDirectory)
+                            || mp.getUri().equals(ProjectUri.Build.finalName ) 
))
                     {
                         firstPassModelProperties.add(mp);
                     }
@@ -212,7 +213,7 @@
                 Map<ModelProperty, ModelProperty> buildDirectories = new 
HashMap<ModelProperty, ModelProperty>();
                 for(ModelProperty mp : secondPassModelProperties)
                 {
-                    if(mp.getUri().equals( ProjectUri.Build.directory ))
+                    if(mp.getUri().startsWith( ProjectUri.Build.xUri ) || 
mp.getUri().equals( ProjectUri.Reporting.outputDirectory ))
                     {
                         File file = new File(mp.getResolvedValue());
                         if( !file.isAbsolute() )