svn commit: r1342957 - in /maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main: java/org/apache/maven/tools/plugin/generator/ resources/

[hboutemy]

Author: hboutemy
Date: Sat May 26 20:29:09 2012
New Revision: 1342957

URL: http://svn.apache.org/viewvc?rev=1342957&view=rev
Log:
renamed plugin-description.xml to plugin-help.xml

Modified:
    
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
    
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
    
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/help-class-source.vm

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java?rev=1342957&r1=1342956&r2=1342957&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java
 Sat May 26 20:29:09 2012
@@ -101,10 +101,10 @@ public class PluginDescriptorGenerator
 
             // write plugin-description.xml help-descriptor
             MavenProject mavenProject = request.getProject();
-            String pluginDescriptionFilePath =
+            String pluginHelpFilePath =
                 "META-INF/maven/" + mavenProject.getGroupId() + "/" + 
mavenProject.getArtifactId()
-                    + "/plugin-description.xml";
-            f = new File( 
request.getProject().getBuild().getOutputDirectory(), pluginDescriptionFilePath 
);
+                    + "/plugin-help.xml";
+            f = new File( 
request.getProject().getBuild().getOutputDirectory(), pluginHelpFilePath );
             writeDescriptor( f, request, true );
         }
         catch ( IOException e )

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=1342957&r1=1342956&r2=1342957&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
 Sat May 26 20:29:09 2012
@@ -201,7 +201,7 @@ public class PluginHelpGenerator
         {
             properties.put( "helpPackageName", "" );
         }
-        properties.put( "pluginDescriptionPath", propertiesFilePath + 
"/plugin-description.xml" );
+        properties.put( "pluginHelpPath", propertiesFilePath + 
"/plugin-help.xml" );
         // FIXME encoding !
 
         StringWriter stringWriter = new StringWriter();

Modified: 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/help-class-source.vm
URL: 
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/help-class-source.vm?rev=1342957&r1=1342956&r2=1342957&view=diff
==============================================================================
--- 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/help-class-source.vm
 (original)
+++ 
maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main/resources/help-class-source.vm
 Sat May 26 20:29:09 2012
@@ -82,15 +82,15 @@ public class HelpMojo
      */
     private int indentSize;
 
-    // groupId/artifactId/plugin-description.xml
-    private String pluginDescriptionPath = "/${pluginDescriptionPath}";
+    // groupId/artifactId/plugin-help.xml
+    private String pluginHelpPath = "/${pluginHelpPath}";
 
     private Xpp3Dom build()
         throws MojoExecutionException
     {
         // olamy more than one pluginDescriptor in the classloader possible ?
-        getLog().debug( "load plugin-description.xml: " + 
pluginDescriptionPath );
-        InputStream is = getClass().getResourceAsStream( pluginDescriptionPath 
);
+        getLog().debug( "load plugin-help.xml: " + pluginHelpPath );
+        InputStream is = getClass().getResourceAsStream( pluginHelpPath );
         try
         {
             return Xpp3DomBuilder.build( is, "ISO-8859-1" );