svn commit: r1599146 - in /maven/plugin-tools/trunk: maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/ maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/

[tchemit]

Author: tchemit
Date: Mon Jun  2 09:54:18 2014
New Revision: 1599146

URL: http://svn.apache.org/r1599146
Log:
[MPLUGIN-266] Incorrect warning comment about deprecated @component usage for 
maven objects

Modified:
    
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
    
maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java?rev=1599146&r1=1599145&r2=1599146&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java
 Mon Jun  2 09:54:18 2014
@@ -580,9 +580,9 @@ public class JavaAnnotationsMojoDescript
                 else
                 {
                     // not a component but a Maven object to be transformed 
into an expression/property: deprecated
-                    getLogger().warn( "Deprecated @component for " + 
parameter.getName() + " field in "
-                                          + mojoAnnotatedClass.getClassName() 
+ "."
-                                          + ": replace with @parameter 
name=\"" + expression + "\" @readonly" );
+                    getLogger().warn( "Deprecated @component for " + 
parameter.getName() + " field in " +
+                                          mojoAnnotatedClass.getClassName() + 
"." +
+                                          ": replace with @parameter 
default-value=\"" + expression + "\" @readonly" );
                     parameter.setDefaultValue( expression );
                     parameter.setType( 
componentAnnotationContent.getRoleClassName() );
                     parameter.setRequired( true );

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java?rev=1599146&r1=1599145&r2=1599146&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-java/src/main/java/org/apache/maven/tools/plugin/extractor/java/JavaMojoDescriptorExtractor.java
 Mon Jun  2 09:54:18 2014
@@ -538,9 +538,9 @@ public class JavaMojoDescriptorExtractor
                 else
                 {
                     // not a component but a Maven object to be transformed 
into an expression/property
-                    getLogger().warn( "Deprecated @Component for " + 
pd.getName() + " field in "
-                                          + javaClass.getFullyQualifiedName() 
+ ": replace with @Parameter( name = \""
-                                          + expression + "\", readonly = true 
)" );
+                    getLogger().warn(
+                        "Deprecated @Component for " + pd.getName() + " field 
in " + javaClass.getFullyQualifiedName() +
+                            ": replace with @Parameter( default-value = \"" + 
expression + "\", readonly = true )" );
                     pd.setDefaultValue( expression );
                     pd.setType( role );
                     pd.setRequired( true );