From 44ffe7eb4c268fd9e4d9bd8920874878e51420e4 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Fri, 1 Sep 2006 05:52:21 +0000 Subject: [PATCH] rename discovery package for consistency git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@439194 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/archiva/DefaultRepositoryManager.java | 4 ++-- .../java/org/apache/maven/archiva/RepositoryManager.java | 2 +- .../org/apache/maven/archiva/scheduler/IndexerTask.java | 6 +++--- .../AbstractArtifactDiscoverer.java | 6 +++--- .../{discovery => discoverer}/AbstractDiscoverer.java | 2 +- .../{discovery => discoverer}/ArtifactDiscoverer.java | 2 +- .../DefaultArtifactDiscoverer.java | 6 +++--- .../DefaultMetadataDiscoverer.java | 8 ++++---- .../archiva/{discovery => discoverer}/Discoverer.java | 2 +- .../{discovery => discoverer}/DiscovererException.java | 2 +- .../archiva/{discovery => discoverer}/DiscovererPath.java | 2 +- .../LegacyArtifactDiscoverer.java | 6 +++--- .../{discovery => discoverer}/MetadataDiscoverer.java | 2 +- .../AbstractArtifactDiscovererTest.java | 2 +- .../DefaultArtifactDiscovererTest.java | 2 +- .../DefaultMetadataDiscovererTest.java | 2 +- .../LegacyArtifactDiscovererTest.java | 2 +- .../maven/archiva/proxy/DefaultProxyRequestHandler.java | 4 ++-- 18 files changed, 31 insertions(+), 31 deletions(-) rename archiva-discoverer/src/main/java/org/apache/maven/archiva/{discovery => discoverer}/AbstractArtifactDiscoverer.java (97%) rename archiva-discoverer/src/main/java/org/apache/maven/archiva/{discovery => discoverer}/AbstractDiscoverer.java (99%) rename archiva-discoverer/src/main/java/org/apache/maven/archiva/{discovery => discoverer}/ArtifactDiscoverer.java (98%) rename archiva-discoverer/src/main/java/org/apache/maven/archiva/{discovery => discoverer}/DefaultArtifactDiscoverer.java (96%) rename archiva-discoverer/src/main/java/org/apache/maven/archiva/{discovery => discoverer}/DefaultMetadataDiscoverer.java (97%) rename archiva-discoverer/src/main/java/org/apache/maven/archiva/{discovery => discoverer}/Discoverer.java (97%) rename archiva-discoverer/src/main/java/org/apache/maven/archiva/{discovery => discoverer}/DiscovererException.java (95%) rename archiva-discoverer/src/main/java/org/apache/maven/archiva/{discovery => discoverer}/DiscovererPath.java (96%) rename archiva-discoverer/src/main/java/org/apache/maven/archiva/{discovery => discoverer}/LegacyArtifactDiscoverer.java (97%) rename archiva-discoverer/src/main/java/org/apache/maven/archiva/{discovery => discoverer}/MetadataDiscoverer.java (97%) rename archiva-discoverer/src/test/java/org/apache/maven/archiva/{discovery => discoverer}/AbstractArtifactDiscovererTest.java (99%) rename archiva-discoverer/src/test/java/org/apache/maven/archiva/{discovery => discoverer}/DefaultArtifactDiscovererTest.java (99%) rename archiva-discoverer/src/test/java/org/apache/maven/archiva/{discovery => discoverer}/DefaultMetadataDiscovererTest.java (99%) rename archiva-discoverer/src/test/java/org/apache/maven/archiva/{discovery => discoverer}/LegacyArtifactDiscovererTest.java (99%) diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java b/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java index 2e789c758..39f3232b1 100644 --- a/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/DefaultRepositoryManager.java @@ -2,8 +2,8 @@ package org.apache.maven.archiva; 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; diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java b/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java index 52f88bf5c..7e7076350 100644 --- a/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/RepositoryManager.java @@ -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; diff --git a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java index 52487d4f0..b95fc7cc9 100644 --- a/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java +++ b/archiva-core/src/main/java/org/apache/maven/archiva/scheduler/IndexerTask.java @@ -21,8 +21,8 @@ import org.apache.maven.archiva.configuration.ConfigurationStore; 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; diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java similarity index 97% rename from archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java index 9b3a8b98b..b7841fc16 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscoverer.java @@ -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 abstract class AbstractArtifactDiscoverer 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 abstract class AbstractArtifactDiscoverer 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 { diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java similarity index 99% rename from archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java index dc90ef0c0..783a8c777 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/AbstractDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/AbstractDiscoverer.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/ArtifactDiscoverer.java similarity index 98% rename from archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ArtifactDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/ArtifactDiscoverer.java index 353a72f6e..c5c79c930 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/ArtifactDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/ArtifactDiscoverer.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java similarity index 96% rename from archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java index 9cde7cf4a..f72f82eed 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscoverer.java @@ -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 @@ import java.util.StringTokenizer; * * @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 diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java similarity index 97% rename from archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java index 7074774b9..1d03d9d70 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscoverer.java @@ -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 @@ import java.util.StringTokenizer; /** * 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 class DefaultMetadataDiscoverer 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 class DefaultMetadataDiscoverer 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 { diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/Discoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java similarity index 97% rename from archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/Discoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java index 8b7d17111..54bb55ebc 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/Discoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/Discoverer.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; import org.apache.maven.artifact.repository.ArtifactRepository; diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DiscovererException.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererException.java similarity index 95% rename from archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DiscovererException.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererException.java index 104f03e8b..393ec5c40 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DiscovererException.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererException.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DiscovererPath.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererPath.java similarity index 96% rename from archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DiscovererPath.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererPath.java index 0af7dd671..c300e9ea1 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/DiscovererPath.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/DiscovererPath.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java similarity index 97% rename from archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java index 1ccadbed6..361a6f9a3 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscoverer.java @@ -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 @@ import java.util.StringTokenizer; * * @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 diff --git a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/MetadataDiscoverer.java b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/MetadataDiscoverer.java similarity index 97% rename from archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/MetadataDiscoverer.java rename to archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/MetadataDiscoverer.java index 04990808b..2c470a3c2 100644 --- a/archiva-discoverer/src/main/java/org/apache/maven/archiva/discovery/MetadataDiscoverer.java +++ b/archiva-discoverer/src/main/java/org/apache/maven/archiva/discoverer/MetadataDiscoverer.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscovererTest.java similarity index 99% rename from archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscovererTest.java rename to archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscovererTest.java index c448b3d9f..2bd422762 100644 --- a/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/AbstractArtifactDiscovererTest.java +++ b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/AbstractArtifactDiscovererTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java similarity index 99% rename from archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java rename to archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java index 9c68b02b8..a8a8a2105 100644 --- a/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultArtifactDiscovererTest.java +++ b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultArtifactDiscovererTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscovererTest.java similarity index 99% rename from archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscovererTest.java rename to archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscovererTest.java index cdc5596e4..9be924c3a 100644 --- a/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/DefaultMetadataDiscovererTest.java +++ b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/DefaultMetadataDiscovererTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscovererTest.java b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java similarity index 99% rename from archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscovererTest.java rename to archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java index d514da90a..72d0f8f88 100644 --- a/archiva-discoverer/src/test/java/org/apache/maven/archiva/discovery/LegacyArtifactDiscovererTest.java +++ b/archiva-discoverer/src/test/java/org/apache/maven/archiva/discoverer/LegacyArtifactDiscovererTest.java @@ -1,4 +1,4 @@ -package org.apache.maven.archiva.discovery; +package org.apache.maven.archiva.discoverer; /* * Copyright 2005-2006 The Apache Software Foundation. diff --git a/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java b/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java index 74b0cc1f1..e4fe87156 100644 --- a/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java +++ b/archiva-proxy/src/main/java/org/apache/maven/archiva/proxy/DefaultProxyRequestHandler.java @@ -18,8 +18,8 @@ package org.apache.maven.archiva.proxy; 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; -- 2.39.5