Author: brett Date: Fri Dec 22 18:31:21 2006 New Revision: 489832 URL: http://svn.apache.org/viewvc?view=rev&rev=489832 Log: merge r479434 from trunk
Modified: maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java Modified: maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java URL: http://svn.apache.org/viewvc/maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java?view=diff&rev=489832&r1=489831&r2=489832 ============================================================================== --- maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java (original) +++ maven/shared/branches/maven-plugin-tools-2.0.x/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java Fri Dec 22 18:31:21 2006 @@ -404,6 +404,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() );