You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2009/02/19 15:02:57 UTC
svn commit: r745871 - in
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli:
AbstractConsoleDownloadMonitor.java BatchModeDownloadMonitor.java
ConsoleDownloadMonitor.java MavenCli.java
Author: brett
Date: Thu Feb 19 14:02:56 2009
New Revision: 745871
URL: http://svn.apache.org/viewvc?rev=745871&view=rev
Log:
[MNG-1585] show debug logging from Wagon in debug mode
Modified:
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java?rev=745871&r1=745870&r2=745871&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java Thu Feb 19 14:02:56 2009
@@ -23,6 +23,7 @@
import org.apache.maven.wagon.events.TransferEvent;
import org.apache.maven.wagon.events.TransferListener;
import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.codehaus.plexus.logging.Logger;
/**
* Abstract console download progress meter.
@@ -35,6 +36,16 @@
extends AbstractLogEnabled
implements TransferListener
{
+ private Logger logger;
+
+ public AbstractConsoleDownloadMonitor()
+ {
+ }
+
+ public AbstractConsoleDownloadMonitor( Logger logger )
+ {
+ this.logger = logger;
+ }
public void transferInitiated( TransferEvent transferEvent )
{
@@ -76,6 +87,11 @@
public void transferError( TransferEvent transferEvent )
{
// these errors should already be handled elsewhere by Maven since they all result in an exception from Wagon
+ if ( logger != null )
+ {
+ Exception exception = transferEvent.getException();
+ logger.debug( exception.getMessage(), exception );
+ }
}
/**
@@ -83,8 +99,10 @@
*/
public void debug( String message )
{
- // TODO: can't use getLogger() because this isn't currently instantiated as a component
-// getLogger().debug( message );
+ if ( logger != null )
+ {
+ logger.debug( message );
+ }
}
}
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java?rev=745871&r1=745870&r2=745871&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java Thu Feb 19 14:02:56 2009
@@ -20,6 +20,7 @@
*/
import org.apache.maven.wagon.events.TransferEvent;
+import org.codehaus.plexus.logging.Logger;
/**
* Console download progress meter.
@@ -30,13 +31,21 @@
public class BatchModeDownloadMonitor
extends AbstractConsoleDownloadMonitor
{
+ public BatchModeDownloadMonitor( Logger logger )
+ {
+ super( logger );
+ }
+
+ public BatchModeDownloadMonitor()
+ {
+ }
+
public void transferInitiated( TransferEvent transferEvent )
{
String message = transferEvent.getRequestType() == TransferEvent.REQUEST_PUT ? "Uploading" : "Downloading";
String url = transferEvent.getWagon().getRepository().getUrl();
- // TODO: can't use getLogger() because this isn't currently instantiated as a component
System.out.println( message + ": " + url + "/" + transferEvent.getResource().getName() );
}
}
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java?rev=745871&r1=745870&r2=745871&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java Thu Feb 19 14:02:56 2009
@@ -21,6 +21,7 @@
import org.apache.maven.wagon.WagonConstants;
import org.apache.maven.wagon.events.TransferEvent;
+import org.codehaus.plexus.logging.Logger;
/**
* Console download progress meter.
@@ -33,13 +34,21 @@
{
private long complete;
+ public ConsoleDownloadMonitor( Logger logger )
+ {
+ super( logger );
+ }
+
+ public ConsoleDownloadMonitor()
+ {
+ }
+
public void transferInitiated( TransferEvent transferEvent )
{
String message = transferEvent.getRequestType() == TransferEvent.REQUEST_PUT ? "Uploading" : "Downloading";
String url = transferEvent.getWagon().getRepository().getUrl();
- // TODO: can't use getLogger() because this isn't currently instantiated as a component
System.out.println( message + ": " + url + "/" + transferEvent.getResource().getName() );
complete = 0;
@@ -54,7 +63,6 @@
{
long total = transferEvent.getResource().getContentLength();
complete += length;
- // TODO [BP]: Sys.out may no longer be appropriate, but will \r work with getLogger()?
if ( total >= 1024 )
{
System.out.print(
Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=745871&r1=745870&r2=745871&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Thu Feb 19 14:02:56 2009
@@ -264,7 +264,9 @@
setProjectFileOptions( commandLine, request );
- maven = createMavenInstance( settings.isInteractiveMode() );
+ maven =
+ createMavenInstance( settings.isInteractiveMode(),
+ loggerManager.getLoggerForComponent( WagonManager.ROLE ) );
}
catch ( ComponentLookupException e )
{
@@ -497,18 +499,18 @@
}
}
- private static Maven createMavenInstance( boolean interactive )
+ private static Maven createMavenInstance( boolean interactive, Logger logger )
throws ComponentLookupException
{
// TODO [BP]: doing this here as it is CLI specific, though it doesn't feel like the right place (likewise logger).
WagonManager wagonManager = (WagonManager) embedder.lookup( WagonManager.ROLE );
if ( interactive )
{
- wagonManager.setDownloadMonitor( new ConsoleDownloadMonitor() );
+ wagonManager.setDownloadMonitor( new ConsoleDownloadMonitor( logger ) );
}
else
{
- wagonManager.setDownloadMonitor( new BatchModeDownloadMonitor() );
+ wagonManager.setDownloadMonitor( new BatchModeDownloadMonitor( logger ) );
}
wagonManager.setInteractive( interactive );