You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2010/12/23 01:19:23 UTC
svn commit: r1052117 - in
/archiva/trunk/archiva-modules/archiva-base/archiva-policies: pom.xml
src/main/resources/META-INF/plexus/
src/main/resources/META-INF/spring-context.xml
Author: brett
Date: Thu Dec 23 00:19:22 2010
New Revision: 1052117
URL: http://svn.apache.org/viewvc?rev=1052117&view=rev
Log:
move cache configuration into Spring context file
Removed:
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/plexus/
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml?rev=1052117&r1=1052116&r2=1052117&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/pom.xml Thu Dec 23 00:19:22 2010
@@ -18,7 +18,8 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-base</artifactId>
@@ -68,24 +69,11 @@
<executions>
<execution>
<id>descriptor</id>
- <phase>generate-resources</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>generate-metadata</goal>
</goals>
</execution>
- <execution>
- <id>merge</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>merge-metadata</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>${basedir}/src/main/resources/META-INF/plexus/components-fragment.xml</descriptor>
- <descriptor>${project.build.outputDirectory}/META-INF/plexus/components.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml?rev=1052117&r1=1052116&r2=1052117&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml Thu Dec 23 00:19:22 2010
@@ -18,15 +18,29 @@
~ under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<bean id="urlFailureCache"
- class="org.apache.maven.archiva.policies.urlcache.DefaultUrlFailureCache">
+ class="org.apache.maven.archiva.policies.urlcache.DefaultUrlFailureCache" lazy-init="true">
<!-- collaborators and configuration for this bean go here -->
- <constructor-arg ref="cache#url-failures-cache"
- type="org.codehaus.plexus.cache.Cache" />
+ <constructor-arg ref="url-failures-cache"
+ type="org.codehaus.plexus.cache.Cache"/>
</bean>
+ <bean id="url-failures-cache" class="org.codehaus.plexus.cache.ehcache.EhcacheCache" lazy-init="true"
+ destroy-method="dispose">
+ <property name="diskExpiryThreadIntervalSeconds" value="600"/>
+ <property name="diskPersistent" value="true"/>
+ <property name="diskStorePath" value="${java.io.tmpdir}/archiva/urlcache"/>
+ <property name="maxElementsInMemory" value="1000"/>
+ <property name="memoryEvictionPolicy" value="LRU"/>
+ <property name="name" value="url-failures-cache"/>
+ <property name="overflowToDisk" value="false"/>
+ <!-- 45 minutes = 2700 seconds -->
+ <property name="timeToIdleSeconds" value="2700"/>
+ <!-- 30 minutes = 1800 seconds -->
+ <property name="timeToLiveSeconds" value="1800"/>
+ </bean>
</beans>
\ No newline at end of file