You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2009/07/25 00:37:40 UTC
svn commit: r797678 - in /maven/components/trunk:
maven-compat/src/main/java/org/apache/maven/artifact/resolver/
maven-compat/src/main/java/org/apache/maven/repository/legacy/
maven-core/src/main/java/org/apache/maven/
maven-core/src/main/java/org/apac...
Author: olamy
Date: Fri Jul 24 22:37:39 2009
New Revision: 797678
URL: http://svn.apache.org/viewvc?rev=797678&view=rev
Log:
[MNG-4247] Displaying which artifacts are downloaded and from which repo
Only displaying a simple : [INFO] Downloaded http://x.x.x.x:x/.......
As there is so much places where ArtifactResolutionRequest is created without any access to mavenExecutionRequest.getTransferListener()
Issue id: MNG-4247
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java?rev=797678&r1=797677&r2=797678&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionRequest.java Fri Jul 24 22:37:39 2009
@@ -43,6 +43,11 @@
private boolean resolveTransitively = false;
+ public ArtifactResolutionRequest( )
+ {
+ // nothing here
+ }
+
public Artifact getArtifact()
{
return artifact;
Modified: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java?rev=797678&r1=797677&r2=797678&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java Fri Jul 24 22:37:39 2009
@@ -346,6 +346,9 @@
if ( downloaded )
{
+
+ logger.info( "Downloaded " + repository.getUrl() + remotePath );
+
// keep the checksum files from showing up on the download monitor...
if ( downloadMonitor != null )
{
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java?rev=797678&r1=797677&r2=797678&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultProjectDependenciesResolver.java Fri Jul 24 22:37:39 2009
@@ -81,7 +81,8 @@
.setRemoteRepostories( remoteRepositories )
.setManagedVersionMap( project.getManagedVersionMap() )
.setFilter( filter );
-
+ // FIXME setTransferListener
+
ArtifactResolutionResult result = repositorySystem.resolve( request );
resolutionErrorHandler.throwErrors( request, result );
project.setArtifacts( result.getArtifacts() );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=797678&r1=797677&r2=797678&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Fri Jul 24 22:37:39 2009
@@ -133,7 +133,7 @@
.setLocalRepository( localRepository )
.setRemoteRepostories( remoteRepositories )
.setResolveTransitively( false );
-
+ // FIXME setTransferListener
ArtifactResolutionResult result = repositorySystem.resolve( request );
try
@@ -275,6 +275,7 @@
.setFilter( filter )
.setResolveTransitively( true );
//.setResolveRoot( false );
+ // FIXME setTransferListener
ArtifactResolutionResult result = repositorySystem.resolve( request );
resolutionErrorHandler.throwErrors( request, result );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=797678&r1=797677&r2=797678&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Fri Jul 24 22:37:39 2009
@@ -231,7 +231,7 @@
.setArtifact( artifact )
.setLocalRepository( configuration.getLocalRepository() )
.setRemoteRepostories( configuration.getRemoteRepositories() );
-
+ // FIXME setTransferListener
ArtifactResolutionResult result = repositorySystem.resolve( request );
try
@@ -307,7 +307,7 @@
.setLocalRepository( request.getLocalRepository() )
.setRemoteRepostories( project.getRemoteArtifactRepositories() )
.setManagedVersionMap( project.getManagedVersionMap() );
-
+ // FIXME setTransferListener
ArtifactResolutionResult result;
ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader();
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java?rev=797678&r1=797677&r2=797678&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java Fri Jul 24 22:37:39 2009
@@ -187,7 +187,8 @@
request.setFilter( artifactFilterManager.getCoreArtifactFilter() );
request.setLocalRepository( localRepository );
request.setRemoteRepostories( remoteRepositories );
-
+ // FIXME setTransferListener
+
ArtifactResolutionResult result = repositorySystem.resolve( request );
resolutionErrorHandler.throwErrors( request, result );
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java?rev=797678&r1=797677&r2=797678&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java Fri Jul 24 22:37:39 2009
@@ -23,9 +23,11 @@
import java.util.List;
import java.util.Properties;
+import org.apache.maven.MavenTransferListener;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.model.Profile;
import org.apache.maven.model.building.ModelBuildingRequest;
+import org.apache.maven.wagon.events.TransferListener;
public interface ProjectBuildingRequest
{
@@ -140,5 +142,9 @@
* @return This request, never {@code null}.
*/
void setBuildStartTime( Date buildStartTime );
+
+ // TODO ?
+ //TransferListener getTransferListener();
+ //void setTransferListener ( TransferListener transferListener );
}
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java?rev=797678&r1=797677&r2=797678&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/RepositoryModelResolver.java Fri Jul 24 22:37:39 2009
@@ -116,7 +116,7 @@
request.setArtifact( artifactParent );
request.setLocalRepository( localRepository );
request.setRemoteRepostories( remoteRepositories );
-
+ // FIXME setTransferListener
ArtifactResolutionResult result = repositorySystem.resolve( request );
try