You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/01/05 18:57:46 UTC
svn commit: r1429339 -
/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
Author: olamy
Date: Sat Jan 5 17:57:45 2013
New Revision: 1429339
URL: http://svn.apache.org/viewvc?rev=1429339&view=rev
Log:
support more than one value for user manager impls from security.properties
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java?rev=1429339&r1=1429338&r2=1429339&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java Sat Jan 5 17:57:45 2013
@@ -46,7 +46,7 @@ import java.util.List;
* @author Olivier Lamy
* @since 1.4-M4
*/
-@Service( "userConfiguration#archiva" )
+@Service("userConfiguration#archiva")
public class DefaultRedbackRuntimeConfigurationAdmin
implements RedbackRuntimeConfigurationAdmin, UserConfiguration
{
@@ -57,11 +57,11 @@ public class DefaultRedbackRuntimeConfig
private ArchivaConfiguration archivaConfiguration;
@Inject
- @Named( value = "userConfiguration#redback" )
+ @Named(value = "userConfiguration#redback")
UserConfiguration userConfiguration;
@Inject
- @Named( value = "cache#users" )
+ @Named(value = "cache#users")
private Cache usersCache;
@PostConstruct
@@ -78,7 +78,18 @@ public class DefaultRedbackRuntimeConfig
String userManagerImpl = userConfiguration.getString( UserConfigurationKeys.USER_MANAGER_IMPL );
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