Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F1BEA9025 for ; Sat, 26 May 2012 16:56:11 +0000 (UTC) Received: (qmail 75080 invoked by uid 500); 26 May 2012 16:56:11 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 74984 invoked by uid 500); 26 May 2012 16:56:11 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 74926 invoked by uid 99); 26 May 2012 16:56:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 May 2012 16:56:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 May 2012 16:56:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C691823889B3; Sat, 26 May 2012 16:55:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1342925 - in /maven/plugin-tools/trunk/maven-plugin-tools-generators/src/main: java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java resources/help-class-source.vm Date: Sat, 26 May 2012 16:55:47 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120526165547.C691823889B3@eris.apache.org> Author: hboutemy Date: Sat May 26 16:55:47 2012 New Revision: 1342925 URL: http://svn.apache.org/viewvc?rev=1342925&view=rev Log: renamed variable Modified: 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/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=1342925&r1=1342924&r2=1342925&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 16:55:47 2012 @@ -201,7 +201,7 @@ public class PluginHelpGenerator { properties.put( "helpPackageName", "" ); } - properties.put( "propertiesFilePath", propertiesFilePath + "/plugin-description.xml" ); + properties.put( "pluginDescriptionPath", propertiesFilePath + "/plugin-description.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=1342925&r1=1342924&r2=1342925&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 16:55:47 2012 @@ -82,15 +82,15 @@ public class HelpMojo */ private int indentSize; - // groupId/artifactId/version - private String pluginDescriptorPath = "/${propertiesFilePath}"; + // groupId/artifactId/plugin-description.xml + private String pluginDescriptionPath = "/${pluginDescriptionPath}"; private Xpp3Dom build() throws MojoExecutionException { // olamy more than one pluginDescriptor in the classloader possible ? - getLog().debug( "load pluginDescriptorPath: " + pluginDescriptorPath ); - InputStream is = getClass().getResourceAsStream( pluginDescriptorPath ); + getLog().debug( "load plugin-description.xml: " + pluginDescriptionPath ); + InputStream is = getClass().getResourceAsStream( pluginDescriptionPath ); try { return Xpp3DomBuilder.build( is, "ISO-8859-1" );