You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2025/06/23 22:40:10 UTC
(directory-fortress-core) branch FC-332 created (now 06c002c8)
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a change to branch FC-332
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git
at 06c002c8 FC-332 Apache Common Configuration 2
This branch includes the following new commits:
new 06c002c8 FC-332 Apache Common Configuration 2
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(directory-fortress-core) 01/01: FC-332 Apache Common Configuration 2
Posted by sm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch FC-332
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git
commit 06c002c8a599319ee7e41b0588fd15f2a896e84a
Author: Shawn McKinney <sm...@apache.org>
AuthorDate: Mon Jun 23 17:39:05 2025 -0500
FC-332 Apache Common Configuration 2
---
pom.xml | 13 ++++--
.../directory/fortress/core/AccelMgrFactory.java | 2 +-
.../directory/fortress/core/AccessMgrFactory.java | 2 +-
.../directory/fortress/core/AdminMgrFactory.java | 2 +-
.../directory/fortress/core/AuditMgrFactory.java | 2 +-
.../fortress/core/DelAccessMgrFactory.java | 2 +-
.../fortress/core/DelReviewMgrFactory.java | 2 +-
.../directory/fortress/core/GroupMgrFactory.java | 2 +-
.../fortress/core/PropertyMgrFactory.java | 2 +-
.../fortress/core/PwPolicyMgrFactory.java | 2 +-
.../directory/fortress/core/ReviewMgrFactory.java | 2 +-
.../fortress/core/ant/FortressAntTask.java | 2 +-
.../directory/fortress/core/ant/UserAnt.java | 4 +-
.../fortress/core/cli/CommandLineInterpreter.java | 4 +-
.../fortress/core/impl/AcceleratorDAO.java | 2 +-
.../directory/fortress/core/impl/AdminRoleDAO.java | 2 +-
.../directory/fortress/core/impl/AdminRoleP.java | 2 +-
.../fortress/core/impl/AdminRoleUtil.java | 2 +-
.../directory/fortress/core/impl/AuditDAO.java | 2 +-
.../directory/fortress/core/impl/AuditMgrImpl.java | 2 +-
.../directory/fortress/core/impl/ConfigDAO.java | 2 +-
.../directory/fortress/core/impl/ConfigP.java | 2 +-
.../directory/fortress/core/impl/GroupDAO.java | 2 +-
.../directory/fortress/core/impl/OrgUnitP.java | 2 +-
.../fortress/core/impl/OrganizationalUnitDAO.java | 2 +-
.../fortress/core/impl/OrganizationalUnitP.java | 2 +-
.../directory/fortress/core/impl/PermDAO.java | 2 +-
.../apache/directory/fortress/core/impl/PermP.java | 2 +-
.../directory/fortress/core/impl/PolicyDAO.java | 2 +-
.../directory/fortress/core/impl/PolicyP.java | 2 +-
.../directory/fortress/core/impl/PsoUtil.java | 2 +-
.../directory/fortress/core/impl/RoleDAO.java | 2 +-
.../apache/directory/fortress/core/impl/RoleP.java | 2 +-
.../directory/fortress/core/impl/RoleUtil.java | 2 +-
.../directory/fortress/core/impl/SDUtil.java | 2 +-
.../apache/directory/fortress/core/impl/SdDAO.java | 2 +-
.../apache/directory/fortress/core/impl/SdP.java | 2 +-
.../directory/fortress/core/impl/SuffixDAO.java | 2 +-
.../directory/fortress/core/impl/SuffixP.java | 2 +-
.../directory/fortress/core/impl/UserDAO.java | 4 +-
.../apache/directory/fortress/core/impl/UserP.java | 2 +-
.../directory/fortress/core/impl/UsoUtil.java | 2 +-
.../fortress/core/ldap/LdapConnectionProvider.java | 2 +-
.../fortress/core/ldap/LdapDataProvider.java | 2 +-
.../directory/fortress/core/model/AdminRole.java | 2 +-
.../fortress/core/model/ConstraintUtil.java | 2 +-
.../directory/fortress/core/model/Permission.java | 2 +-
.../fortress/core/model/UserAdminRole.java | 2 +-
.../directory/fortress/core/model/UserRole.java | 2 +-
.../directory/fortress/core/rest/RestUtils.java | 2 +-
.../directory/fortress/core/util/Config.java | 54 +++++++++++++---------
.../directory/fortress/core/util/LogUtil.java | 2 +-
.../apache/directory/fortress/core/util/VUtil.java | 4 +-
.../fortress/core/util/time/Discriminant.java | 2 +-
.../core/util/time/UserRoleConstraint.java | 2 +-
.../directory/fortress/core/AdminMgrConsole.java | 2 +-
.../directory/fortress/core/AuditMgrConsole.java | 2 +-
.../directory/fortress/core/GroupMgrConsole.java | 2 +-
.../fortress/core/impl/AccelMgrImplTest.java | 2 +-
.../fortress/core/impl/AccessMgrImplTest.java | 2 +-
.../fortress/core/impl/AdminRoleTestData.java | 2 +-
.../fortress/core/impl/OrgUnitTestData.java | 2 +-
.../directory/fortress/core/impl/PRATestData.java | 2 +-
.../directory/fortress/core/impl/RoleTestData.java | 2 +-
.../directory/fortress/core/impl/TestUtils.java | 2 +-
.../directory/fortress/core/impl/URATestData.java | 2 +-
.../directory/fortress/core/impl/UserTestData.java | 2 +-
.../directory/fortress/core/jmeter/AddUser.java | 2 +-
.../directory/fortress/core/jmeter/CheckUser.java | 2 +-
.../directory/fortress/core/jmeter/LoadBase.java | 2 +-
70 files changed, 114 insertions(+), 97 deletions(-)
diff --git a/pom.xml b/pom.xml
index 29d02c2b..f90aa1ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,8 +66,9 @@
<version.ant>1.10.15</version.ant>
<version.antlr>3.5.3</version.antlr>
<version.apache.jdbm1>2.0.0-M3</version.apache.jdbm1>
- <version.commons.configuration>1.10</version.commons.configuration>
+ <version.commons.configuration>2.12.0</version.commons.configuration>
<version.commons.io>2.19.0</version.commons.io>
+ <version.commons.lang>3.17.0</version.commons.lang>
<version.ehcache>2.10.9.2</version.ehcache>
<version.httpcomponent.httpclient>4.5.14</version.httpcomponent.httpclient>
<version.jasypt>1.9.3</version.jasypt>
@@ -113,11 +114,17 @@
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-configuration2</artifactId>
<version>${version.commons.configuration}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${version.commons.lang}</version>
+ </dependency>
+
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git a/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
index 44738816..8e14691b 100644
--- a/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccelMgrFactory.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.impl.AccelMgrImpl;
import org.apache.directory.fortress.core.util.ClassUtil;
import org.apache.directory.fortress.core.util.Config;
diff --git a/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
index 311c4e9e..7bae81b4 100755
--- a/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccessMgrFactory.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.impl.AccessMgrImpl;
import org.apache.directory.fortress.core.rest.AccessMgrRestImpl;
import org.apache.directory.fortress.core.util.ClassUtil;
diff --git a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
index 24dbaa56..a1cc60e6 100755
--- a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.impl.AdminMgrImpl;
import org.apache.directory.fortress.core.model.Session;
import org.apache.directory.fortress.core.rest.AdminMgrRestImpl;
diff --git a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
index 96e1754d..5c2054dc 100755
--- a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.impl.AuditMgrImpl;
import org.apache.directory.fortress.core.model.Session;
import org.apache.directory.fortress.core.rest.AuditMgrRestImpl;
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
index 0897c2e9..64fa1a47 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.impl.DelAccessMgrImpl;
import org.apache.directory.fortress.core.model.Session;
import org.apache.directory.fortress.core.rest.DelAccessMgrRestImpl;
diff --git a/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
index 6d59fd50..df3227d0 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelReviewMgrFactory.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.impl.DelReviewMgrImpl;
import org.apache.directory.fortress.core.model.Session;
import org.apache.directory.fortress.core.rest.DelReviewMgrRestImpl;
diff --git a/src/main/java/org/apache/directory/fortress/core/GroupMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/GroupMgrFactory.java
index 3b64a0f7..6372f078 100755
--- a/src/main/java/org/apache/directory/fortress/core/GroupMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/GroupMgrFactory.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.impl.GroupMgrImpl;
import org.apache.directory.fortress.core.model.Session;
import org.apache.directory.fortress.core.rest.GroupMgrRestImpl;
diff --git a/src/main/java/org/apache/directory/fortress/core/PropertyMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/PropertyMgrFactory.java
index ddc406e1..4997b2e6 100644
--- a/src/main/java/org/apache/directory/fortress/core/PropertyMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/PropertyMgrFactory.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.model.Session;
import org.apache.directory.fortress.core.rest.PropertyMgrRestImpl;
import org.apache.directory.fortress.core.util.ClassUtil;
diff --git a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
index aec88050..b96debe8 100755
--- a/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/PwPolicyMgrFactory.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.impl.PwPolicyMgrImpl;
import org.apache.directory.fortress.core.model.Session;
import org.apache.directory.fortress.core.rest.PwPolicyMgrRestImpl;
diff --git a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
index c3db0609..4fd8fa0b 100755
--- a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.impl.ReviewMgrImpl;
import org.apache.directory.fortress.core.model.Session;
import org.apache.directory.fortress.core.rest.ReviewMgrRestImpl;
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java b/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
index 87757446..22e52fae 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
@@ -27,7 +27,7 @@ import java.util.Properties;
import java.util.StringTokenizer;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.AdminMgr;
import org.apache.directory.fortress.core.AdminMgrFactory;
import org.apache.directory.fortress.core.CfgException;
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
index d56fd6ab..07e1f26f 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
@@ -21,8 +21,8 @@ package org.apache.directory.fortress.core.ant;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.PropUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java b/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
index 8a6d32f7..b3f7642b 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
+++ b/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
@@ -32,8 +32,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.*;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.model.Group;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AcceleratorDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AcceleratorDAO.java
index a778707d..6467dd5f 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/AcceleratorDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AcceleratorDAO.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.model.exception.LdapException;
import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
import org.apache.directory.fortress.core.GlobalErrIds;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
index 900b47ad..326fc8a3 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
index e7359d9a..d9df01d8 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
index 6ad007b4..4d40835e 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
@@ -25,7 +25,7 @@ import java.util.Set;
import java.util.TreeSet;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.ValidationException;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
index 424149ed..8dddf8f4 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AuditMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/AuditMgrImpl.java
index ac2b97c7..e12b81aa 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AuditMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AuditMgrImpl.java
@@ -22,7 +22,7 @@ package org.apache.directory.fortress.core.impl;
import java.io.Serializable;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.annotation.AdminPermissionOperation;
import org.apache.directory.fortress.core.AuditMgr;
import org.apache.directory.fortress.core.GlobalErrIds;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
index 191968c3..8c8cf551 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.entry.*;
import org.apache.directory.api.ldap.model.exception.LdapEntryAlreadyExistsException;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/ConfigP.java b/src/main/java/org/apache/directory/fortress/core/impl/ConfigP.java
index 193c8c38..91780448 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/ConfigP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/ConfigP.java
@@ -22,7 +22,7 @@ package org.apache.directory.fortress.core.impl;
import java.util.Properties;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.SecurityException;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
index 50d56a46..59d9c25d 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/GroupDAO.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitP.java b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitP.java
index 3f3092ff..0cb87514 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitP.java
@@ -25,7 +25,7 @@ import java.util.Set;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.SecurityException;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
index 4dccd5d4..ab8de07b 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
@@ -20,7 +20,7 @@
package org.apache.directory.fortress.core.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitP.java b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitP.java
index 4304886a..581ad005 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitP.java
@@ -20,7 +20,7 @@
package org.apache.directory.fortress.core.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.model.OrganizationalUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
index 21c73eb4..5af77d2b 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermP.java b/src/main/java/org/apache/directory/fortress/core/impl/PermP.java
index c2a4d8f3..d2d9844e 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermP.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
index e23dc65f..c6c53c84 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PolicyP.java b/src/main/java/org/apache/directory/fortress/core/impl/PolicyP.java
index 575a889f..f78cd99f 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PolicyP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PolicyP.java
@@ -25,7 +25,7 @@ import java.util.Set;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.SecurityException;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
index f2fb6f61..d2a2420a 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
@@ -25,7 +25,7 @@ import java.util.Set;
import java.util.TreeSet;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.ValidationException;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
index 59322930..c727edf9 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java b/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
index ad4917e0..f2f5441b 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/RoleP.java
@@ -23,7 +23,7 @@ package org.apache.directory.fortress.core.impl;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.FinderException;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
index be41af67..a2c104fd 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
@@ -25,7 +25,7 @@ import java.util.Set;
import java.util.TreeSet;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.ValidationException;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
index 3e56d77b..758b0de0 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
@@ -29,7 +29,7 @@ import net.sf.ehcache.search.Result;
import net.sf.ehcache.search.Results;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.fortress.core.*;
import org.apache.directory.fortress.core.SecurityException;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
index 4e1aa564..6d7a5017 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
@@ -27,7 +27,7 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.cursor.SearchCursor;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SdP.java b/src/main/java/org/apache/directory/fortress/core/impl/SdP.java
index 74fd3571..c86f971d 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SdP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SdP.java
@@ -23,7 +23,7 @@ package org.apache.directory.fortress.core.impl;
import java.util.List;
import java.util.Set;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.model.Role;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
index ecdf7a03..fe598600 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
@@ -20,7 +20,7 @@
package org.apache.directory.fortress.core.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
import org.apache.directory.api.ldap.model.entry.DefaultEntry;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SuffixP.java b/src/main/java/org/apache/directory/fortress/core/impl/SuffixP.java
index a03df5f8..76d333b5 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SuffixP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SuffixP.java
@@ -20,7 +20,7 @@
package org.apache.directory.fortress.core.impl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.ValidationException;
import org.apache.directory.fortress.core.model.Suffix;
import org.slf4j.Logger;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
index 11047db7..09686427 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
@@ -29,8 +29,8 @@ import java.util.Set;
import java.util.TreeMap;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyResponse;
import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.api.ldap.model.cursor.CursorException;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
index 34adb3ad..e679b6c8 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
@@ -26,7 +26,7 @@ import java.util.Properties;
import java.util.Set;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.PasswordException;
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
index 119096a8..f2081a55 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
@@ -26,7 +26,7 @@ import java.util.TreeSet;
//import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.*;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.ValidationException;
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
index c829d4b5..a8c4904f 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapConnectionProvider.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.pool2.PooledObjectFactory;
import org.apache.directory.api.ldap.codec.api.LdapApiService;
import org.apache.directory.api.ldap.codec.api.LdapApiServiceFactory;
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
index 0e308b38..457d51a5 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
@@ -29,7 +29,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyRequest;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyRequestImpl;
import org.apache.directory.api.ldap.extras.controls.ppolicy.PasswordPolicyResponse;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
index 04d5f13e..d663325a 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
@@ -28,7 +28,7 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
/**
diff --git a/src/main/java/org/apache/directory/fortress/core/model/ConstraintUtil.java b/src/main/java/org/apache/directory/fortress/core/model/ConstraintUtil.java
index 47b9ea45..75d15f81 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/ConstraintUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/ConstraintUtil.java
@@ -21,7 +21,7 @@ package org.apache.directory.fortress.core.model;
import java.util.StringTokenizer;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.ValidationException;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.core.util.ConstraintValidator;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Permission.java b/src/main/java/org/apache/directory/fortress/core/model/Permission.java
index 12f7d7bd..3a8ab662 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Permission.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Permission.java
@@ -35,7 +35,7 @@ import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
/*
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
index a6e98c22..15ecf0f4 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
@@ -28,7 +28,7 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.util.Config;
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
index a78ed9d9..00d836b3 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
@@ -31,7 +31,7 @@ import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlSeeAlso;
import jakarta.xml.bind.annotation.XmlType;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.Config;
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
index f7c21fa7..579e844d 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
@@ -36,7 +36,7 @@ import jakarta.xml.bind.Unmarshaller;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.RestException;
import org.apache.directory.fortress.core.model.FortRequest;
diff --git a/src/main/java/org/apache/directory/fortress/core/util/Config.java b/src/main/java/org/apache/directory/fortress/core/util/Config.java
index 0936df32..1788967c 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/Config.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/Config.java
@@ -25,8 +25,13 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.configuration2.CompositeConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.builder.fluent.Configurations;
+import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.CfgException;
import org.apache.directory.fortress.core.CfgRuntimeException;
import org.apache.directory.fortress.core.ConfigMgr;
@@ -53,7 +58,7 @@ import org.slf4j.LoggerFactory;
*/
public final class Config
{
- private static PropertiesConfiguration config = new PropertiesConfiguration();
+ private static CompositeConfiguration config = new CompositeConfiguration();
private static final String CLS_NM = Config.class.getName();
private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );
private static final String PROP_FILE = "fortress.properties";
@@ -277,7 +282,7 @@ public final class Config
LOG.warn( "getInt invalid config, can't read prop [{}]", key );
}
}
- catch (org.apache.commons.configuration.ConversionException e)
+ catch (org.apache.commons.configuration2.ex.ConversionException e)
{
LOG.debug( "getInt can't read prop [{}], exception [{}]", key, e );
}
@@ -310,7 +315,7 @@ public final class Config
{
LOG.debug( "getInt - illegal state exception [{}], using default [{}]", key, defaultValue );
}
- catch (org.apache.commons.configuration.ConversionException e)
+ catch (org.apache.commons.configuration2.ex.ConversionException e)
{
LOG.debug( "getInt name [{}], conversion exception using default [{}]", key, defaultValue );
}
@@ -364,7 +369,7 @@ public final class Config
value = config.getBoolean( key, defaultValue );
LOG.debug( "getBoolean name [{}] value [{}]", key, value );
}
- catch (org.apache.commons.configuration.ConversionException e )
+ catch (org.apache.commons.configuration2.ex.ConversionException e )
{
LOG.debug( "getBoolean name [{}], conversion exception using default [{}]", key, defaultValue );
}
@@ -545,33 +550,38 @@ public final class Config
try
{
// Load the system config file.
- URL fUrl = Config.class.getClassLoader().getResource( PROP_FILE );
- config.setDelimiterParsingDisabled( true );
- if ( fUrl == null )
+ URL fUrl = Config.class.getClassLoader().getResource(PROP_FILE);
+ if (fUrl == null)
{
String error = "static init: Error, null cfg file: " + PROP_FILE;
- LOG.warn( error );
+ LOG.warn(error);
}
else
{
- LOG.info( "static init: found from: {} path: {}", PROP_FILE, fUrl.getPath() );
- config.load( fUrl );
- LOG.info( "static init: loading from: {}", PROP_FILE );
+ LOG.info("static init: found from: {} path: {}", PROP_FILE, fUrl.getPath());
+ PropertiesConfiguration sysProps = new PropertiesConfiguration();
+ FileHandler fileHandler = new FileHandler(sysProps);
+ fileHandler.load(fUrl);
+ config.addConfiguration(sysProps);
+ LOG.info("static init: loading from: {}", PROP_FILE);
}
-
- URL fUserUrl = Config.class.getClassLoader().getResource( USER_PROP_FILE );
- if ( fUserUrl != null )
+ URL fUserUrl = Config.class.getClassLoader().getResource(USER_PROP_FILE);
+ if (fUserUrl != null)
{
- LOG.info( "static init: found user properties from: {} path: {}", USER_PROP_FILE, fUserUrl.getPath() );
- config.load( fUserUrl );
+ LOG.info("static init: found user properties from: {} path: {}", USER_PROP_FILE, fUserUrl.getPath());
+ PropertiesConfiguration userProps = new PropertiesConfiguration();
+ FileHandler userFileHandler = new FileHandler(userProps);
+ userFileHandler.load(fUserUrl);
+ config.addConfiguration(userProps);
}
+ config.setListDelimiterHandler(new DisabledListDelimiterHandler());
}
- catch ( org.apache.commons.configuration.ConfigurationException ex )
+ catch (ConfigurationException ex)
{
String error = "static init: Error loading from cfg file: [" + PROP_FILE
- + "] ConfigurationException=" + ex;
- LOG.error( error );
- throw new CfgRuntimeException( GlobalErrIds.FT_CONFIG_BOOTSTRAP_FAILED, error, ex );
+ + "] ConfigurationException=" + ex;
+ LOG.error(error);
+ throw new CfgRuntimeException(GlobalErrIds.FT_CONFIG_BOOTSTRAP_FAILED, error, ex);
}
}
diff --git a/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java b/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
index a46c9486..bd450b74 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/LogUtil.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core.util;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.directory.fortress.core.GlobalIds;
diff --git a/src/main/java/org/apache/directory/fortress/core/util/VUtil.java b/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
index ac7d4c24..9a8fe690 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/VUtil.java
@@ -28,8 +28,8 @@ import java.util.List;
import java.util.Properties;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.CfgException;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.GlobalIds;
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Discriminant.java b/src/main/java/org/apache/directory/fortress/core/util/time/Discriminant.java
index 5bbd1d98..2ebc59ce 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Discriminant.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Discriminant.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core.util.time;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.model.Constraint;
import org.apache.directory.fortress.core.model.Session;
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/UserRoleConstraint.java b/src/main/java/org/apache/directory/fortress/core/util/time/UserRoleConstraint.java
index f0da0767..06ea3d4f 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/time/UserRoleConstraint.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/UserRoleConstraint.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core.util.time;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.model.Constraint;
import org.apache.directory.fortress.core.model.RoleConstraint;
diff --git a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
index ab56f693..239b62c6 100755
--- a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
@@ -27,7 +27,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.example.Example;
import org.apache.directory.fortress.core.example.ExampleAdminMgr;
import org.apache.directory.fortress.core.example.ExampleAdminMgrFactory;
diff --git a/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
index 725e6352..f548a70d 100755
--- a/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
@@ -20,7 +20,7 @@
package org.apache.directory.fortress.core;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.model.name.Rdn;
diff --git a/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
index 3eb46c97..2838ac34 100755
--- a/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/GroupMgrConsole.java
@@ -20,7 +20,7 @@
package org.apache.directory.fortress.core;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.model.Group;
import java.util.Enumeration;
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/AccelMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/AccelMgrImplTest.java
index 186d4ae3..8e9f51a6 100644
--- a/src/test/java/org/apache/directory/fortress/core/impl/AccelMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/AccelMgrImplTest.java
@@ -26,7 +26,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.model.Permission;
import org.apache.directory.fortress.core.model.Session;
import org.apache.directory.fortress.core.model.User;
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java
index 816b6c28..a35cb8c3 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java
@@ -29,7 +29,7 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.model.Permission;
import org.apache.directory.fortress.core.model.SDSet;
import org.apache.directory.fortress.core.model.Session;
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
index a82a331b..86d564cb 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/AdminRoleTestData.java
@@ -26,7 +26,7 @@ import java.util.StringTokenizer;
import junit.framework.TestCase;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.model.AdminRole;
import org.apache.directory.fortress.core.model.Constraint;
import org.slf4j.Logger;
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/OrgUnitTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/OrgUnitTestData.java
index f35f0ce1..dc860c06 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/OrgUnitTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/OrgUnitTestData.java
@@ -27,7 +27,7 @@ import java.util.StringTokenizer;
import junit.framework.TestCase;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.model.OrgUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/PRATestData.java b/src/test/java/org/apache/directory/fortress/core/impl/PRATestData.java
index 02498c15..a1b1b426 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/PRATestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/PRATestData.java
@@ -25,7 +25,7 @@ import java.util.Map;
import junit.framework.TestCase;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/RoleTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/RoleTestData.java
index ae0366c4..f208e031 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/RoleTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/RoleTestData.java
@@ -30,7 +30,7 @@ import java.util.StringTokenizer;
import junit.framework.TestCase;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.model.Role;
import org.apache.directory.fortress.core.model.RoleConstraint;
import org.apache.directory.fortress.core.model.SDSet;
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/TestUtils.java b/src/test/java/org/apache/directory/fortress/core/impl/TestUtils.java
index ffbc1118..a5496932 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/TestUtils.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/TestUtils.java
@@ -33,7 +33,7 @@ import java.util.TreeSet;
import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.model.Constraint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/URATestData.java b/src/test/java/org/apache/directory/fortress/core/impl/URATestData.java
index 2a6f4d48..88a9912c 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/URATestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/URATestData.java
@@ -25,7 +25,7 @@ import java.util.Map;
import junit.framework.TestCase;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.model.RoleConstraint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/UserTestData.java b/src/test/java/org/apache/directory/fortress/core/impl/UserTestData.java
index b789be78..f79c509b 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/UserTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/UserTestData.java
@@ -31,7 +31,7 @@ import java.util.TreeSet;
import junit.framework.TestCase;
import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.GlobalIds;
import org.apache.directory.fortress.core.model.Address;
import org.apache.directory.fortress.core.model.User;
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/AddUser.java b/src/test/java/org/apache/directory/fortress/core/jmeter/AddUser.java
index 3b6a0beb..486f673f 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/AddUser.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/AddUser.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core.jmeter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.model.UserRole;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckUser.java b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckUser.java
index 4e7fd141..d7bb94f3 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckUser.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckUser.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core.jmeter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.model.Permission;
import org.apache.directory.fortress.core.model.Session;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/LoadBase.java b/src/test/java/org/apache/directory/fortress/core/jmeter/LoadBase.java
index 2894e21f..7a95d2f1 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/LoadBase.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/LoadBase.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.core.jmeter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.*;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.model.Permission;