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 3de481f099f29f7fde396cbe5494b1ecc7843349..2332b0b577d885e4cf325d465ce63d3865ef396a 100644 (file)
--- 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 7e9760dff34f31e89cc20865774badc1bac7617a..1dfd4cdb5dcd61f801f83f195e89acc4d774c2af 100644 (file)
--- 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 fb9a5078d47bf0875cc1bdb0d769990a87c390d8..97d8eb72196e09a4e2f75bfabfc30fbae899fa7a 100644 (file)
--- 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 07aed3fc56132eff883f04bcf7cfee8e1db76b36..488cf5d086e7cb07cd3436ae3ef1242e44e53dd8 100644 (file)
--- 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 14284cb2384b2047623a801a061d43dd8ecd6f45..db451617c667a523c2ba0f7042549ceeceda30f6 100644 (file)
--- 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 a4b27de15f51e270aef08da35a608561b55d8c3a..aff9ac32568eb7614f780f454f687078b9c8e1ae 100644 (file)
--- 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;