Author: olamy
Date: Mon Mar 4 23:14:35 2013
New Revision: 1452590
URL: http://svn.apache.org/r1452590
Log:
use a more traditionnal naming convention with #default
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
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-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.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/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java
archiva/redback/redback-core/trunk/redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySystem.java
archiva/redback/redback-core/trunk/redback-system/src/test/resources/spring-context.xml
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java
Mon Mar 4 23:14:35 2013
@@ -61,7 +61,7 @@ public class DefaultAuthenticationManage
private ApplicationContext applicationContext;
@Inject
- @Named( value = "userManager#configurable" )
+ @Named( value = "userManager#default" )
private UserManager userManager;
@SuppressWarnings( "unchecked" )
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
(original)
+++
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
Mon Mar 4 23:14:35 2013
@@ -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
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-users/src/test/resources/spring-context.xml
Mon Mar 4 23:14:35 2013
@@ -33,4 +33,6 @@
<alias name="userConfiguration#redback" alias="userConfiguration#default"/>
+ <alias name="userManager#configurable" alias="userManager#default"/>
+
</beans>
\ No newline at end of file
Modified:
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/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-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
(original)
+++
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
Mon Mar 4 23:14:35 2013
@@ -59,7 +59,7 @@ public class RbacAuthorizer
private RBACManager manager;
@Inject
- @Named(value = "userManager#configurable")
+ @Named(value = "userManager#default")
private UserManager userManager;
@Inject
Modified:
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
(original)
+++
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/evaluator/DefaultPermissionEvaluator.java
Mon Mar 4 23:14:35 2013
@@ -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 )
Modified:
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
Mon Mar 4 23:14:35 2013
@@ -44,4 +44,6 @@
<alias name="userConfiguration#redback" alias="userConfiguration#default"/>
+
+ <alias name="userManager#configurable" alias="userManager#default"/>
</beans>
\ No newline at end of file
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=1452590&r1=1452589&r2=1452590&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
Mon Mar 4 23:14:35 2013
@@ -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
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=1452590&r1=1452589&r2=1452590&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
Mon Mar 4 23:14:35 2013
@@ -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
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.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/filter/authentication/digest/HttpDigestAuthentication.java?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
Mon Mar 4 23:14:35 2013
@@ -51,7 +51,7 @@ public class HttpDigestAuthentication
extends HttpAuthenticator
{
@Inject
- @Named(value = "userManager#configurable")
+ @Named(value = "userManager#default")
private UserManager userManager;
/**
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=1452590&r1=1452589&r2=1452590&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
Mon Mar 4 23:14:35 2013
@@ -79,7 +79,7 @@ public class DefaultRoleManagementServic
@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;
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=1452590&r1=1452589&r2=1452590&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
Mon Mar 4 23:14:35 2013
@@ -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 )
{
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.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/interceptors/AuthenticationInterceptor.java?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AuthenticationInterceptor.java
Mon Mar 4 23:14:35 2013
@@ -61,7 +61,7 @@ public class AuthenticationInterceptor
implements RequestHandler
{
@Inject
- @Named(value = "userManager#configurable")
+ @Named(value = "userManager#default")
private UserManager userManager;
@Inject
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
Mon Mar 4 23:14:35 2013
@@ -44,4 +44,6 @@
<alias name="authorizer#rbac" alias="authorizer#default"/>
+ <alias name="userManager#configurable" alias="userManager#default"/>
+
</beans>
\ No newline at end of file
Modified:
archiva/redback/redback-core/trunk/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java
(original)
+++
archiva/redback/redback-core/trunk/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java
Mon Mar 4 23:14:35 2013
@@ -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()
Modified:
archiva/redback/redback-core/trunk/redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySystem.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySystem.java?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySystem.java
(original)
+++
archiva/redback/redback-core/trunk/redback-system/src/main/java/org/apache/archiva/redback/system/DefaultSecuritySystem.java
Mon Mar 4 23:14:35 2013
@@ -61,7 +61,7 @@ public class DefaultSecuritySystem
private Authorizer authorizer;
@Inject
- @Named(value = "userManager#configurable")
+ @Named(value = "userManager#default")
private UserManager userManager;
@Inject
Modified:
archiva/redback/redback-core/trunk/redback-system/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-system/src/test/resources/spring-context.xml?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-system/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-system/src/test/resources/spring-context.xml
Mon Mar 4 23:14:35 2013
@@ -47,4 +47,6 @@
<bean name="userManager#configurable"
class="org.apache.archiva.redback.system.MockUserManager"/>
+ <alias name="userManager#configurable" alias="userManager#default"/>
+
</beans>
\ No newline at end of file
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
Mon Mar 4 23:14:35 2013
@@ -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
Modified:
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml?rev=1452590&r1=1452589&r2=1452590&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
Mon Mar 4 23:14:35 2013
@@ -44,4 +44,6 @@
<alias name="userConfiguration#redback" alias="userConfiguration#default"/>
+ <alias name="userManager#configurable" alias="userManager#default"/>
+
</beans>
\ No newline at end of file
