Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 41424 invoked from network); 10 Oct 2005 19:29:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Oct 2005 19:29:20 -0000 Received: (qmail 64330 invoked by uid 500); 10 Oct 2005 19:29:20 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 64315 invoked by uid 500); 10 Oct 2005 19:29:19 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 64304 invoked by uid 99); 10 Oct 2005 19:29:19 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 10 Oct 2005 12:29:19 -0700 Received: (qmail 41206 invoked by uid 65534); 10 Oct 2005 19:28:59 -0000 Message-ID: <20051010192859.41204.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r312718 - in /maven/continuum/trunk: continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/ continuum-core/src/main/java/org/apache/maven/continuum/utils/ continuum-model/src/main/mdo/ Date: Mon, 10 Oct 2005 19:28:58 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Mon Oct 10 12:28:51 2005 New Revision: 312718 URL: http://svn.apache.org/viewcvs?rev=312718&view=rev Log: Add parent to project. Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=312718&r1=312717&r2=312718&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Mon Oct 10 12:28:51 2005 @@ -151,6 +151,25 @@ } // ---------------------------------------------------------------------- + // Parent + // ---------------------------------------------------------------------- + + if ( mavenProject.getParent() != null ) + { + MavenProject parentProject = mavenProject.getParent(); + + ProjectDependency parent = new ProjectDependency(); + + parent.setGroupId( parentProject.getGroupId() ); + + parent.setArtifactId( parentProject.getArtifactId() ); + + parent.setVersion( parentProject.getVersion() ); + + continuumProject.setParent( parent ); + } + + // ---------------------------------------------------------------------- // Dependencies // ---------------------------------------------------------------------- @@ -174,7 +193,6 @@ } continuumProject.setDependencies( dependencies ); - } // ---------------------------------------------------------------------- Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java?rev=312718&r1=312717&r2=312718&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java Mon Oct 10 12:28:51 2005 @@ -77,6 +77,20 @@ String id = getProjectId( project ); + // Parent + ProjectDependency parent = project.getParent(); + + if ( parent != null ) + { + String dependencyId = getDependencyId( parent ); + + if ( dag.getVertex( dependencyId ) != null ) + { + dag.addEdge( id, dependencyId ); + } + } + + // Dependencies for ( Iterator j = project.getDependencies().iterator(); j.hasNext(); ) { ProjectDependency dependency = (ProjectDependency) j.next(); Modified: maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo?rev=312718&r1=312717&r2=312718&view=diff ============================================================================== --- maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo (original) +++ maven/continuum/trunk/continuum-model/src/main/mdo/continuum.mdo Mon Oct 10 12:28:51 2005 @@ -165,6 +165,13 @@ + parent + 1.0.0+ + + ProjectDependency + + + dependencies 1.0.0+