diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-12-06 09:09:45 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-12-06 09:09:45 +0000 |
| commit | 2907ffa1019d1130786e564cc5569842b0a5ae26 (patch) | |
| tree | 22e2ba6914f6170487397af2224c1e2895b791d8 /redback-authentication | |
| parent | 2f75fce0e4b290b21d88c5745424808f4190c5c8 (diff) | |
| download | archiva-2907ffa1019d1130786e564cc5569842b0a5ae26.tar.gz archiva-2907ffa1019d1130786e564cc5569842b0a5ae26.zip | |
use a more classic name for this bean userConfiguration#default
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1417782 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'redback-authentication')
2 files changed, 4 insertions, 4 deletions
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java index bc5c75710..a4b51fee8 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java @@ -68,7 +68,7 @@ public class LdapBindAuthenticator private LdapConnectionFactory connectionFactory; @Inject - @Named( value = "userConfiguration" ) + @Named( value = "userConfiguration#default" ) private UserConfiguration config; @Inject diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml index ba7d70010..dce487256 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/resources/META-INF/spring-context.xml @@ -43,7 +43,7 @@ <property name="contextFactory" value="com.sun.jndi.ldap.LdapCtxFactory"/> <property name="password" value="secret"/> <property name="bindDn" value="uid=admin,ou=system"/> - <property name="userConf" ref="userConfiguration"/> + <property name="userConf" ref="userConfiguration#default"/> </bean> <bean name="userMapper#ldap" class="org.apache.archiva.redback.common.ldap.LdapUserMapper"> @@ -53,10 +53,10 @@ <property name="userIdAttribute" value="cn"/> <property name="userBaseDn" value="dc=redback,dc=plexus,dc=codehaus,dc=org"/> <property name="userObjectClass" value="inetOrgPerson"/> - <property name="userConf" ref="userConfiguration"/> + <property name="userConf" ref="userConfiguration#default"/> </bean> - <bean name="userConfiguration" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration" + <bean name="userConfiguration#default" class="org.apache.archiva.redback.configuration.DefaultUserConfiguration" init-method="initialize"> <property name="configs"> <list> |