Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

support more than one value for user manager impls from security.properties 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1429339 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-01-05 17:57:45 +00:00
parent 023a0b4fe1
commit 007258a9ed
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
View File

@ -46,7 +46,7 @@ import java.util.List;
* @author Olivier Lamy * @author Olivier Lamy
* @since 1.4-M4 * @since 1.4-M4
*/ */
@Service( "userConfiguration#archiva" ) @Service("userConfiguration#archiva")
public class DefaultRedbackRuntimeConfigurationAdmin public class DefaultRedbackRuntimeConfigurationAdmin
implements RedbackRuntimeConfigurationAdmin, UserConfiguration implements RedbackRuntimeConfigurationAdmin, UserConfiguration
{ {
@ -57,11 +57,11 @@ public class DefaultRedbackRuntimeConfigurationAdmin
private ArchivaConfiguration archivaConfiguration; private ArchivaConfiguration archivaConfiguration;
@Inject @Inject
@Named( value = "userConfiguration#redback" ) @Named(value = "userConfiguration#redback")
UserConfiguration userConfiguration; UserConfiguration userConfiguration;
@Inject @Inject
@Named( value = "cache#users" ) @Named(value = "cache#users")
private Cache usersCache; private Cache usersCache;
@PostConstruct @PostConstruct
@ -78,7 +78,18 @@ public class DefaultRedbackRuntimeConfigurationAdmin
String userManagerImpl = userConfiguration.getString( UserConfigurationKeys.USER_MANAGER_IMPL ); String userManagerImpl = userConfiguration.getString( UserConfigurationKeys.USER_MANAGER_IMPL );
if ( StringUtils.isNotEmpty( userManagerImpl ) ) if ( StringUtils.isNotEmpty( userManagerImpl ) )
{ {
redbackRuntimeConfiguration.getUserManagerImpls().add( userManagerImpl ); if ( StringUtils.contains( userManagerImpl, ',' ) )
{
String[] impls = StringUtils.split( userManagerImpl, ',' );
for ( String impl : impls )
{
redbackRuntimeConfiguration.getUserManagerImpls().add( impl );
}
}
else
{
redbackRuntimeConfiguration.getUserManagerImpls().add( userManagerImpl );
}
} }
// now ldap // now ldap