use a rbacManager#default rather than hardcoded impl to ease alias usage

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

diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
index 2ce17b4c82966310a7f62383fc3f3eca0e1f4e81..63284b1c53b4765a7e42f0f2ecc533a393ce4ecb 100644 (file)
--- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
@@ -55,7 +55,7 @@ public class RbacAuthorizer
     private Logger log = LoggerFactory.getLogger( getClass() );
 
     @Inject
-    @Named(value = "rbacManager#cached")
+    @Named(value = "rbacManager#default")
     private RBACManager manager;
 
     @Inject

diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
index 282890425bf48f5416fc1d1575d33c7eda9b7f6f..727ad612f966ea20dc8cfce3dde709641f2419cc 100644 (file)
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
@@ -80,7 +80,7 @@ public class AdminAutoCreateCheck
     private RoleManager roleManager;
 
     @Inject
-    @Named(value = "rbacManager#cached")
+    @Named(value = "rbacManager#default")
     private RBACManager rbacManager;
 
     public void validateEnvironment( List<String> violations )

diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
index 5fb819b7a281e4f163d937ca1b629a141002d6bd..8cca2b7414be180818bd91228dc9576aea4268ef 100644 (file)
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
@@ -55,7 +55,7 @@ public class LockedAdminEnvironmentCheck
     private UserManager userManager;
 
     @Inject
-    @Named( value = "rbacManager#cached" )
+    @Named( value = "rbacManager#default" )
     private RBACManager rbacManager;
 
     /**

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
index 4a95c65e84be241ce26cd43cb19b27a49643be91..e37310c43bc3f35bf8a62d38959997cffb8fcff3 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
@@ -78,7 +78,7 @@ public class DefaultRoleManagementService
 
     @Inject
     public DefaultRoleManagementService( RoleManager roleManager,
-                                         @Named(value = "rbacManager#cached") RBACManager rbacManager,
+                                         @Named(value = "rbacManager#default") RBACManager rbacManager,
                                          @Named(value = "userManager#cached") UserManager userManager )
     {
         this.roleManager = roleManager;

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
index eb9f06e2ecdf7ec94165ba44622c469c5e8e8a73..de429a7e8e1d9870fb063c4413a9f8552b149dc5 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
@@ -120,7 +120,7 @@ public class DefaultUserService
     private Mailer mailer;
 
     @Inject
-    @Named( value = "rbacManager#cached" )
+    @Named( value = "rbacManager#default" )
     private RBACManager rbacManager;
 
     private HttpAuthenticator httpAuthenticator;

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
index 4953a469918cf4ed56b4d5bad8f11a5eb295d120..e529249c7985969d10096edcc6948a2ba78db428 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
@@ -78,7 +78,7 @@ public class LdapRbacManager
     private Logger log = LoggerFactory.getLogger( getClass() );
 
     @Inject
-    @Named( value = "rbacManager#cached" )
+    @Named( value = "rbacManager#default" )
     private RBACManager rbacImpl;
 
     @Inject

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
index d6fa67857378d9960e8491f1589e826d15184846..1c306918d6a35876d5b044f99ccc8b26705f1292 100755 (executable)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
@@ -29,6 +29,8 @@
 
   <context:property-placeholder system-properties-mode="OVERRIDE"/>
 
+  <alias name="rbacManager#memory" alias="rbacManager#default"/>
+
   <bean name="apacheDS#test" class="org.apache.archiva.redback.components.apacheds.DefaultApacheDs"
         scope="prototype">
     <property name="basedir" value="${basedir}/target/apacheds"/>

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
index cf32595697f01d2ccdfc33b9da0fa4fec889547f..ec63909a961c67a3702b1e344e608e3c50fe8ce5 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
@@ -93,7 +93,7 @@ public class DefaultRoleManager
     private RoleTemplateProcessor templateProcessor;
 
     @Inject
-    @Named(value = "rbacManager#cached")
+    @Named(value = "rbacManager#default")
     private RBACManager rbacManager;
 
 

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
index 0625fe3020d4d73f1e738bbb21182a7b717b9bf7..45b4df305eda34382de6a8ab353f05885dad0b31 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
@@ -57,7 +57,7 @@ public class DefaultRoleModelProcessor
     private Logger log = LoggerFactory.getLogger( DefaultRoleModelProcessor.class );
 
     @Inject
-    @Named(value = "rbacManager#cached")
+    @Named(value = "rbacManager#default")
     private RBACManager rbacManager;
 
     private Map<String, Resource> resourceMap = new HashMap<String, Resource>();

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
index 62f04b8606e136d0b3df4fc0badb332178a1296b..b9ca4d992127663babf33a853b86ad5f8c22366c 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
@@ -57,7 +57,7 @@ public class DefaultRoleTemplateProcessor
     private Logger log = LoggerFactory.getLogger( DefaultRoleTemplateProcessor.class );
 
     @Inject
-    @Named(value = "rbacManager#cached")
+    @Named(value = "rbacManager#default")
     private RBACManager rbacManager;
 
     @SuppressWarnings("unchecked")

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml
index 73c41059c515e6a39c2e119bab1e9e7f441f0ce0..d777c6e8212587be1711b00531aa52dabd1993c6 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml
+++ b/redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml
@@ -27,6 +27,8 @@
            http://www.springframework.org/schema/context/spring-context-3.0.xsd"
        default-lazy-init="true">
 
+  <alias name="rbacManager#cached" alias="rbacManager#default"/>
+
   <context:annotation-config />
   <context:component-scan 
     base-package="org.apache.archiva.redback.role"/>