Configuring for JDO caching.

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

diff --git a/archiva-webapp/pom.xml b/archiva-webapp/pom.xml
index 5b0176e7afe16b0935ad9530d917f30f3c830563..087373fadce04169fedd55f251eb893493b689e9 100644 (file)
--- a/archiva-webapp/pom.xml
+++ b/archiva-webapp/pom.xml
@@ -152,6 +152,10 @@
       <groupId>org.codehaus.plexus.security</groupId>
       <artifactId>plexus-security-user-management-provider-jdo</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus.security</groupId>
+      <artifactId>plexus-security-authorization-rbac-store-cached</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus.security</groupId>
       <artifactId>plexus-security-authorization-rbac-store-jdo</artifactId>

diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index b688a95f2bbe4742b9225c4bb8e548335645ddff..747fb5eca789c8a6eea091ad1d011011f89bcfb6 100644 (file)
--- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -202,7 +202,8 @@
       <requirements>
         <requirement>
           <role>org.codehaus.plexus.security.rbac.RBACManager</role>
-          <role-hint>jdo</role-hint>
+          <role-hint>cached</role-hint>
+          <field-name>manager</field-name>
         </requirement>
         <requirement>
           <role>org.codehaus.plexus.security.user.UserManager</role>
@@ -216,6 +217,50 @@
       </requirements>
     </component>
 
+    <component>
+      <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+      <role-hint>cached</role-hint>
+      <implementation>org.codehaus.plexus.security.authorization.rbac.store.cached.CachedRbacManager</implementation>
+      <description>CachedRbacManager is a wrapped RBACManager with caching.</description>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.plexus.security.rbac.RBACManager</role>
+          <role-hint>jdo</role-hint>
+          <field-name>rbacImpl</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
+          <role-hint>operations</role-hint>
+          <field-name>operationsCache</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
+          <role-hint>permissions</role-hint>
+          <field-name>permissionsCache</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
+          <role-hint>resources</role-hint>
+          <field-name>resourcesCache</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
+          <role-hint>roles</role-hint>
+          <field-name>rolesCache</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
+          <role-hint>userAssignments</role-hint>
+          <field-name>userAssignmentsCache</field-name>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.ehcache.EhcacheComponent</role>
+          <role-hint>userPermissions</role-hint>
+          <field-name>userPermissionsCache</field-name>
+        </requirement>
+      </requirements>
+    </component>
+
     <component>
       <role>org.codehaus.plexus.security.policy.UserSecurityPolicy</role>
       <role-hint>default</role-hint>

diff --git a/pom.xml b/pom.xml
index 1133b40f9fe300f0cbbd682498a02942f3fddd8e..ad390b278fad521cd6c5ac57daea3cb305ed3da3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -323,6 +323,11 @@
         <artifactId>plexus-security-user-management-provider-jdo</artifactId>
         <version>${plexus-security.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus.security</groupId>
+        <artifactId>plexus-security-authorization-rbac-store-cached</artifactId>
+        <version>${plexus-security.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.codehaus.plexus.security</groupId>
         <artifactId>plexus-security-authorization-rbac-store-jdo</artifactId>