From 402137be5444fa15bef178fe87300432eed63bd1 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sat, 26 May 2012 16:55:47 +0000 Subject: [PATCH] renamed variable git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1342925 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/tools/plugin/generator/PluginHelpGenerator.java | 2 +- .../src/main/resources/help-class-source.vm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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 ff5825a..27bda5e 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( "propertiesFilePath", propertiesFilePath + "/plugin-description.xml" ); + properties.put( "pluginDescriptionPath", propertiesFilePath + "/plugin-description.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 f72363b..713ec9d 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/version - private String pluginDescriptorPath = "/${propertiesFilePath}"; + // groupId/artifactId/plugin-description.xml + private String pluginDescriptionPath = "/${pluginDescriptionPath}"; private Xpp3Dom build() throws MojoExecutionException { // olamy more than one pluginDescriptor in the classloader possible ? - getLog().debug( "load pluginDescriptorPath: " + pluginDescriptorPath ); - InputStream is = getClass().getResourceAsStream( pluginDescriptorPath ); + getLog().debug( "load plugin-description.xml: " + pluginDescriptionPath ); + InputStream is = getClass().getResourceAsStream( pluginDescriptionPath ); try { return Xpp3DomBuilder.build( is, "ISO-8859-1" );