Updated Branches: refs/heads/master e95060321 -> 8112e6a83
created Slf4jConfiguration.Level enum to replace int Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8112e6a8 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8112e6a8 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8112e6a8 Branch: refs/heads/master Commit: 8112e6a83544fe8acdd7efd973200157c1e7ca04 Parents: e950603 Author: Hervé Boutemy <hbout...@apache.org> Authored: Tue Dec 18 04:23:52 2012 +0100 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Tue Dec 18 04:23:52 2012 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/maven/cli/MavenCli.java | 6 +++--- .../cli/logging/AbstractSlf4jConfiguration.java | 2 +- .../maven/cli/logging/Slf4jConfiguration.java | 11 ++++------- .../cli/logging/impl/Slf4jSimpleConfiguration.java | 9 ++++----- 4 files changed, 12 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/8112e6a8/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index eb440e4..23d2ba1 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -310,17 +310,17 @@ public class MavenCli if ( cliRequest.debug ) { cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_DEBUG ); - slf4jConfiguration.setRootLoggerLevel( MavenExecutionRequest.LOGGING_LEVEL_DEBUG ); + slf4jConfiguration.setRootLoggerLevel( Slf4jConfiguration.Level.DEBUG ); } else if ( cliRequest.quiet ) { cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_ERROR ); - slf4jConfiguration.setRootLoggerLevel( MavenExecutionRequest.LOGGING_LEVEL_ERROR ); + slf4jConfiguration.setRootLoggerLevel( Slf4jConfiguration.Level.ERROR ); } else { cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_INFO ); - slf4jConfiguration.setRootLoggerLevel( MavenExecutionRequest.LOGGING_LEVEL_INFO ); + slf4jConfiguration.setRootLoggerLevel( Slf4jConfiguration.Level.INFO ); } if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) ) http://git-wip-us.apache.org/repos/asf/maven/blob/8112e6a8/maven-embedder/src/main/java/org/apache/maven/cli/logging/AbstractSlf4jConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/AbstractSlf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/AbstractSlf4jConfiguration.java index 2b2ef6d..4f89a94 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/AbstractSlf4jConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/AbstractSlf4jConfiguration.java @@ -34,7 +34,7 @@ public class AbstractSlf4jConfiguration { private final Logger logger = LoggerFactory.getLogger( AbstractSlf4jConfiguration.class ); - public void setRootLoggerLevel( int level ) + public void setRootLoggerLevel( Level level ) { logger.warn( "setRootLoggerLevel: operation not supported" ); } http://git-wip-us.apache.org/repos/asf/maven/blob/8112e6a8/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java index e153c96..1ab596f 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java @@ -20,8 +20,6 @@ package org.apache.maven.cli.logging; */ import java.io.File; -import org.apache.maven.execution.MavenExecutionRequest; -import org.codehaus.plexus.logging.Logger; /** * Interface for configuration operations on loggers, which are not available in slf4j, then require per-slf4f-binding @@ -31,15 +29,14 @@ import org.codehaus.plexus.logging.Logger; */ public interface Slf4jConfiguration { + public static enum Level { DEBUG, INFO, ERROR } + /** * Set root logging level. * - * @param level the level as defined in Plexus <code>Logger.LEVEL_*</code> and equivalent - * <code>MavenExecutionRequest.LOGGING_LEVEL_*</code> constants. - * @see Logger - * @see MavenExecutionRequest + * @param level the level */ - void setRootLoggerLevel( int level ); + void setRootLoggerLevel( Level level ); void setLoggerFile( File output ); } http://git-wip-us.apache.org/repos/asf/maven/blob/8112e6a8/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java index c5d60d8..56304c1 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java @@ -23,7 +23,6 @@ import java.io.File; import org.apache.maven.cli.logging.AbstractSlf4jConfiguration; import org.apache.maven.cli.logging.Slf4jConfiguration; -import org.apache.maven.execution.MavenExecutionRequest; import org.codehaus.plexus.component.annotations.Component; /** @@ -35,20 +34,20 @@ import org.codehaus.plexus.component.annotations.Component; public class Slf4jSimpleConfiguration extends AbstractSlf4jConfiguration { - public void setRootLoggerLevel( int level ) + public void setRootLoggerLevel( Level level ) { String value = "info"; switch ( level ) { - case MavenExecutionRequest.LOGGING_LEVEL_DEBUG: + case DEBUG: value = "debug"; break; - case MavenExecutionRequest.LOGGING_LEVEL_INFO: + case INFO: value = "info"; break; - case MavenExecutionRequest.LOGGING_LEVEL_ERROR: + case ERROR: value = "error"; break; }
