diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java index 92e8515..f458eba 100644 --- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java +++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java @@ -101,10 +101,10 @@ public class PluginDescriptorGenerator // write plugin-description.xml help-descriptor MavenProject mavenProject = request.getProject(); - String pluginDescriptionFilePath = + String pluginHelpFilePath = "META-INF/maven/" + mavenProject.getGroupId() + "/" + mavenProject.getArtifactId() - + "/plugin-description.xml"; - f = new File( request.getProject().getBuild().getOutputDirectory(), pluginDescriptionFilePath ); + + "/plugin-help.xml"; + f = new File( request.getProject().getBuild().getOutputDirectory(), pluginHelpFilePath ); writeDescriptor( f, request, true ); } catch ( IOException e ) diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java index 27bda5e..1299cf8 100644 --- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java +++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java @@ -201,7 +201,7 @@ public class PluginHelpGenerator { properties.put( "helpPackageName", "" ); } - properties.put( "pluginDescriptionPath", propertiesFilePath + "/plugin-description.xml" ); + properties.put( "pluginHelpPath", propertiesFilePath + "/plugin-help.xml" ); // FIXME encoding ! StringWriter stringWriter = new StringWriter(); diff --git a/maven-plugin-tools-generators/src/main/resources/help-class-source.vm b/maven-plugin-tools-generators/src/main/resources/help-class-source.vm index 713ec9d..1e76d20 100644 --- a/maven-plugin-tools-generators/src/main/resources/help-class-source.vm +++ b/maven-plugin-tools-generators/src/main/resources/help-class-source.vm @@ -82,15 +82,15 @@ public class HelpMojo */ private int indentSize; - // groupId/artifactId/plugin-description.xml - private String pluginDescriptionPath = "/${pluginDescriptionPath}"; + // groupId/artifactId/plugin-help.xml + private String pluginHelpPath = "/${pluginHelpPath}"; private Xpp3Dom build() throws MojoExecutionException { // olamy more than one pluginDescriptor in the classloader possible ? - getLog().debug( "load plugin-description.xml: " + pluginDescriptionPath ); - InputStream is = getClass().getResourceAsStream( pluginDescriptionPath ); + getLog().debug( "load plugin-help.xml: " + pluginHelpPath ); + InputStream is = getClass().getResourceAsStream( pluginHelpPath ); try { return Xpp3DomBuilder.build( is, "ISO-8859-1" );