diff options
| author | Olivier Lamy <olamy@apache.org> | 2014-01-07 09:28:05 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2014-01-07 09:28:05 +0000 |
| commit | 2d840d9ffe0ebfe949a09638ebf0d81f4a2c8f21 (patch) | |
| tree | 31a537256bc0d02882bbc8bd5a924dfbc8981d9c /archiva-modules/archiva-base/archiva-repository-admin | |
| parent | 59743128e85e9f81fc214ab87531bfc3e3d5e603 (diff) | |
| download | archiva-2d840d9ffe0ebfe949a09638ebf0d81f4a2c8f21.tar.gz archiva-2d840d9ffe0ebfe949a09638ebf0d81f4a2c8f21.zip | |
use strict matching for model mapper
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1556158 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-repository-admin')
1 files changed, 13 insertions, 10 deletions
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java index 6373a3427..677517898 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java @@ -52,7 +52,7 @@ import java.util.Set; * @author Olivier Lamy * @since 1.4-M4 */ -@Service( "redbackRuntimeConfigurationAdmin#default" ) +@Service("redbackRuntimeConfigurationAdmin#default") public class DefaultRedbackRuntimeConfigurationAdmin extends AbstractRepositoryAdmin implements RedbackRuntimeConfigurationAdmin, UserConfiguration @@ -64,13 +64,19 @@ public class DefaultRedbackRuntimeConfigurationAdmin private ArchivaConfiguration archivaConfiguration; @Inject - @Named( value = "userConfiguration#redback" ) + @Named(value = "userConfiguration#redback") private UserConfiguration userConfiguration; @Inject - @Named( value = "cache#users" ) + @Named(value = "cache#users") private Cache usersCache; + @Inject + public DefaultRedbackRuntimeConfigurationAdmin( ArchivaConfiguration archivaConfiguration ) + { + this.archivaConfiguration = archivaConfiguration; + } + @PostConstruct public void initialize() throws UserConfigurationException @@ -383,19 +389,16 @@ public class DefaultRedbackRuntimeConfigurationAdmin { redbackRuntimeConfiguration.setLdapConfiguration( new LdapConfiguration() ); } - res.setLdapConfiguration( - getModelMapper().map( redbackRuntimeConfiguration.getLdapConfiguration(), - org.apache.archiva.configuration.LdapConfiguration.class ) ); + res.setLdapConfiguration( getModelMapper().map( redbackRuntimeConfiguration.getLdapConfiguration(), + org.apache.archiva.configuration.LdapConfiguration.class ) ); if ( redbackRuntimeConfiguration.getUsersCacheConfiguration() == null ) { redbackRuntimeConfiguration.setUsersCacheConfiguration( new CacheConfiguration() ); } - - res.setUsersCacheConfiguration( - getModelMapper().map( redbackRuntimeConfiguration.getUsersCacheConfiguration(), - org.apache.archiva.configuration.CacheConfiguration.class ) ); + res.setUsersCacheConfiguration( getModelMapper().map( redbackRuntimeConfiguration.getUsersCacheConfiguration(), + org.apache.archiva.configuration.CacheConfiguration.class ) ); List<LdapGroupMapping> ldapGroupMappings = redbackRuntimeConfiguration.getLdapGroupMappings(); |