Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 95724 invoked from network); 26 Nov 2006 22:34:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Nov 2006 22:34:25 -0000 Received: (qmail 24468 invoked by uid 500); 26 Nov 2006 22:34:34 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 24349 invoked by uid 500); 26 Nov 2006 22:34:33 -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 24315 invoked by uid 99); 26 Nov 2006 22:34:33 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Nov 2006 14:34:33 -0800 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 [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Nov 2006 14:34:18 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id B5B1E1A9846; Sun, 26 Nov 2006 14:33:21 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r479434 - /maven/shared/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java Date: Sun, 26 Nov 2006 22:33:21 -0000 To: commits@maven.apache.org From: brett@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061126223321.B5B1E1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: brett Date: Sun Nov 26 14:33:20 2006 New Revision: 479434 URL: http://svn.apache.org/viewvc?view=rev&rev=479434 Log: support role-hint as an alternate syntax to roleHint Modified: maven/shared/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java Modified: maven/shared/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java?view=diff&rev=479434&r1=479433&r2=479434 ============================================================================== --- maven/shared/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java (original) +++ maven/shared/trunk/maven-plugin-tools/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java Sun Nov 26 14:33:20 2006 @@ -417,6 +417,12 @@ String roleHint = componentTag.getNamedParameter( COMPONENT_ROLEHINT ); + if ( roleHint == null ) + { + // support alternate syntax for better compatibility with the Plexus CDC. + roleHint = componentTag.getNamedParameter( "role-hint" ); + } + pd.setRequirement( new Requirement( role, roleHint ) ); pd.setName( (String) entry.getKey() );