You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2013/05/20 12:28:31 UTC
svn commit: r1484418 - in /archiva/trunk:
archiva-docs/src/site/apt/userguide/ archiva-jetty/
archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/
archiva-modules/archiva-web/archiva-webapp/
Author: oching
Date: Mon May 20 10:28:30 2013
New Revision: 1484418
URL: http://svn.apache.org/r1484418
Log:
[MRM-1751] removed unused methods and config + update docs
Modified:
archiva/trunk/archiva-docs/src/site/apt/userguide/virtual-repositories.apt
archiva/trunk/archiva-jetty/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/DefaultIndexMerger.java
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
Modified: archiva/trunk/archiva-docs/src/site/apt/userguide/virtual-repositories.apt
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-docs/src/site/apt/userguide/virtual-repositories.apt?rev=1484418&r1=1484417&r2=1484418&view=diff
==============================================================================
--- archiva/trunk/archiva-docs/src/site/apt/userguide/virtual-repositories.apt (original)
+++ archiva/trunk/archiva-docs/src/site/apt/userguide/virtual-repositories.apt Mon May 20 10:28:30 2013
@@ -140,7 +140,7 @@ Virtual Repositories
merging repositories index for which the current user has karma.
This merged index is available in the path .indexer .
- To not generate this merged index on each request, there is a ttl value for build merged index.
- This ttl has a default value of 30 minutes. You can change it with modifying the sys props value <<<archiva.tmp.group.index.ttl>>> (see your <<<wrapper.conf>>> file)
+ To not generate this merged index on each request, there is a ttl (time to live) value for build merged index. It can be configured
+ in the repository group configuration. This ttl has a default value of 30 minutes.
Modified: archiva/trunk/archiva-jetty/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/pom.xml?rev=1484418&r1=1484417&r2=1484418&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/pom.xml (original)
+++ archiva/trunk/archiva-jetty/pom.xml Mon May 20 10:28:30 2013
@@ -171,7 +171,6 @@
-->
<systemProperty>jetty.logs=%ARCHIVA_BASE%/logs</systemProperty>
<systemProperty>java.io.tmpdir=%ARCHIVA_BASE%/temp</systemProperty>
- <systemProperty>archiva.tmp.group.index.ttl=30</systemProperty>
<systemProperty>AsyncLogger.WaitStrategy=Sleep</systemProperty>
</systemProperties>
<extraArguments>
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=1484418&r1=1484417&r2=1484418&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 Mon May 20 10:28:30 2013
@@ -19,6 +19,7 @@ package org.apache.archiva.indexer.merge
*/
import com.google.common.io.Files;
+
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.common.plexusbridge.MavenIndexerUtils;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
@@ -35,7 +36,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
-import javax.annotation.PostConstruct;
import javax.inject.Inject;
import java.io.File;
import java.io.IOException;
@@ -70,8 +70,6 @@ public class DefaultIndexMerger
private List<TemporaryGroupIndex> temporaryGroupIndexes = new CopyOnWriteArrayList<TemporaryGroupIndex>();
- private int groupMergedIndexTtl;
-
@Inject
public DefaultIndexMerger( PlexusSisuBridge plexusSisuBridge, MavenIndexerUtils mavenIndexerUtils )
throws PlexusSisuBridgeException
@@ -81,12 +79,6 @@ public class DefaultIndexMerger
indexPacker = plexusSisuBridge.lookup( IndexPacker.class, "default" );
}
- @PostConstruct
- public void intialize()
- {
- this.groupMergedIndexTtl = Integer.getInteger( IndexMerger.TMP_GROUP_INDEX_SYS_KEY, DEFAULT_GROUP_INDEX_TTL );
- }
-
public IndexingContext buildMergedIndex( IndexMergerRequest indexMergerRequest )
throws IndexMergerException
{
@@ -170,9 +162,4 @@ public class DefaultIndexMerger
{
return this.temporaryGroupIndexes;
}
-
- public int getGroupMergedIndexTtl()
- {
- return this.groupMergedIndexTtl;
- }
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java?rev=1484418&r1=1484417&r2=1484418&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/main/java/org/apache/archiva/indexer/merger/IndexMerger.java Mon May 20 10:28:30 2013
@@ -28,12 +28,6 @@ import java.util.Collection;
*/
public interface IndexMerger
{
-
- /**
- * system property which contains the value in s for ttl of temporary index groups
- */
- String TMP_GROUP_INDEX_SYS_KEY = "archiva.tmp.group.index.ttl";
-
/**
* @param indexMergerRequest
* @return a temporary directory with a merge index (directory marked deleteOnExit)
@@ -45,10 +39,4 @@ public interface IndexMerger
void cleanTemporaryGroupIndex( TemporaryGroupIndex temporaryGroupIndex );
Collection<TemporaryGroupIndex> getTemporaryGroupIndexes();
-
- /**
- * @return ttl of temporay group index
- */
- int getGroupMergedIndexTtl();
-
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1484418&r1=1484417&r2=1484418&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Mon May 20 10:28:30 2013
@@ -1013,7 +1013,6 @@
<archiva.devMode>${archiva.devMode}</archiva.devMode>
<archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
<archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
- <archiva.tmp.group.index.ttl>${archiva.groupIndexTtl}</archiva.tmp.group.index.ttl>
<!--
not needed as we use asyncLogger in configuration
<Log4jContextSelector>org.apache.logging.log4j.core.async.AsyncLoggerContextSelector</Log4jContextSelector>