FC-332 migrate to commons 2
diff --git a/pom.xml b/pom.xml
index ce2aa89..dc91b68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
<properties>
<title>${project.name} ${project.version}</title>
<java.version>17</java.version>
- <fortress.realm.version>3.0.0</fortress.realm.version>
+ <fortress.realm.version>3.0.1-SNAPSHOT</fortress.realm.version>
<wicket.version>10.5.0</wicket.version>
<wicketstuff.version>10.5.0</wicketstuff.version>
<wicket.googlecode.version>10.0.0-M1</wicket.googlecode.version>
diff --git a/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java b/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
index 1e7dc20..68222e9 100644
--- a/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
+++ b/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
@@ -20,7 +20,7 @@
package org.apache.directory.fortress.web;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.realm.J2eePolicyMgr;
diff --git a/src/main/java/org/apache/directory/fortress/web/LoginPage.java b/src/main/java/org/apache/directory/fortress/web/LoginPage.java
index 436e013..b09dc43 100644
--- a/src/main/java/org/apache/directory/fortress/web/LoginPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/LoginPage.java
@@ -20,7 +20,7 @@
package org.apache.directory.fortress.web;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.wicket.markup.html.form.Button;
diff --git a/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java b/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java
index baf5277..09d319f 100644
--- a/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java
+++ b/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java
@@ -20,7 +20,7 @@
package org.apache.directory.fortress.web.control;
import org.apache.commons.collections4.CollectionUtils;
-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.util.Config;
diff --git a/src/main/java/org/apache/directory/fortress/web/model/AuditAuthzListModel.java b/src/main/java/org/apache/directory/fortress/web/model/AuditAuthzListModel.java
index 9f8c441..871ecf2 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/AuditAuthzListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/AuditAuthzListModel.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.web.model;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/web/model/AuditBindListModel.java b/src/main/java/org/apache/directory/fortress/web/model/AuditBindListModel.java
index b126c62..67ecb05 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/AuditBindListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/AuditBindListModel.java
@@ -20,7 +20,7 @@
package org.apache.directory.fortress.web.model;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/web/model/AuditModListModel.java b/src/main/java/org/apache/directory/fortress/web/model/AuditModListModel.java
index 56a0697..7fe8f17 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/AuditModListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/AuditModListModel.java
@@ -19,7 +19,7 @@
*/
package org.apache.directory.fortress.web.model;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/web/model/UserListModel.java b/src/main/java/org/apache/directory/fortress/web/model/UserListModel.java
index 9194338..3724b2e 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/UserListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/UserListModel.java
@@ -20,7 +20,7 @@
package org.apache.directory.fortress.web.model;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzDetailPanel.java
index 4989f72..41a8f5c 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzDetailPanel.java
@@ -20,7 +20,7 @@
package org.apache.directory.fortress.web.panel;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.web.control.SecUtils;
import org.apache.directory.fortress.web.event.SelectModelEvent;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java
index c638ea2..91c2fe5 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java
@@ -25,7 +25,7 @@
import com.inmethod.grid.IGridColumn;
import com.inmethod.grid.column.PropertyColumn;
import com.inmethod.grid.treegrid.TreeGrid;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.time.TUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditBindDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditBindDetailPanel.java
index dddb427..fd89397 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditBindDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditBindDetailPanel.java
@@ -21,7 +21,7 @@
package org.apache.directory.fortress.web.panel;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.apache.directory.fortress.web.control.SecUtils;
import org.apache.directory.fortress.web.event.SelectModelEvent;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditBindListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditBindListPanel.java
index 38f21f1..8365e47 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditBindListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditBindListPanel.java
@@ -26,7 +26,7 @@
import com.inmethod.grid.column.PropertyColumn;
import com.inmethod.grid.treegrid.TreeGrid;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.time.TUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
index 71a4563..e3a0adc 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
@@ -24,7 +24,7 @@
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.kendo.ui.datatable.column.IColumn;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.*;
import org.apache.directory.fortress.core.util.Config;
import org.apache.wicket.model.AbstractPropertyModel;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditModListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditModListPanel.java
index 6bfc753..ceb2536 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditModListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditModListPanel.java
@@ -26,7 +26,7 @@
import com.inmethod.grid.column.PropertyColumn;
import com.inmethod.grid.treegrid.TreeGrid;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.time.TUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
index 791e772..38a3022 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
@@ -22,7 +22,7 @@
import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
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.LdapInvalidDnException;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.model.name.Rdn;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
index c3b8556..720d6c3 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
@@ -25,7 +25,7 @@
import com.inmethod.grid.column.PropertyColumn;
import com.inmethod.grid.treegrid.TreeGrid;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.wicket.Component;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java
index 8d0eba6..8b7bfad 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java
@@ -24,7 +24,7 @@
import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
index 9b7aaa9..0593024 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
@@ -25,7 +25,7 @@
import com.inmethod.grid.column.PropertyColumn;
import com.inmethod.grid.treegrid.TreeGrid;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.wicket.Component;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
index 4fab453..e28bbee 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
@@ -25,7 +25,7 @@
import com.inmethod.grid.column.PropertyColumn;
import com.inmethod.grid.treegrid.TreeGrid;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.wicket.Component;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
index 42d7d49..f6d68eb 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
@@ -24,7 +24,7 @@
import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
index df141d9..80b504c 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
@@ -25,7 +25,7 @@
import com.inmethod.grid.column.PropertyColumn;
import com.inmethod.grid.treegrid.TreeGrid;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.wicket.Component;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
index 59ee328..89819f5 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
@@ -25,7 +25,7 @@
import com.inmethod.grid.column.PropertyColumn;
import com.inmethod.grid.treegrid.TreeGrid;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.wicket.Component;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RoleAdminDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/RoleAdminDetailPanel.java
index 2880e98..b00d308 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RoleAdminDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RoleAdminDetailPanel.java
@@ -23,7 +23,7 @@
import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.wicket.Component;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java
index 414eca8..662058a 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java
@@ -25,7 +25,7 @@
import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
index 9fcc970..eaf79a8 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
@@ -25,7 +25,7 @@
import com.inmethod.grid.column.PropertyColumn;
import com.inmethod.grid.treegrid.TreeGrid;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.wicket.Component;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
index dec70f4..0522046 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
@@ -25,7 +25,7 @@
import com.googlecode.wicket.kendo.ui.form.button.AjaxButton;
import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
index 510e578..d9b84e8 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
@@ -25,7 +25,7 @@
import com.inmethod.grid.column.PropertyColumn;
import com.inmethod.grid.treegrid.TreeGrid;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.wicket.Component;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java
index 89987cc..a87baff 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java
@@ -27,7 +27,7 @@
import com.googlecode.wicket.kendo.ui.form.dropdown.AjaxDropDownList;
import com.googlecode.wicket.kendo.ui.form.dropdown.DropDownList;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
index 700e59e..ba8497b 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
@@ -25,7 +25,7 @@
import com.inmethod.grid.column.PropertyColumn;
import com.inmethod.grid.treegrid.TreeGrid;
import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.web.common.GlobalIds;
import org.apache.directory.fortress.web.control.SecUtils;
import org.apache.directory.fortress.web.control.SecureIndicatingAjaxButton;
diff --git a/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java b/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
index 41de273..8b0b604 100644
--- a/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
+++ b/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
@@ -26,7 +26,7 @@
import java.util.concurrent.TimeUnit;
import io.github.bonigarcia.wdm.WebDriverManager;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.directory.fortress.core.util.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
