You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/06/26 22:34:18 UTC
svn commit: r1354212 -
/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
Author: hboutemy
Date: Tue Jun 26 20:34:17 2012
New Revision: 1354212
URL: http://svn.apache.org/viewvc?rev=1354212&view=rev
Log:
renamed parameter
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java?rev=1354212&r1=1354211&r2=1354212&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java Tue Jun 26 20:34:17 2012
@@ -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 !