Author: olamy
Date: Wed Jan 2 18:04:59 2013
New Revision: 1427883
URL: http://svn.apache.org/viewvc?rev=1427883&view=rev
Log:
fix bean naming
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java?rev=1427883&r1=1427882&r2=1427883&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
Wed Jan 2 18:04:59 2013
@@ -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 )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java?rev=1427883&r1=1427882&r2=1427883&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/ArchivaStandardRolesCheck.java
Wed Jan 2 18:04:59 2013
@@ -45,7 +45,7 @@ public class ArchivaStandardRolesCheck
/**
*
*/
- @Inject @Named(value = "rBACManager#cached")
+ @Inject @Named(value = "rbacManager#cached")
private RBACManager rbacManager;
/**
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java?rev=1427883&r1=1427882&r2=1427883&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/archiva/security/AbstractSecurityTest.java
Wed Jan 2 18:04:59 2013
@@ -68,7 +68,7 @@ public abstract class AbstractSecurityTe
protected SecuritySystem securitySystem;
@Inject
- @Named(value = "rBACManager#memory")
+ @Named(value = "rbacManager#memory")
protected RBACManager rbacManager;
@Inject
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml?rev=1427883&r1=1427882&r2=1427883&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
Wed Jan 2 18:04:59 2013
@@ -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"/>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java?rev=1427883&r1=1427882&r2=1427883&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
Wed Jan 2 18:04:59 2013
@@ -52,7 +52,7 @@ public class ArchivaLockedAdminEnvironme
@Inject
- @Named( value = "rBACManager#cached" )
+ @Named( value = "rbacManager#cached" )
private RBACManager rbacManager;
/**
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java?rev=1427883&r1=1427882&r2=1427883&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
Wed Jan 2 18:04:59 2013
@@ -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;
