Author: jvanzyl
Date: Sun Feb 26 12:25:40 2006
New Revision: 381162
URL: http://svn.apache.org/viewcvs?rev=381162&view=rev
Log:
o remove reference to ArtifactRepositoryFactor for checksum policies and couch
in terms of the MavenExecutionRequest
Modified:
maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Modified:
maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java?rev=381162&r1=381161&r2=381162&view=diff
==============================================================================
---
maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/branches/maven-embedder-refactor/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
Sun Feb 26 12:25:40 2006
@@ -21,7 +21,6 @@
import org.apache.maven.CommonMavenObjectFactory;
import org.apache.maven.Maven;
import org.apache.maven.SettingsConfigurationException;
-import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.reactor.MavenExecutionException;
@@ -212,14 +211,14 @@
// todo; log
System.out.println( "+ Enabling strict checksum verification
on all artifact downloads." );
- globalChecksumPolicy =
ArtifactRepositoryPolicy.CHECKSUM_POLICY_FAIL;
+ globalChecksumPolicy =
MavenExecutionRequest.CHECKSUM_POLICY_FAIL;
}
else if ( commandLine.hasOption(
CLIManager.CHECKSUM_WARNING_POLICY ) )
{
// todo: log
System.out.println( "+ Disabling strict checksum verification
on all artifact downloads." );
- globalChecksumPolicy =
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
+ globalChecksumPolicy =
MavenExecutionRequest.CHECKSUM_POLICY_WARN;
}
File baseDirectory = new File( System.getProperty( "user.dir" ) );
Modified:
maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=381162&r1=381161&r2=381162&view=diff
==============================================================================
---
maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
(original)
+++
maven/components/branches/maven-embedder-refactor/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Sun Feb 26 12:25:40 2006
@@ -20,6 +20,7 @@
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.codehaus.plexus.logging.Logger;
import java.io.File;
@@ -102,6 +103,14 @@
static final String REACTOR_FAIL_AT_END = ReactorManager.FAIL_AT_END;
static final String REACTOR_FAIL_NEVER = ReactorManager.FAIL_NEVER;
+
+ // ----------------------------------------------------------------------
+ // Artifactr repository policies
+ // ----------------------------------------------------------------------
+
+ static final String CHECKSUM_POLICY_FAIL =
ArtifactRepositoryPolicy.CHECKSUM_POLICY_FAIL;
+
+ static final String CHECKSUM_POLICY_WARN =
ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
// ----------------------------------------------------------------------
//