You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/10/02 16:40:27 UTC
svn commit: r821036 - in
/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli:
MavenCli.java MavenLoggerManager.java PrintStreamLogger.java
Author: bentmann
Date: Fri Oct 2 14:40:27 2009
New Revision: 821036
URL: http://svn.apache.org/viewvc?rev=821036&view=rev
Log:
[MNG-3183] Allow a user to specify logging to a text file
o Restored feature
Added:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java (contents, props changed)
- copied, changed from r820822, maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java
Modified:
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/PrintStreamLogger.java
Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java?rev=821036&r1=821035&r2=821036&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java Fri Oct 2 14:40:27 2009
@@ -153,10 +153,19 @@
.setName( "embedder" );
container = new DefaultPlexusContainer( cc );
-
+
logger = container.getLogger();
+
+ if ( commandLine.hasOption( CLIManager.LOG_FILE ) )
+ {
+ File logFile = new File( commandLine.getOptionValue( CLIManager.LOG_FILE ) ).getAbsoluteFile();
+
+ logger = new FileLogger( logFile );
+
+ container.setLoggerManager( new MavenLoggerManager( logger ) );
+ }
- maven = container.lookup( Maven.class );
+ maven = container.lookup( Maven.class );
}
catch ( PlexusContainerException e )
{
Copied: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java (from r820822, maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java?p2=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java&p1=maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java&r1=820822&r2=821036&rev=821036&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java (original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java Fri Oct 2 14:40:27 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.embedder;
+package org.apache.maven.cli;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.util.Locale;
+
import org.codehaus.plexus.logging.AbstractLoggerManager;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.LoggerManager;
@@ -41,7 +43,7 @@
* @author Jason van Zyl
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*/
-public class MavenEmbedderLoggerManager
+public class MavenLoggerManager
extends AbstractLoggerManager
implements LoggerManager, Initializable
{
@@ -57,7 +59,7 @@
private Logger logger;
- public MavenEmbedderLoggerManager( Logger logger )
+ public MavenLoggerManager( Logger logger )
{
this.logger = logger;
}
@@ -123,7 +125,7 @@
private int parseThreshold( String text )
{
- text = text.trim().toLowerCase();
+ text = text.trim().toLowerCase( Locale.ENGLISH );
if ( text.equals( "debug" ) )
{
Propchange: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/MavenLoggerManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 2 14:40:27 2009
@@ -0,0 +1,8 @@
+/maven/components/branches/MNG-3932-1/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:680477
+/maven/components/branches/maven-2.0.x/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:739385,741841,747468,747683,748815,749612,766523,768817
+/maven/components/branches/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:738757-738972
+/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:751453-767358,767708-768832
+/maven/maven-2/branches/maven-2.2.x/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java:795521
Modified: maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/PrintStreamLogger.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/PrintStreamLogger.java?rev=821036&r1=821035&r2=821036&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/PrintStreamLogger.java (original)
+++ maven/maven-3/trunk/maven-embedder/src/main/java/org/apache/maven/cli/PrintStreamLogger.java Fri Oct 2 14:40:27 2009
@@ -22,6 +22,7 @@
import java.io.PrintStream;
import org.apache.maven.Maven;
+import org.codehaus.plexus.logging.AbstractLogger;
import org.codehaus.plexus.logging.Logger;
/**
@@ -30,8 +31,9 @@
* @author Benjamin Bentmann
*/
public class PrintStreamLogger
- implements Logger
+ extends AbstractLogger
{
+
private final PrintStream out;
private static final String FATAL_ERROR = "[FATAL] ";
@@ -46,6 +48,8 @@
public PrintStreamLogger( PrintStream out )
{
+ super( Logger.LEVEL_INFO, Maven.class.getName() );
+
if ( out == null )
{
throw new IllegalArgumentException( "output stream missing" );
@@ -54,11 +58,6 @@
this.out = out;
}
- public void debug( String message )
- {
- debug( message, null );
- }
-
public void debug( String message, Throwable throwable )
{
if ( isDebugEnabled() )
@@ -73,11 +72,6 @@
}
}
- public void info( String message )
- {
- info( message, null );
- }
-
public void info( String message, Throwable throwable )
{
if ( isInfoEnabled() )
@@ -92,11 +86,6 @@
}
}
- public void warn( String message )
- {
- warn( message, null );
- }
-
public void warn( String message, Throwable throwable )
{
if ( isWarnEnabled() )
@@ -111,11 +100,6 @@
}
}
- public void error( String message )
- {
- error( message, null );
- }
-
public void error( String message, Throwable throwable )
{
if ( isErrorEnabled() )
@@ -130,11 +114,6 @@
}
}
- public void fatalError( String message )
- {
- fatalError( message, null );
- }
-
public void fatalError( String message, Throwable throwable )
{
if ( isFatalErrorEnabled() )
@@ -166,42 +145,4 @@
return this;
}
- public String getName()
- {
- return Maven.class.getName();
- }
-
- public int getThreshold()
- {
- return 0;
- }
-
- public boolean isDebugEnabled()
- {
- return false;
- }
-
- public boolean isErrorEnabled()
- {
- return false;
- }
-
- public boolean isFatalErrorEnabled()
- {
- return false;
- }
-
- public boolean isInfoEnabled()
- {
- return false;
- }
-
- public boolean isWarnEnabled()
- {
- return false;
- }
-
- public void setThreshold( int arg0 )
- {
- }
}