You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/02/07 15:57:32 UTC
svn commit: r1443526 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/
archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/
Author: olamy
Date: Thu Feb 7 14:57:32 2013
New Revision: 1443526
URL: http://svn.apache.org/viewvc?rev=1443526&view=rev
Log:
simplify code and better variable name
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java?rev=1443526&r1=1443525&r2=1443526&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java Thu Feb 7 14:57:32 2013
@@ -47,7 +47,7 @@ import java.util.concurrent.CopyOnWriteA
* @author Olivier Lamy
* @since 1.4-M2
*/
-@Service( "indexMerger#default" )
+@Service("indexMerger#default")
public class DefaultIndexMerger
implements IndexMerger
{
@@ -70,7 +70,7 @@ public class DefaultIndexMerger
private List<TemporaryGroupIndex> temporaryGroupIndexes = new CopyOnWriteArrayList<TemporaryGroupIndex>();
- private int defaultGroupIndexTtl;
+ private int groupMergedIndexTtl;
@Inject
public DefaultIndexMerger( PlexusSisuBridge plexusSisuBridge, MavenIndexerUtils mavenIndexerUtils )
@@ -84,10 +84,7 @@ public class DefaultIndexMerger
@PostConstruct
public void intialize()
{
- String ttlStr =
- System.getProperty( IndexMerger.TMP_GROUP_INDEX_SYS_KEY, Integer.toString( DEFAULT_GROUP_INDEX_TTL ) );
- this.defaultGroupIndexTtl = NumberUtils.toInt( ttlStr, DEFAULT_GROUP_INDEX_TTL );
-
+ this.groupMergedIndexTtl = Integer.getInteger( IndexMerger.TMP_GROUP_INDEX_SYS_KEY, DEFAULT_GROUP_INDEX_TTL );
}
public IndexingContext buildMergedIndex( Collection<String> repositoriesIds, boolean packIndex )
@@ -169,6 +166,6 @@ public class DefaultIndexMerger
public int getGroupMergedIndexTtl()
{
- return this.defaultGroupIndexTtl;
+ return this.groupMergedIndexTtl;
}
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java?rev=1443526&r1=1443525&r2=1443526&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java Thu Feb 7 14:57:32 2013
@@ -87,6 +87,7 @@ import org.codehaus.plexus.digest.Digest
import org.codehaus.plexus.digest.DigesterException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.slf4j.MarkerFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service;
@@ -108,7 +109,7 @@ import java.util.Set;
/**
*
*/
-@Service ("davResourceFactory#archiva")
+@Service("davResourceFactory#archiva")
public class ArchivaDavResourceFactory
implements DavResourceFactory, Auditable
{
@@ -139,7 +140,7 @@ public class ArchivaDavResourceFactory
*
*/
@Inject
- @Named (value = "repositoryProxyConnectors#default")
+ @Named(value = "repositoryProxyConnectors#default")
private RepositoryProxyConnectors connectors;
/**
@@ -169,7 +170,7 @@ public class ArchivaDavResourceFactory
*
*/
@Inject
- @Named (value = "httpAuthenticator#basic")
+ @Named(value = "httpAuthenticator#basic")
private HttpAuthenticator httpAuth;
@Inject
@@ -205,7 +206,7 @@ public class ArchivaDavResourceFactory
*
*/
@Inject
- @Named (value = "archivaTaskScheduler#repository")
+ @Named(value = "archivaTaskScheduler#repository")
private RepositoryArchivaTaskScheduler scheduler;
private ApplicationContext applicationContext;
@@ -1181,11 +1182,14 @@ public class ArchivaDavResourceFactory
if ( System.currentTimeMillis() - tmp.getCreationTime() > ( indexMerger.getGroupMergedIndexTtl() * 60
* 1000 ) )
{
- log.debug( "tmp group index is too old so delete it" );
+ log.debug( MarkerFactory.getDetachedMarker( "group.merged.index" ),
+ "tmp group index '{}' is too old so delete it", groupId );
indexMerger.cleanTemporaryGroupIndex( tmp );
}
else
{
+ log.debug( MarkerFactory.getDetachedMarker( "group.merged.index" ),
+ "merged index for group '{}' found in cache", groupId );
return tmp.getDirectory();
}
}