Author: olamy
Date: Sat Dec 22 14:50:24 2012
New Revision: 1425289
URL: http://svn.apache.org/viewvc?rev=1425289&view=rev
Log:
align name with others
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml?rev=1425289&r1=1425288&r2=1425289&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
Sat Dec 22 14:50:24 2012
@@ -329,7 +329,7 @@
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
<property name="memoryEvictionPolicy" value="LRU"/>
- <property name="name" value="cache"/>
+ <property name="name" value="url-failures-cache"/>
<property name="overflowToDisk" value="false"/>
<property name="timeToIdleSeconds" value="2700"/>
<property name="timeToLiveSeconds" value="1800"/>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java?rev=1425289&r1=1425288&r2=1425289&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
Sat Dec 22 14:50:24 2012
@@ -36,7 +36,7 @@ public class DefaultUrlFailureCache
private Cache urlCache;
@Inject
- public DefaultUrlFailureCache( @Named( "url-failures-cache" ) Cache
urlCache )
+ public DefaultUrlFailureCache( @Named( "cache#url-failures-cache" ) Cache
urlCache )
{
this.urlCache = urlCache;
}
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=1425289&r1=1425288&r2=1425289&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
Sat Dec 22 14:50:24 2012
@@ -35,7 +35,7 @@
- <bean id="url-failures-cache"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
lazy-init="true"
+ <bean name="cache#url-failures-cache"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
lazy-init="true"
destroy-method="dispose">
<property name="diskExpiryThreadIntervalSeconds" value="600"/>
<property name="diskPersistent" value="true"/>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml?rev=1425289&r1=1425288&r2=1425289&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml
Sat Dec 22 14:50:24 2012
@@ -29,13 +29,13 @@
<context:property-placeholder system-properties-mode="OVERRIDE"/>
- <bean name="url-failures-cache"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
+ <bean name="cache#url-failures-cache"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
<property name="diskExpiryThreadIntervalSeconds" value="600"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
<property name="memoryEvictionPolicy" value="LRU"/>
- <property name="name" value="cache"/>
+ <property name="name" value="url-failures-cache"/>
<property name="overflowToDisk" value="false"/>
<property name="timeToIdleSeconds" value="2700"/>
<property name="timeToLiveSeconds" value="1800"/>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml?rev=1425289&r1=1425288&r2=1425289&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml
Sat Dec 22 14:50:24 2012
@@ -65,7 +65,7 @@
</bean>
- <bean id="url-failures-cache"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
lazy-init="true"
+ <bean name="cache#url-failures-cache"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
lazy-init="true"
destroy-method="dispose">
<property name="diskExpiryThreadIntervalSeconds" value="600"/>
<property name="diskPersistent" value="false"/>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml?rev=1425289&r1=1425288&r2=1425289&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml
Sat Dec 22 14:50:24 2012
@@ -161,7 +161,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
- <bean id="url-failures-cache"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
lazy-init="true"
+ <bean name="cache#url-failures-cache"
class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
lazy-init="true"
destroy-method="dispose">
<property name="diskExpiryThreadIntervalSeconds" value="600"/>
<property name="diskPersistent" value="true"/>
