Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 97422 invoked from network); 21 Mar 2008 16:14:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Mar 2008 16:14:59 -0000 Received: (qmail 39638 invoked by uid 500); 21 Mar 2008 16:14:57 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 39600 invoked by uid 500); 21 Mar 2008 16:14:57 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 39589 invoked by uid 99); 21 Mar 2008 16:14:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Mar 2008 09:14:57 -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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Mar 2008 16:14:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5372C1A9832; Fri, 21 Mar 2008 09:14:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r639693 - /directory/studio/trunk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/AbstractStudioMojo.java Date: Fri, 21 Mar 2008 16:14:36 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080321161438.5372C1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Fri Mar 21 09:14:17 2008 New Revision: 639693 URL: http://svn.apache.org/viewvc?rev=639693&view=rev Log: Updated the Studio Maven Plugin to sort Artifacts using their artifact ids to avoid the problem with updated MANIFEST.MF files. Modified: directory/studio/trunk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/AbstractStudioMojo.java Modified: directory/studio/trunk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/AbstractStudioMojo.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/AbstractStudioMojo.java?rev=639693&r1=639692&r2=639693&view=diff ============================================================================== --- directory/studio/trunk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/AbstractStudioMojo.java (original) +++ directory/studio/trunk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/AbstractStudioMojo.java Fri Mar 21 09:14:17 2008 @@ -23,6 +23,8 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.Iterator; import java.util.List; @@ -413,6 +415,8 @@ protected List createArtifactList() { List list = new ArrayList(); + + // Copying only artifacts with 'provided' scope for ( Iterator artifactItem = project.getArtifacts().iterator(); artifactItem.hasNext(); ) { Artifact artifact = ( Artifact ) artifactItem.next(); @@ -421,6 +425,25 @@ list.add( artifact ); } } + + // Sorting list before returning it + Collections.sort( list, new Comparator() + { + public int compare( Artifact o1, Artifact o2 ) + { + String artifactId1 = o1.getArtifactId(); + String artifactId2 = o2.getArtifactId(); + + if ( ( artifactId1 != null ) && ( artifactId2 != null ) ) + { + return artifactId1.compareToIgnoreCase( artifactId2 ); + } + + // Default + return o1.toString().compareToIgnoreCase( o2.toString() ); + } + } ); + return list; }