Author: jvanzyl
Date: Sun Jun 21 13:24:04 2009
New Revision: 787010
URL: http://svn.apache.org/viewvc?rev=787010&view=rev
Log:
o moving blacklisting up and out of the repository itself
o remove magic policy creation in the artifact implementation, it's already
done in the request populator
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=787010&r1=787009&r2=787010&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Sun Jun 21 13:24:04 2009
@@ -333,10 +333,7 @@
{
logger.debug( "Skipping disabled repository " + repository.getId()
);
}
- else if ( repository.isBlacklisted() )
- {
- logger.debug( "Skipping blacklisted repository " +
repository.getId() );
- }
+
// If the artifact is a snapshot, we need to determine whether it's
time to check this repository for an update:
// 1. If it's forced, then check
// 2. If the updateInterval has been exceeded since the last check for
this artifact on this repository, then check.
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java?rev=787010&r1=787009&r2=787010&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
Sun Jun 21 13:24:04 2009
@@ -52,10 +52,6 @@
void setLayout( ArtifactRepositoryLayout layout );
String getKey();
-
- void setBlacklisted( boolean blackListed );
-
- boolean isBlacklisted();
// New interface methods for the repository system.
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java?rev=787010&r1=787009&r2=787010&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
Sun Jun 21 13:24:04 2009
@@ -33,7 +33,7 @@
* @author <a href="michal.mac...@dimatics.com">Michal Maczka </a>
* @version $Id$
*/
-//TODO: this needs to be decoupled from Wagon
+...@deprecated
public class DefaultArtifactRepository
extends Repository
implements ArtifactRepository
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java?rev=787010&r1=787009&r2=787010&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
Sun Jun 21 13:24:04 2009
@@ -103,17 +103,6 @@
ArtifactRepositoryPolicy snapshots,
ArtifactRepositoryPolicy releases )
{
- boolean blacklisted = false;
- if ( artifactRepositories.containsKey( id ) )
- {
- ArtifactRepository repository = artifactRepositories.get( id );
- // TODO: this should be an if there are duplicates?
- if ( repository.getUrl().equals( url ) )
- {
- blacklisted = repository.isBlacklisted();
- }
- }
-
if ( snapshots == null )
{
snapshots = new ArtifactRepositoryPolicy();
@@ -137,7 +126,6 @@
}
ArtifactRepository repository = new MavenArtifactRepository( id, url,
repositoryLayout, snapshots, releases );
- repository.setBlacklisted( blacklisted );
artifactRepositories.put( id, repository );
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java?rev=787010&r1=787009&r2=787010&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
Sun Jun 21 13:24:04 2009
@@ -30,8 +30,6 @@
public class MavenArtifactRepository
implements ArtifactRepository
{
- public static final int UNKNOWN_PORT = -1;
-
private String id;
private String url;
@@ -67,24 +65,13 @@
this.id = id;
this.url = url;
this.layout = layout;
-
+ this.snapshots = snapshots;
+ this.releases = releases;
//
// Derive these from the URL
//
this.protocol = protocol( url );
this.basedir = basedir( url );
- this.snapshots = snapshots;
- this.releases = releases;
-
- if ( this.snapshots == null )
- {
- this.snapshots = new ArtifactRepositoryPolicy( true,
ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS,
ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE );
- }
-
- if ( this.releases == null )
- {
- this.releases = new ArtifactRepositoryPolicy( true,
ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS,
ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE );
- }
}
public String pathOf( Artifact artifact )
@@ -332,7 +319,7 @@
return false;
}
- final ArtifactRepository other = (ArtifactRepository) obj;
+ ArtifactRepository other = (ArtifactRepository) obj;
if ( id == null )
{
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java?rev=787010&r1=787009&r2=787010&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
Sun Jun 21 13:24:04 2009
@@ -81,16 +81,8 @@
}
catch ( TransferFailedException e )
{
- getLogger().warn(
- metadata + " could not be retrieved from
repository: " + repository.getId()
- + " due to an error: " +
e.getMessage() );
+ getLogger().warn( metadata + " could not be retrieved from
repository: " + repository.getId() + " due to an error: " + e.getMessage() );
getLogger().debug( "Exception", e );
-
- getLogger().info( "Repository '" + repository.getId() + "'
will be blacklisted" );
- repository.setBlacklisted( true );
-
- // TODO: [jc; 08-Nov-2005] revisit this for 2.1
- // suppressing logging to avoid logging this error twice.
}
finally
{
