mirror of
https://github.com/apache/archiva.git
synced 2025-02-23 11:04:56 +00:00
rename discovery package for consistency
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@439194 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
a2f265e94e
commit
44ffe7eb4c
@ -2,8 +2,8 @@
|
||||
|
||||
import org.apache.maven.archiva.converter.RepositoryConversionException;
|
||||
import org.apache.maven.archiva.converter.RepositoryConverter;
|
||||
import org.apache.maven.archiva.discovery.ArtifactDiscoverer;
|
||||
import org.apache.maven.archiva.discovery.DiscovererException;
|
||||
import org.apache.maven.archiva.discoverer.ArtifactDiscoverer;
|
||||
import org.apache.maven.archiva.discoverer.DiscovererException;
|
||||
import org.apache.maven.archiva.reporting.ArtifactReporter;
|
||||
import org.apache.maven.artifact.repository.ArtifactRepository;
|
||||
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
|
||||
|
@ -1,7 +1,7 @@
|
||||
package org.apache.maven.archiva;
|
||||
|
||||
import org.apache.maven.archiva.converter.RepositoryConversionException;
|
||||
import org.apache.maven.archiva.discovery.DiscovererException;
|
||||
import org.apache.maven.archiva.discoverer.DiscovererException;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
|
@ -21,8 +21,8 @@
|
||||
import org.apache.maven.archiva.configuration.ConfigurationStoreException;
|
||||
import org.apache.maven.archiva.configuration.ConfiguredRepositoryFactory;
|
||||
import org.apache.maven.archiva.configuration.RepositoryConfiguration;
|
||||
import org.apache.maven.archiva.discovery.ArtifactDiscoverer;
|
||||
import org.apache.maven.archiva.discovery.DiscovererException;
|
||||
import org.apache.maven.archiva.discoverer.ArtifactDiscoverer;
|
||||
import org.apache.maven.archiva.discoverer.DiscovererException;
|
||||
import org.apache.maven.archiva.indexer.RepositoryArtifactIndex;
|
||||
import org.apache.maven.archiva.indexer.RepositoryArtifactIndexFactory;
|
||||
import org.apache.maven.archiva.indexer.RepositoryIndexException;
|
||||
@ -65,7 +65,7 @@ public class IndexerTask
|
||||
private ConfiguredRepositoryFactory repoFactory;
|
||||
|
||||
/**
|
||||
* @plexus.requirement role="org.apache.maven.archiva.discovery.ArtifactDiscoverer"
|
||||
* @plexus.requirement role="org.apache.maven.archiva.discoverer.ArtifactDiscoverer"
|
||||
*/
|
||||
private Map artifactDiscoverers;
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
||||
@ -65,7 +65,7 @@ public List discoverArtifacts( ArtifactRepository repository, String operation,
|
||||
long comparisonTimestamp = readComparisonTimestamp( repository, operation, dom );
|
||||
|
||||
// Note that last checked time is deliberately set to the start of the process so that anything added
|
||||
// mid-discovery and missed by the scanner will get checked next time.
|
||||
// mid-discoverer and missed by the scanner will get checked next time.
|
||||
// Due to this, there must be no negative side-effects of discovering something twice.
|
||||
Date newLastCheckedTime = new Date();
|
||||
|
||||
@ -76,7 +76,7 @@ public List discoverArtifacts( ArtifactRepository repository, String operation,
|
||||
List artifactPaths = scanForArtifactPaths( repositoryBase, blacklistedPatterns, comparisonTimestamp );
|
||||
|
||||
// Also note that the last check time, while set at the start, is saved at the end, so that if any exceptions
|
||||
// occur, then the timestamp is not updated so that the discovery is attempted again
|
||||
// occur, then the timestamp is not updated so that the discoverer is attempted again
|
||||
// TODO: under the list-return behaviour we have now, exceptions might occur later and the timestamp will not be reset - see MRM-83
|
||||
try
|
||||
{
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
||||
@ -29,13 +29,13 @@
|
||||
*
|
||||
* @author John Casey
|
||||
* @author Brett Porter
|
||||
* @plexus.component role="org.apache.maven.archiva.discovery.ArtifactDiscoverer" role-hint="default"
|
||||
* @plexus.component role="org.apache.maven.archiva.discoverer.ArtifactDiscoverer" role-hint="default"
|
||||
*/
|
||||
public class DefaultArtifactDiscoverer
|
||||
extends AbstractArtifactDiscoverer
|
||||
{
|
||||
/**
|
||||
* @see org.apache.maven.archiva.discovery.ArtifactDiscoverer#buildArtifact(String)
|
||||
* @see org.apache.maven.archiva.discoverer.ArtifactDiscoverer#buildArtifact(String)
|
||||
*/
|
||||
public Artifact buildArtifact( String path )
|
||||
throws DiscovererException
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
||||
@ -47,7 +47,7 @@
|
||||
/**
|
||||
* This class gets all the paths that contain the metadata files.
|
||||
*
|
||||
* @plexus.component role="org.apache.maven.archiva.discovery.MetadataDiscoverer" role-hint="default"
|
||||
* @plexus.component role="org.apache.maven.archiva.discoverer.MetadataDiscoverer" role-hint="default"
|
||||
*/
|
||||
public class DefaultMetadataDiscoverer
|
||||
extends AbstractDiscoverer
|
||||
@ -74,7 +74,7 @@ public List discoverMetadata( ArtifactRepository repository, String operation, L
|
||||
long comparisonTimestamp = readComparisonTimestamp( repository, operation, dom );
|
||||
|
||||
// Note that last checked time is deliberately set to the start of the process so that anything added
|
||||
// mid-discovery and missed by the scanner will get checked next time.
|
||||
// mid-discoverer and missed by the scanner will get checked next time.
|
||||
// Due to this, there must be no negative side-effects of discovering something twice.
|
||||
Date newLastCheckedTime = new Date();
|
||||
|
||||
@ -83,7 +83,7 @@ public List discoverMetadata( ArtifactRepository repository, String operation, L
|
||||
STANDARD_DISCOVERY_INCLUDES, null, comparisonTimestamp );
|
||||
|
||||
// Also note that the last check time, while set at the start, is saved at the end, so that if any exceptions
|
||||
// occur, then the timestamp is not updated so that the discovery is attempted again
|
||||
// occur, then the timestamp is not updated so that the discoverer is attempted again
|
||||
// TODO: under the list-return behaviour we have now, exceptions might occur later and the timestamp will not be reset - see MRM-83
|
||||
try
|
||||
{
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
import org.apache.maven.artifact.repository.ArtifactRepository;
|
||||
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
||||
@ -32,13 +32,13 @@
|
||||
*
|
||||
* @author John Casey
|
||||
* @author Brett Porter
|
||||
* @plexus.component role="org.apache.maven.archiva.discovery.ArtifactDiscoverer" role-hint="legacy"
|
||||
* @plexus.component role="org.apache.maven.archiva.discoverer.ArtifactDiscoverer" role-hint="legacy"
|
||||
*/
|
||||
public class LegacyArtifactDiscoverer
|
||||
extends AbstractArtifactDiscoverer
|
||||
{
|
||||
/**
|
||||
* @see org.apache.maven.archiva.discovery.ArtifactDiscoverer#buildArtifact(String)
|
||||
* @see org.apache.maven.archiva.discoverer.ArtifactDiscoverer#buildArtifact(String)
|
||||
*/
|
||||
public Artifact buildArtifact( String path )
|
||||
throws DiscovererException
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
@ -1,4 +1,4 @@
|
||||
package org.apache.maven.archiva.discovery;
|
||||
package org.apache.maven.archiva.discoverer;
|
||||
|
||||
/*
|
||||
* Copyright 2005-2006 The Apache Software Foundation.
|
@ -18,8 +18,8 @@
|
||||
|
||||
import org.apache.maven.archiva.digest.DigestUtils;
|
||||
import org.apache.maven.archiva.digest.DigesterException;
|
||||
import org.apache.maven.archiva.discovery.ArtifactDiscoverer;
|
||||
import org.apache.maven.archiva.discovery.DiscovererException;
|
||||
import org.apache.maven.archiva.discoverer.ArtifactDiscoverer;
|
||||
import org.apache.maven.archiva.discoverer.DiscovererException;
|
||||
import org.apache.maven.artifact.Artifact;
|
||||
import org.apache.maven.artifact.factory.ArtifactFactory;
|
||||
import org.apache.maven.artifact.repository.ArtifactRepository;
|
||||
|
Loading…
x
Reference in New Issue
Block a user