You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/08/20 10:26:11 UTC
[james-project] 05/16: JAMES-2855 adapt new
PropertyListConfiguration properties
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit ae5a99dac66a7207a10ce8cb837b96ac00767d11
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Mon Aug 19 11:36:06 2019 +0700
JAMES-2855 adapt new PropertyListConfiguration properties
---
.../james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
index 670c29a..54ee3b4 100644
--- a/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
+++ b/server/data/data-ldap/src/test/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepositoryTest.java
@@ -27,9 +27,9 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock;
-import org.apache.commons.configuration.ConversionException;
-import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.commons.configuration.plist.PropertyListConfiguration;
+import org.apache.commons.configuration2.HierarchicalConfiguration;
+import org.apache.commons.configuration2.ex.ConversionException;
+import org.apache.commons.configuration2.plist.PropertyListConfiguration;
import org.apache.james.core.MailAddress;
import org.apache.james.domainlist.api.DomainList;
import org.junit.jupiter.api.BeforeEach;
@@ -197,9 +197,9 @@ public class ReadOnlyUsersLDAPRepositoryTest {
private static HierarchicalConfiguration ldapRepositoryConfiguration() {
PropertyListConfiguration configuration = new PropertyListConfiguration();
configuration.addProperty("[@ldapHost]", DockerLdapSingleton.ldapContainer.getLdapHost());
- configuration.addProperty("[@principal]", "cn=admin\\,dc=james\\,dc=org");
+ configuration.addProperty("[@principal]", "cn=admin,dc=james,dc=org");
configuration.addProperty("[@credentials]", ADMIN_PASSWORD);
- configuration.addProperty("[@userBase]", "ou=People\\,dc=james\\,dc=org");
+ configuration.addProperty("[@userBase]", "ou=People,dc=james,dc=org");
configuration.addProperty("[@userIdAttribute]", "uid");
configuration.addProperty("[@userObjectClass]", "inetOrgPerson");
configuration.addProperty("[@maxRetries]", "4");
@@ -212,9 +212,9 @@ public class ReadOnlyUsersLDAPRepositoryTest {
private static HierarchicalConfiguration ldapRepositoryConfigurationWithVirtualHosting() {
PropertyListConfiguration configuration = new PropertyListConfiguration();
configuration.addProperty("[@ldapHost]", DockerLdapSingleton.ldapContainer.getLdapHost());
- configuration.addProperty("[@principal]", "cn=admin\\,dc=james\\,dc=org");
+ configuration.addProperty("[@principal]", "cn=admin,dc=james,dc=org");
configuration.addProperty("[@credentials]", ADMIN_PASSWORD);
- configuration.addProperty("[@userBase]", "ou=People\\,dc=james\\,dc=org");
+ configuration.addProperty("[@userBase]", "ou=People,dc=james,dc=org");
configuration.addProperty("[@userIdAttribute]", "mail");
configuration.addProperty("[@userObjectClass]", "inetOrgPerson");
configuration.addProperty("[@maxRetries]", "4");
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org