align name with others

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1425289 13f79535-47bb-0310-9956-ffa450edef68

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 5d9afa13d7cf85d8e0426f3397e9c58649def03e..fd941ccdaebf9243fd0c45a7e4ddc6f024eabcc8 100755 (executable)
--- 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 500841071cb12821761ab80cd5f8481a807e848f..4b671411cd6bc5d34522120f07f37897cc12c409 100644 (file)
--- 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 a474a2cb39756452e7ebee52543135748d7c3e06..7ed448f65ceebf17d0a31bb5359b758ebbfa7807 100644 (file)
--- 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 cb4a2554478ee0ba433805b09d167aca73226c5d..c3263e5e2b1028108e1e2aa91b15d9dd9db95cc8 100755 (executable)
--- 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 c3f6560eb7b348d68f5f9369dba373089a3973d0..ee094eaf1388c70d546fec6b29ef6c0438b38c8f 100755 (executable)
--- 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 bbd799b6b126c5a85ff0b5dd163cc5c8ab9679cc..704358dec2930798c2d1eafbc3eff9a5f3dc7bfe 100644 (file)
--- 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"/>