svn commit: r834919 - /maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java

[bentmann]

Author: bentmann
Date: Wed Nov 11 15:46:56 2009
New Revision: 834919

URL: http://svn.apache.org/viewvc?rev=834919&view=rev
Log:
[MNG-4412] Make legacy entry points to repository system pick offline mode from 
session

Modified:
    
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java

Modified: 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java?rev=834919&r1=834918&r2=834919&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
 (original)
+++ 
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
 Wed Nov 11 15:46:56 2009
@@ -45,6 +45,8 @@
 import org.apache.maven.artifact.versioning.ManagedVersionMap;
 import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
 import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.LegacySupport;
 import 
org.apache.maven.repository.legacy.metadata.ArtifactMetadataRetrievalException;
 import 
org.apache.maven.repository.legacy.metadata.DefaultMetadataResolutionRequest;
 import org.apache.maven.repository.legacy.metadata.MetadataResolutionRequest;
@@ -67,6 +69,23 @@
        @Requirement
     private Logger logger;
 
+    @Requirement
+    private LegacySupport legacySupport;
+
+    private void injectSession( ArtifactResolutionRequest request )
+    {
+        MavenSession session = legacySupport.getSession();
+
+        if ( session != null )
+        {
+            request.setOffline( session.isOffline() );
+            request.setServers( session.getRequest().getServers() );
+            request.setMirrors( session.getRequest().getMirrors() );
+            request.setProxies( session.getRequest().getProxies() );
+            request.setTransferListener( 
session.getRequest().getTransferListener() );
+        }
+    }
+
     public ArtifactResolutionResult collect( Set<Artifact> artifacts, 
                                              Artifact originatingArtifact,
                                              Map managedVersions, 
@@ -80,6 +99,7 @@
         ArtifactResolutionRequest request = new ArtifactResolutionRequest();
         request.setLocalRepository( localRepository );
         request.setRemoteRepositories( remoteRepositories );
+        injectSession( request );
         return collect( artifacts, originatingArtifact, managedVersions, 
request, source, filter, listeners,
                         conflictResolvers );
     }