aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-base
diff options
context:
space:
mode:
authorMartin Stockhammer <martin_s@apache.org>2021-01-03 19:12:24 +0100
committerMartin Stockhammer <martin_s@apache.org>2021-01-03 19:12:24 +0100
commit8bd27b8851f6f917b7725380ddb93d9b88fa09f2 (patch)
tree5f00c1d9d5c5b70e78048c2607c00459cc1e4331 /archiva-modules/archiva-base
parentd50e02314093db0ba788a6c79d852e3025d5b939 (diff)
downloadarchiva-8bd27b8851f6f917b7725380ddb93d9b88fa09f2.tar.gz
archiva-8bd27b8851f6f917b7725380ddb93d9b88fa09f2.zip
Adding ldap properties
Diffstat (limited to 'archiva-modules/archiva-base')
-rw-r--r--archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java6
1 files changed, 6 insertions, 0 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 56e3ba1bf..256865ec7 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
@@ -495,6 +495,9 @@ public class DefaultRedbackRuntimeConfigurationAdmin
if (LDAP_MAPPER.isPrefixMapping( key )) {
return LDAP_MAPPER.getPrefixString( key, conf.getLdapGroupMappings( ) );
}
+ if (conf.getLdapConfiguration().getExtraProperties().containsKey( key )) {
+ return conf.getLdapConfiguration( ).getExtraProperties( ).get( key );
+ }
if ( USER_MANAGER_IMPL.equals( key ) )
{
@@ -538,6 +541,9 @@ public class DefaultRedbackRuntimeConfigurationAdmin
if (LDAP_MAPPER.isPrefixMapping( key )) {
return LDAP_MAPPER.getPrefixString( key, conf.getLdapGroupMappings( ) );
}
+ if (conf.getLdapConfiguration().getExtraProperties().containsKey( key )) {
+ return conf.getLdapConfiguration( ).getExtraProperties( ).get( key );
+ }
if ( conf.getConfigurationProperties().containsKey( key ) )
{