use o.a.a package namespace for spring-cache-ehcache component

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

diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
index cb8c29f6187dcbf8f02c6798bc61f0139d2ff95a..693365962dc6b73c0f6a1d1ff0e7aa53f7d7e03a 100644 (file)
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
@@ -31,7 +31,7 @@
   <context:component-scan 
     base-package="org.apache.archiva.redback.keys.cached"/>
 
-  <bean name="cache#keys" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#keys" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>

diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
index d0b8b024db2873b213bc12748aff40d53ff062d5..0011db39c610e521b3c8abc81446f7ff93330ace 100644 (file)
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
@@ -49,7 +49,7 @@
 
   <alias name="commons-configuration" alias="test-conf"/>
 
-  <bean name="cache#keys" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#keys" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>

diff --git a/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml b/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
index 9aacd8ad334aa22537c3c3ad0ef5059c360f50bf..e12bd391562b62eb908bacf11397fb9b6989822d 100644 (file)
--- a/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-authorization-rbac/src/test/resources/spring-context.xml
@@ -34,7 +34,7 @@
   
   <alias name="userManager#memory" alias="userManager#jdo"/>
 
-  <bean name="cache#users" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#users" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
index 9e667728b7438b56ecd14fee3a75dcbc16665a07..f24140f390d97445876f7e576ab88a0854b9d2c9 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
@@ -31,7 +31,7 @@
   <context:component-scan 
     base-package="org.apache.archiva.redback.rbac.cached"/>
 
-  <bean name="cache#operations" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#operations" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -42,7 +42,7 @@
     <property name="timeToLiveSeconds" value="14400"/>
   </bean>
 
-  <bean name="cache#permissions" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#permissions" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -53,7 +53,7 @@
     <property name="timeToLiveSeconds" value="14400"/>
   </bean>
 
-  <bean name="cache#resources" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#resources" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -64,7 +64,7 @@
     <property name="timeToLiveSeconds" value="14400"/>
   </bean>
 
-  <bean name="cache#roles" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#roles" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -75,7 +75,7 @@
     <property name="timeToLiveSeconds" value="14400"/>
   </bean>
 
-  <bean name="cache#effectiveRoleSet" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#effectiveRoleSet" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -90,7 +90,7 @@
          Caches with Short Term entries
        ================================================================ -->
 
-  <bean name="cache#userAssignments" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#userAssignments" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -101,7 +101,7 @@
     <property name="timeToLiveSeconds" value="600"/>
   </bean>
 
-  <bean name="cache#userPermissions" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#userPermissions" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
index cd7d00cb8690f5ddb5f0612546da83910c9dc09c..d732d499d7a80761d2a064d0d70078edb78e6d9f 100755 (executable)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
@@ -58,7 +58,7 @@
     <property name="userPermissionsCache" ref="cache#userPermissions"/>
   </bean>
 
-  <bean name="cache#userAssignments" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#userAssignments" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -69,7 +69,7 @@
     <property name="timeToLiveSeconds" value="600"/>
   </bean>
 
-  <bean name="cache#userPermissions" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#userPermissions" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>

diff --git a/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml b/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
index 42c80d124cc97612647340d3b0d801fcb9d0c6eb..36320c043aca284386d9b528a3ea03c180f51898 100644 (file)
--- a/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
@@ -31,7 +31,7 @@
   <context:component-scan 
     base-package="org.apache.archiva.redback.users.cached"/>
 
-  <bean name="cache#users" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#users" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>

diff --git a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
index 47aeee0e36711a5cab00068903f5319dc6512696..54ef336bee881077d0a115710cfa3c58894eebf4 100644 (file)
--- a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
@@ -32,7 +32,7 @@
     <property name="usersCache" ref="cache#users"/>
   </bean>
 
-  <bean name="cache#users" class="org.codehaus.plexus.cache.ehcache.EhcacheCache"
+  <bean name="cache#users" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
       init-method="initialize">
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>

diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml b/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
index 0cccd673fb3f9355001c73a350d5e9c1180aa4c0..ac1384ced9dd25d652547aad8add3371f986b08e 100644 (file)
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
@@ -33,7 +33,7 @@
 
   <!-- REDBACK-289/MRM-1488 -->
   <!-- Cache for LDAP users. Data is refreshed every 3 mins. -->
-  <bean name="cache#ldapUser" class="org.codehaus.plexus.cache.ehcache.EhcacheCache">
+  <bean name="cache#ldapUser" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
     <property name="diskExpiryThreadIntervalSeconds" value="180"/>
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>
@@ -46,7 +46,7 @@
   </bean>
 
   <!-- Cache for users' LDAP userDn. Data is refreshed every 3 mins. -->
-  <bean name="cache#ldapUserDn" class="org.codehaus.plexus.cache.ehcache.EhcacheCache">
+  <bean name="cache#ldapUserDn" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
     <property name="diskExpiryThreadIntervalSeconds" value="180"/>
     <property name="diskPersistent" value="false"/>
     <property name="eternal" value="false"/>