You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/15 16:39:45 UTC
svn commit: r1433460 - in /archiva/redback/redback-core/trunk:
redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/
redback-integrations/redback-common-integration...
Author: olamy
Date: Tue Jan 15 15:39:45 2013
New Revision: 1433460
URL: http://svn.apache.org/viewvc?rev=1433460&view=rev
Log:
use a rbacManager#default rather than hardcoded impl to ease alias usage
Modified:
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml
Modified: archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java?rev=1433460&r1=1433459&r2=1433460&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java (original)
+++ archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java Tue Jan 15 15:39:45 2013
@@ -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
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java?rev=1433460&r1=1433459&r2=1433460&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java Tue Jan 15 15:39:45 2013
@@ -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 )
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java?rev=1433460&r1=1433459&r2=1433460&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java Tue Jan 15 15:39:45 2013
@@ -55,7 +55,7 @@ public class LockedAdminEnvironmentCheck
private UserManager userManager;
@Inject
- @Named( value = "rbacManager#cached" )
+ @Named( value = "rbacManager#default" )
private RBACManager rbacManager;
/**
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java?rev=1433460&r1=1433459&r2=1433460&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java Tue Jan 15 15:39:45 2013
@@ -78,7 +78,7 @@ public class DefaultRoleManagementServic
@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;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java?rev=1433460&r1=1433459&r2=1433460&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java Tue Jan 15 15:39:45 2013
@@ -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;
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java?rev=1433460&r1=1433459&r2=1433460&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/java/org/apache/archiva/redback/rbac/ldap/LdapRbacManager.java Tue Jan 15 15:39:45 2013
@@ -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
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml?rev=1433460&r1=1433459&r2=1433460&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml Tue Jan 15 15:39:45 2013
@@ -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"/>
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java?rev=1433460&r1=1433459&r2=1433460&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java Tue Jan 15 15:39:45 2013
@@ -93,7 +93,7 @@ public class DefaultRoleManager
private RoleTemplateProcessor templateProcessor;
@Inject
- @Named(value = "rbacManager#cached")
+ @Named(value = "rbacManager#default")
private RBACManager rbacManager;
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java?rev=1433460&r1=1433459&r2=1433460&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java Tue Jan 15 15:39:45 2013
@@ -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>();
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java?rev=1433460&r1=1433459&r2=1433460&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java Tue Jan 15 15:39:45 2013
@@ -57,7 +57,7 @@ public class DefaultRoleTemplateProcesso
private Logger log = LoggerFactory.getLogger( DefaultRoleTemplateProcessor.class );
@Inject
- @Named(value = "rbacManager#cached")
+ @Named(value = "rbacManager#default")
private RBACManager rbacManager;
@SuppressWarnings("unchecked")
Modified: archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml?rev=1433460&r1=1433459&r2=1433460&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/resources/META-INF/spring-context.xml Tue Jan 15 15:39:45 2013
@@ -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"/>