From 2585ccafb28357a7d5c1ce99290cfb8121e27f13 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Tue, 26 Jun 2012 20:34:17 +0000 Subject: [PATCH] renamed parameter git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1354212 13f79535-47bb-0310-9956-ffa450edef68 --- .../plugin/generator/PluginHelpGenerator.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 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 714fc1b..630d7d7 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 @@ -112,13 +112,12 @@ public class PluginHelpGenerator } } } + Properties properties = new Properties(); properties.put( "helpPackageName", helpPackageName == null ? "" : helpPackageName ); MavenProject mavenProject = request.getProject(); - String propertiesFilePath = "META-INF/maven/" + mavenProject.getGroupId() + "/" + mavenProject.getArtifactId(); - File tmpPropertiesFile = new File( request.getProject().getBuild().getDirectory(), "maven-plugin-help.properties" ); if ( tmpPropertiesFile.exists() ) @@ -154,8 +153,10 @@ public class PluginHelpGenerator Writer writer = null; try { + String pluginResourcesPath = "META-INF/maven/" + mavenProject.getGroupId() + "/" + mavenProject.getArtifactId(); + writer = new OutputStreamWriter( new FileOutputStream( helpClass ), request.getEncoding() ); - writer.write( getHelpClassSources( propertiesFilePath, pluginDescriptor ) ); + writer.write( getHelpClassSources( pluginResourcesPath, pluginDescriptor ) ); writer.flush(); } catch ( IOException e ) @@ -189,7 +190,7 @@ public class PluginHelpGenerator // Private methods // ---------------------------------------------------------------------- - protected String getHelpClassSources( String propertiesFilePath, PluginDescriptor pluginDescriptor ) + protected String getHelpClassSources( String pluginResourcesPath, PluginDescriptor pluginDescriptor ) { Properties properties = new Properties(); VelocityContext context = new VelocityContext( properties ); @@ -201,9 +202,9 @@ public class PluginHelpGenerator { properties.put( "helpPackageName", "" ); } - properties.put( "pluginHelpPath", propertiesFilePath + "/plugin-help.xml" ); - properties.put( "artifactId", pluginDescriptor.getArtifactId()); - properties.put( "goalPrefix", pluginDescriptor.getGoalPrefix()); + properties.put( "pluginHelpPath", pluginResourcesPath + "/plugin-help.xml" ); + properties.put( "artifactId", pluginDescriptor.getArtifactId() ); + properties.put( "goalPrefix", pluginDescriptor.getGoalPrefix() ); // FIXME encoding !