Author: brett
Date: Thu Apr 21 03:11:08 2005
New Revision: 164024
URL: http://svn.apache.org/viewcvs?rev=164024&view=rev
Log:
improve download/upload monitors
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/SnapshotArtifactMetadata.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=164024&r1=164023&r2=164024&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Thu Apr 21 03:11:08 2005
@@ -84,7 +84,7 @@
{
try
{
- putRemoteFile( repository, source, repository.pathOf( artifact ) );
+ putRemoteFile( repository, source, repository.pathOf( artifact ),
downloadMonitor );
}
catch ( ArtifactPathFormatException e )
{
@@ -97,7 +97,8 @@
{
try
{
- putRemoteFile( repository, source, repository.pathOfMetadata(
artifactMetadata ) );
+ getLogger().info( "Uploading " + artifactMetadata );
+ putRemoteFile( repository, source, repository.pathOfMetadata(
artifactMetadata ), null );
}
catch ( ArtifactPathFormatException e )
{
@@ -105,7 +106,8 @@
}
}
- private void putRemoteFile( ArtifactRepository repository, File source,
String remotePath )
+ private void putRemoteFile( ArtifactRepository repository, File source,
String remotePath,
+ TransferListener downloadMonitor )
throws TransferFailedException
{
Wagon wagon = null;
@@ -118,12 +120,10 @@
throw new TransferFailedException( "Unsupported Protocol: ", e );
}
- // TODO: probably don't want this on metadata...
- // TODO: not working well on upload, commented out for now
-// if ( downloadMonitor != null )
-// {
-// wagon.addTransferListener( downloadMonitor );
-// }
+ if ( downloadMonitor != null )
+ {
+ wagon.addTransferListener( downloadMonitor );
+ }
// TODO: configure these
try
@@ -227,7 +227,7 @@
throw new TransferFailedException( "Failed to determine path for
artifact", e );
}
- // TODO: maybe some other listener that still notifies when metadata
is being retrieved?
+ getLogger().info( "Retrieving " + metadata );
getRemoteFile( remoteRepository, destination, remotePath, null );
}
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/SnapshotArtifactMetadata.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/SnapshotArtifactMetadata.java?rev=164024&r1=164023&r2=164024&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/SnapshotArtifactMetadata.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/SnapshotArtifactMetadata.java
Thu Apr 21 03:11:08 2005
@@ -257,4 +257,9 @@
}
return false;
}
+
+ public String toString()
+ {
+ return "snapshot information for " + artifact.getArtifactId() + " " +
artifact.getBaseVersion();
+ }
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java?rev=164024&r1=164023&r2=164024&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/artifact/metadata/MavenMetadata.java
Thu Apr 21 03:11:08 2005
@@ -106,4 +106,9 @@
{
// not used - TODO: again indicates bad design?
}
+
+ public String toString()
+ {
+ return "project information for " + artifact.getArtifactId() + " " +
artifact.getVersion();
+ }
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java?rev=164024&r1=164023&r2=164024&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
Thu Apr 21 03:11:08 2005
@@ -17,6 +17,7 @@
* ====================================================================
*/
+import org.apache.maven.wagon.WagonConstants;
import org.apache.maven.wagon.events.TransferEvent;
import org.apache.maven.wagon.events.TransferListener;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -37,8 +38,10 @@
{
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 + ": " +
transferEvent.getResource().getName() );
+ System.out.println( message + ": " + url + "/" +
transferEvent.getResource().getName() );
complete = 0;
}
@@ -53,13 +56,15 @@
long total = transferEvent.getResource().getContentLength();
complete += length;
// TODO [BP]: Sys.out may no longer be appropriate, but will \r work
with getLogger()?
- System.out.print( ( complete / 1024 ) + "/" + ( total == 0 ? "?" : (
total / 1024 ) + "K" ) + "\r" );
+ System.out.print(
+ ( complete / 1024 ) + "/" + ( total ==
WagonConstants.UNKNOWN_LENGTH ? "?" : ( total / 1024 ) + "K" ) +
+ "\r" );
}
public void transferCompleted( TransferEvent transferEvent )
{
- long total = transferEvent.getResource().getContentLength();
- System.out.println( ( total / 1024 ) + "K downloaded" );
+ System.out.println( ( complete / 1024 ) + "K " +
+ ( transferEvent.getRequestType() ==
TransferEvent.REQUEST_PUT ? "uploaded" : "downloaded" ) );
}
public void transferError( TransferEvent transferEvent )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
