svn commit: r882668 - /maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java

[be...@apache.org]

Author: bentmann
Date: Fri Nov 20 18:18:54 2009
New Revision: 882668

URL: http://svn.apache.org/viewvc?rev=882668&view=rev
Log:
[MNG-4461] [regression] No transfer progress during artifact deployment

Modified:
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java

Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java?rev=882668&r1=882667&r2=882668&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java Fri Nov 20 18:18:54 2009
@@ -23,9 +23,13 @@
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadataDeploymentException;
 import org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.LegacySupport;
+import org.apache.maven.repository.legacy.TransferListenerAdapter;
 import org.apache.maven.repository.legacy.WagonManager;
 import org.apache.maven.repository.legacy.resolver.transform.ArtifactTransformationManager;
 import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.events.TransferListener;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -45,6 +49,9 @@
     @Requirement
     private RepositoryMetadataManager repositoryMetadataManager;
 
+    @Requirement
+    private LegacySupport legacySupport;
+
     /**
      * @deprecated we want to use the artifact method only, and ensure artifact.file is set
      *             correctly.
@@ -72,7 +79,7 @@
                 FileUtils.copyFile( source, artifactFile );
             }
 
-            wagonManager.putArtifact( source, artifact, deploymentRepository, null );
+            wagonManager.putArtifact( source, artifact, deploymentRepository, getTransferListener() );
 
             // must be after the artifact is installed
             for ( ArtifactMetadata metadata : artifact.getMetadataList() )
@@ -93,4 +100,17 @@
             throw new ArtifactDeploymentException( "Error installing artifact's metadata: " + e.getMessage(), e );
         }
     }
+
+    private TransferListener getTransferListener()
+    {
+        MavenSession session = legacySupport.getSession();
+
+        if ( session == null )
+        {
+            return null;
+        }
+
+        return TransferListenerAdapter.newAdapter( session.getRequest().getTransferListener() );
+    }
+
 }