Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 52502 invoked from network); 28 Nov 2005 16:14:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Nov 2005 16:14:29 -0000 Received: (qmail 36212 invoked by uid 500); 28 Nov 2005 16:14:29 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 36199 invoked by uid 500); 28 Nov 2005 16:14:28 -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 36186 invoked by uid 99); 28 Nov 2005 16:14:28 -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, 28 Nov 2005 08:14:28 -0800 Received: (qmail 51976 invoked by uid 65534); 28 Nov 2005 16:14:07 -0000 Message-ID: <20051128161407.51962.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r349412 - /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java Date: Mon, 28 Nov 2005 16:14:06 -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 Nov 28 08:14:00 2005 New Revision: 349412 URL: http://svn.apache.org/viewcvs?rev=349412&view=rev Log: [CONTINUUM-480] Use project name as groupId and artifactId if groupId and artifactId are null like in ant and shell project. Added version too to project identifier. Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java 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=349412&r1=349411&r2=349412&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 Nov 28 08:14:00 2005 @@ -118,11 +118,35 @@ private static String getProjectId( Project project ) { - return project.getGroupId() + ":" + project.getArtifactId(); + String groupId; + + String artifactId; + + if ( project.getGroupId() == null ) + { + groupId = project.getName(); + } + else + { + groupId = project.getGroupId(); + } + + if ( project.getArtifactId() == null ) + { + artifactId = project.getName(); + } + else + { + artifactId = project.getArtifactId(); + } + + String id = groupId + ":" + artifactId + ":" + project.getVersion(); + + return id; } private static String getDependencyId( ProjectDependency project ) { - return project.getGroupId() + ":" + project.getArtifactId(); + return project.getGroupId() + ":" + project.getArtifactId() + ":" + project.getVersion(); } }