Author: vsiveton
Date: Fri Feb 1 04:29:36 2008
New Revision: 617485
URL: http://svn.apache.org/viewvc?rev=617485&view=rev
Log:
o improved logging usage
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java?rev=617485&r1=617484&r2=617485&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
Fri Feb 1 04:29:36 2008
@@ -54,7 +54,7 @@
/** [EMAIL PROTECTED] */
protected Generator createGenerator()
{
- return new PluginHelpGenerator( getLog() );
+ return new PluginHelpGenerator();
}
/** [EMAIL PROTECTED] */
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java?rev=617485&r1=617484&r2=617485&view=diff
==============================================================================
---
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
Fri Feb 1 04:29:36 2008
@@ -35,7 +35,9 @@
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.logging.Log;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
@@ -47,6 +49,7 @@
* @since 2.4
*/
public class PluginHelpGenerator
+ extends AbstractLogEnabled
implements Generator
{
private static final String LS = System.getProperty( "line.separator" );
@@ -55,16 +58,12 @@
private static final String HELP_GOAL = "help";
- private final Log log;
-
/**
* Default constructor
- *
- * @param log
*/
- public PluginHelpGenerator( Log log )
+ public PluginHelpGenerator()
{
- this.log = log;
+ this.enableLogging( new ConsoleLogger( Logger.LEVEL_INFO,
"PluginHelpGenerator" ) );
}
// ----------------------------------------------------------------------
@@ -93,9 +92,9 @@
if ( descriptor.getGoal().equals( HELP_GOAL )
&& !descriptor.getImplementation().equals( packageName + "." +
HELP_MOJO_CLASS_NAME ) )
{
- if ( log.isWarnEnabled() )
+ if ( getLogger().isWarnEnabled() )
{
- log.warn( "\n\nAn help goal (" +
descriptor.getImplementation()
+ getLogger().warn( "\n\nAn help goal (" +
descriptor.getImplementation()
+ ") already exists in this plugin. SKIPPED THE " +
HELP_MOJO_CLASS_NAME + " GENERATION.\n" );
}