Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename method 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1443524 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-02-07 14:57:11 +00:00
parent 9ff7c33332
commit 3e447d498c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
View File

@ -167,7 +167,7 @@ public class DefaultIndexMerger
return this.temporaryGroupIndexes;
}
public int getDefaultGroupIndexTtl()
public int getGroupMergedIndexTtl()
{
return this.defaultGroupIndexTtl;
}

2
archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java
View File

@ -50,6 +50,6 @@ public interface IndexMerger
/**
* @return ttl of temporay group index
*/
int getDefaultGroupIndexTtl();
int getGroupMergedIndexTtl();
}

1
archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/TemporaryGroupIndexCleaner.java
View File

@ -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

3
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
View File

@ -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" );