Updating indexing path
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/d1fcc2dd Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/d1fcc2dd Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/d1fcc2dd Branch: refs/heads/master Commit: d1fcc2dd2e3578f87503d447607004752793a1e3 Parents: 0ef19fe Author: Martin Stockhammer <[email protected]> Authored: Tue Mar 27 07:32:34 2018 +0200 Committer: Martin Stockhammer <[email protected]> Committed: Tue Mar 27 07:32:34 2018 +0200 ---------------------------------------------------------------------- .../indexer/maven/MavenIndexManager.java | 26 +++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/d1fcc2dd/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java b/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java index 51a5f70..718cd7d 100644 --- a/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java +++ b/archiva-modules/archiva-base/archiva-maven2-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java @@ -34,6 +34,7 @@ import org.apache.archiva.proxy.common.WagonFactory; import org.apache.archiva.proxy.common.WagonFactoryException; import org.apache.archiva.proxy.common.WagonFactoryRequest; import org.apache.archiva.repository.*; +import org.apache.archiva.repository.features.IndexCreationEvent; import org.apache.archiva.repository.features.IndexCreationFeature; import org.apache.archiva.repository.features.RemoteIndexFeature; import org.apache.commons.lang.StringUtils; @@ -64,6 +65,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import javax.annotation.PostConstruct; import javax.inject.Inject; import java.io.FileNotFoundException; import java.io.IOException; @@ -87,8 +89,7 @@ import java.util.stream.Collectors; * time of retries a IndexUpdateFailedException is thrown. */ @Service( "archivaIndexManager#maven" ) -public class MavenIndexManager implements ArchivaIndexManager -{ +public class MavenIndexManager implements ArchivaIndexManager { private static final Logger log = LoggerFactory.getLogger( MavenIndexManager.class ); @@ -122,6 +123,11 @@ public class MavenIndexManager implements ArchivaIndexManager @Inject private ArtifactContextProducer artifactContextProducer; + @Inject + RepositoryRegistry repositoryRegistry; + + public static final String DEFAULT_INDEXER_DIR = ".indexer"; + private ConcurrentSkipListSet<Path> activeContexts = new ConcurrentSkipListSet<>( ); private static final int WAIT_TIME = 100; @@ -511,6 +517,18 @@ public class MavenIndexManager implements ArchivaIndexManager } } + @Override + public void updateLocalIndexPath(Repository repo) { + if (repo.supportsFeature(IndexCreationFeature.class)) { + IndexCreationFeature icf = repo.getFeature(IndexCreationFeature.class).get(); + try { + icf.setLocalIndexPath(getIndexPath(repo)); + } catch (IOException e) { + log.error("Could not set local index path for {}. New URI: {}", repo.getId(), icf.getIndexPath()); + } + } + } + private Path getIndexPath(Repository repo) throws IOException { IndexCreationFeature icf = repo.getFeature(IndexCreationFeature.class).get(); Path repoDir = repo.getLocalPath(); @@ -528,7 +546,7 @@ public class MavenIndexManager implements ArchivaIndexManager } else { - indexDirectory = repoDir.resolve( ".index" ); + indexDirectory = repoDir.resolve( DEFAULT_INDEXER_DIR ); } if ( !Files.exists( indexDirectory ) ) @@ -644,7 +662,7 @@ public class MavenIndexManager implements ArchivaIndexManager { if ( rif.getIndexUri( ) == null ) { - return baseUri.resolve( ".index" ).toString( ); + return baseUri.resolve( DEFAULT_INDEXER_DIR ).toString( ); } else {
