Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 72494 invoked from network); 31 Aug 2008 20:03:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Aug 2008 20:03:46 -0000 Received: (qmail 6602 invoked by uid 500); 31 Aug 2008 20:03:44 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 6541 invoked by uid 500); 31 Aug 2008 20:03:44 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 6532 invoked by uid 99); 31 Aug 2008 20:03:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 31 Aug 2008 13:03:44 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 31 Aug 2008 20:02:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2A204238896B; Sun, 31 Aug 2008 13:02:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@maven.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080831200255.2A204238896B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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); + } + } }