From 75b4882d44de964d01bfc9c6be7408b283ae6650 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 4 Mar 2013 23:14:35 +0000 Subject: [PATCH] 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 --- .../redback/authentication/DefaultAuthenticationManager.java | 2 +- .../redback/authentication/users/UserManagerAuthenticator.java | 2 +- .../src/test/resources/spring-context.xml | 2 ++ .../archiva/redback/authorization/rbac/RbacAuthorizer.java | 2 +- .../rbac/evaluator/DefaultPermissionEvaluator.java | 2 +- .../src/test/resources/spring-context.xml | 2 ++ .../integration/checks/security/AdminAutoCreateCheck.java | 2 +- .../checks/security/LockedAdminEnvironmentCheck.java | 2 +- .../filter/authentication/digest/HttpDigestAuthentication.java | 2 +- .../redback/rest/services/DefaultRoleManagementService.java | 2 +- .../archiva/redback/rest/services/DefaultUserService.java | 2 +- .../rest/services/interceptors/AuthenticationInterceptor.java | 2 +- .../redback-rest-services/src/test/resources/spring-context.xml | 2 ++ .../redback/authentication/keystore/KeyStoreAuthenticator.java | 2 +- .../apache/archiva/redback/system/DefaultSecuritySystem.java | 2 +- redback-system/src/test/resources/spring-context.xml | 2 ++ .../apache/archiva/redback/users/cached/CachedUserManager.java | 2 +- .../redback-users-cached/src/test/resources/spring-context.xml | 2 ++ 18 files changed, 23 insertions(+), 13 deletions(-) diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java index d39587c4..63e4f0ec 100644 --- a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java +++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java @@ -61,7 +61,7 @@ public class DefaultAuthenticationManager private ApplicationContext applicationContext; @Inject - @Named( value = "userManager#configurable" ) + @Named( value = "userManager#default" ) private UserManager userManager; @SuppressWarnings( "unchecked" ) diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java index c679c12a..802d1a1b 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java +++ b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java @@ -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 diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml index 33625b86..0638e2ac 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml +++ b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml @@ -33,4 +33,6 @@ + + \ No newline at end of file diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java index 63284b1c..e385d315 100644 --- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java +++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java @@ -59,7 +59,7 @@ public class RbacAuthorizer private RBACManager manager; @Inject - @Named(value = "userManager#configurable") + @Named(value = "userManager#default") private UserManager userManager; @Inject diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java index c3d033d8..681ae426 100644 --- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java +++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java @@ -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 ) diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml index 926b77aa..ce2a5e10 100644 --- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml +++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml @@ -44,4 +44,6 @@ + + \ No newline at end of file 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 727ad612..8ab0e813 100644 --- 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 @@ -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 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 8cca2b74..c1cb6613 100644 --- 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 @@ -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 diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java index 0cd7a64e..7a1bc18f 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java @@ -51,7 +51,7 @@ public class HttpDigestAuthentication extends HttpAuthenticator { @Inject - @Named(value = "userManager#configurable") + @Named(value = "userManager#default") private UserManager userManager; /** 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 22d2b5ea..b5d6511f 100644 --- 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 @@ -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; 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 af03218a..1cdf252d 100644 --- 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 @@ -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 ) { diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java index 5ab5a545..b8390456 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java @@ -61,7 +61,7 @@ public class AuthenticationInterceptor implements RequestHandler { @Inject - @Named(value = "userManager#configurable") + @Named(value = "userManager#default") private UserManager userManager; @Inject diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml index d7e54fd7..1aae21af 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml @@ -44,4 +44,6 @@ + + \ No newline at end of file diff --git a/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java b/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java index 8c13fe4d..84ed964d 100644 --- a/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java +++ b/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java @@ -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() diff --git a/redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySystem.java b/redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySystem.java index a4b61574..f5fc35c8 100644 --- a/redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySystem.java +++ b/redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySystem.java @@ -61,7 +61,7 @@ public class DefaultSecuritySystem private Authorizer authorizer; @Inject - @Named(value = "userManager#configurable") + @Named(value = "userManager#default") private UserManager userManager; @Inject diff --git a/redback-system/src/test/resources/spring-context.xml b/redback-system/src/test/resources/spring-context.xml index 9857d4f2..3cb2eefc 100644 --- a/redback-system/src/test/resources/spring-context.xml +++ b/redback-system/src/test/resources/spring-context.xml @@ -47,4 +47,6 @@ + + \ No newline at end of file diff --git a/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java b/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java index 8e09fad7..b63092dc 100644 --- a/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java +++ b/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java @@ -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 diff --git a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml index 916edcb3..5ad17aec 100644 --- a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml +++ b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml @@ -44,4 +44,6 @@ + + \ No newline at end of file