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

renamed plugin-description.xml to plugin-help.xml 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1342957 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2012-05-26 20:29:09 +00:00
parent 46532f2300
commit 93e82e524e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
View File

@ -101,10 +101,10 @@ public class PluginDescriptorGenerator
// write plugin-description.xml help-descriptor // write plugin-description.xml help-descriptor
MavenProject mavenProject = request.getProject(); MavenProject mavenProject = request.getProject();
String pluginDescriptionFilePath = String pluginHelpFilePath =
"META-INF/maven/" + mavenProject.getGroupId() + "/" + mavenProject.getArtifactId() "META-INF/maven/" + mavenProject.getGroupId() + "/" + mavenProject.getArtifactId()
+ "/plugin-description.xml"; + "/plugin-help.xml";
f = new File( request.getProject().getBuild().getOutputDirectory(), pluginDescriptionFilePath ); f = new File( request.getProject().getBuild().getOutputDirectory(), pluginHelpFilePath );
writeDescriptor( f, request, true ); writeDescriptor( f, request, true );
} }
catch ( IOException e ) catch ( IOException e )

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

@ -201,7 +201,7 @@ public class PluginHelpGenerator
{ {
properties.put( "helpPackageName", "" ); properties.put( "helpPackageName", "" );
} }
properties.put( "pluginDescriptionPath", propertiesFilePath + "/plugin-description.xml" ); properties.put( "pluginHelpPath", propertiesFilePath + "/plugin-help.xml" );
// FIXME encoding ! // FIXME encoding !
StringWriter stringWriter = new StringWriter(); StringWriter stringWriter = new StringWriter();

8
maven-plugin-tools-generators/src/main/resources/help-class-source.vm
View File

@ -82,15 +82,15 @@ public class HelpMojo
*/ */
private int indentSize; private int indentSize;
// groupId/artifactId/plugin-description.xml // groupId/artifactId/plugin-help.xml
private String pluginDescriptionPath = "/${pluginDescriptionPath}"; private String pluginHelpPath = "/${pluginHelpPath}";
private Xpp3Dom build() private Xpp3Dom build()
throws MojoExecutionException throws MojoExecutionException
{ {
// olamy more than one pluginDescriptor in the classloader possible ? // olamy more than one pluginDescriptor in the classloader possible ?
getLog().debug( "load plugin-description.xml: " + pluginDescriptionPath ); getLog().debug( "load plugin-help.xml: " + pluginHelpPath );
InputStream is = getClass().getResourceAsStream( pluginDescriptionPath ); InputStream is = getClass().getResourceAsStream( pluginHelpPath );
try try
{ {
return Xpp3DomBuilder.build( is, "ISO-8859-1" ); return Xpp3DomBuilder.build( is, "ISO-8859-1" );