[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.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1754050 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
index 820c573..d1cbec2 100644
--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
@@ -543,6 +543,10 @@
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 @@
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
diff --git a/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties b/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
index 0c8de65..20ecb56 100644
--- a/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
+++ b/maven-plugin-tools-generators/src/main/resources/pluginxdoc.properties
@@ -53,6 +53,8 @@
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
diff --git a/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties b/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties
index d1f92b7..c326151 100644
--- a/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties
+++ b/maven-plugin-tools-generators/src/main/resources/pluginxdoc_de.properties
@@ -47,6 +47,8 @@
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
diff --git a/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties b/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties
index d7fc190..221ff92 100644
--- a/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties
+++ b/maven-plugin-tools-generators/src/main/resources/pluginxdoc_fr.properties
@@ -52,6 +52,8 @@
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
diff --git a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
index 58d1e2c..5619ed4 100644
--- a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
+++ b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/AbstractGeneratorTestCase.java
@@ -77,6 +77,7 @@
param.setRequired( true );
param.setType( "java.lang.String" );
param.setDescription( "Test parameter description" );
+ param.setAlias( "some.alias" );
params.add( param );
diff --git a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
index cd70d97..9a1ab71 100644
--- a/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
+++ b/maven-plugin-tools-generators/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
@@ -115,6 +115,7 @@
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 )
