From 95637d1587a2eb7176dd278d5bb24e6eb81b97b9 Mon Sep 17 00:00:00 2001
From: Martin Stockhammer <martin_s@apache.org>
Date: Thu, 12 Dec 2019 18:33:35 +0100
Subject: [PATCH] Adapting to component changes. Updating to commons
 configuration 2.

---
 .../redback-common-configuration-acc2/pom.xml                 | 2 +-
 .../src/test/resources/spring-context-role-mapper.xml         | 2 +-
 redback-configuration/pom.xml                                 | 4 ++++
 .../redback/configuration/DefaultUserConfiguration.java       | 2 +-
 .../src/test/resources/ldap-spring-test.xml                   | 2 +-
 .../src/test/resources/spring-context.xml                     | 2 +-
 .../redback-rbac-ldap/src/test/resources/spring-context.xml   | 2 +-
 .../redback-users-jpa/src/test/resources/spring-context.xml   | 2 +-
 .../archiva/redback/users/ldap/ctl/DefaultLdapController.java | 2 +-
 9 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/redback-common/redback-common-configuration/redback-common-configuration-acc2/pom.xml b/redback-common/redback-common-configuration/redback-common-configuration-acc2/pom.xml
index aa5c822e..aa0c3a32 100644
--- a/redback-common/redback-common-configuration/redback-common-configuration-acc2/pom.xml
+++ b/redback-common/redback-common-configuration/redback-common-configuration-acc2/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-configuration2</artifactId>
-      <version>2.4</version>
+      <version>${commons.configuration.version}</version>
       <exclusions>
         <exclusion>
           <groupId>commons-beanutils</groupId>
diff --git a/redback-common/redback-common-ldap/src/test/resources/spring-context-role-mapper.xml b/redback-common/redback-common-ldap/src/test/resources/spring-context-role-mapper.xml
index a246630b..59f01b21 100755
--- a/redback-common/redback-common-ldap/src/test/resources/spring-context-role-mapper.xml
+++ b/redback-common/redback-common-ldap/src/test/resources/spring-context-role-mapper.xml
@@ -33,7 +33,7 @@
 
   <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"
         init-method="initialize">
-    <property name="properties">
+    <property name="initialConfiguration">
       <value>
         <![CDATA[
         <configuration>
diff --git a/redback-configuration/pom.xml b/redback-configuration/pom.xml
index b8b0015b..5c3c0400 100644
--- a/redback-configuration/pom.xml
+++ b/redback-configuration/pom.xml
@@ -49,6 +49,10 @@
       <artifactId>archiva-components-spring-registry-commons</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
index f808d837..548d2399 100644
--- a/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
+++ b/redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
@@ -133,7 +133,7 @@ public class DefaultUserConfiguration
                 }
                 log.info( "Attempting to find configuration [{}] (resolved to [{}])", configName, configName );
 
-                registry.addConfigurationFromFile(Paths.get(configName).toFile(), PREFIX );
+                registry.addConfigurationFromFile(Paths.get(configName), configName, PREFIX );
             }
         }
     }
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/ldap-spring-test.xml b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/ldap-spring-test.xml
index 3130f1f8..8ed78228 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/ldap-spring-test.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/ldap-spring-test.xml
@@ -33,7 +33,7 @@
 
   <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"
         init-method="initialize">
-    <property name="properties">
+    <property name="initialConfiguration">
       <value>
         <![CDATA[
         <configuration>
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
index c867763a..130e48e5 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
@@ -34,7 +34,7 @@
 
   <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"
       init-method="initialize">
-    <property name="properties">
+    <property name="initialConfiguration">
       <value>
         <![CDATA[
         <configuration>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
index aa241135..65cdf6d0 100755
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
@@ -69,7 +69,7 @@
 
   <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry"
         init-method="initialize">
-    <property name="properties">
+    <property name="initialConfiguration">
       <value>
         <![CDATA[
         <configuration>
diff --git a/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml
index 813c557b..aedda06b 100644
--- a/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml
@@ -36,7 +36,7 @@
   </bean>
 
   <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry">
-    <property name="properties">
+    <property name="initialConfiguration">
       <value>
         <![CDATA[
           <configuration>
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
index 510e2250..90b0a58b 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
@@ -30,7 +30,7 @@ import org.apache.archiva.redback.policy.encoders.SHA1PasswordEncoder;
 import org.apache.archiva.redback.users.User;
 import org.apache.archiva.redback.users.UserManager;
 import org.apache.archiva.redback.users.ldap.LdapUserQuery;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;