From: Olivier Lamy <olamy@apache.org>
Date: Wed, 2 Jan 2013 18:04:59 +0000 (+0000)
Subject: fix bean naming
X-Git-Tag: archiva-1.4-M4~324
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=36563f58bd058adfb8ca7b1be96ac13207ad70dc;p=archiva.git

fix bean naming

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

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
index 3de481f09..2332b0b57 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
@@ -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 )
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"/>
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
index 14284cb23..db451617c 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
@@ -52,7 +52,7 @@ public class ArchivaLockedAdminEnvironmentCheck
 
 
     @Inject
-    @Named( value = "rBACManager#cached" )
+    @Named( value = "rbacManager#cached" )
     private RBACManager rbacManager;
 
     /**
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
index a4b27de15..aff9ac325 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
@@ -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;