svn commit: r418631 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven-core/src/main/resources/META-INF/plexus/components.xml maven-tools/src/main/java/org/apache/maven/DefaultMavenTools.java

[mkleint]

Author: mkleint
Date: Sun Jul  2 11:00:48 2006
New Revision: 418631

URL: http://svn.apache.org/viewvc?rev=418631&view=rev
Log:
when creating local repository, don't force updating snapshots from all remote 
repositories.
handle according to the executionrequest

Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
    
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
    
maven/components/trunk/maven-tools/src/main/java/org/apache/maven/DefaultMavenTools.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=418631&r1=418630&r2=418631&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 Sun Jul  2 11:00:48 2006
@@ -19,6 +19,8 @@
 
 import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.execution.BuildFailure;
@@ -104,6 +106,8 @@
     protected LoggerManager loggerManager;
 
     protected MavenTools mavenTools;
+    
+    protected ArtifactRepositoryFactory artifactRepositoryFactory;
 
     private static final long MB = 1024 * 1024;
 
@@ -118,6 +122,20 @@
     public void execute( MavenExecutionRequest request )
         throws MavenExecutionException
     {
+        boolean snapshotPolicySet = false;
+
+        if ( request.isOffline() )
+        {
+            snapshotPolicySet = true;
+        }
+
+        if ( !snapshotPolicySet && request.isUpdateSnapshots() )
+        {
+            artifactRepositoryFactory.setGlobalUpdatePolicy( 
ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS );
+        }
+
+        artifactRepositoryFactory.setGlobalChecksumPolicy( 
request.getGlobalChecksumPolicy() );
+        
         if ( request.getLocalRepository() == null )
         {
             request.setLocalRepository( mavenTools.createLocalRepository( 
request.getLocalRepositoryPath() ) );

Modified: 
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=418631&r1=418630&r2=418631&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
 (original)
+++ 
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
 Sun Jul  2 11:00:48 2006
@@ -85,6 +85,9 @@
         <requirement>
           <role>org.apache.maven.MavenTools</role>
         </requirement>
+        <requirement>
+          
<role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
+        </requirement>
       </requirements>
     </component>
 

Modified: 
maven/components/trunk/maven-tools/src/main/java/org/apache/maven/DefaultMavenTools.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-tools/src/main/java/org/apache/maven/DefaultMavenTools.java?rev=418631&r1=418630&r2=418631&view=diff
==============================================================================
--- 
maven/components/trunk/maven-tools/src/main/java/org/apache/maven/DefaultMavenTools.java
 (original)
+++ 
maven/components/trunk/maven-tools/src/main/java/org/apache/maven/DefaultMavenTools.java
 Sun Jul  2 11:00:48 2006
@@ -61,32 +61,14 @@
             localRepositoryUrl = "file://" + localRepositoryUrl;
         }
 
-        return createRepository( "local", localRepositoryUrl, false, true, 
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN );
+        return createRepository( "local", localRepositoryUrl);
     }
 
-    public ArtifactRepository createRepository( String repositoryId,
-                                                String repositoryUrl,
-                                                boolean offline,
-                                                boolean updateSnapshots,
-                                                String globalChecksumPolicy )
+    private ArtifactRepository createRepository( String repositoryId,
+                                                String repositoryUrl)
     {
         ArtifactRepository localRepository =
             new DefaultArtifactRepository( repositoryId, repositoryUrl, 
repositoryLayout );
-
-        boolean snapshotPolicySet = false;
-
-        if ( offline )
-        {
-            snapshotPolicySet = true;
-        }
-
-        if ( !snapshotPolicySet && updateSnapshots )
-        {
-            artifactRepositoryFactory.setGlobalUpdatePolicy( 
ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS );
-        }
-
-        artifactRepositoryFactory.setGlobalChecksumPolicy( 
globalChecksumPolicy );
-
         return localRepository;
     }