You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/10/03 15:23:01 UTC
svn commit: r293336 - in
/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant:
AbstractArtifactTask.java RemoteRepository.java
Author: brett
Date: Mon Oct 3 06:22:55 2005
New Revision: 293336
URL: http://svn.apache.org/viewcvs?rev=293336&view=rev
Log:
PR: MNG-644
remove deprecated ant task properties
Modified:
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=293336&r1=293335&r2=293336&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Mon Oct 3 06:22:55 2005
@@ -112,12 +112,8 @@
{
repositoryFactory = (ArtifactRepositoryFactory) lookup( ArtifactRepositoryFactory.ROLE );
- ArtifactRepositoryPolicy snapshots = buildArtifactRepositoryPolicy( repository.getSnapshots(),
- repository.getSnapshotPolicy(),
- repository.getChecksumPolicy() );
- ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy( repository.getReleases(),
- repository.getSnapshotPolicy(),
- repository.getChecksumPolicy() );
+ ArtifactRepositoryPolicy snapshots = buildArtifactRepositoryPolicy( repository.getSnapshots() );
+ ArtifactRepositoryPolicy releases = buildArtifactRepositoryPolicy( repository.getReleases() );
artifactRepository = repositoryFactory.createArtifactRepository( "remote", repository.getUrl(),
repositoryLayout, snapshots, releases );
@@ -137,13 +133,11 @@
return artifactRepository;
}
- private static ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( RepositoryPolicy policy,
- String defaultUpdatePolicy,
- String defaultChecksumPolicy )
+ private static ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( RepositoryPolicy policy )
{
boolean enabled = true;
- String updatePolicy = defaultUpdatePolicy;
- String checksumPolicy = defaultChecksumPolicy;
+ String updatePolicy = null;
+ String checksumPolicy = null;
if ( policy != null )
{
Modified: maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java?rev=293336&r1=293335&r2=293336&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java (original)
+++ maven/components/trunk/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/RemoteRepository.java Mon Oct 3 06:22:55 2005
@@ -29,16 +29,6 @@
private Authentication authentication;
- /**
- * @deprecated use <snapshots/> and <updatePolicy> instead.
- */
- private String snapshotPolicy;
-
- /**
- * @deprecated use <snapshots/> and <checksumPolicy> instead.
- */
- private String checksumPolicy;
-
private Proxy proxy;
private RepositoryPolicy snapshots;
@@ -65,16 +55,6 @@
this.authentication = authentication;
}
- public void setSnapshotPolicy( String snapshotPolicy )
- {
- this.snapshotPolicy = snapshotPolicy;
- }
-
- public String getSnapshotPolicy()
- {
- return snapshotPolicy;
- }
-
public void addProxy( Proxy proxy )
{
this.proxy = proxy;
@@ -83,16 +63,6 @@
public Proxy getProxy()
{
return proxy;
- }
-
- public String getChecksumPolicy()
- {
- return checksumPolicy;
- }
-
- public void setChecksumPolicy( String checksumPolicy )
- {
- this.checksumPolicy = checksumPolicy;
}
public RepositoryPolicy getSnapshots()
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org