Author: gboue Date: Mon Jul 25 21:19:22 2016 New Revision: 1754050 URL: http://svn.apache.org/viewvc?rev=1754050&view=rev Log: [MPLUGIN-307] The "alias" field on the annotation "@Parameter" is not considered for goal "plugin:report"
PluginXdocGenerator didn't include the alias for parameters in the report. Added to the end of the bullet list. Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java?rev=1754050&r1=1754049&r2=1754050&view=diff ============================================================================== --- maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java Mon Jul 25 21:19:22 2016 @@ -543,6 +543,10 @@ public class PluginXdocGenerator addedUl = addUl( w, addedUl, parameter.getDefaultValue() ); writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.default" ), escapeXml( parameter.getDefaultValue() ), w ); + + addedUl = addUl( w, addedUl, parameter.getAlias() ); + writeDetail( getString( "pluginxdoc.mojodescriptor.parameter.alias" ), escapeXml( parameter.getAlias() ), + w ); if ( addedUl ) { @@ -719,6 +723,13 @@ public class PluginXdocGenerator if ( property != null ) { w.writeMarkup( format( "pluginxdoc.mojodescriptor.parameter.property.description", property ) ); + w.writeMarkup( "<br/>" ); + } + + if ( StringUtils.isNotEmpty( parameter.getAlias() ) ) + { + w.writeMarkup( format( "pluginxdoc.mojodescriptor.parameter.alias.description", + escapeXml( parameter.getAlias() ) ) ); } w.endElement(); //td Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties?rev=1754050&r1=1754049&r2=1754050&view=diff ============================================================================== --- maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties Mon Jul 25 21:19:22 2016 @@ -53,6 +53,8 @@ pluginxdoc.mojodescriptor.parameter.prop pluginxdoc.mojodescriptor.parameter.property.description=<strong>User property is</strong>: <code>{0}</code>. pluginxdoc.mojodescriptor.parameter.default=Default pluginxdoc.mojodescriptor.parameter.defaultValue=<strong>Default value is</strong>: <code>{0}</code>. +pluginxdoc.mojodescriptor.parameter.alias=Alias +pluginxdoc.mojodescriptor.parameter.alias.description=<strong>Alias is</strong>: <code>{0}</code>. pluginxdoc.mojodescriptor.requiredParameters=Required Parameters pluginxdoc.mojodescriptor.optionalParameters=Optional Parameters pluginxdoc.mojodescriptor.parameters=Parameters Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties?rev=1754050&r1=1754049&r2=1754050&view=diff ============================================================================== --- maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties Mon Jul 25 21:19:22 2016 @@ -47,6 +47,8 @@ pluginxdoc.mojodescriptor.parameter.requ pluginxdoc.mojodescriptor.parameter.expression=Ausdruck pluginxdoc.mojodescriptor.parameter.default=Standard pluginxdoc.mojodescriptor.parameter.defaultValue=<strong>Standardwert ist</strong>: <code>{0}</code>. +pluginxdoc.mojodescriptor.parameter.alias=Alias +pluginxdoc.mojodescriptor.parameter.alias.description=<strong>Alias ist</strong>: <code>{0}</code>. pluginxdoc.mojodescriptor.requiredParameters=Erforderliche Parameter pluginxdoc.mojodescriptor.optionalParameters=Optionale Parameter pluginxdoc.mojodescriptor.parameters=Parameter Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties?rev=1754050&r1=1754049&r2=1754050&view=diff ============================================================================== --- maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties Mon Jul 25 21:19:22 2016 @@ -52,6 +52,8 @@ pluginxdoc.mojodescriptor.parameter.prop pluginxdoc.mojodescriptor.parameter.property.description=<strong>Propri\u00e9t\u00e9 utilisateur</strong> : <code>{0}</code>. pluginxdoc.mojodescriptor.parameter.default=D\u00e9faut pluginxdoc.mojodescriptor.parameter.defaultValue=<strong>Valeur par d\u00e9faut</strong> : <code>{0}</code>. +pluginxdoc.mojodescriptor.parameter.alias=Alias +pluginxdoc.mojodescriptor.parameter.alias.description=<strong>Alias</strong> : <code>{0}</code>. pluginxdoc.mojodescriptor.requiredParameters=Param\u00e8tres requis pluginxdoc.mojodescriptor.optionalParameters=Param\u00e8tres optionnels pluginxdoc.mojodescriptor.parameters=Param\u00e8tres Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java?rev=1754050&r1=1754049&r2=1754050&view=diff ============================================================================== --- maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java Mon Jul 25 21:19:22 2016 @@ -77,6 +77,7 @@ public abstract class AbstractGeneratorT param.setRequired( true ); param.setType( "java.lang.String" ); param.setDescription( "Test parameter description" ); + param.setAlias( "some.alias" ); params.add( param ); Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java?rev=1754050&r1=1754049&r2=1754050&view=diff ============================================================================== --- maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java (original) +++ maven/plugin-tools/trunk/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java Mon Jul 25 21:19:22 2016 @@ -115,6 +115,7 @@ public class PluginDescriptorGeneratorTe assertEquals( "dir", parameter.getName() ); assertEquals( String.class.getName(), parameter.getType() ); assertTrue( parameter.isRequired() ); + assertEquals( "some.alias", parameter.getAlias() ); } private void checkDependency( String groupId, String artifactId, String version, ComponentDependency dependency )