maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r690777 - /maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Date Sun, 31 Aug 2008 20:02:54 GMT
Author: sisbell
Date: Sun Aug 31 13:02:54 2008
New Revision: 690777

URL: http://svn.apache.org/viewvc?rev=690777&view=rev
Log:
Fix: MNG3723 - set interpolated path for parent projects.

Modified:
    maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java

Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=690777&r1=690776&r2=690777&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Sun Aug 31 13:02:54 2008
@@ -186,10 +186,15 @@
             project.addCompileSourceRoot(build.getSourceDirectory());
             project.addTestCompileSourceRoot(build.getTestSourceDirectory());
             project.setFile(projectDescriptor);
+
+            setBuildOutputDirectoryOnParent(project);
+
         }
         return project;
     }
 
+
+
     /**
      * @deprecated
      */
@@ -645,4 +650,14 @@
 
         return ArtifactUtils.versionlessKey(gid, aid);
     }
+    
+    private static void setBuildOutputDirectoryOnParent(MavenProject project)
+    {
+        MavenProject parent = project.getParent();
+        if(parent != null)
+        {
+            parent.getModel().getBuild().setDirectory(parent.getFile().getAbsolutePath());
+            setBuildOutputDirectoryOnParent(parent);
+        }
+    }
 }



Mime
View raw message