You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/03/06 00:35:02 UTC
svn commit: r750686 - in /maven/components/trunk:
maven-embedder/src/main/java/org/apache/maven/embedder/execution/
maven-repository/src/main/java/org/apache/maven/repository/
Author: jvanzyl
Date: Thu Mar 5 23:35:02 2009
New Revision: 750686
URL: http://svn.apache.org/viewvc?rev=750686&view=rev
Log:
o remove more methods from the repository interface
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=750686&r1=750685&r2=750686&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Thu Mar 5 23:35:02 2009
@@ -26,7 +26,6 @@
import org.apache.maven.Maven;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.embedder.Configuration;
import org.apache.maven.embedder.MavenEmbedder;
import org.apache.maven.embedder.MavenEmbedderException;
@@ -98,10 +97,6 @@
localRepository( request, configuration );
- snapshotPolicy( request, configuration );
-
- checksumPolicy( request, configuration );
-
artifactTransferMechanism( request, configuration );
realmManager( request, configuration );
@@ -408,48 +403,6 @@
}
// ------------------------------------------------------------------------
- // Snapshot Policy
- // ------------------------------------------------------------------------
-
- private void snapshotPolicy( MavenExecutionRequest request, Configuration configuration )
- {
- // ------------------------------------------------------------------------
- // Snapshot Repository Update Policies
- //
- // Set the global policies for snapshot updates.
- // ------------------------------------------------------------------------
-
- boolean snapshotPolicySet = false;
-
- if ( request.isOffline() )
- {
- snapshotPolicySet = true;
- }
-
- if ( !snapshotPolicySet )
- {
- if ( request.isUpdateSnapshots() )
- {
- repositorySystem.setGlobalUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS );
- }
- else if ( request.isNoSnapshotUpdates() )
- {
- getLogger().info( "+ Supressing SNAPSHOT updates." );
- repositorySystem.setGlobalUpdatePolicy( ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER );
- }
- }
- }
-
- // ------------------------------------------------------------------------
- // Checksum Policy
- // ------------------------------------------------------------------------
-
- private void checksumPolicy( MavenExecutionRequest request, Configuration configuration )
- {
- repositorySystem.setGlobalChecksumPolicy( request.getGlobalChecksumPolicy() );
- }
-
- // ------------------------------------------------------------------------
// Artifact Transfer Mechanism
// ------------------------------------------------------------------------
Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=750686&r1=750685&r2=750686&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java (original)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java Thu Mar 5 23:35:02 2009
@@ -404,16 +404,6 @@
return artifactRepositoryFactory.createArtifactRepository( repositoryId, url, defaultArtifactRepositoryLayout, snapshotsPolicy, releasesPolicy );
}
- public void setGlobalUpdatePolicy( String policy )
- {
- artifactRepositoryFactory.setGlobalUpdatePolicy( policy );
- }
-
- public void setGlobalChecksumPolicy( String policy )
- {
- artifactRepositoryFactory.setGlobalChecksumPolicy( policy );
- }
-
public ArtifactResolutionResult resolve( ArtifactResolutionRequest request )
{
return artifactResolver.resolve( request );
Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java?rev=750686&r1=750685&r2=750686&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java (original)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java Thu Mar 5 23:35:02 2009
@@ -39,7 +39,7 @@
* @author Jason van Zyl
*/
public interface MavenRepositorySystem
- extends ArtifactMetadataSource // This needs to be removed
+ extends ArtifactMetadataSource // This needs to be removed and it's here because it's passed into the resolver. not sure why we didn't just inject the metadata source.
{
// Artifact creation: This needs to be reduced to fewer, if not one, method.
@@ -75,10 +75,6 @@
ArtifactRepository createRepository( String url, String repositoryId );
- void setGlobalUpdatePolicy( String policy );
-
- void setGlobalChecksumPolicy( String policy );
-
// Artifact resolution
//MetadataResolutionResult resolveMetadata( MetadataResolutionRequest request );