Author: olamy
Date: Wed Jan 2 18:05:45 2013
New Revision: 1427884
URL: http://svn.apache.org/viewvc?rev=1427884&view=rev
Log:
fix bean naming
Modified:
archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/pom.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/resources/META-INF/spring-context.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/RoleManagerTest.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
Modified:
archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
Wed Jan 2 18:05:45 2013
@@ -81,7 +81,7 @@ public class DataManagementTest
@Inject
- @Named(value = "rBACManager#jdo")
+ @Named(value = "rbacManager#jdo")
RBACManager rbacManager;
@Before
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
Wed Jan 2 18:05:45 2013
@@ -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 )
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
Wed Jan 2 18:05:45 2013
@@ -55,7 +55,7 @@ public class LockedAdminEnvironmentCheck
private UserManager userManager;
@Inject
- @Named( value = "rBACManager#cached" )
+ @Named( value = "rbacManager#cached" )
private RBACManager rbacManager;
/**
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
Wed Jan 2 18:05:45 2013
@@ -78,7 +78,7 @@ public class DefaultRoleManagementServic
@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;
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
Wed Jan 2 18:05:45 2013
@@ -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;
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java
Wed Jan 2 18:05:45 2013
@@ -36,7 +36,7 @@ public class FakeCreateAdminServiceImpl
implements FakeCreateAdminService
{
@Inject
- @Named( value = "rBACManager#jdo" )
+ @Named( value = "rbacManager#jdo" )
private RBACManager rbacManager;
@Inject
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
Wed Jan 2 18:05:45 2013
@@ -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
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/pom.xml?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/pom.xml
Wed Jan 2 18:05:45 2013
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/java/org/apache/archiva/redback/rbac/cached/CachedRbacManager.java
Wed Jan 2 18:05:45 2013
@@ -46,7 +46,7 @@ import java.util.Set;
*
* @author <a href="mailto:[email protected]";>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
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerPerformanceTest.java
Wed Jan 2 18:05:45 2013
@@ -39,7 +39,7 @@ public class CachedRbacManagerPerformanc
@Inject
- @Named( value = "rBACManager#cached" )
+ @Named( value = "rbacManager#cached" )
RBACManager rbacManager;
/**
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/java/org/apache/archiva/redback/rbac/cached/CachedRbacManagerTest.java
Wed Jan 2 18:05:45 2013
@@ -36,7 +36,7 @@ public class CachedRbacManagerTest
{
@Inject
- @Named( value = "rBACManager#cached" )
+ @Named( value = "rbacManager#cached" )
RBACManager rbacManager;
/*
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
Wed Jan 2 18:05:45 2013
@@ -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"/>
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManager.java
Wed Jan 2 18:05:45 2013
@@ -48,7 +48,7 @@ import java.util.List;
* @author Jesse McConnell <[email protected]>
*
*/
-@Service( "rBACManager#jdo" )
+@Service( "rbacManager#jdo" )
public class JdoRbacManager
extends AbstractRBACManager
implements RBACManagerListener
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/resources/META-INF/spring-context.xml?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/main/resources/META-INF/spring-context.xml
Wed Jan 2 18:05:45 2013
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-jdo/src/test/java/org/apache/archiva/redback/rbac/jdo/JdoRbacManagerTest.java
Wed Jan 2 18:05:45 2013
@@ -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;
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/main/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManager.java
Wed Jan 2 18:05:45 2013
@@ -50,7 +50,7 @@ import java.util.Map;
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
*
*/
-@Service( "rBACManager#memory" )
+@Service( "rbacManager#memory" )
public class MemoryRbacManager
extends AbstractRBACManager
implements RBACManager
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-providers/redback-rbac-memory/src/test/java/org/apache/archiva/redback/rbac/memory/MemoryRbacManagerTest.java
Wed Jan 2 18:05:45 2013
@@ -39,7 +39,7 @@ public class MemoryRbacManagerTest
{
@Inject
- @Named (value = "rBACManager#memory")
+ @Named (value = "rbacManager#memory")
RBACManager rbacManager;
public static int EVENTCOUNT = 2;
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
Wed Jan 2 18:05:45 2013
@@ -93,7 +93,7 @@ public class DefaultRoleManager
private RoleTemplateProcessor templateProcessor;
@Inject
- @Named(value = "rBACManager#cached")
+ @Named(value = "rbacManager#cached")
private RBACManager rbacManager;
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java
Wed Jan 2 18:05:45 2013
@@ -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>();
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
Wed Jan 2 18:05:45 2013
@@ -58,7 +58,7 @@ public class DefaultRoleTemplateProcesso
private Logger log = LoggerFactory.getLogger(
DefaultRoleTemplateProcessor.class );
@Inject
- @Named( value = "rBACManager#cached" )
+ @Named( value = "rbacManager#cached" )
private RBACManager rbacManager;
@SuppressWarnings( "unchecked" )
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/JpoxRoleManagerTest.java
Wed Jan 2 18:05:45 2013
@@ -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")
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/RoleManagerTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/RoleManagerTest.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/RoleManagerTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/RoleManagerTest.java
Wed Jan 2 18:05:45 2013
@@ -35,7 +35,7 @@ public class RoleManagerTest
extends AbstractRoleManagerTest
{
- @Inject @Named(value = "rBACManager#memory")
+ @Inject @Named(value = "rbacManager#memory")
RBACManager rbacManagerMemory;
@Inject
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/processor/RoleModelProcessorTest.java
Wed Jan 2 18:05:45 2013
@@ -51,7 +51,7 @@ public class RoleModelProcessorTest
extends TestCase
{
@Inject
- @Named( value = "rBACManager#memory" )
+ @Named( value = "rbacManager#memory" )
private RBACManager rbacManager;
@Inject
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/java/org/apache/archiva/redback/role/template/RoleTemplateProcessorTest.java
Wed Jan 2 18:05:45 2013
@@ -50,7 +50,7 @@ public class RoleTemplateProcessorTest
{
@Inject
- @Named( value = "rBACManager#memory" )
+ @Named( value = "rbacManager#memory" )
private RBACManager rbacManager;
@Inject @Named(value = "modelProcessor#memory")
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/jpox-spring-context.xml
Wed Jan 2 18:05:45 2013
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml?rev=1427884&r1=1427883&r2=1427884&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-rbac/redback-rbac-role-manager/src/test/resources/spring-context.xml
Wed Jan 2 18:05:45 2013
@@ -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>
<!--
