stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use hint rather than roleHint 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1341650 13f79535-47bb-0310-9956-ffa450edef68
master
Olivier Lamy 2012-05-22 21:42:04 +00:00
parent b3be96af8e
commit f375619f9c
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maven-plugin-annotations/src/main/java/org/apache/maven/plugins/annotations/Component.java
View File

@ -45,8 +45,8 @@ public @interface Component
Class<?> role() default Object.class; Class<?> role() default Object.class;
/** /**
* role-hint of the component to inject. * hint of the component to inject.
* @return the role-hint * @return the hint
*/ */
String roleHint() default ""; String hint() default "";
} }

2
maven-plugin-plugin/src/it/annotation-with-inheritance-reactor/module-abstract-mojo/src/main/java/org/apache/maven/plugins/AbstractFirstMojo.java
View File

@ -58,7 +58,7 @@ public abstract class AbstractFirstMojo
/** /**
* *
*/ */
@Component( role = ArtifactMetadataSource.class, roleHint = "maven" ) @Component( role = ArtifactMetadataSource.class, hint = "maven" )
protected ArtifactMetadataSource artifactMetadataSource; protected ArtifactMetadataSource artifactMetadataSource;
} }

2
maven-plugin-plugin/src/it/annotation-with-inheritance/src/main/java/org/apache/maven/plugin/coreit/AbstractFirstMojo.java
View File

@ -58,7 +58,7 @@ public abstract class AbstractFirstMojo
/** /**
* *
*/ */
@Component( role = ArtifactMetadataSource.class, roleHint = "maven" ) @Component( role = ArtifactMetadataSource.class, hint = "maven" )
protected ArtifactMetadataSource artifactMetadataSource; protected ArtifactMetadataSource artifactMetadataSource;
} }

2
maven-plugin-plugin/src/it/java-basic-annotations/src/main/java/org/apache/maven/plugin/coreit/FirstMojo.java
View File

@ -60,7 +60,7 @@ public class FirstMojo
@Parameter( alias = "alias" ) @Parameter( alias = "alias" )
private String aliasedParam; private String aliasedParam;
@Component( role = MavenProjectHelper.class, roleHint = "test" ) @Component( role = MavenProjectHelper.class, hint = "test" )
private Object projectHelper; private Object projectHelper;
public void execute() public void execute()

2
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
View File

@ -546,7 +546,7 @@ public class JavaAnnotationsMojoDescriptorExtractor
new org.apache.maven.plugin.descriptor.Parameter(); new org.apache.maven.plugin.descriptor.Parameter();
parameter.setName( componentAnnotationContent.getFieldName() ); parameter.setName( componentAnnotationContent.getFieldName() );
parameter.setRequirement( new Requirement( componentAnnotationContent.getRoleClassName(), parameter.setRequirement( new Requirement( componentAnnotationContent.getRoleClassName(),
componentAnnotationContent.roleHint() ) ); componentAnnotationContent.hint() ) );
parameter.setDeprecated( componentAnnotationContent.getDeprecated() ); parameter.setDeprecated( componentAnnotationContent.getDeprecated() );
parameter.setSince( componentAnnotationContent.getSince() ); parameter.setSince( componentAnnotationContent.getSince() );

16
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/ComponentAnnotationContent.java
View File

@ -33,18 +33,18 @@ public class ComponentAnnotationContent
{ {
private String roleClassName; private String roleClassName;
private String roleHint; private String hint;
public ComponentAnnotationContent( String fieldName ) public ComponentAnnotationContent( String fieldName )
{ {
super( fieldName ); super( fieldName );
} }
public ComponentAnnotationContent( String fieldName, String role, String roleHint ) public ComponentAnnotationContent( String fieldName, String role, String hint )
{ {
this( fieldName ); this( fieldName );
this.roleClassName = role; this.roleClassName = role;
this.roleHint = roleHint; this.hint = hint;
} }
public Class<?> role() public Class<?> role()
@ -63,14 +63,14 @@ public class ComponentAnnotationContent
return roleClassName; return roleClassName;
} }
public String roleHint() public String hint()
{ {
return roleHint == null ? "" : roleHint; return hint == null ? "" : hint;
} }
public void roleHint( String roleHint ) public void hint( String hint )
{ {
this.roleHint = roleHint; this.hint = hint;
} }
public Class<? extends Annotation> annotationType() public Class<? extends Annotation> annotationType()
@ -85,7 +85,7 @@ public class ComponentAnnotationContent
sb.append( super.toString() ); sb.append( super.toString() );
sb.append( "ComponentAnnotationContent" ); sb.append( "ComponentAnnotationContent" );
sb.append( "{role='" ).append( roleClassName ).append( '\'' ); sb.append( "{role='" ).append( roleClassName ).append( '\'' );
sb.append( ", roleHint='" ).append( roleHint ).append( '\'' ); sb.append( ", hint='" ).append( hint ).append( '\'' );
sb.append( '}' ); sb.append( '}' );
return sb.toString(); return sb.toString();
} }

2
maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/annotations/FooMojo.java
View File

@ -61,7 +61,7 @@ public class FooMojo
/** /**
* *
*/ */
@Component( role = ArtifactMetadataSource.class, roleHint = "maven" ) @Component( role = ArtifactMetadataSource.class, hint = "maven" )
protected ArtifactMetadataSource artifactMetadataSource; protected ArtifactMetadataSource artifactMetadataSource;
public void execute() public void execute()