Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapting to component changes. Updating to commons configuration 2.

This commit is contained in:
Martin Stockhammer 2019-12-12 18:33:35 +01:00
parent 011aed509e
commit 95637d1587
9 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redback-common/redback-common-configuration/redback-common-configuration-acc2/pom.xml
View File

@ -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>

2
redback-common/redback-common-ldap/src/test/resources/spring-context-role-mapper.xml
View File

@ -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>

4
redback-configuration/pom.xml
View File

@ -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>

2
redback-configuration/src/main/java/org/apache/archiva/redback/configuration/DefaultUserConfiguration.java
View File

@ -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 );
}
}
}

2
redback-integrations/redback-rest/redback-rest-services/src/test/resources/ldap-spring-test.xml
View File

@ -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>

2
redback-integrations/redback-rest/redback-rest-services/src/test/resources/spring-context.xml
View File

@ -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>

2
redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
View File

@ -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>

2
redback-users/redback-users-providers/redback-users-jpa/src/test/resources/spring-context.xml
View File

@ -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>

2
redback-users/redback-users-providers/redback-users-ldap/src/main/java/org/apache/archiva/redback/users/ldap/ctl/DefaultLdapController.java
View File

@ -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;