Removing ldap properties as they are env properties for ldap context

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 256865ec70273fcf641a34f4290385f20c9dd07c..86cad9e7807c4910e277609bd987f197b7af39c8 100644 (file)
--- 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
@@ -424,16 +424,6 @@ public class DefaultRedbackRuntimeConfigurationAdmin
         Map<String, String> properties = redbackRuntimeConfiguration.getConfigurationProperties();
         LdapConfiguration ldapConf = redbackRuntimeConfiguration.getLdapConfiguration( );
         LDAP_MAPPER.getAllAttributes( ).stream( ).forEach( att -> properties.remove( att ) );
-        List<String> prefixRemove = new ArrayList<>( );
-        for ( String key : properties.keySet()) {
-            boolean prefixMapping = LDAP_MAPPER.isPrefixMapping( key );
-            if (prefixMapping) {
-                prefixRemove.add( key );
-            } else if ( key.startsWith( "ldap" ) && !LDAP_MAPPER.isMapping( key ) ) {
-                ldapConf.getExtraProperties( ).put( key, properties.get( key ) );
-            }
-        }
-        prefixRemove.stream( ).forEach( att -> properties.remove( att ) );
     }
 
     private org.apache.archiva.configuration.RedbackRuntimeConfiguration build(