From 3e447d498c2634e706e002700540a3d8ff015169 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 7 Feb 2013 14:57:11 +0000 Subject: [PATCH] rename method git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1443524 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/archiva/indexer/merger/DefaultIndexMerger.java | 2 +- .../java/org/apache/archiva/indexer/merger/IndexMerger.java | 2 +- .../archiva/indexer/merger/TemporaryGroupIndexCleaner.java | 1 + .../org/apache/archiva/webdav/ArchivaDavResourceFactory.java | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java index 11b0814c2..f8516456b 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java @@ -167,7 +167,7 @@ public class DefaultIndexMerger return this.temporaryGroupIndexes; } - public int getDefaultGroupIndexTtl() + public int getGroupMergedIndexTtl() { return this.defaultGroupIndexTtl; } diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java index 09165b7eb..be0fb10e1 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java @@ -50,6 +50,6 @@ public interface IndexMerger /** * @return ttl of temporay group index */ - int getDefaultGroupIndexTtl(); + int getGroupMergedIndexTtl(); } diff --git a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java index 3ee8b9e4a..edfec5a77 100644 --- a/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java +++ b/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java @@ -54,6 +54,7 @@ public class TemporaryGroupIndexCleaner @Scheduled( fixedDelay = 900000 ) public void cleanTemporaryIndex() { + log.info( "cleanTemporaryIndex" ); for ( TemporaryGroupIndex temporaryGroupIndex : indexMerger.getTemporaryGroupIndexes() ) { // cleanup files older than 60 minutes 3600000 diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java index e513b7bb7..342b4ce52 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java @@ -82,7 +82,6 @@ import org.apache.jackrabbit.webdav.DavSession; import org.apache.jackrabbit.webdav.lock.LockManager; import org.apache.jackrabbit.webdav.lock.SimpleLockManager; import org.apache.maven.index.context.IndexingContext; -import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.codehaus.plexus.digest.ChecksumFile; import org.codehaus.plexus.digest.Digester; import org.codehaus.plexus.digest.DigesterException; @@ -1179,7 +1178,7 @@ public class ArchivaDavResourceFactory if ( tmp != null && tmp.getDirectory() != null && tmp.getDirectory().exists() ) { - if ( System.currentTimeMillis() - tmp.getCreationTime() > ( indexMerger.getDefaultGroupIndexTtl() * 60 + if ( System.currentTimeMillis() - tmp.getCreationTime() > ( indexMerger.getGroupMergedIndexTtl() * 60 * 1000 ) ) { log.debug( "tmp group index is too old so delete it" ); -- 2.39.5