stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed parameter 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1354212 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2012-06-26 20:34:17 +00:00
parent dce2541a3e
commit 2585ccafb2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
View File

@ -112,13 +112,12 @@ public class PluginHelpGenerator
} }
} }
} }
Properties properties = new Properties(); Properties properties = new Properties();
properties.put( "helpPackageName", helpPackageName == null ? "" : helpPackageName ); properties.put( "helpPackageName", helpPackageName == null ? "" : helpPackageName );
MavenProject mavenProject = request.getProject(); MavenProject mavenProject = request.getProject();
String propertiesFilePath = "META-INF/maven/" + mavenProject.getGroupId() + "/" + mavenProject.getArtifactId();
File tmpPropertiesFile = File tmpPropertiesFile =
new File( request.getProject().getBuild().getDirectory(), "maven-plugin-help.properties" ); new File( request.getProject().getBuild().getDirectory(), "maven-plugin-help.properties" );
if ( tmpPropertiesFile.exists() ) if ( tmpPropertiesFile.exists() )
@ -154,8 +153,10 @@ public class PluginHelpGenerator
Writer writer = null; Writer writer = null;
try try
{ {
String pluginResourcesPath = "META-INF/maven/" + mavenProject.getGroupId() + "/" + mavenProject.getArtifactId();
writer = new OutputStreamWriter( new FileOutputStream( helpClass ), request.getEncoding() ); writer = new OutputStreamWriter( new FileOutputStream( helpClass ), request.getEncoding() );
writer.write( getHelpClassSources( propertiesFilePath, pluginDescriptor ) ); writer.write( getHelpClassSources( pluginResourcesPath, pluginDescriptor ) );
writer.flush(); writer.flush();
} }
catch ( IOException e ) catch ( IOException e )
@ -189,7 +190,7 @@ public class PluginHelpGenerator
// Private methods // Private methods
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
protected String getHelpClassSources( String propertiesFilePath, PluginDescriptor pluginDescriptor ) protected String getHelpClassSources( String pluginResourcesPath, PluginDescriptor pluginDescriptor )
{ {
Properties properties = new Properties(); Properties properties = new Properties();
VelocityContext context = new VelocityContext( properties ); VelocityContext context = new VelocityContext( properties );
@ -201,9 +202,9 @@ public class PluginHelpGenerator
{ {
properties.put( "helpPackageName", "" ); properties.put( "helpPackageName", "" );
} }
properties.put( "pluginHelpPath", propertiesFilePath + "/plugin-help.xml" ); properties.put( "pluginHelpPath", pluginResourcesPath + "/plugin-help.xml" );
properties.put( "artifactId", pluginDescriptor.getArtifactId()); properties.put( "artifactId", pluginDescriptor.getArtifactId() );
properties.put( "goalPrefix", pluginDescriptor.getGoalPrefix()); properties.put( "goalPrefix", pluginDescriptor.getGoalPrefix() );
// FIXME encoding ! // FIXME encoding !