Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use a more traditionnal naming convention with #default 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1452590 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-03-04 23:14:35 +00:00
parent a8f651e8a6
commit 75b4882d44
18 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java
View File

@ -61,7 +61,7 @@ public class DefaultAuthenticationManager
private ApplicationContext applicationContext;
@Inject
@Named( value = "userManager#configurable" )
@Named( value = "userManager#default" )
private UserManager userManager;
@SuppressWarnings( "unchecked" )

2
redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
View File

@ -58,7 +58,7 @@ public class UserManagerAuthenticator
private Logger log = LoggerFactory.getLogger( getClass() );
@Inject
@Named(value = "userManager#configurable")
@Named(value = "userManager#default")
private UserManager userManager;
@Inject

2
redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml
View File

@ -33,4 +33,6 @@
<alias name="userConfiguration#redback" alias="userConfiguration#default"/>
<alias name="userManager#configurable" alias="userManager#default"/>
</beans>

2
redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
View File

@ -59,7 +59,7 @@ public class RbacAuthorizer
private RBACManager manager;
@Inject
@Named(value = "userManager#configurable")
@Named(value = "userManager#default")
private UserManager userManager;
@Inject

2
redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
View File

@ -42,7 +42,7 @@ public class DefaultPermissionEvaluator
implements PermissionEvaluator
{
@Inject
@Named(value = "userManager#configurable")
@Named(value = "userManager#default")
private UserManager userManager;
public boolean evaluate( Permission permission, String operation, String resource, String principal )

2
redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
View File

@ -44,4 +44,6 @@
<alias name="userConfiguration#redback" alias="userConfiguration#default"/>
<alias name="userManager#configurable" alias="userManager#default"/>
</beans>

2
redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/AdminAutoCreateCheck.java
View File

@ -66,7 +66,7 @@ public class AdminAutoCreateCheck
public static final String ADMIN_PASSWORD_KEY = "redback.admin.password";
@Inject
@Named(value = "userManager#configurable")
@Named(value = "userManager#default")
private UserManager userManager;
@Inject

2
redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
View File

@ -51,7 +51,7 @@ public class LockedAdminEnvironmentCheck
protected Logger log = LoggerFactory.getLogger( getClass() );
@Inject
@Named( value = "userManager#configurable" )
@Named( value = "userManager#default" )
private UserManager userManager;
@Inject

2
redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
View File

@ -51,7 +51,7 @@ public class HttpDigestAuthentication
extends HttpAuthenticator
{
@Inject
@Named(value = "userManager#configurable")
@Named(value = "userManager#default")
private UserManager userManager;
/**

2
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
View File

@ -79,7 +79,7 @@ public class DefaultRoleManagementService
@Inject
public DefaultRoleManagementService( RoleManager roleManager,
@Named(value = "rbacManager#default") RBACManager rbacManager,
@Named(value = "userManager#configurable") UserManager userManager )
@Named(value = "userManager#default") UserManager userManager )
{
this.roleManager = roleManager;
this.rbacManager = rbacManager;

2
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
View File

@ -132,7 +132,7 @@ public class DefaultUserService
private HttpServletRequest httpServletRequest;
@Inject
public DefaultUserService( @Named( value = "userManager#configurable" ) UserManager userManager,
public DefaultUserService( @Named( value = "userManager#default" ) UserManager userManager,
SecuritySystem securitySystem,
@Named( "httpAuthenticator#basic" ) HttpAuthenticator httpAuthenticator )
{

2
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java
View File

@ -61,7 +61,7 @@ public class AuthenticationInterceptor
implements RequestHandler
{
@Inject
@Named(value = "userManager#configurable")
@Named(value = "userManager#default")
private UserManager userManager;
@Inject

2
redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
View File

@ -44,4 +44,6 @@
<alias name="authorizer#rbac" alias="authorizer#default"/>
<alias name="userManager#configurable" alias="userManager#default"/>
</beans>

2
redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java
View File

@ -56,7 +56,7 @@ public class KeyStoreAuthenticator
@Resource(name = "keyManager#cached")
private KeyManager keystore;
@Resource(name = "userManager#configurable")
@Resource(name = "userManager#default")
private UserManager userManager;
public String getId()

2
redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySystem.java
View File

@ -61,7 +61,7 @@ public class DefaultSecuritySystem
private Authorizer authorizer;
@Inject
@Named(value = "userManager#configurable")
@Named(value = "userManager#default")
private UserManager userManager;
@Inject

2
redback-system/src/test/resources/spring-context.xml
View File

@ -47,4 +47,6 @@
<bean name="userManager#configurable" class="org.apache.archiva.redback.system.MockUserManager"/>
<alias name="userManager#configurable" alias="userManager#default"/>
</beans>

2
redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
View File

@ -47,7 +47,7 @@ public class CachedUserManager
private Logger log = LoggerFactory.getLogger( getClass() );
@Inject
@Named(value = "userManager#configurable")
@Named(value = "userManager#default")
private UserManager userImpl;
@Inject

2
redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
View File

@ -44,4 +44,6 @@
<alias name="userConfiguration#redback" alias="userConfiguration#default"/>
<alias name="userManager#configurable" alias="userManager#default"/>
</beans>