fix bean naming

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

diff --git a/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
index cf29e6c6bc2fbf376ae50d2057722bee7a85f02d..461337a574dd9b153284fcabf4206b6b8262bf7f 100644 (file)
--- a/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
+++ b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
@@ -81,7 +81,7 @@ public class DataManagementTest
 
 
     @Inject
-    @Named(value = "rBACManager#jdo")
+    @Named(value = "rbacManager#jdo")
     RBACManager rbacManager;
 
     @Before

diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
index ebd4b6ab0e1f16276f6dd39a2290073be3e3854c..282890425bf48f5416fc1d1575d33c7eda9b7f6f 100644 (file)
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
@@ -80,7 +80,7 @@ public class AdminAutoCreateCheck
     private RoleManager roleManager;
 
     @Inject
-    @Named(value = "rBACManager#cached")
+    @Named(value = "rbacManager#cached")
     private RBACManager rbacManager;
 
     public void validateEnvironment( List<String> violations )

diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
index 27b148a9839f346ad508fc27e2d4e3097429b383..5fb819b7a281e4f163d937ca1b629a141002d6bd 100644 (file)
--- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
+++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
@@ -55,7 +55,7 @@ public class LockedAdminEnvironmentCheck
     private UserManager userManager;
 
     @Inject
-    @Named( value = "rBACManager#cached" )
+    @Named( value = "rbacManager#cached" )
     private RBACManager rbacManager;
 
     /**

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
index 643d21989f8a31af10824d7375c4b9ec8252c488..4a95c65e84be241ce26cd43cb19b27a49643be91 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
@@ -78,7 +78,7 @@ public class DefaultRoleManagementService
 
     @Inject
     public DefaultRoleManagementService( RoleManager roleManager,
-                                         @Named(value = "rBACManager#cached") RBACManager rbacManager,
+                                         @Named(value = "rbacManager#cached") RBACManager rbacManager,
                                          @Named(value = "userManager#cached") UserManager userManager )
     {
         this.roleManager = roleManager;

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
index 35d1078e409d90fa25f6e9102b578428219d2ef6..9093839126bae2dac9443b604330f01425fd7eb4 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
@@ -120,7 +120,7 @@ public class DefaultUserService
     private Mailer mailer;
 
     @Inject
-    @Named( value = "rBACManager#cached" )
+    @Named( value = "rbacManager#cached" )
     private RBACManager rbacManager;
 
     private HttpAuthenticator httpAuthenticator;

diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
index d37c83baeced9a9252f56a9a0bdaf12fd320762b..a9c0596a61bd90f0fff1825d3ad58059f2ad718f 100644 (file)
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
@@ -36,7 +36,7 @@ public class FakeCreateAdminServiceImpl
     implements FakeCreateAdminService
 {
     @Inject
-    @Named( value = "rBACManager#jdo" )
+    @Named( value = "rbacManager#jdo" )
     private RBACManager rbacManager;
 
     @Inject

diff --git a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
index eefca1a8da5de397178a83380ba52b115008e696..6b1f8042d96bf714a6a69e1b2ef1d0cdd096a3ff 100644 (file)
--- a/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
+++ b/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
@@ -55,7 +55,7 @@ public class RbacAuthorizer
     private Logger log = LoggerFactory.getLogger( getClass() );
 
     @Inject
-    @Named(value = "rBACManager#cached")
+    @Named(value = "rbacManager#cached")
     private RBACManager manager;
 
     @Inject

diff --git a/redback-rbac/redback-rbac-providers/pom.xml b/redback-rbac/redback-rbac-providers/pom.xml
index 897b535e9d9efbc892bb6629064d7ce46e7cedba..cd42db3cbf54cc227eaef1e19c942049db847833 100644 (file)
--- a/redback-rbac/redback-rbac-providers/pom.xml
+++ b/redback-rbac/redback-rbac-providers/pom.xml
@@ -31,5 +31,6 @@
     <module>redback-rbac-jdo</module>
     <module>redback-rbac-memory</module>
     <module>redback-rbac-cached</module>
+    <!--module>redback-rbac-ldap</module-->
   </modules>
 </project>

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
index e01e390ab0d5c559a803b2210939c578e04017de..6da6a4773a386d3c4e931c0da8bbbb80f901d1ea 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
@@ -46,7 +46,7 @@ import java.util.Set;
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  */
-@Service( "rBACManager#cached" )
+@Service( "rbacManager#cached" )
 public class CachedRbacManager
     implements RBACManager, RBACManagerListener
 {
@@ -54,7 +54,7 @@ public class CachedRbacManager
     private Logger log = LoggerFactory.getLogger( getClass() );
 
     @Inject
-    @Named( value = "rBACManager#jdo" )
+    @Named( value = "rbacManager#jdo" )
     private RBACManager rbacImpl;
 
     @Inject

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
index 0b03c7841a513dff6e8d6b71e8fec130c39973aa..d120d89ebf2de5db4f17f33057dcc4fc8302391a 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
@@ -39,7 +39,7 @@ public class CachedRbacManagerPerformanceTest
 
 
     @Inject
-    @Named( value = "rBACManager#cached" )
+    @Named( value = "rbacManager#cached" )
     RBACManager rbacManager;
 
     /**

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
index dda23f40b2d08196d6bb7134a1967e8cf7d64afa..e00e62ed355313419cc99be27fefbaab928739f7 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
@@ -36,7 +36,7 @@ public class CachedRbacManagerTest
 {
 
     @Inject
-    @Named( value = "rBACManager#cached" )
+    @Named( value = "rbacManager#cached" )
     RBACManager rbacManager;
 
     /*

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
index a64641847a886cb9167c1c3e12a50de61c7f79e0..83f1084cc6f84dabfc4383af93448644ed2d9d85 100755 (executable)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
@@ -47,8 +47,8 @@
 
   <alias name="commons-configuration" alias="test-conf"/>
 
-  <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"/>
     <property name="effectiveRoleSetCache" ref="cache#effectiveRoleSet"/>
     <property name="operationsCache" ref="cache#operations"/>
     <property name="permissionsCache" ref="cache#permissions"/>

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
index 090b0a4e6d9ce48dcfafa30958af9e1efd40db51..9451880f5842de82e95a1d32c8f6145c21c147aa 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
@@ -48,7 +48,7 @@ import java.util.List;
  * @author Jesse McConnell <jmcconnell@apache.org>
  *
  */
-@Service( "rBACManager#jdo" )
+@Service( "rbacManager#jdo" )
 public class JdoRbacManager
     extends AbstractRBACManager
     implements RBACManagerListener

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/resources/META-INF/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/resources/META-INF/spring-context.xml
index 965dd501d892ed0fe6375093618c99d64e185775..2a3dec13a7a4f4f45be9100bb83c15b7b14c7996 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/resources/META-INF/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/resources/META-INF/spring-context.xml
@@ -24,7 +24,7 @@
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
        default-lazy-init="true">
 
-  <bean name="rBACManager#jdo" class="org.apache.archiva.redback.rbac.jdo.JdoRbacManager" init-method="initialize">
+  <bean name="rbacManager#jdo" class="org.apache.archiva.redback.rbac.jdo.JdoRbacManager" init-method="initialize">
     <property name="jdo" ref="jdoTool"/>
   </bean>
 

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
index 60b2f96cb91f55a25eda9976fe2f61fada9ffe33..25ddd2c99a53c0e020ca9312a47891dfaaeb6e7b 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
@@ -57,7 +57,7 @@ public class JdoRbacManagerTest
     DefaultConfigurableJdoFactory jdoFactory;
 
     @Inject
-    @Named( value = "rBACManager#jdo" )
+    @Named( value = "rbacManager#jdo" )
     RBACManager rbacManager;
 
     public static int EVENTCOUNT = 2;

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
index d0276e3e45a2b4272032e2e75c0a75c112b38939..dbed4d020a5ff456f08c6280bfb207f9de103b31 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
@@ -50,7 +50,7 @@ import java.util.Map;
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  *
  */
-@Service( "rBACManager#memory" )
+@Service( "rbacManager#memory" )
 public class MemoryRbacManager
     extends AbstractRBACManager
     implements RBACManager

diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java
index 8d152005da116c9f24ca9f32fed91d67ab0a2a19..de1515d6acc6418c5e46270a399fe2327a0737d7 100644 (file)
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java
@@ -39,7 +39,7 @@ public class MemoryRbacManagerTest
 {
 
     @Inject
-    @Named (value = "rBACManager#memory")
+    @Named (value = "rbacManager#memory")
     RBACManager rbacManager;
 
     public static int EVENTCOUNT = 2;

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
index edac507050c398fd51e67a5349df212f2a4dd3a2..fb3a91f5a7eafc2b78d284a26a9e0219c9d521e9 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
@@ -93,7 +93,7 @@ public class DefaultRoleManager
     private RoleTemplateProcessor templateProcessor;
 
     @Inject
-    @Named(value = "rBACManager#cached")
+    @Named(value = "rbacManager#cached")
     private RBACManager rbacManager;
 
 

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
index 02496906fa2a47a757f8968a8639d77e4006ecf3..ce70df48affb64f7bfcfa4b25248c62cd85e1b43 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
@@ -58,7 +58,7 @@ public class DefaultRoleModelProcessor
     private Logger log = LoggerFactory.getLogger( DefaultRoleModelProcessor.class );
 
     @Inject
-    @Named( value = "rBACManager#cached" )
+    @Named( value = "rbacManager#cached" )
     private RBACManager rbacManager;
 
     private Map<String, Resource> resourceMap = new HashMap<String, Resource>();

diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
index d336d6c2556c36ef788bc7e12cdfce73798af656..94dfbbb0aa47a28fbba3ee65f55d9235bb714cd8 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
@@ -58,7 +58,7 @@ public class DefaultRoleTemplateProcessor
     private Logger log = LoggerFactory.getLogger( DefaultRoleTemplateProcessor.class );
 
     @Inject
-    @Named( value = "rBACManager#cached" )
+    @Named( value = "rbacManager#cached" )
     private RBACManager rbacManager;
 
     @SuppressWarnings( "unchecked" )

diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java
index 8af39e54370888f2935e9d100e1cb8a6f70befb2..ef4028ac5c50b9ad4b60b3f77c2af129b1e0a769 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java
+++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java
@@ -46,7 +46,7 @@ public class JpoxRoleManagerTest
     DefaultConfigurableJdoFactory jdoFactory;
 
     @Inject
-    @Named( value = "rBACManager#jdo" )
+    @Named( value = "rbacManager#jdo" )
     JdoRbacManager rbacManagerJdo;
 
     @Inject @Named(value = "roleManager#jpox")

diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/RoleManagerTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/RoleManagerTest.java
index 47db0dcf95c5ba1a60e103806ffb19f1795f21c8..7ed8cf46689f84cc13bc31b95f83f926f13f82dd 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/RoleManagerTest.java
+++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/RoleManagerTest.java
@@ -35,7 +35,7 @@ public class RoleManagerTest
     extends AbstractRoleManagerTest
 {
 
-    @Inject @Named(value = "rBACManager#memory")
+    @Inject @Named(value = "rbacManager#memory")
     RBACManager rbacManagerMemory;
 
     @Inject

diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java
index 112707d6694273e23f272e6af62b6a5513e383d9..b9bc365adac4acb830f6a5bd658e4e43dfb15a73 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java
+++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java
@@ -51,7 +51,7 @@ public class RoleModelProcessorTest
     extends TestCase
 {
     @Inject
-    @Named( value = "rBACManager#memory" )
+    @Named( value = "rbacManager#memory" )
     private RBACManager rbacManager;
 
     @Inject

diff --git a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java
index 6428e087e007dfbc6e4dd6c2e66d187f655a9b35..28bfc07f26b59f061ac06e489c763c96de0e15e4 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java
+++ b/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java
@@ -50,7 +50,7 @@ public class RoleTemplateProcessorTest
 {
 
     @Inject
-    @Named( value = "rBACManager#memory" )
+    @Named( value = "rbacManager#memory" )
     private RBACManager rbacManager;
 
     @Inject @Named(value = "modelProcessor#memory")

diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
index b69cc120784adf4b800b470ee96840b02f313e05..c674a02d89d750e521f8c9db1577d284ca0372ae 100644 (file)
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
+++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
@@ -26,13 +26,13 @@
 
 
   <bean name="roleModelProcessor" class="org.apache.archiva.redback.role.processor.DefaultRoleModelProcessor">
-    <property name="rbacManager" ref="rBACManager#jdo"/>
+    <property name="rbacManager" ref="rbacManager#jdo"/>
   </bean>
 
   <alias name="roleModelProcessor" alias="roleModelProcessor#jpox"/>
 
   <bean name="roleTemplateProcessor" class="org.apache.archiva.redback.role.template.DefaultRoleTemplateProcessor">
-    <property name="rbacManager" ref="rBACManager#jdo"/>
+    <property name="rbacManager" ref="rbacManager#jdo"/>
   </bean>
 
   <alias name="roleTemplateProcessor" alias="roleTemplateProcessor#jpox"/>
@@ -41,12 +41,12 @@
     <property name="modelValidator" ref="roleModelValidator"/>
     <property name="modelProcessor" ref="roleModelProcessor#jpox"/>
     <property name="templateProcessor" ref="roleTemplateProcessor#jpox"/>
-    <property name="rbacManager" ref="rBACManager#jdo"/>
+    <property name="rbacManager" ref="rbacManager#jdo"/>
   </bean>
   <alias name="roleManager" alias="roleManager#jpox"/>
 
 
-  <bean name="rBACManager#jdo" class="org.apache.archiva.redback.rbac.jdo.JdoRbacManager">
+  <bean name="rbacManager#jdo" class="org.apache.archiva.redback.rbac.jdo.JdoRbacManager">
     <property name="jdo" ref="jdoTool"/>
     <property name="enableCache" value="false"/>
   </bean>

diff --git a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
index 9f59f4e9c2bd81669755d05b12735a1e6646f02e..53d53435f88cb20568aab112a42eacce4674ac88 100755 (executable)
--- a/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
@@ -52,19 +52,19 @@
     <property name="modelValidator" ref="roleModelValidator"/>
     <property name="modelProcessor" ref="modelProcessor#memory"/>
     <property name="templateProcessor" ref="templateProcessor#memory"/>
-    <property name="rbacManager" ref="rBACManager#memory"/>
+    <property name="rbacManager" ref="rbacManager#memory"/>
   </bean>
 
 
 
   <bean name="modelProcessor#memory" class="org.apache.archiva.redback.role.processor.DefaultRoleModelProcessor">
-    <property name="rbacManager" ref="rBACManager#memory"/>
+    <property name="rbacManager" ref="rbacManager#memory"/>
   </bean>
 
 
 
   <bean name="templateProcessor#memory" class="org.apache.archiva.redback.role.template.DefaultRoleTemplateProcessor">
-    <property name="rbacManager" ref="rBACManager#memory"/>
+    <property name="rbacManager" ref="rbacManager#memory"/>
   </bean>
 
   <!--