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 @@ 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( "
" ); + } + + 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=User Property pluginxdoc.mojodescriptor.parameter.property.description=User property is: {0}. pluginxdoc.mojodescriptor.parameter.default=Default pluginxdoc.mojodescriptor.parameter.defaultValue=Default value is: {0}. +pluginxdoc.mojodescriptor.parameter.alias=Alias +pluginxdoc.mojodescriptor.parameter.alias.description=Alias is: {0}. 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.required=Erforderlich pluginxdoc.mojodescriptor.parameter.expression=Ausdruck pluginxdoc.mojodescriptor.parameter.default=Standard pluginxdoc.mojodescriptor.parameter.defaultValue=Standardwert ist: {0}. +pluginxdoc.mojodescriptor.parameter.alias=Alias +pluginxdoc.mojodescriptor.parameter.alias.description=Alias ist: {0}. 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=Propri\u00e9t\u00e9 utilisateur pluginxdoc.mojodescriptor.parameter.property.description=Propri\u00e9t\u00e9 utilisateur : {0}. pluginxdoc.mojodescriptor.parameter.default=D\u00e9faut pluginxdoc.mojodescriptor.parameter.defaultValue=Valeur par d\u00e9faut : {0}. +pluginxdoc.mojodescriptor.parameter.alias=Alias +pluginxdoc.mojodescriptor.parameter.alias.description=Alias : {0}. 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 @@ public abstract class AbstractGeneratorTestCase 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 @@ public class PluginDescriptorGeneratorTest 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 )