Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bean naming 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1427883 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-01-02 18:04:59 +00:00
parent 09b27cc196
commit 36563f58bd
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
View File

@ -38,7 +38,7 @@ import java.util.Set;
/**
* @author Olivier Lamy
*/
@Service("rBACManager#cached")
@Service("rbacManager#cached")
public class TestRBACManager implements RBACManager
{
public void addListener( RBACManagerListener listener )

2
archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
View File

@ -45,7 +45,7 @@ public class ArchivaStandardRolesCheck
/**
*
*/
@Inject @Named(value = "rBACManager#cached")
@Inject @Named(value = "rbacManager#cached")
private RBACManager rbacManager;
/**

2
archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
View File

@ -68,7 +68,7 @@ public abstract class AbstractSecurityTest
protected SecuritySystem securitySystem;
@Inject
@Named(value = "rBACManager#memory")
@Named(value = "rbacManager#memory")
protected RBACManager rbacManager;
@Inject

12
archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
View File

@ -42,7 +42,7 @@
<bean name="authorizer#rbac" class="org.apache.archiva.redback.authorization.rbac.RbacAuthorizer">
<property name="manager" ref="rBACManager#memory"/>
<property name="manager" ref="rbacManager#memory"/>
<property name="userManager" ref="userManager#memory"/>
<property name="evaluator" ref="permissionEvaluator"/>
</bean>
@ -52,23 +52,23 @@
</bean>
<bean name="roleManager" class="org.apache.archiva.redback.role.DefaultRoleManager">
<property name="rbacManager" ref="rBACManager#memory"/>
<property name="rbacManager" ref="rbacManager#memory"/>
<property name="modelProcessor" ref="roleModelProcessor"/>
<property name="templateProcessor" ref="roleTemplateProcessor#test"/>
</bean>
<bean name="rBACManager#cached" class="org.apache.archiva.redback.rbac.cached.CachedRbacManager">
<property name="rbacImpl" ref="rBACManager#memory"/>
<bean name="rbacManager#cached" class="org.apache.archiva.redback.rbac.cached.CachedRbacManager">
<property name="rbacImpl" ref="rbacManager#memory"/>
</bean>
<bean name="roleModelProcessor" class="org.apache.archiva.redback.role.processor.DefaultRoleModelProcessor">
<property name="rbacManager" ref="rBACManager#memory"/>
<property name="rbacManager" ref="rbacManager#memory"/>
</bean>
<alias name="roleModelProcessor" alias="roleModelProcessor#test"/>
<bean name="roleTemplateProcessor" class="org.apache.archiva.redback.role.template.DefaultRoleTemplateProcessor">
<property name="rbacManager" ref="rBACManager#memory"/>
<property name="rbacManager" ref="rbacManager#memory"/>
</bean>
<alias name="roleTemplateProcessor" alias="roleTemplateProcessor#test"/>

2
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
View File

@ -52,7 +52,7 @@ public class ArchivaLockedAdminEnvironmentCheck
@Inject
@Named( value = "rBACManager#cached" )
@Named( value = "rbacManager#cached" )
private RBACManager rbacManager;
/**

2
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
View File

@ -63,7 +63,7 @@ public class SecuritySynchronization
private RoleManager roleManager;
@Inject
@Named( value = "rBACManager#cached" )
@Named( value = "rbacManager#cached" )
private RBACManager rbacManager;
private Map<String, EnvironmentCheck> checkers;