diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-12-22 14:50:24 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-12-22 14:50:24 +0000 |
| commit | 88674f25b47702cbcd785cafc8a613f4d6e1fd99 (patch) | |
| tree | 5ec23330a830eeebfe4db8d0a9c7639080b05796 /archiva-modules | |
| parent | 177acedf3836e227daa22c5eae1d2022008ef611 (diff) | |
| download | archiva-88674f25b47702cbcd785cafc8a613f4d6e1fd99.tar.gz archiva-88674f25b47702cbcd785cafc8a613f4d6e1fd99.zip | |
align name with others
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1425289 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
6 files changed, 7 insertions, 7 deletions
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml index 5d9afa13d..fd941ccda 100755 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml @@ -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"/> diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java index 500841071..4b671411c 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java +++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java @@ -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; } diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml index a474a2cb3..7ed448f65 100644 --- a/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml @@ -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"/> diff --git a/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml index cb4a25544..c3263e5e2 100755 --- a/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml @@ -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"/> diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml index c3f6560eb..ee094eaf1 100755 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/spring-context.xml @@ -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"/> diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml index bbd799b6b..704358dec 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/WEB-INF/applicationContext.xml @@ -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"/> |