summaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web/archiva-security
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2013-01-02 18:04:59 +0000
committerOlivier Lamy <olamy@apache.org>2013-01-02 18:04:59 +0000
commit36563f58bd058adfb8ca7b1be96ac13207ad70dc (patch)
treeba164e2362ee3054a189dae03a85cfa21791f819 /archiva-modules/archiva-web/archiva-security
parent09b27cc196e57242771a71ad82545a595ac3658e (diff)
downloadarchiva-36563f58bd058adfb8ca7b1be96ac13207ad70dc.tar.gz
archiva-36563f58bd058adfb8ca7b1be96ac13207ad70dc.zip
fix bean naming
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1427883 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-security')
-rw-r--r--archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java2
-rw-r--r--archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java2
-rw-r--r--archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml12
3 files changed, 8 insertions, 8 deletions
diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
index 7e9760dff..1dfd4cdb5 100644
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
@@ -45,7 +45,7 @@ public class ArchivaStandardRolesCheck
/**
*
*/
- @Inject @Named(value = "rBACManager#cached")
+ @Inject @Named(value = "rbacManager#cached")
private RBACManager rbacManager;
/**
diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
index fb9a5078d..97d8eb721 100644
--- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
+++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
@@ -68,7 +68,7 @@ public abstract class AbstractSecurityTest
protected SecuritySystem securitySystem;
@Inject
- @Named(value = "rBACManager#memory")
+ @Named(value = "rbacManager#memory")
protected RBACManager rbacManager;
@Inject
diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
index 07aed3fc5..488cf5d08 100644
--- a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
@@ -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"/>