directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [2/2] directory-fortress-commander git commit: FC-109 - use new package structure
Date Tue, 02 Jun 2015 21:12:16 GMT
FC-109 - use new package structure


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/25248493
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/25248493
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/25248493

Branch: refs/heads/1.0-RC41
Commit: 25248493d61f0d5bcf5c90ef739fab13cb136b0c
Parents: d0f2c4a
Author: Shawn McKinney <smckinney@apache.org>
Authored: Tue Jun 2 16:12:25 2015 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Tue Jun 2 16:12:25 2015 -0500

----------------------------------------------------------------------
 .../directory/fortress/web/AuditAuthzPage.java  |  2 +-
 .../directory/fortress/web/AuditBindPage.java   |  2 +-
 .../directory/fortress/web/AuditModPage.java    |  2 +-
 .../fortress/web/FortressWebBasePage.java       |  2 +-
 .../directory/fortress/web/LoginPage.java       |  5 +-
 .../fortress/web/common/GlobalIds.java          | 12 ++--
 .../web/control/FtBookmarkablePageLink.java     |  2 +-
 .../web/control/FtIndicatingAjaxButton.java     |  2 +-
 .../fortress/web/control/SecUtils.java          | 22 ++++---
 .../web/control/SecureIndicatingAjaxButton.java |  2 +-
 .../web/control/SecureIndicatingAjaxLink.java   |  2 +-
 .../fortress/web/control/WicketSession.java     |  4 +-
 .../fortress/web/event/SaveModelEvent.java      |  2 +-
 .../fortress/web/event/SelectModelEvent.java    |  2 +-
 .../fortress/web/model/AuditAuthzListModel.java | 26 ++++----
 .../fortress/web/model/AuditBindListModel.java  | 10 +--
 .../fortress/web/model/AuditModListModel.java   | 21 ++++---
 .../fortress/web/model/GroupListModel.java      | 16 ++---
 .../fortress/web/model/OUListModel.java         |  8 +--
 .../fortress/web/model/ObjectListModel.java     | 10 +--
 .../fortress/web/model/PermListModel.java       |  8 +--
 .../fortress/web/model/PwPolicyListModel.java   |  8 +--
 .../fortress/web/model/RoleListModel.java       | 12 ++--
 .../fortress/web/model/SDListModel.java         | 12 ++--
 .../fortress/web/model/UserListModel.java       | 25 ++++----
 .../web/panel/AuditAuthzDetailPanel.java        |  8 +--
 .../fortress/web/panel/AuditAuthzListPanel.java | 18 +++---
 .../web/panel/AuditBindDetailPanel.java         |  8 +--
 .../fortress/web/panel/AuditBindListPanel.java  | 14 ++---
 .../fortress/web/panel/AuditModDetailPanel.java | 15 ++---
 .../fortress/web/panel/AuditModListPanel.java   | 16 ++---
 .../fortress/web/panel/AuditUtils.java          | 14 ++---
 .../fortress/web/panel/GroupDetailPanel.java    | 30 ++++-----
 .../fortress/web/panel/GroupListPanel.java      | 13 ++--
 .../fortress/web/panel/OUDetailPanel.java       | 11 ++--
 .../fortress/web/panel/OUListPanel.java         | 11 ++--
 .../fortress/web/panel/OUSearchModalPanel.java  |  6 +-
 .../fortress/web/panel/ObjectDetailPanel.java   |  4 +-
 .../fortress/web/panel/ObjectListPanel.java     | 13 ++--
 .../web/panel/ObjectSearchModalPanel.java       |  6 +-
 .../fortress/web/panel/PermDetailPanel.java     | 19 +++---
 .../fortress/web/panel/PermListPanel.java       | 15 ++---
 .../web/panel/PermSearchModalPanel.java         |  6 +-
 .../fortress/web/panel/PwPolicyDetailPanel.java |  2 +-
 .../fortress/web/panel/PwPolicyListPanel.java   | 11 ++--
 .../web/panel/PwPolicySearchModalPanel.java     |  6 +-
 .../web/panel/RoleAdminDetailPanel.java         | 12 ++--
 .../fortress/web/panel/RoleDetailPanel.java     | 17 +++---
 .../fortress/web/panel/RoleListPanel.java       | 13 ++--
 .../web/panel/RoleSearchModalPanel.java         | 10 +--
 .../fortress/web/panel/SDDetailPanel.java       | 13 ++--
 .../fortress/web/panel/SDListPanel.java         | 13 ++--
 .../web/panel/UserAuditDetailPanel.java         |  2 +-
 .../fortress/web/panel/UserDetailPanel.java     | 51 ++++++++--------
 .../fortress/web/panel/UserListPanel.java       | 19 +++---
 .../web/panel/UserSearchModalPanel.java         |  7 ++-
 src/main/resources/FortressWebDemoUsers.xml     | 64 ++++++++++----------
 src/main/resources/applicationContext.xml       |  2 +-
 .../integration/FortressWebSeleniumITCase.java  |  2 +-
 59 files changed, 356 insertions(+), 334 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/AuditAuthzPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/AuditAuthzPage.java b/src/main/java/org/apache/directory/fortress/web/AuditAuthzPage.java
index eda8255..6c0e036 100644
--- a/src/main/java/org/apache/directory/fortress/web/AuditAuthzPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/AuditAuthzPage.java
@@ -28,7 +28,7 @@ import org.apache.directory.fortress.web.panel.AuditAuthzDetailPanel;
 import org.apache.directory.fortress.web.panel.AuditAuthzListPanel;
 import org.apache.directory.fortress.web.panel.Displayable;
 import org.apache.directory.fortress.web.panel.InfoPanel;
-import org.apache.directory.fortress.core.rbac.UserAudit;
+import org.apache.directory.fortress.core.model.UserAudit;
 
 /**
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/AuditBindPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/AuditBindPage.java b/src/main/java/org/apache/directory/fortress/web/AuditBindPage.java
index 1791a46..3adffd8 100644
--- a/src/main/java/org/apache/directory/fortress/web/AuditBindPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/AuditBindPage.java
@@ -28,7 +28,7 @@ import org.apache.directory.fortress.web.panel.AuditBindDetailPanel;
 import org.apache.directory.fortress.web.panel.AuditBindListPanel;
 import org.apache.directory.fortress.web.panel.Displayable;
 import org.apache.directory.fortress.web.panel.InfoPanel;
-import org.apache.directory.fortress.core.rbac.UserAudit;
+import org.apache.directory.fortress.core.model.UserAudit;
 
 /**
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/AuditModPage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/AuditModPage.java b/src/main/java/org/apache/directory/fortress/web/AuditModPage.java
index a6ca62c..e631b35 100644
--- a/src/main/java/org/apache/directory/fortress/web/AuditModPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/AuditModPage.java
@@ -28,7 +28,7 @@ import org.apache.directory.fortress.web.panel.AuditModDetailPanel;
 import org.apache.directory.fortress.web.panel.AuditModListPanel;
 import org.apache.directory.fortress.web.panel.Displayable;
 import org.apache.directory.fortress.web.panel.InfoPanel;
-import org.apache.directory.fortress.core.rbac.UserAudit;
+import org.apache.directory.fortress.core.model.UserAudit;
 
 /**
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
----------------------------------------------------------------------
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 bcfc72f..f46df42 100644
--- a/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
+++ b/src/main/java/org/apache/directory/fortress/web/FortressWebBasePage.java
@@ -32,7 +32,7 @@ import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.core.*;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 
 import javax.servlet.http.HttpServletRequest;
 import java.security.Principal;

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/LoginPage.java
----------------------------------------------------------------------
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 476d6cb..6e9563b 100644
--- a/src/main/java/org/apache/directory/fortress/web/LoginPage.java
+++ b/src/main/java/org/apache/directory/fortress/web/LoginPage.java
@@ -20,6 +20,7 @@
 package org.apache.directory.fortress.web;
 
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.Form;
@@ -27,7 +28,7 @@ import org.apache.wicket.markup.html.form.PasswordTextField;
 import org.apache.wicket.markup.html.form.TextField;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.request.http.handler.RedirectRequestHandler;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.util.VUtil;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -86,7 +87,7 @@ public final class LoginPage extends FortressWebBasePage
             Principal principal = servletReq.getUserPrincipal();
             if ( principal == null )
             {
-                if ( VUtil.isNotNullOrEmpty( userId ) && VUtil.isNotNullOrEmpty( pswdField ) )
+                if ( StringUtils.isNotEmpty( userId ) && StringUtils.isNotEmpty( pswdField ) )
                 {
                     try
                     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/common/GlobalIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/common/GlobalIds.java b/src/main/java/org/apache/directory/fortress/web/common/GlobalIds.java
index 5be0c5b..239ae8a 100644
--- a/src/main/java/org/apache/directory/fortress/web/common/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/web/common/GlobalIds.java
@@ -45,12 +45,12 @@ public class GlobalIds
     public static final String SSD = "SSD";
     public static final String DSD = "DSD";
     public static final String PAGE_TYPE = "type";
-    public static final String ADMIN_MGR = "org.apache.directory.fortress.core.rbac.AdminMgrImpl";
-    public static final String REVIEW_MGR = "org.apache.directory.fortress.core.rbac.ReviewMgrImpl";
-    public static final String DEL_ADMIN_MGR = "org.apache.directory.fortress.core.rbac.DelAdminMgrImpl";
-    public static final String DEL_REVIEW_MGR = "org.apache.directory.fortress.core.rbac.DelReviewMgrImpl";
-    public static final String PWPOLICY_MGR = "org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl";
-    public static final String AUDIT_MGR = "org.apache.directory.fortress.core.rbac.AuditMgrImpl";
+    public static final String ADMIN_MGR = "org.apache.directory.fortress.core.impl.AdminMgrImpl";
+    public static final String REVIEW_MGR = "org.apache.directory.fortress.core.impl.ReviewMgrImpl";
+    public static final String DEL_ADMIN_MGR = "org.apache.directory.fortress.core.impl.DelAdminMgrImpl";
+    public static final String DEL_REVIEW_MGR = "org.apache.directory.fortress.core.impl.DelReviewMgrImpl";
+    public static final String PWPOLICY_MGR = "org.apache.directory.fortress.core.impl.PwPolicyMgrImpl";
+    public static final String AUDIT_MGR = "org.apache.directory.fortress.core.impl.AuditMgrImpl";
     public static final String GROUP_MGR = "org.apache.directory.fortress.core.ldap.group.GroupMgrImpl";
     public static final String ASSIGN_USER = "assignUser";
     public static final String ADD = "add";

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/control/FtBookmarkablePageLink.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/control/FtBookmarkablePageLink.java b/src/main/java/org/apache/directory/fortress/web/control/FtBookmarkablePageLink.java
index 70991f4..e1454c1 100644
--- a/src/main/java/org/apache/directory/fortress/web/control/FtBookmarkablePageLink.java
+++ b/src/main/java/org/apache/directory/fortress/web/control/FtBookmarkablePageLink.java
@@ -20,7 +20,7 @@
 package org.apache.directory.fortress.web.control;
 
 
-import org.apache.directory.fortress.core.rbac.Permission;
+import org.apache.directory.fortress.core.model.Permission;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Page;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/control/FtIndicatingAjaxButton.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/control/FtIndicatingAjaxButton.java b/src/main/java/org/apache/directory/fortress/web/control/FtIndicatingAjaxButton.java
index 9388fb9..62a8c94 100644
--- a/src/main/java/org/apache/directory/fortress/web/control/FtIndicatingAjaxButton.java
+++ b/src/main/java/org/apache/directory/fortress/web/control/FtIndicatingAjaxButton.java
@@ -23,7 +23,7 @@ import com.googlecode.wicket.jquery.ui.form.button.IndicatingAjaxButton;
 import org.apache.log4j.Logger;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.core.*;
-import org.apache.directory.fortress.core.rbac.Permission;
+import org.apache.directory.fortress.core.model.Permission;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/control/SecUtils.java
----------------------------------------------------------------------
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 732cd90..136402b 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
@@ -19,19 +19,21 @@
  */
 package org.apache.directory.fortress.web.control;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.*;
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.cfg.Config;
-import org.apache.directory.fortress.core.rbac.UserRole;
-import org.apache.directory.fortress.core.rbac.Warning;
+import org.apache.directory.fortress.core.util.Config;
+import org.apache.directory.fortress.core.model.UserRole;
+import org.apache.directory.fortress.core.model.Warning;
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.directory.fortress.realm.*;
 import org.apache.directory.fortress.realm.GlobalIds;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.util.VUtil;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 
 import javax.servlet.http.HttpServletRequest;
@@ -177,7 +179,7 @@ public class SecUtils
     public static boolean isFound( Permission permission, Component component )
     {
         List<Permission> permissions = SecUtils.getPermissions( component );
-        return VUtil.isNotNullOrEmpty( permissions ) && permissions.contains( permission );
+        return ObjUtil.isNotNullOrEmpty( permissions ) && permissions.contains( permission );
     }
 
     /**
@@ -216,7 +218,7 @@ public class SecUtils
         }
         try
         {
-            if(VUtil.isNotNullOrEmpty( szPrincipal ))
+            if( StringUtils.isNotEmpty( szPrincipal ))
                 realmSession = j2eePolicyMgr.deserialize( szPrincipal );
         }
         catch( SecurityException se )
@@ -260,7 +262,7 @@ public class SecUtils
             session.getSession().setWarnings( null );
             accessMgr.addActiveRole( session.getSession(), new UserRole( roleName ) );
             List<Warning> warnings = session.getSession().getWarnings();
-            if ( VUtil.isNotNullOrEmpty( warnings ) )
+            if ( ObjUtil.isNotNullOrEmpty( warnings ) )
             {
                 for ( Warning warning : warnings )
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxButton.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxButton.java b/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxButton.java
index 419cb20..106256c 100644
--- a/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxButton.java
+++ b/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxButton.java
@@ -24,7 +24,7 @@ import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.core.*;
-import org.apache.directory.fortress.core.rbac.Permission;
+import org.apache.directory.fortress.core.model.Permission;
 
 import javax.servlet.http.HttpServletRequest;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxLink.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxLink.java b/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxLink.java
index c978610..51eba6d 100644
--- a/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxLink.java
+++ b/src/main/java/org/apache/directory/fortress/web/control/SecureIndicatingAjaxLink.java
@@ -22,7 +22,7 @@ package org.apache.directory.fortress.web.control;
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
-import org.apache.directory.fortress.core.rbac.Permission;
+import org.apache.directory.fortress.core.model.Permission;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/control/WicketSession.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/control/WicketSession.java b/src/main/java/org/apache/directory/fortress/web/control/WicketSession.java
index 03fe3b9..f55db4a 100644
--- a/src/main/java/org/apache/directory/fortress/web/control/WicketSession.java
+++ b/src/main/java/org/apache/directory/fortress/web/control/WicketSession.java
@@ -22,8 +22,8 @@ package org.apache.directory.fortress.web.control;
 
 import org.apache.wicket.protocol.http.WebSession;
 import org.apache.wicket.request.Request;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Session;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/event/SaveModelEvent.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/event/SaveModelEvent.java b/src/main/java/org/apache/directory/fortress/web/event/SaveModelEvent.java
index 1033187..4e3a924 100644
--- a/src/main/java/org/apache/directory/fortress/web/event/SaveModelEvent.java
+++ b/src/main/java/org/apache/directory/fortress/web/event/SaveModelEvent.java
@@ -29,7 +29,7 @@ import org.apache.wicket.request.ILogData;
 import org.apache.wicket.request.IRequestCycle;
 import org.apache.wicket.request.component.IRequestablePage;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.directory.fortress.core.rbac.FortEntity;
+import org.apache.directory.fortress.core.model.FortEntity;
 
 import java.util.Collection;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/event/SelectModelEvent.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/event/SelectModelEvent.java b/src/main/java/org/apache/directory/fortress/web/event/SelectModelEvent.java
index 8f02b51..dc05855 100644
--- a/src/main/java/org/apache/directory/fortress/web/event/SelectModelEvent.java
+++ b/src/main/java/org/apache/directory/fortress/web/event/SelectModelEvent.java
@@ -29,7 +29,7 @@ import org.apache.wicket.request.ILogData;
 import org.apache.wicket.request.IRequestCycle;
 import org.apache.wicket.request.component.IRequestablePage;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.directory.fortress.core.rbac.FortEntity;
+import org.apache.directory.fortress.core.model.FortEntity;
 
 import java.util.Collection;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/model/AuditAuthzListModel.java
----------------------------------------------------------------------
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 305703b..1c4815d 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,17 +19,17 @@
  */
 package org.apache.directory.fortress.web.model;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.core.AuditMgr;
 import org.apache.directory.fortress.core.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.AuthZ;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.rbac.UserAudit;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.AuthZ;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.UserAudit;
 import org.apache.directory.fortress.core.SecurityException;
 
 import java.util.ArrayList;
@@ -91,17 +91,17 @@ public class AuditAuthzListModel extends Model<SerializableList<AuthZ>>
         
         // if caller did not set userId return an empty list:
         if (userAudit == null ||
-             ( !VUtil.isNotNullOrEmpty( userAudit.getUserId() )   &&
-               !VUtil.isNotNullOrEmpty( userAudit.getObjName() )  &&
-               !VUtil.isNotNullOrEmpty( userAudit.getOpName() )  &&
-               //!VUtil.isNotNullOrEmpty( userAudit.getDn() )  &&
+             ( !StringUtils.isNotEmpty( userAudit.getUserId() )   &&
+               !StringUtils.isNotEmpty( userAudit.getObjName() )  &&
+               !StringUtils.isNotEmpty( userAudit.getOpName() )  &&
+               //!StringUtils.isNotEmpty( userAudit.getDn() )  &&
                userAudit.getBeginDate() == null  &&
                userAudit.getEndDate() == null
              )
             ||
-             ( !VUtil.isNotNullOrEmpty( userAudit.getUserId() )   &&
-                VUtil.isNotNullOrEmpty( userAudit.getObjName() )  &&
-                !VUtil.isNotNullOrEmpty( userAudit.getOpName() )  &&
+             ( !StringUtils.isNotEmpty( userAudit.getUserId() )   &&
+                StringUtils.isNotEmpty( userAudit.getObjName() )  &&
+                !StringUtils.isNotEmpty( userAudit.getOpName() )  &&
                 userAudit.getBeginDate() == null  &&
                 userAudit.getEndDate() == null
             )
@@ -115,7 +115,7 @@ public class AuditAuthzListModel extends Model<SerializableList<AuthZ>>
         {
             // get the list of matching authorization records from fortress:
             //log.debug( ".getObject authZ id: " + userAudit != null ? userAudit.getUserId() : "null" );
-            if ( VUtil.isNotNullOrEmpty( userAudit.getObjName()) && VUtil.isNotNullOrEmpty( userAudit.getOpName()) && !VUtil.isNotNullOrEmpty( userAudit.getDn() ) )
+            if ( StringUtils.isNotEmpty( userAudit.getObjName() ) && StringUtils.isNotEmpty( userAudit.getOpName() ) && !StringUtils.isNotEmpty( userAudit.getDn() ) )
             {
                 Permission permission = getPermission( userAudit );
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/model/AuditBindListModel.java
----------------------------------------------------------------------
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 98fd3ef..d704277 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,15 +20,15 @@
 
 package org.apache.directory.fortress.web.model;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.core.AuditMgr;
-import org.apache.directory.fortress.core.rbac.Bind;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.rbac.UserAudit;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.Bind;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.UserAudit;
 import org.apache.directory.fortress.core.SecurityException;
 
 import java.util.ArrayList;
@@ -89,7 +89,7 @@ public class AuditBindListModel extends Model<SerializableList<Bind>>
         // if caller did not set userId return an empty list:
         if ( ( userAudit == null ) || 
              ( 
-                 !VUtil.isNotNullOrEmpty( userAudit.getUserId() ) &&
+                 !StringUtils.isNotEmpty( userAudit.getUserId() ) &&
                  ( userAudit.getBeginDate() == null ) && 
                  ( userAudit.getEndDate() == null )
              )

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/model/AuditModListModel.java
----------------------------------------------------------------------
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 f385932..c19c7a7 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,17 +19,17 @@
  */
 package org.apache.directory.fortress.web.model;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.core.AuditMgr;
 import org.apache.directory.fortress.core.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.Mod;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserAudit;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.Mod;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserAudit;
 import org.apache.directory.fortress.core.SecurityException;
 
 import java.util.ArrayList;
@@ -91,9 +91,9 @@ public class AuditModListModel extends Model<SerializableList<Mod>>
         // if caller did not set userId return an empty list:
         if ( ( userAudit == null ) ||
              ( 
-                 !VUtil.isNotNullOrEmpty( userAudit.getUserId() )  &&
-                 !VUtil.isNotNullOrEmpty( userAudit.getObjName() )  &&
-                 !VUtil.isNotNullOrEmpty( userAudit.getOpName() )  &&
+                 !StringUtils.isNotEmpty( userAudit.getUserId() )  &&
+                 !StringUtils.isNotEmpty( userAudit.getObjName() )  &&
+                 !StringUtils.isNotEmpty( userAudit.getOpName() )  &&
                  ( userAudit.getBeginDate() == null ) &&
                  ( userAudit.getEndDate() == null )
              )
@@ -105,7 +105,8 @@ public class AuditModListModel extends Model<SerializableList<Mod>>
         else
         {
             // do we need to retrieve the internalUserId (which is what maps to admin modification record in slapd audit log?
-            if ( VUtil.isNotNullOrEmpty( userAudit.getUserId()) && !VUtil.isNotNullOrEmpty( userAudit.getInternalUserId() ) )
+            if ( StringUtils.isNotEmpty( userAudit.getUserId() ) && !StringUtils.isNotEmpty( userAudit
+                .getInternalUserId() ) )
             {
                 User user = getUser( userAudit );
                 
@@ -150,7 +151,7 @@ public class AuditModListModel extends Model<SerializableList<Mod>>
         {
             userAudit.setDn( "" );
             
-            if (VUtil.isNotNullOrEmpty( userAudit.getObjName() ) )
+            if ( StringUtils.isNotEmpty( userAudit.getObjName() ) )
             {
                 userAudit.setObjName( getTruncatedObjName( userAudit.getObjName() ) );
             }

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/model/GroupListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/GroupListModel.java b/src/main/java/org/apache/directory/fortress/web/model/GroupListModel.java
index 12b0488..54ef4f0 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/GroupListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/GroupListModel.java
@@ -19,15 +19,15 @@
  */
 package org.apache.directory.fortress.web.model;
 
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.directory.fortress.core.ldap.group.Group;
-import org.apache.directory.fortress.core.ldap.group.GroupMgr;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.Group;
+import org.apache.directory.fortress.core.GroupMgr;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.SecurityException;
 
 import java.util.ArrayList;
@@ -96,7 +96,7 @@ public class GroupListModel extends Model<SerializableList<Group>>
         {
             LOG.debug( ".getObject group name: " + group.getName() );
             List<Group> foundGroups = getList( group );
-            if(VUtil.isNotNullOrEmpty( foundGroups ))
+            if( ObjUtil.isNotNullOrEmpty( foundGroups ))
             {
                 groups = new SerializableList<>( foundGroups );
             }
@@ -132,7 +132,7 @@ public class GroupListModel extends Model<SerializableList<Group>>
         
         try
         {
-            if ( VUtil.isNotNullOrEmpty( group.getMembers() ) )
+            if ( ObjUtil.isNotNullOrEmpty( group.getMembers() ) )
             {
                 String userId = group.getMembers().get( 0 );
                 LOG.debug( ".getList userId name: " + userId );
@@ -144,7 +144,7 @@ public class GroupListModel extends Model<SerializableList<Group>>
                 groupList = groupMgr.find( group );
             }
             // sort list by name:
-            if( VUtil.isNotNullOrEmpty( groupList ))
+            if( ObjUtil.isNotNullOrEmpty( groupList ))
             {
                 Collections.sort( groupList, new Comparator<Group>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/model/OUListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/OUListModel.java b/src/main/java/org/apache/directory/fortress/web/model/OUListModel.java
index 2976cea..58537d2 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/OUListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/OUListModel.java
@@ -19,14 +19,14 @@
  */
 package org.apache.directory.fortress.web.model;
 
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.core.DelReviewMgr;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.OrgUnit;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.SecurityException;
 
 import java.util.ArrayList;
@@ -131,7 +131,7 @@ public class OUListModel extends Model<SerializableList<OrgUnit>>
             LOG.debug( ".getList orgUnitNm: " + szOrgUnitNm );
             orgUnitList = delReviewMgr.search( orgUnit.getType(), orgUnit.getName() );
             // sort list by name:
-            if( VUtil.isNotNullOrEmpty( orgUnitList ))
+            if( ObjUtil.isNotNullOrEmpty( orgUnitList ))
             {
                 Collections.sort( ( orgUnitList ), new Comparator<OrgUnit>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/model/ObjectListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/ObjectListModel.java b/src/main/java/org/apache/directory/fortress/web/model/ObjectListModel.java
index e3bfa5f..f3e13a4 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/ObjectListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/ObjectListModel.java
@@ -19,16 +19,16 @@
  */
 package org.apache.directory.fortress.web.model;
 
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.fortress.core.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.rbac.PermObj;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.OrgUnit;
+import org.apache.directory.fortress.core.model.PermObj;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.SecurityException;
 
 import java.util.ArrayList;
@@ -149,7 +149,7 @@ public class ObjectListModel extends Model<SerializableList<PermObj>>
                 permObjList = reviewMgr.findPermObjs( new OrgUnit( ou ) );
             }
             // sort list by objName:
-            if( VUtil.isNotNullOrEmpty( permObjList ))
+            if( ObjUtil.isNotNullOrEmpty( permObjList ))
             {
                 Collections.sort( permObjList, new Comparator<PermObj>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/model/PermListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/PermListModel.java b/src/main/java/org/apache/directory/fortress/web/model/PermListModel.java
index 02c6eff..3de9e95 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/PermListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/PermListModel.java
@@ -19,14 +19,14 @@
  */
 package org.apache.directory.fortress.web.model;
 
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.core.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.SecurityException;
 
 import java.util.ArrayList;
@@ -136,7 +136,7 @@ public class PermListModel extends Model<SerializableList<Permission>>
             perm.setAdmin( isAdmin );
             permsList = reviewMgr.findPermissions( perm );
             // sort list by abstract name:
-            if( VUtil.isNotNullOrEmpty( permsList ))
+            if( ObjUtil.isNotNullOrEmpty( permsList ))
             {
                 Collections.sort( permsList, new Comparator<Permission>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/model/PwPolicyListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/PwPolicyListModel.java b/src/main/java/org/apache/directory/fortress/web/model/PwPolicyListModel.java
index 9ca092a..e6547cc 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/PwPolicyListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/PwPolicyListModel.java
@@ -19,14 +19,14 @@
  */
 package org.apache.directory.fortress.web.model;
 
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.core.PwPolicyMgr;
-import org.apache.directory.fortress.core.rbac.PwPolicy;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.PwPolicy;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.SecurityException;
 
 import java.util.ArrayList;
@@ -129,7 +129,7 @@ public class PwPolicyListModel extends Model<SerializableList<PwPolicy>>
             LOG.debug( ".getList policyNm: " + szPolicyNm );
             policiesList = pwPolicyMgr.search( szPolicyNm );
             // sort list by policy name:
-            if( VUtil.isNotNullOrEmpty( policiesList ))
+            if( ObjUtil.isNotNullOrEmpty( policiesList ))
             {
                 Collections.sort( policiesList, new Comparator<PwPolicy>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/model/RoleListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/RoleListModel.java b/src/main/java/org/apache/directory/fortress/web/model/RoleListModel.java
index 21844a4..0177518 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/RoleListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/RoleListModel.java
@@ -19,16 +19,16 @@
  */
 package org.apache.directory.fortress.web.model;
 
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.core.DelReviewMgr;
 import org.apache.directory.fortress.core.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.AdminRole;
-import org.apache.directory.fortress.core.rbac.Role;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.AdminRole;
+import org.apache.directory.fortress.core.model.Role;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.SecurityException;
 
 import java.util.ArrayList;
@@ -140,7 +140,7 @@ public class RoleListModel extends Model<SerializableList<? extends Role>>
             LOG.debug( ".getList roleNm: " + szRoleNm );
             rolesList = reviewMgr.findRoles( szRoleNm );
             // sort list by role name:
-            if( VUtil.isNotNullOrEmpty( rolesList ))
+            if( ObjUtil.isNotNullOrEmpty( rolesList ))
             {
                 Collections.sort( rolesList, new Comparator<Role>()
                 {
@@ -170,7 +170,7 @@ public class RoleListModel extends Model<SerializableList<? extends Role>>
         {
             LOG.debug( ".getList roleNm: " + szRoleNm );
             rolesList = delReviewMgr.findRoles( szRoleNm );
-            if( VUtil.isNotNullOrEmpty( rolesList ))
+            if( ObjUtil.isNotNullOrEmpty( rolesList ))
             {
                 Collections.sort( rolesList, new Comparator<AdminRole>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/model/SDListModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/model/SDListModel.java b/src/main/java/org/apache/directory/fortress/web/model/SDListModel.java
index 4cf80af..4e9880f 100644
--- a/src/main/java/org/apache/directory/fortress/web/model/SDListModel.java
+++ b/src/main/java/org/apache/directory/fortress/web/model/SDListModel.java
@@ -19,15 +19,15 @@
  */
 package org.apache.directory.fortress.web.model;
 
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.core.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.Role;
-import org.apache.directory.fortress.core.rbac.SDSet;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.Role;
+import org.apache.directory.fortress.core.model.SDSet;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.SecurityException;
 
 import java.util.ArrayList;
@@ -133,7 +133,7 @@ public class SDListModel extends Model<SerializableList<SDSet>>
             String szSdSetNm = sdSet.getName();
             LOG.debug( ".getList sdSetNm: " + szSdSetNm );
 
-            if ( VUtil.isNotNullOrEmpty( sdSet.getMembers() ) )
+            if ( ObjUtil.isNotNullOrEmpty( sdSet.getMembers() ) )
             {
                 Object[] roleNms = sdSet.getMembers().toArray();
                 String szRoleNm = (String)roleNms[0];
@@ -160,7 +160,7 @@ public class SDListModel extends Model<SerializableList<SDSet>>
                 }
             }
             // sort list by set name:
-            if( VUtil.isNotNullOrEmpty( sdSetList ))
+            if( ObjUtil.isNotNullOrEmpty( sdSetList ))
             {
                 Collections.sort( sdSetList, new Comparator<SDSet>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/model/UserListModel.java
----------------------------------------------------------------------
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 483e27e..7089753 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
@@ -19,6 +19,8 @@
  */
 package org.apache.directory.fortress.web.model;
 
+import org.apache.commons.lang.StringUtils;
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.injection.Injector;
 import org.apache.wicket.model.Model;
@@ -26,13 +28,12 @@ import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.web.panel.UserListPanel;
 import org.apache.directory.fortress.core.DelReviewMgr;
 import org.apache.directory.fortress.core.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.AdminRole;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Role;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.AdminRole;
+import org.apache.directory.fortress.core.model.OrgUnit;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Role;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.SecurityException;
 
 import java.util.ArrayList;
@@ -152,7 +153,7 @@ public class UserListModel extends Model<SerializableList<User>>
             {
                 Set<String> users = reviewMgr.authorizedPermissionUsers( perm );
                 
-                if ( VUtil.isNotNullOrEmpty( users ) )
+                if ( ObjUtil.isNotNullOrEmpty( users ) )
                 {
                     usersList = new ArrayList<>();
                     
@@ -163,15 +164,15 @@ public class UserListModel extends Model<SerializableList<User>>
                     }
                 }
             }
-            else if( VUtil.isNotNullOrEmpty( user.getOu() ) )
+            else if( StringUtils.isNotEmpty( user.getOu() ) )
             {
                 usersList = reviewMgr.findUsers( new OrgUnit( user.getOu(), OrgUnit.Type.USER ) );
             }
-            else if ( VUtil.isNotNullOrEmpty( user.getRoles() ) )
+            else if ( ObjUtil.isNotNullOrEmpty( user.getRoles() ) )
             {
                 usersList = reviewMgr.assignedUsers( new Role( user.getRoles().get( 0 ).getName() ) );
             }
-            else if ( VUtil.isNotNullOrEmpty( user.getAdminRoles() ) )
+            else if ( ObjUtil.isNotNullOrEmpty( user.getAdminRoles() ) )
             {
                 usersList = delReviewMgr.assignedUsers( new AdminRole( user.getAdminRoles().get( 0 ).getName() ) );
             }
@@ -180,7 +181,7 @@ public class UserListModel extends Model<SerializableList<User>>
                 usersList = reviewMgr.findUsers( user );
             }
             // sort list by userId:
-            if( VUtil.isNotNullOrEmpty( usersList ))
+            if( ObjUtil.isNotNullOrEmpty( usersList ))
             {
                 Collections.sort( usersList, new Comparator<User>()
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzDetailPanel.java
----------------------------------------------------------------------
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 01e3938..ec89039 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
@@ -21,6 +21,7 @@
 package org.apache.directory.fortress.web.panel;
 
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.directory.fortress.web.control.SecUtils;
 import org.apache.directory.fortress.web.event.SelectModelEvent;
 import org.apache.log4j.Logger;
@@ -35,9 +36,8 @@ import org.apache.wicket.model.IModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.directory.fortress.core.*;
-import org.apache.directory.fortress.core.rbac.AuthZ;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.AuthZ;
+import org.apache.directory.fortress.core.model.User;
 
 
 /**
@@ -136,7 +136,7 @@ public class AuditAuthzDetailPanel extends FormComponentPanel
                 User user = null;
                 // necessary to push the 'changed' model down into the aggregated panel:
                 AuthZ authZ = ( AuthZ ) detailForm.getModelObject();
-                if ( VUtil.isNotNullOrEmpty( authZ.getReqAuthzID() ) )
+                if ( StringUtils.isNotBlank( authZ.getReqAuthzID() ) )
                 {
                     user = AuditUtils.getUser( reviewMgr, authZ.getReqAuthzID() );
                 }

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/AuditAuthzListPanel.java
----------------------------------------------------------------------
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 57a99d2..68f1f6f 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,6 +25,8 @@ import com.googlecode.wicket.kendo.ui.form.datetime.DatePicker;
 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.directory.fortress.core.util.time.TUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -45,14 +47,12 @@ import org.apache.directory.fortress.web.control.SecUtils;
 import org.apache.directory.fortress.web.control.SecureIndicatingAjaxButton;
 import org.apache.directory.fortress.web.control.SecureIndicatingAjaxLink;
 import org.apache.directory.fortress.web.event.SelectModelEvent;
-import org.apache.directory.fortress.core.rbac.AuthZ;
+import org.apache.directory.fortress.core.model.AuthZ;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.Model;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserAudit;
-import org.apache.directory.fortress.core.util.attr.AttrHelper;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserAudit;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -254,7 +254,7 @@ public class AuditAuthzListPanel extends FormComponentPanel
             {
                 LOG.debug( ".search onSubmit" );
                 UserAudit userAudit = ( UserAudit ) listForm.getModelObject();
-                if ( !VUtil.isNotNullOrEmpty( userAudit.getUserId() ) )
+                if ( !StringUtils.isNotEmpty( userAudit.getUserId() ) )
                 {
                     userAudit.setUserId( "" );
                 }
@@ -585,7 +585,7 @@ public class AuditAuthzListPanel extends FormComponentPanel
             Date start = null;
             try
             {
-                start = AttrHelper.decodeGeneralizedTime( authZ.getReqStart() );
+                start = TUtil.decodeGeneralizedTime( authZ.getReqStart() );
             }
             catch ( ParseException pe )
             {
@@ -600,7 +600,7 @@ public class AuditAuthzListPanel extends FormComponentPanel
             authZ.setReqResult( GlobalIds.FAILURE );
             /*
                         TODO: On RC40 - Replace above line with the following:
-                        if(VUtil.isNotNullOrEmpty( authZ.getReqAssertion() ) && (authZ.getReqAssertion().equals( org.apache.directory.fortress.core.GlobalIds.AUTH_Z_FAILED_VALUE ) ) )
+                        if(StringUtils.isNotEmpty( authZ.getReqAssertion() ) && (authZ.getReqAssertion().equals( org.apache.directory.fortress.core.GlobalIds.AUTH_Z_FAILED_VALUE ) ) )
                         {
                             authZ.setReqResult( GlobalIds.FAILURE );
                         }

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/AuditBindDetailPanel.java
----------------------------------------------------------------------
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 a45856b..5e0a741 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,6 +21,7 @@
 package org.apache.directory.fortress.web.panel;
 
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.directory.fortress.web.control.SecUtils;
 import org.apache.directory.fortress.web.event.SelectModelEvent;
 import org.apache.log4j.Logger;
@@ -35,9 +36,8 @@ import org.apache.wicket.model.IModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.directory.fortress.core.*;
-import org.apache.directory.fortress.core.rbac.Bind;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.Bind;
+import org.apache.directory.fortress.core.model.User;
 
 
 /**
@@ -133,7 +133,7 @@ public class AuditBindDetailPanel extends FormComponentPanel
                 User user = null;
                 // necessary to push the 'changed' model down into the aggregated panel:
                 Bind bind = ( Bind ) detailForm.getModelObject();
-                if ( VUtil.isNotNullOrEmpty( bind.getReqDN() ) )
+                if ( StringUtils.isNotBlank( bind.getReqDN() ) )
                 {
                     user = AuditUtils.getUser( reviewMgr, bind.getReqDN() );
                 }

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/AuditBindListPanel.java
----------------------------------------------------------------------
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 63b48bf..0639d3e 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,6 +26,8 @@ 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.directory.fortress.core.util.time.TUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -49,11 +51,9 @@ import org.apache.directory.fortress.web.event.SelectModelEvent;
 import org.apache.directory.fortress.web.model.SerializableList;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.Model;
-import org.apache.directory.fortress.core.rbac.Bind;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserAudit;
-import org.apache.directory.fortress.core.util.attr.AttrHelper;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.Bind;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserAudit;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -198,7 +198,7 @@ public class AuditBindListPanel extends FormComponentPanel
             {
                 LOG.debug( ".search onSubmit" );
                 UserAudit userAudit = ( UserAudit ) listForm.getModelObject();
-                if ( !VUtil.isNotNullOrEmpty( userAudit.getUserId() ) )
+                if ( !StringUtils.isNotEmpty( userAudit.getUserId() ) )
                 {
                     userAudit.setUserId( "" );
                 }
@@ -429,7 +429,7 @@ public class AuditBindListPanel extends FormComponentPanel
             Date start = null;
             try
             {
-                start = AttrHelper.decodeGeneralizedTime( bind.getReqStart() );
+                start = TUtil.decodeGeneralizedTime( bind.getReqStart() );
             }
             catch ( ParseException pe )
             {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/AuditModDetailPanel.java
----------------------------------------------------------------------
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 0f4a5c6..ffb3895 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
@@ -25,6 +25,8 @@ import com.googlecode.wicket.jquery.core.Options;
 import com.googlecode.wicket.kendo.ui.datatable.DataTable;
 import com.googlecode.wicket.kendo.ui.datatable.column.IColumn;
 import com.googlecode.wicket.kendo.ui.datatable.column.PropertyColumn;
+import org.apache.commons.lang.StringUtils;
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -43,9 +45,8 @@ import org.apache.directory.fortress.web.control.SecUtils;
 import org.apache.directory.fortress.web.event.SelectModelEvent;
 import org.apache.directory.fortress.core.AuditMgr;
 import org.apache.directory.fortress.core.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.Mod;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.Mod;
+import org.apache.directory.fortress.core.model.User;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -148,7 +149,7 @@ public class AuditModDetailPanel extends FormComponentPanel
                 if ( indx != -1 )
                 {
                     ftModifier = modifications.get( indx ).getValue();
-                    if ( VUtil.isNotNullOrEmpty( ftModifier ) )
+                    if ( StringUtils.isNotEmpty( ftModifier ) )
                     {
                         user = AuditUtils.getUserByInternalId( reviewMgr, ftModifier );
                         userId = user.getUserId();
@@ -194,10 +195,10 @@ public class AuditModDetailPanel extends FormComponentPanel
         private List<RequestMod> parseRequestMods( List<String> mods )
         {
             List<RequestMod> results = new ArrayList<>();
-            if ( VUtil.isNotNullOrEmpty( mods ) )
+            if ( ObjUtil.isNotNullOrEmpty( mods ) )
             {
                 Mod mod = ( Mod ) detailForm.getModelObject();
-                if ( mod != null && VUtil.isNotNullOrEmpty( mod.getReqMod() ) )
+                if ( mod != null && ObjUtil.isNotNullOrEmpty( mod.getReqMod() ) )
                 {
                     int ctr = 1;
                     for ( String szMod : mod.getReqMod() )
@@ -243,7 +244,7 @@ public class AuditModDetailPanel extends FormComponentPanel
     private IDataProvider<RequestMod> createDataProvider( List<RequestMod> mods )
     {
         ListDataProvider<RequestMod> results;
-        if ( VUtil.isNotNullOrEmpty( mods ) )
+        if ( ObjUtil.isNotNullOrEmpty( mods ) )
         {
             results = new ListDataProvider<>( mods );
         }

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/AuditModListPanel.java
----------------------------------------------------------------------
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 23c9c01..21756ab 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,6 +26,8 @@ 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.directory.fortress.core.util.time.TUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -48,12 +50,10 @@ import org.apache.directory.fortress.web.event.SelectModelEvent;
 import org.apache.directory.fortress.web.model.SerializableList;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.Model;
-import org.apache.directory.fortress.core.rbac.Mod;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserAudit;
-import org.apache.directory.fortress.core.util.attr.AttrHelper;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.Mod;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserAudit;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -216,7 +216,7 @@ public class AuditModListPanel extends FormComponentPanel
             {
                 LOG.debug( ".search onSubmit" );
                 UserAudit userAudit = ( UserAudit ) listForm.getModelObject();
-                if ( !VUtil.isNotNullOrEmpty( userAudit.getUserId() ) )
+                if ( !StringUtils.isNotEmpty( userAudit.getUserId() ) )
                 {
                     userAudit.setUserId( "" );
                 }
@@ -525,7 +525,7 @@ public class AuditModListPanel extends FormComponentPanel
             Date start = null;
             try
             {
-                start = AttrHelper.decodeGeneralizedTime( mod.getReqStart() );
+                start = TUtil.decodeGeneralizedTime( mod.getReqStart() );
             }
             catch ( ParseException pe )
             {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java b/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java
index caca0ed..5fc26db 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/AuditUtils.java
@@ -21,10 +21,10 @@
 package org.apache.directory.fortress.web.panel;
 
 import org.apache.directory.fortress.core.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.AuthZ;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.AuthZ;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.log4j.Logger;
 
@@ -51,7 +51,7 @@ final class AuditUtils
      */
     static Permission getAuthZPerm( String raw )
     {
-        //// ftOpNm=addUser,ftObjNm=org.apache.directory.fortress.core.rbac.AdminMgrImpl,ou=AdminPerms,ou=ARBAC,dc=jts,dc=us
+        //// ftOpNm=addUser,ftObjNm=org.apache.directory.fortress.core.model.AdminMgrImpl,ou=AdminPerms,ou=ARBAC,dc=jts,dc=us
         // ftObjId=006+ftOpNm=TOP1_6,ftObjNm=TOB1_4,ou=Permissions,ou=RBAC,dc=jts,dc=us
         Permission perm = new Permission();
         int bindx = raw.indexOf( GlobalIds.POBJ_ID );
@@ -92,7 +92,7 @@ final class AuditUtils
      */
     static void mapAuthZPerm( AuthZ authZ )
     {
-        //// ftOpNm=addUser,ftObjNm=org.apache.directory.fortress.core.rbac.AdminMgrImpl,ou=AdminPerms,ou=ARBAC,dc=jts,dc=us
+        //// ftOpNm=addUser,ftObjNm=org.apache.directory.fortress.core.impl.AdminMgrImpl,ou=AdminPerms,ou=ARBAC,dc=jts,dc=us
         // ftObjId=006+ftOpNm=TOP1_6,ftObjNm=TOB1_4,ou=Permissions,ou=RBAC,dc=jts,dc=us
         String raw = authZ.getReqDN();
 
@@ -194,7 +194,7 @@ final class AuditUtils
             User inUser = new User();
             inUser.setInternalId( internalId );
             List<User> users = reviewMgr.findUsers( inUser );
-            if ( VUtil.isNotNullOrEmpty( users ) )
+            if ( ObjUtil.isNotNullOrEmpty( users ) )
             {
                 if ( users.size() > 1 )
                 {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/GroupDetailPanel.java
----------------------------------------------------------------------
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 856f3d7..e047ff0 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
@@ -28,9 +28,11 @@ import com.googlecode.wicket.kendo.ui.datatable.column.CommandsColumn;
 import com.googlecode.wicket.kendo.ui.datatable.column.IColumn;
 import com.googlecode.wicket.kendo.ui.datatable.column.PropertyColumn;
 import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
+import org.apache.commons.lang.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;
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -54,10 +56,10 @@ import org.apache.directory.fortress.web.control.SecUtils;
 import org.apache.directory.fortress.web.event.SaveModelEvent;
 import org.apache.directory.fortress.web.control.SecureIndicatingAjaxButton;
 import org.apache.directory.fortress.web.event.SelectModelEvent;
-import org.apache.directory.fortress.core.ldap.group.Group;
-import org.apache.directory.fortress.core.ldap.group.GroupMgr;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.Group;
+import org.apache.directory.fortress.core.GroupMgr;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.util.VUtil;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -170,7 +172,7 @@ public class GroupDetailPanel extends FormComponentPanel
                     log.debug( ".onSubmit Add" );
                     Group group = ( Group ) form.getModel().getObject();
                     String msg = null;
-                    if ( !VUtil.isNotNullOrEmpty( memberAssign ) && !VUtil.isNotNullOrEmpty( group.getMembers() ) )
+                    if ( !StringUtils.isNotBlank( memberAssign ) && !ObjUtil.isNotNullOrEmpty( group.getMembers() ) )
                     {
                         msg = "Group name: " + group.getName() + " cannot be added without a member";
                     }
@@ -178,7 +180,7 @@ public class GroupDetailPanel extends FormComponentPanel
                     {
                         try
                         {
-                            if ( VUtil.isNotNullOrEmpty( memberAssign ) )
+                            if ( StringUtils.isNotBlank( memberAssign ) )
                             {
                                 group.setMember( memberAssign );
                             }
@@ -381,7 +383,7 @@ public class GroupDetailPanel extends FormComponentPanel
                 protected void onSubmit( AjaxRequestTarget target, Form<?> form )
                 {
                     String msg = "clicked on memberProps.add";
-                    if ( VUtil.isNotNullOrEmpty( memberPropsSelection ) )
+                    if ( StringUtils.isNotBlank( memberPropsSelection ) )
                     {
                         msg += " selection:" + memberPropsSelection;
                         Group group = ( Group ) form.getModel().getObject();
@@ -448,7 +450,7 @@ public class GroupDetailPanel extends FormComponentPanel
                 protected void onSubmit( AjaxRequestTarget target, Form<?> form )
                 {
                     String msg = "clicked on memberProps.delete";
-                    if ( VUtil.isNotNullOrEmpty( memberPropsSelection ) )
+                    if ( StringUtils.isNotBlank( memberPropsSelection ) )
                     {
                         msg += " selection:" + memberPropsSelection;
                         Group group = ( Group ) form.getModel().getObject();
@@ -522,7 +524,7 @@ public class GroupDetailPanel extends FormComponentPanel
                 protected void onSubmit( AjaxRequestTarget target, Form<?> form )
                 {
                     Group group = ( Group ) form.getModel().getObject();
-                    if ( VUtil.isNotNullOrEmpty( memberAssign ) )
+                    if ( StringUtils.isNotBlank( memberAssign ) )
                     {
                         try
                         {
@@ -589,7 +591,7 @@ public class GroupDetailPanel extends FormComponentPanel
                 protected void onSubmit( AjaxRequestTarget target, Form<?> form )
                 {
                     Group group = ( Group ) form.getModel().getObject();
-                    if ( VUtil.isNotNullOrEmpty( memberAssign ) )
+                    if ( StringUtils.isNotBlank( memberAssign ) )
                     {
                         try
                         {
@@ -690,7 +692,7 @@ public class GroupDetailPanel extends FormComponentPanel
         private IDataProvider<Member> createDataProvider( List<String> members )
         {
             ListDataProvider<Member> results;
-            if ( VUtil.isNotNullOrEmpty( members ) )
+            if ( ObjUtil.isNotNullOrEmpty( members ) )
             {
                 Collections.sort( members, new Comparator<String>()
                 {
@@ -757,7 +759,7 @@ public class GroupDetailPanel extends FormComponentPanel
                     msg += memberAssign != null ? ": " + memberAssign : "";
                     display.setMessage( msg );
                     log.debug( msg );
-                    if ( VUtil.isNotNullOrEmpty( memberAssign ) )
+                    if ( StringUtils.isNotBlank( memberAssign ) )
                     {
                         memberSearchModalPanel.setSearchVal( memberAssign );
                     }
@@ -802,7 +804,7 @@ public class GroupDetailPanel extends FormComponentPanel
                 final Group group = ( Group ) modelEvent.getEntity();
                 this.setModelObject( group );
                 memberPropsSelection = "";
-                if ( VUtil.isNotNullOrEmpty( group.getProperties() ) )
+                if ( ObjUtil.isNotNullOrEmpty( group.getProperties() ) )
                 {
                     memberPropsCB = new ComboBox<>( "memberProps", new PropertyModel<String>( this,
                         "memberPropsSelection" ), group.getPropList() );
@@ -843,7 +845,7 @@ public class GroupDetailPanel extends FormComponentPanel
                 @Override
                 public void onClick( AjaxRequestTarget target, ColumnButton button, String value )
                 {
-                    if ( VUtil.isNotNullOrEmpty( value ) )
+                    if ( StringUtils.isNotEmpty( value ) )
                     {
                         try
                         {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/GroupListPanel.java
----------------------------------------------------------------------
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 42d5b37..c06df71 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
@@ -24,6 +24,8 @@ package org.apache.directory.fortress.web.panel;
 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.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -45,12 +47,11 @@ import org.apache.directory.fortress.web.event.SaveModelEvent;
 import org.apache.directory.fortress.web.control.SecureIndicatingAjaxButton;
 import org.apache.directory.fortress.web.control.SecureIndicatingAjaxLink;
 import org.apache.directory.fortress.web.event.SelectModelEvent;
-import org.apache.directory.fortress.core.ldap.group.Group;
-import org.apache.directory.fortress.core.rbac.FortEntity;
+import org.apache.directory.fortress.core.model.Group;
+import org.apache.directory.fortress.core.model.FortEntity;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.Model;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.User;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -128,7 +129,7 @@ public class GroupListPanel extends FormComponentPanel
             {
                 log.debug( ".search.onSubmit selected radio button: " + selectedRadioButton );
                 info( "Searching Group Objects..." );
-                if ( !VUtil.isNotNullOrEmpty( searchVal ) )
+                if ( !StringUtils.isNotEmpty( searchVal ) )
                 {
                     searchVal = "";
                 }
@@ -148,7 +149,7 @@ public class GroupListPanel extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<Group> groups = ( List<Group> ) getDefaultModelObject();
-                if ( VUtil.isNotNullOrEmpty( groups ) )
+                if ( ObjUtil.isNotNullOrEmpty( groups ) )
                 {
                     for ( Group group : groups )
                         rootNode.add( new DefaultMutableTreeNode( group ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/OUDetailPanel.java
----------------------------------------------------------------------
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 9141064..08adee7 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
@@ -23,6 +23,8 @@ package org.apache.directory.fortress.web.panel;
 
 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.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -45,8 +47,7 @@ import org.apache.directory.fortress.web.event.SaveModelEvent;
 import org.apache.directory.fortress.web.control.SecureIndicatingAjaxButton;
 import org.apache.directory.fortress.web.event.SelectModelEvent;
 import org.apache.directory.fortress.core.DelAdminMgr;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.OrgUnit;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -358,7 +359,7 @@ public class OUDetailPanel extends FormComponentPanel
                 protected void onSubmit( AjaxRequestTarget target, Form<?> form )
                 {
                     String msg = "clicked on members.delete";
-                    if ( VUtil.isNotNullOrEmpty( parentsSelection ) )
+                    if ( StringUtils.isNotEmpty( parentsSelection ) )
                     {
                         msg += " selection:" + parentsSelection;
                         OrgUnit orgUnit = ( OrgUnit ) form.getModel().getObject();
@@ -481,7 +482,7 @@ public class OUDetailPanel extends FormComponentPanel
 
         private void updateEntityWithComboData( OrgUnit orgUnit )
         {
-            if ( VUtil.isNotNullOrEmpty( parentsSelection ) )
+            if ( StringUtils.isNotEmpty( parentsSelection ) )
             {
                 orgUnit.setParent( parentsSelection );
                 parents.add( parentsSelection );
@@ -497,7 +498,7 @@ public class OUDetailPanel extends FormComponentPanel
                 SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
                 OrgUnit orgUnit = ( OrgUnit ) modelEvent.getEntity();
                 this.setModelObject( orgUnit );
-                if ( VUtil.isNotNullOrEmpty( orgUnit.getParents() ) )
+                if ( ObjUtil.isNotNullOrEmpty( orgUnit.getParents() ) )
                 {
                     parents = new ArrayList<>( orgUnit.getParents() );
                     parentsCB = new ComboBox<>( PARENTS, new PropertyModel<String>( this, PARENTS_SELECTION ),

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/OUListPanel.java
----------------------------------------------------------------------
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 1b24f31..18183bf 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
@@ -24,6 +24,8 @@ package org.apache.directory.fortress.web.panel;
 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.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -40,11 +42,10 @@ import org.apache.directory.fortress.web.model.OUListModel;
 import org.apache.directory.fortress.web.event.SaveModelEvent;
 import org.apache.directory.fortress.web.control.SecureIndicatingAjaxButton;
 import org.apache.directory.fortress.web.event.SelectModelEvent;
-import org.apache.directory.fortress.core.rbac.FortEntity;
+import org.apache.directory.fortress.core.model.FortEntity;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.Model;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.OrgUnit;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -158,7 +159,7 @@ public class OUListPanel extends FormComponentPanel
             {
                 log.debug( ".search onSubmit" );
                 info( "Searching OrgUnits..." );
-                if ( !VUtil.isNotNullOrEmpty( searchVal ) )
+                if ( !StringUtils.isNotEmpty( searchVal ) )
                 {
                     searchVal = "";
                 }
@@ -176,7 +177,7 @@ public class OUListPanel extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<OrgUnit> orgUnits1 = ( List<OrgUnit> ) getDefaultModelObject();
-                if ( VUtil.isNotNullOrEmpty( orgUnits1 ) )
+                if ( ObjUtil.isNotNullOrEmpty( orgUnits1 ) )
                 {
                     for ( OrgUnit ou : orgUnits1 )
                     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java
index 210a179..50a7a65 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/OUSearchModalPanel.java
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.util.ObjUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -40,7 +40,7 @@ import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.web.control.SecUtils;
 import org.apache.directory.fortress.core.DelReviewMgr;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
+import org.apache.directory.fortress.core.model.OrgUnit;
 
 
 /**
@@ -136,7 +136,7 @@ public class OUSearchModalPanel extends Panel
                     else
                         ous = delReviewMgr.search( OrgUnit.Type.PERM, ouSearchVal );
                     // sort list by name:
-                    if( VUtil.isNotNullOrEmpty( ous ))
+                    if( ObjUtil.isNotNullOrEmpty( ous ))
                     {
                         Collections.sort( ( List<OrgUnit> ) ous, new Comparator<OrgUnit>()
                         {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/ObjectDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/ObjectDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/ObjectDetailPanel.java
index eb8af0e..5817af6 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/ObjectDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/ObjectDetailPanel.java
@@ -43,8 +43,8 @@ import org.apache.directory.fortress.web.event.SaveModelEvent;
 import org.apache.directory.fortress.web.control.SecureIndicatingAjaxButton;
 import org.apache.directory.fortress.web.event.SelectModelEvent;
 import org.apache.directory.fortress.core.AdminMgr;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.rbac.PermObj;
+import org.apache.directory.fortress.core.model.OrgUnit;
+import org.apache.directory.fortress.core.model.PermObj;
 
 
 /**


Mime
View raw message