directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [1/8] directory-fortress-commander git commit: FC-109 - use new package structure
Date Tue, 09 Jun 2015 03:21:34 GMT
Repository: directory-fortress-commander
Updated Branches:
  refs/heads/master d0f2c4a5b -> d0092957c


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/ObjectListPanel.java
----------------------------------------------------------------------
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 3876a76..28f3967 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
@@ -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.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.rbac.PermObj;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.OrgUnit;
+import org.apache.directory.fortress.core.model.PermObj;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -129,7 +130,7 @@ public class ObjectListPanel extends FormComponentPanel
             {
                 log.debug( ".search.onSubmit selected radio button: " + selectedRadioButton );
                 info( "Searching Permission Objects..." );
-                if ( !VUtil.isNotNullOrEmpty( searchVal ) )
+                if ( !StringUtils.isNotEmpty( searchVal ) )
                 {
                     searchVal = "";
                 }
@@ -150,7 +151,7 @@ public class ObjectListPanel extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<PermObj> permObjs = ( List<PermObj> ) getDefaultModelObject();
-                if ( VUtil.isNotNullOrEmpty( permObjs ) )
+                if ( ObjUtil.isNotNullOrEmpty( permObjs ) )
                 {
                     for ( PermObj permObj : permObjs )
                         rootNode.add( new DefaultMutableTreeNode( permObj ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.java
index 0492327..37bedd8 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/ObjectSearchModalPanel.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.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.PermObj;
+import org.apache.directory.fortress.core.model.PermObj;
 
 
 /**
@@ -137,7 +137,7 @@ public class ObjectSearchModalPanel extends Panel
                     permObj.setAdmin( isAdmin );
                     objects = reviewMgr.findPermObjs( permObj );
                     // sort list by objName:
-                    if( VUtil.isNotNullOrEmpty( objects ))
+                    if( ObjUtil.isNotNullOrEmpty( objects ))
                     {
                         Collections.sort( ( List<PermObj> ) objects, new Comparator<PermObj>()
                         {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/PermDetailPanel.java
----------------------------------------------------------------------
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 cc50ba6..9c17368 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
@@ -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;
@@ -46,11 +48,10 @@ 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.DelAdminMgr;
-import org.apache.directory.fortress.core.rbac.AdminRole;
-import org.apache.directory.fortress.core.rbac.PermObj;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.UserRole;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.AdminRole;
+import org.apache.directory.fortress.core.model.PermObj;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.UserRole;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -193,7 +194,7 @@ public class PermDetailPanel extends FormComponentPanel
                     {
                         if ( isAdmin )
                         {
-                            if ( VUtil.isNotNullOrEmpty( rolesSelection ) )
+                            if ( StringUtils.isNotEmpty( rolesSelection ) )
                             {
                                 delAdminMgr.grantPermission( perm, new AdminRole( rolesSelection ) );
                             }
@@ -389,7 +390,7 @@ public class PermDetailPanel extends FormComponentPanel
                 protected void onSubmit( AjaxRequestTarget target, Form<?> form )
                 {
                     String msg = "clicked on roles.delete";
-                    if ( VUtil.isNotNullOrEmpty( rolesSelection ) )
+                    if ( StringUtils.isNotEmpty( rolesSelection ) )
                     {
                         msg += " selection:" + rolesSelection;
                         Permission perm = ( Permission ) form.getModel().getObject();
@@ -601,7 +602,7 @@ public class PermDetailPanel extends FormComponentPanel
         private void updateEntityWithComboData( Permission perm )
         {
             String szValue = rolesCB.getModelObject();
-            if ( VUtil.isNotNullOrEmpty( szValue ) )
+            if ( StringUtils.isNotEmpty( szValue ) )
             {
                 perm.setRole( szValue );
             }
@@ -617,7 +618,7 @@ public class PermDetailPanel extends FormComponentPanel
                 Permission perm = ( Permission ) modelEvent.getEntity();
                 this.setModelObject( perm );
                 rolesSelection = "";
-                if ( VUtil.isNotNullOrEmpty( perm.getRoles() ) )
+                if ( ObjUtil.isNotNullOrEmpty( perm.getRoles() ) )
                 {
                     roles = new ArrayList<>( perm.getRoles() );
                     rolesCB = new ComboBox<>( "roles", new PropertyModel<String>( this, ROLES_SELECTION ), roles );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/PermListPanel.java
----------------------------------------------------------------------
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 c0efb3c..38556c9 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
@@ -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;
@@ -43,12 +45,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.rbac.FortEntity;
-import org.apache.directory.fortress.core.rbac.PermObj;
-import org.apache.directory.fortress.core.rbac.Permission;
+import org.apache.directory.fortress.core.model.FortEntity;
+import org.apache.directory.fortress.core.model.PermObj;
+import org.apache.directory.fortress.core.model.Permission;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.Model;
-import org.apache.directory.fortress.core.util.attr.VUtil;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -192,12 +193,12 @@ public class PermListPanel extends FormComponentPanel
                 log.debug( ".search onSubmit" );
                 info( "Searching Perms..." );
 
-                if ( !VUtil.isNotNullOrEmpty( permObject ) )
+                if ( !StringUtils.isNotEmpty( permObject ) )
                 {
                     permObject = "";
                 }
 
-                if ( !VUtil.isNotNullOrEmpty( permOperation ) )
+                if ( !StringUtils.isNotEmpty( permOperation ) )
                 {
                     permOperation = "";
                 }
@@ -208,7 +209,7 @@ public class PermListPanel extends FormComponentPanel
                 rootNode.removeAllChildren();
                 List<Permission> perms = ( List<Permission> ) getDefaultModelObject();
 
-                if ( VUtil.isNotNullOrEmpty( perms ) )
+                if ( ObjUtil.isNotNullOrEmpty( perms ) )
                 {
                     for ( Permission perm : perms )
                     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.java
index 1e63c44..4866af7 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PermSearchModalPanel.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.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.Permission;
+import org.apache.directory.fortress.core.model.Permission;
 
 
 /**
@@ -140,7 +140,7 @@ public class PermSearchModalPanel extends Panel
                     permission.setAdmin( isAdmin );
                     objects = reviewMgr.findPermissions( permission );
                     // sort list by abstract name:
-                    if( VUtil.isNotNullOrEmpty( objects ))
+                    if( ObjUtil.isNotNullOrEmpty( objects ))
                     {
                         Collections.sort( ( List<Permission> ) objects, new Comparator<Permission>()
                         {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyDetailPanel.java
index 7ffc2e3..ead8a96 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyDetailPanel.java
@@ -43,7 +43,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.PwPolicyMgr;
-import org.apache.directory.fortress.core.rbac.PwPolicy;
+import org.apache.directory.fortress.core.model.PwPolicy;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/PwPolicyListPanel.java
----------------------------------------------------------------------
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 a8f5770..9e0878a 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
@@ -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.control.SecUtils;
 import org.apache.directory.fortress.web.model.PwPolicyListModel;
 import org.apache.directory.fortress.web.event.SaveModelEvent;
 import org.apache.directory.fortress.web.event.SelectModelEvent;
-import org.apache.directory.fortress.core.rbac.FortEntity;
-import org.apache.directory.fortress.core.rbac.PwPolicy;
+import org.apache.directory.fortress.core.model.FortEntity;
+import org.apache.directory.fortress.core.model.PwPolicy;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.Model;
-import org.apache.directory.fortress.core.util.attr.VUtil;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -207,7 +208,7 @@ public class PwPolicyListPanel extends FormComponentPanel
             {
                 log.debug( ".search onSubmit" );
                 info( "Searching Policies..." );
-                if ( !VUtil.isNotNullOrEmpty( searchVal ) )
+                if ( !StringUtils.isNotEmpty( searchVal ) )
                 {
                     searchVal = "";
                 }
@@ -216,7 +217,7 @@ public class PwPolicyListPanel extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<PwPolicy> policies = ( List<PwPolicy> ) getDefaultModelObject();
-                if ( VUtil.isNotNullOrEmpty( policies ) )
+                if ( ObjUtil.isNotNullOrEmpty( policies ) )
                 {
                     for ( PwPolicy policy : policies )
                         rootNode.add( new DefaultMutableTreeNode( policy ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java
index b00d7e1..15b8d70 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/PwPolicySearchModalPanel.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;
@@ -39,7 +39,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.PropertyModel;
 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.model.PwPolicy;
 
 
 /**
@@ -146,7 +146,7 @@ public class PwPolicySearchModalPanel extends Panel
                         policySearchVal = "";
                     policies = pwPolicyMgr.search( policySearchVal );
                     // sort list by name:
-                    if( VUtil.isNotNullOrEmpty( policies ))
+                    if( ObjUtil.isNotNullOrEmpty( policies ))
                     {
                         Collections.sort( ( List<PwPolicy> ) policies, new Comparator<PwPolicy>()
                         {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/RoleAdminDetailPanel.java
----------------------------------------------------------------------
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 fab0cb1..ca8aed6 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,6 +23,7 @@ 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.log4j.Logger;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -36,10 +37,9 @@ import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.directory.fortress.web.common.GlobalIds;
-import org.apache.directory.fortress.core.rbac.AdminRole;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.rbac.UserRole;
-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.UserRole;
 
 import java.util.List;
 
@@ -185,7 +185,7 @@ public class RoleAdminDetailPanel extends Panel
             protected void onSubmit( AjaxRequestTarget target, Form<?> form )
             {
                 String msg = "clicked on permous.delete";
-                if ( VUtil.isNotNullOrEmpty( permouSelection ) )
+                if ( StringUtils.isNotEmpty( permouSelection ) )
                 {
                     msg += " selection:" + permouSelection;
                     AdminRole adminRole = ( AdminRole ) form.getModel().getObject();
@@ -312,7 +312,7 @@ public class RoleAdminDetailPanel extends Panel
             protected void onSubmit( AjaxRequestTarget target, Form<?> form )
             {
                 String msg = "clicked on userous.delete";
-                if ( VUtil.isNotNullOrEmpty( userouSelection ) )
+                if ( StringUtils.isNotEmpty( userouSelection ) )
                 {
                     msg += " selection:" + userouSelection;
                     AdminRole adminRole = ( AdminRole ) form.getModel().getObject();

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/RoleDetailPanel.java
----------------------------------------------------------------------
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 f8d1a99..8b16cf3 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
@@ -24,6 +24,8 @@ package org.apache.directory.fortress.web.panel;
 import com.googlecode.wicket.jquery.core.JQueryBehavior;
 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;
@@ -48,11 +50,10 @@ 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.DelAdminMgr;
-import org.apache.directory.fortress.core.rbac.AdminRole;
-import org.apache.directory.fortress.core.rbac.FortEntity;
-import org.apache.directory.fortress.core.rbac.Role;
-import org.apache.directory.fortress.core.rbac.UserRole;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.AdminRole;
+import org.apache.directory.fortress.core.model.FortEntity;
+import org.apache.directory.fortress.core.model.Role;
+import org.apache.directory.fortress.core.model.UserRole;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -419,7 +420,7 @@ public class RoleDetailPanel extends Panel
                 protected void onSubmit( AjaxRequestTarget target, Form<?> form )
                 {
                     String msg = "clicked on roles.delete";
-                    if ( VUtil.isNotNullOrEmpty( parentsSelection ) )
+                    if ( StringUtils.isNotEmpty( parentsSelection ) )
                     {
                         msg += " selection:" + parentsSelection;
                         Role role = ( Role ) form.getModel().getObject();
@@ -470,7 +471,7 @@ public class RoleDetailPanel extends Panel
 
         private void updateEntityWithComboData( Role role )
         {
-            if ( VUtil.isNotNullOrEmpty( parentsSelection ) )
+            if ( StringUtils.isNotEmpty( parentsSelection ) )
             {
                 role.setParent( parentsSelection );
                 parents.add( parentsSelection );
@@ -567,7 +568,7 @@ public class RoleDetailPanel extends Panel
                 T role = ( T ) modelEvent.getEntity();
                 this.setModelObject( role );
                 parentsSelection = "";
-                if ( VUtil.isNotNullOrEmpty( ( ( Role ) role ).getParents() ) )
+                if ( ObjUtil.isNotNullOrEmpty( ( ( Role ) role ).getParents() ) )
                 {
                     parents = new ArrayList<>( ( ( Role ) role ).getParents() );
                     parentsCB = new ComboBox<>( GlobalIds.PARENTS, new PropertyModel<String>( this,

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/RoleListPanel.java
----------------------------------------------------------------------
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 d63ece7..bffea0d 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
@@ -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,12 +42,11 @@ import org.apache.directory.fortress.web.model.RoleListModel;
 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.AdminRole;
-import org.apache.directory.fortress.core.rbac.FortEntity;
-import org.apache.directory.fortress.core.rbac.Role;
+import org.apache.directory.fortress.core.model.AdminRole;
+import org.apache.directory.fortress.core.model.FortEntity;
+import org.apache.directory.fortress.core.model.Role;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.Model;
-import org.apache.directory.fortress.core.util.attr.VUtil;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -182,7 +183,7 @@ public class RoleListPanel<T extends Serializable> extends FormComponentPanel
             {
                 log.debug( ".search onSubmit" );
                 info( "Searching Roles..." );
-                if ( !VUtil.isNotNullOrEmpty( searchVal ) )
+                if ( !StringUtils.isNotEmpty( searchVal ) )
                 {
                     searchVal = "";
                 }
@@ -192,7 +193,7 @@ public class RoleListPanel<T extends Serializable> extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<Role> roles = ( List<Role> ) getDefaultModelObject();
-                if ( VUtil.isNotNullOrEmpty( roles ) )
+                if ( ObjUtil.isNotNullOrEmpty( roles ) )
                 {
                     for ( T role : ( List<T> ) roles )
                         rootNode.add( new DefaultMutableTreeNode( role ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java
index 2daae8d..d0375fc 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/RoleSearchModalPanel.java
@@ -26,7 +26,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;
@@ -42,9 +42,9 @@ 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.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.Role;
-import org.apache.directory.fortress.core.rbac.UserAdminRole;
-import org.apache.directory.fortress.core.rbac.UserRole;
+import org.apache.directory.fortress.core.model.Role;
+import org.apache.directory.fortress.core.model.UserAdminRole;
+import org.apache.directory.fortress.core.model.UserRole;
 import org.apache.directory.fortress.core.util.time.CUtil;
 import org.apache.directory.fortress.core.util.time.Constraint;
 
@@ -178,7 +178,7 @@ public class RoleSearchModalPanel extends Panel
                 }
 
                 // sort list by name:
-                if( VUtil.isNotNullOrEmpty( roles ))
+                if( ObjUtil.isNotNullOrEmpty( roles ))
                 {
                     Collections.sort( (List<Role>)roles, new Comparator<Role>()
                     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/SDDetailPanel.java
----------------------------------------------------------------------
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 de5a96a..a6ddc19 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
@@ -24,6 +24,8 @@ package org.apache.directory.fortress.web.panel;
 import com.googlecode.wicket.jquery.ui.form.spinner.Spinner;
 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;
@@ -46,9 +48,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.SDSet;
-import org.apache.directory.fortress.core.rbac.UserRole;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.SDSet;
+import org.apache.directory.fortress.core.model.UserRole;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -384,7 +385,7 @@ public class SDDetailPanel extends FormComponentPanel
                 protected void onSubmit( AjaxRequestTarget target, Form<?> form )
                 {
                     String msg = "clicked on members.delete";
-                    if ( VUtil.isNotNullOrEmpty( membersSelection ) )
+                    if ( StringUtils.isNotEmpty( membersSelection ) )
                     {
                         msg += " selection:" + membersSelection;
                         SDSet sdSet = ( SDSet ) form.getModel().getObject();
@@ -505,7 +506,7 @@ public class SDDetailPanel extends FormComponentPanel
 
         private void updateEntityWithComboData( SDSet sdSet )
         {
-            if ( VUtil.isNotNullOrEmpty( membersSelection ) )
+            if ( StringUtils.isNotEmpty( membersSelection ) )
             {
                 sdSet.setMember( membersSelection );
                 members.add( membersSelection );
@@ -521,7 +522,7 @@ public class SDDetailPanel extends FormComponentPanel
                 SelectModelEvent modelEvent = ( SelectModelEvent ) event.getPayload();
                 SDSet sdSet = ( SDSet ) modelEvent.getEntity();
                 this.setModelObject( sdSet );
-                if ( VUtil.isNotNullOrEmpty( sdSet.getMembers() ) )
+                if ( ObjUtil.isNotNullOrEmpty( sdSet.getMembers() ) )
                 {
                     members = new ArrayList<>( sdSet.getMembers() );
                     membersCB = new ComboBox<>( "members", new PropertyModel<String>( this, MEMBERS_SELECTION ),

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/SDListPanel.java
----------------------------------------------------------------------
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 38dae3f..6900896 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
@@ -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.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.SDSet;
-import org.apache.directory.fortress.core.rbac.UserRole;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.SDSet;
+import org.apache.directory.fortress.core.model.UserRole;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -202,7 +203,7 @@ public class SDListPanel extends FormComponentPanel
             {
                 log.debug( ".search onSubmit" );
                 info( "Searching SDSets..." );
-                if ( !VUtil.isNotNullOrEmpty( searchVal ) )
+                if ( !StringUtils.isNotBlank( searchVal ) )
                 {
                     searchVal = "";
                 }
@@ -231,7 +232,7 @@ public class SDListPanel extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<SDSet> sdSets = ( List<SDSet> ) getDefaultModelObject();
-                if ( VUtil.isNotNullOrEmpty( sdSets ) )
+                if ( ObjUtil.isNotNullOrEmpty( sdSets ) )
                 {
                     for ( SDSet sdSet : sdSets )
                         rootNode.add( new DefaultMutableTreeNode( sdSet ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/UserAuditDetailPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/UserAuditDetailPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/UserAuditDetailPanel.java
index fef5fa4..a83d3fe 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/UserAuditDetailPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/UserAuditDetailPanel.java
@@ -26,7 +26,7 @@ import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.FormComponentPanel;
 import org.apache.wicket.model.IModel;
 import org.apache.directory.fortress.web.common.GlobalIds;
-import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.model.User;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/UserDetailPanel.java
----------------------------------------------------------------------
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 e4c3079..295bd0e 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
@@ -25,6 +25,8 @@ import com.googlecode.wicket.jquery.core.JQueryBehavior;
 import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
 import com.googlecode.wicket.kendo.ui.form.combobox.ComboBox;
 import com.googlecode.wicket.kendo.ui.renderer.ChoiceRenderer;
+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;
@@ -54,12 +56,11 @@ 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.DelAdminMgr;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.rbac.PwPolicy;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserAdminRole;
-import org.apache.directory.fortress.core.rbac.UserRole;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.OrgUnit;
+import org.apache.directory.fortress.core.model.PwPolicy;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserAdminRole;
+import org.apache.directory.fortress.core.model.UserRole;
 import org.apache.directory.fortress.core.util.time.Constraint;
 
 import java.io.File;
@@ -961,7 +962,7 @@ public class UserDetailPanel extends FormComponentPanel
                 protected void onSubmit( AjaxRequestTarget target, Form<?> form )
                 {
                     String msg = "clicked on address.delete";
-                    if ( VUtil.isNotNullOrEmpty( addressSelection ) )
+                    if ( StringUtils.isNotEmpty( addressSelection ) )
                     {
                         msg += " selection:" + addressSelection;
                         User user = ( User ) form.getModel().getObject();
@@ -1015,7 +1016,7 @@ public class UserDetailPanel extends FormComponentPanel
                 protected void onSubmit( AjaxRequestTarget target, Form<?> form )
                 {
                     String msg = "clicked on emails.delete";
-                    if ( VUtil.isNotNullOrEmpty( emailsSelection ) )
+                    if ( StringUtils.isNotEmpty( emailsSelection ) )
                     {
                         msg += " selection:" + emailsSelection;
                         User user = ( User ) form.getModel().getObject();
@@ -1070,7 +1071,7 @@ public class UserDetailPanel extends FormComponentPanel
                 protected void onSubmit( AjaxRequestTarget target, Form<?> form )
                 {
                     String msg = "clicked on phones.delete";
-                    if ( VUtil.isNotNullOrEmpty( phonesSelection ) )
+                    if ( StringUtils.isNotEmpty( phonesSelection ) )
                     {
                         msg += " selection:" + phonesSelection;
                         User user = ( User ) form.getModel().getObject();
@@ -1124,7 +1125,7 @@ public class UserDetailPanel extends FormComponentPanel
                 protected void onSubmit( AjaxRequestTarget target, Form<?> form )
                 {
                     String msg = "clicked on mobiles.delete";
-                    if ( VUtil.isNotNullOrEmpty( mobilesSelection ) )
+                    if ( StringUtils.isNotEmpty( mobilesSelection ) )
                     {
                         msg += " selection:" + mobilesSelection;
                         User user = ( User ) form.getModel().getObject();
@@ -1580,19 +1581,19 @@ public class UserDetailPanel extends FormComponentPanel
 
         private void updateEntityWithComboData( User user )
         {
-            if ( VUtil.isNotNullOrEmpty( emailsSelection ) )
+            if ( StringUtils.isNotEmpty( emailsSelection ) )
             {
                 user.setEmail( emailsSelection );
             }
-            if ( VUtil.isNotNullOrEmpty( phonesSelection ) )
+            if ( StringUtils.isNotEmpty( phonesSelection ) )
             {
                 user.setPhone( phonesSelection );
             }
-            if ( VUtil.isNotNullOrEmpty( mobilesSelection ) )
+            if ( StringUtils.isNotEmpty( mobilesSelection ) )
             {
                 user.setMobile( mobilesSelection );
             }
-            if ( VUtil.isNotNullOrEmpty( addressSelection ) )
+            if ( StringUtils.isNotEmpty( addressSelection ) )
             {
                 user.getAddress().setAddress( addressSelection );
             }
@@ -1602,7 +1603,7 @@ public class UserDetailPanel extends FormComponentPanel
         private boolean assignRole( User user, String szRoleName )
         {
             boolean success = false;
-            if ( VUtil.isNotNullOrEmpty( szRoleName ) )
+            if ( StringUtils.isNotEmpty( szRoleName ) )
             {
                 UserRole userRole = roleConstraint;
                 userRole.setUserId( user.getUserId() );
@@ -1661,7 +1662,7 @@ public class UserDetailPanel extends FormComponentPanel
         private boolean assignAdminRole( User user, String szAdminRoleName )
         {
             boolean success = false;
-            if ( VUtil.isNotNullOrEmpty( szAdminRoleName ) )
+            if ( StringUtils.isNotEmpty( szAdminRoleName ) )
             {
                 UserAdminRole userAdminRole = adminRoleConstraint;
                 userAdminRole.setUserId( user.getUserId() );
@@ -1746,7 +1747,7 @@ public class UserDetailPanel extends FormComponentPanel
                     {
                         log.warn( "onUpdate roleDB in ajax form updater" );
                         String roleNm = rolesCB.getConvertedInput();
-                        if ( VUtil.isNotNullOrEmpty( roleNm ) )
+                        if ( StringUtils.isNotEmpty( roleNm ) )
                         {
                             UserRole userRole = null;
                             int indx = user.getRoles().indexOf( new UserRole( roleNm ) );
@@ -1781,7 +1782,7 @@ public class UserDetailPanel extends FormComponentPanel
                     {
                         log.warn( "onUpdate adminRoleCB in ajax form updater" );
                         String adminRoleNm = adminRolesCB.getConvertedInput();
-                        if ( VUtil.isNotNullOrEmpty( adminRoleNm ) )
+                        if ( StringUtils.isNotEmpty( adminRoleNm ) )
                         {
                             UserAdminRole userAdminRole = null;
                             int indx = user.getAdminRoles().indexOf( new UserAdminRole( user.getUserId(),
@@ -1880,12 +1881,12 @@ public class UserDetailPanel extends FormComponentPanel
             }
             userDetailLabel = "User Detail: " + user.getUserId();
             roleAssignmentsLabel = "RBAC Role Assignments";
-            if ( VUtil.isNotNullOrEmpty( user.getRoles() ) )
+            if ( ObjUtil.isNotNullOrEmpty( user.getRoles() ) )
             {
                 roleAssignmentsLabel += ": " + user.getRoles().get( 0 ) + " + " + ( user.getRoles().size() - 1 );
             }
             adminRoleAssignmentsLabel = "Admin Role Assignments";
-            if ( VUtil.isNotNullOrEmpty( user.getAdminRoles() ) )
+            if ( ObjUtil.isNotNullOrEmpty( user.getAdminRoles() ) )
             {
                 adminRoleAssignmentsLabel += ": " + user.getAdminRoles().get( 0 ) + " + " + ( user.getAdminRoles()
                     .size() - 1 );
@@ -1893,7 +1894,7 @@ public class UserDetailPanel extends FormComponentPanel
             if ( user.getAddress() != null )
             {
                 addressAssignmentsLabel = "Address Assignments: ";
-                if ( VUtil.isNotNullOrEmpty( user.getAddress().getAddresses() ) )
+                if ( ObjUtil.isNotNullOrEmpty( user.getAddress().getAddresses() ) )
                 {
                     int ctr = 0;
                     for ( String street : user.getAddress().getAddresses() )
@@ -1909,7 +1910,7 @@ public class UserDetailPanel extends FormComponentPanel
                     }
                     isSet = true;
                 }
-                if ( VUtil.isNotNullOrEmpty( user.getAddress().getCity() ) )
+                if ( StringUtils.isNotBlank( user.getAddress().getCity() ) )
                 {
                     if ( isSet )
                     {
@@ -1919,7 +1920,7 @@ public class UserDetailPanel extends FormComponentPanel
                     addressAssignmentsLabel += user.getAddress().getCity();
                     isSet = true;
                 }
-                if ( VUtil.isNotNullOrEmpty( user.getAddress().getState() ) )
+                if ( StringUtils.isNotEmpty( user.getAddress().getState() ) )
                 {
                     if ( isSet )
                     {
@@ -1929,7 +1930,7 @@ public class UserDetailPanel extends FormComponentPanel
                     addressAssignmentsLabel += user.getAddress().getState();
                     isSet = true;
                 }
-                if ( VUtil.isNotNullOrEmpty( user.getAddress().getPostalCode() ) )
+                if ( StringUtils.isNotEmpty( user.getAddress().getPostalCode() ) )
                 {
                     if ( isSet )
                     {
@@ -1940,7 +1941,7 @@ public class UserDetailPanel extends FormComponentPanel
                 }
             }
             String szName = user.getDisplayName();
-            if ( !VUtil.isNotNullOrEmpty( szName ) )
+            if ( !StringUtils.isNotEmpty( szName ) )
             {
                 szName = user.getCn();
             }

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/UserListPanel.java
----------------------------------------------------------------------
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 259afa9..9ee9be1 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
@@ -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.directory.fortress.web.common.GlobalIds;
 import org.apache.directory.fortress.web.control.SecUtils;
 import org.apache.directory.fortress.web.control.SecureIndicatingAjaxButton;
@@ -52,12 +54,11 @@ import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.Model;
 import org.apache.directory.fortress.web.UserPage;
-import org.apache.directory.fortress.core.rbac.FortEntity;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserRole;
-import org.apache.directory.fortress.core.util.attr.VUtil;
+import org.apache.directory.fortress.core.model.FortEntity;
+import org.apache.directory.fortress.core.model.OrgUnit;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserRole;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -223,7 +224,7 @@ public class UserListPanel extends FormComponentPanel
                 LOG.debug( ".search.onSubmit selected radio button: " + selectedRadioButton );
                 info( "Searching Users..." );
                 String searchVal = "";
-                if ( VUtil.isNotNullOrEmpty( searchData.getField1() ) )
+                if ( StringUtils.isNotEmpty( searchData.getField1() ) )
                 {
                     searchVal = searchData.getField1();
                 }
@@ -269,7 +270,7 @@ public class UserListPanel extends FormComponentPanel
                 treeModel.reload();
                 rootNode.removeAllChildren();
                 List<User> users = ( List<User> ) getDefaultModelObject();
-                if ( VUtil.isNotNullOrEmpty( users ) )
+                if ( ObjUtil.isNotNullOrEmpty( users ) )
                 {
                     for ( User user : users )
                     {
@@ -608,7 +609,7 @@ public class UserListPanel extends FormComponentPanel
                 String msg = "clicked on perms search";
                 msg += "permSelection: " + permission;
                 String objectSearchVal = "";
-                if ( VUtil.isNotNullOrEmpty( searchData.getField1() ) )
+                if ( StringUtils.isNotEmpty( searchData.getField1() ) )
                 {
                     objectSearchVal = searchData.getField1();
                 }

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java b/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java
index eefc900..6a27205 100644
--- a/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java
+++ b/src/main/java/org/apache/directory/fortress/web/panel/UserSearchModalPanel.java
@@ -25,7 +25,8 @@ 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.directory.fortress.core.util.VUtil;
 import org.apache.log4j.Logger;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -41,7 +42,7 @@ import org.apache.wicket.spring.injection.annot.SpringBean;
 import org.apache.directory.fortress.web.common.GlobalIds;
 import org.apache.directory.fortress.web.control.SecUtils;
 import org.apache.directory.fortress.core.ReviewMgr;
-import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.model.User;
 
 
 /**
@@ -150,7 +151,7 @@ public class UserSearchModalPanel extends Panel
                         userSearchVal = "";
                     users = reviewMgr.findUsers( new User( userSearchVal ) );
                     // sort list by userId:
-                    if( VUtil.isNotNullOrEmpty( users ))
+                    if( ObjUtil.isNotNullOrEmpty( users ))
                     {
                         Collections.sort( ( List<User> ) users, new Comparator<User>()
                         {

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/resources/FortressWebDemoUsers.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/FortressWebDemoUsers.xml b/src/main/resources/FortressWebDemoUsers.xml
index b86b7dc..6a030ea 100644
--- a/src/main/resources/FortressWebDemoUsers.xml
+++ b/src/main/resources/FortressWebDemoUsers.xml
@@ -53,38 +53,38 @@
             </addadminrole>
 
             <addpermgrant>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchBinds" roleNm="fortress-web-audit-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchAuthZs" roleNm="fortress-web-audit-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="getUserAuthZs" roleNm="fortress-web-audit-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchUserSessions" roleNm="fortress-web-audit-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchAdminMods" roleNm="fortress-web-audit-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchInvalidUsers" roleNm="fortress-web-audit-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="readUser" roleNm="fortress-web-audit-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findUsers" roleNm="fortress-web-audit-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findPermissions" roleNm="fortress-web-audit-admin" admin="true"/>
-
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="readUser" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findUsers" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="assignedUsers" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="assignedRoles" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="authorizedUsers" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="authorizedRoles" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="userPermissions" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findPermissions" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findRoles" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl" opName="searchOU" roleNm="fortress-web-user-admin" admin="true"/>
-
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="addUser" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="disableUser" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deleteUser" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="updateUser" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="changePassword" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="lockUserAccount" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="unlockUserAccount" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="resetPassword" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="assignUser" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deassignUser" roleNm="fortress-web-user-admin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl" opName="updateUserPolicy" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AuditMgrImpl" opName="searchBinds" roleNm="fortress-web-audit-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AuditMgrImpl" opName="searchAuthZs" roleNm="fortress-web-audit-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AuditMgrImpl" opName="getUserAuthZs" roleNm="fortress-web-audit-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AuditMgrImpl" opName="searchUserSessions" roleNm="fortress-web-audit-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AuditMgrImpl" opName="searchAdminMods" roleNm="fortress-web-audit-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AuditMgrImpl" opName="searchInvalidUsers" roleNm="fortress-web-audit-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="readUser" roleNm="fortress-web-audit-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="findUsers" roleNm="fortress-web-audit-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="findPermissions" roleNm="fortress-web-audit-admin" admin="true"/>
+
+                <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="readUser" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="findUsers" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="assignedUsers" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="assignedRoles" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="authorizedUsers" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="authorizedRoles" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="userPermissions" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="findPermissions" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.ReviewMgrImpl" opName="findRoles" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.DelReviewMgrImpl" opName="searchOU" roleNm="fortress-web-user-admin" admin="true"/>
+
+                <permgrant objName="org.apache.directory.fortress.core.impl.AdminMgrImpl" opName="addUser" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AdminMgrImpl" opName="disableUser" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AdminMgrImpl" opName="deleteUser" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AdminMgrImpl" opName="updateUser" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AdminMgrImpl" opName="changePassword" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AdminMgrImpl" opName="lockUserAccount" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AdminMgrImpl" opName="unlockUserAccount" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AdminMgrImpl" opName="resetPassword" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AdminMgrImpl" opName="assignUser" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.AdminMgrImpl" opName="deassignUser" roleNm="fortress-web-user-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.impl.PwPolicyMgrImpl" opName="updateUserPolicy" roleNm="fortress-web-user-admin" admin="true"/>
 
                 <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="add" roleNm="fortress-web-user-admin" admin="true"/>
                 <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="update" roleNm="fortress-web-user-admin" admin="true"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/main/resources/applicationContext.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index 817003a..6c9df01 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -78,7 +78,7 @@
           factory-method="createInstance">
         <constructor-arg value="HOME"/>
     </bean>
-    <bean id="groupMgr" class="org.apache.directory.fortress.core.ldap.group.GroupMgrFactory" scope="prototype"
+    <bean id="groupMgr" class="org.apache.directory.fortress.core.GroupMgrFactory" scope="prototype"
           factory-method="createInstance">
         <constructor-arg value="HOME"/>
     </bean>

http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/25248493/src/test/java/org/apache/directory/fortress/web/integration/FortressWebSeleniumITCase.java
----------------------------------------------------------------------
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 2ceef25..826512d 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
@@ -592,7 +592,7 @@ TODO: FIX ME:
     {
         driver.findElement( By.linkText( "AUTHZ" ) ).click();
         driver.findElement( By.id( GlobalIds.OBJ_NAME ) ).clear();
-        driver.findElement( By.id( GlobalIds.OBJ_NAME ) ).sendKeys( "org.apache.directory.fortress.core.rbac.AdminMgrImpl" );
+        driver.findElement( By.id( GlobalIds.OBJ_NAME ) ).sendKeys( "org.apache.directory.fortress.core.impl.AdminMgrImpl" );
         driver.findElement( By.name( "admin" ) ).click();
         driver.findElement( By.id( "permLinkLbl" ) ).click();
         TUtils.sleep( 1 );


Mime
View raw message