directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [17/19] directory-fortress-core git commit: FC-109 - break core package cycles
Date Mon, 01 Jun 2015 23:02:22 GMT
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java b/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java
index b81f30f..478691f 100755
--- a/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/ReviewMgr.java
@@ -20,13 +20,13 @@
 package org.apache.directory.fortress.core;
 
 
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.PermObj;
-import org.apache.directory.fortress.core.rbac.Role;
-import org.apache.directory.fortress.core.rbac.SDSet;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserRole;
+import org.apache.directory.fortress.core.model.OrgUnit;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.PermObj;
+import org.apache.directory.fortress.core.model.Role;
+import org.apache.directory.fortress.core.model.SDSet;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserRole;
 
 import java.util.List;
 import java.util.Set;
@@ -63,7 +63,7 @@ import java.util.Set;
  * <img src="./doc-files/RbacDSD.png">
  * <hr>
  * <p/>
- * This interface's implementer will NOT be thread safe if parent instance variables ({@link Manageable#setContextId(String)} or {@link Manageable#setAdmin(org.apache.directory.fortress.core.rbac.Session)}) are set.
+ * This interface's implementer will NOT be thread safe if parent instance variables ({@link Manageable#setContextId(String)} or {@link Manageable#setAdmin(org.apache.directory.fortress.core.model.Session)}) are set.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -142,7 +142,7 @@ public interface ReviewMgr extends Manageable
      * <li>{@link OrgUnit#name} - contains one or more characters of org unit associated with existing object being targeted</li>
      * </ul>
      *
-     * @param ou contains org unit name {@link org.apache.directory.fortress.core.rbac.OrgUnit#name}.  The search val contains the full name of matching ou in OS-P data set.
+     * @param ou contains org unit name {@link org.apache.directory.fortress.core.model.OrgUnit#name}.  The search val contains the full name of matching ou in OS-P data set.
      * @return List of type PermObj.  Fortress permissions are object->operation mappings.
      * @throws SecurityException
      *          thrown in the event of system error.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
index e2c2348..90a3670 100755
--- a/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/ReviewMgrFactory.java
@@ -22,7 +22,7 @@ package org.apache.directory.fortress.core;
 import org.apache.directory.fortress.core.cfg.Config;
 import org.apache.directory.fortress.core.rbac.ClassUtil;
 import org.apache.directory.fortress.core.rbac.ReviewMgrImpl;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.rest.ReviewMgrRestImpl;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/SecurityException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/SecurityException.java b/src/main/java/org/apache/directory/fortress/core/SecurityException.java
index 2ea1d80..3f17398 100755
--- a/src/main/java/org/apache/directory/fortress/core/SecurityException.java
+++ b/src/main/java/org/apache/directory/fortress/core/SecurityException.java
@@ -39,7 +39,7 @@ package org.apache.directory.fortress.core;
  * <li>{@link ValidationException} in the event entity validation fails.
  * </ul>
  * <p/>
- * For certain APIs, i.e., {@link AccessMgr#createSession(org.apache.directory.fortress.core.rbac.User, boolean)}, or {@link AccessMgr#authenticate(String, char[])}, the caller may need to differentiate by one of the above subclasses, e.g. {@link PasswordException}, to facilitate password expiring condition or allow user to retry authentication after entering it incorrectly.
+ * For certain APIs, i.e., {@link AccessMgr#createSession(org.apache.directory.fortress.core.model.User, boolean)}, or {@link AccessMgr#authenticate(String, char[])}, the caller may need to differentiate by one of the above subclasses, e.g. {@link PasswordException}, to facilitate password expiring condition or allow user to retry authentication after entering it incorrectly.
  * If specific exception processing is not the aim, or if differentiating conditions by {@link #errorId} is acceptable, callers are allowed to catch (or throw) as type {@link SecurityException}.
  * <p/>
  * All exceptions generated by Fortress will be set with error code {@link SecurityException#getErrorId()} indicating fault condition which is set via its constructor - ({@link #SecurityException(int, String)}, {@link #SecurityException(int, String, Exception)}).

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java
index ac03834..076ec34 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addadminrole.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.rbac.AdminRole}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#addRole(org.apache.directory.fortress.core.rbac.AdminRole)}.
+ * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.model.AdminRole}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#addRole(org.apache.directory.fortress.core.model.AdminRole)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Addadminrole', is used for the xml tag in the load script.</p>
  * <pre>
@@ -68,7 +68,7 @@ public class Addadminrole
      * }
      * </pre>
      *
-     * @param role contains extension of {@link org.apache.directory.fortress.core.rbac.AdminRole}.
+     * @param role contains extension of {@link org.apache.directory.fortress.core.model.AdminRole}.
      */
     public void addRole(AdminRoleAnt role)
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java
index beb1f7d..50f8479 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addadminroleinheritance.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.Relationship;
+import org.apache.directory.fortress.core.model.Relationship;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addInheritance(org.apache.directory.fortress.core.rbac.Role, org.apache.directory.fortress.core.rbac.Role)}.
+ * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addInheritance(org.apache.directory.fortress.core.model.Role, org.apache.directory.fortress.core.model.Role)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Addadminroleinheritance', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java b/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java
index 1a4a6d9..812e36e 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addcontext.java
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.Context;
+import org.apache.directory.fortress.core.model.Context;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java b/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java
index cd35b4c..87b9b97 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addorgunit.java
@@ -19,13 +19,11 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.OrgUnitAnt;
-
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link FortressAntTask} to create new {@link org.apache.directory.fortress.core.rbac.OrgUnit}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#add(org.apache.directory.fortress.core.rbac.OrgUnit)}.
+ * The class is used by {@link FortressAntTask} to create new {@link org.apache.directory.fortress.core.model.OrgUnit}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#add(org.apache.directory.fortress.core.model.OrgUnit)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Addorgunit', is used for the xml tag in the load script.</p>
  * <pre>
@@ -79,7 +77,7 @@ public class Addorgunit
     /**
      * Used by {@link FortressAntTask#addOrgunits()} to retrieve list of OrgUnits as defined in input xml file.
      *
-     * @return collection containing {@link org.apache.directory.fortress.core.rbac.OrgUnit}s targeted for insertion.
+     * @return collection containing {@link org.apache.directory.fortress.core.model.OrgUnit}s targeted for insertion.
      */
     public List<OrgUnitAnt> getOrgUnits()
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java b/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java
index ab6d967..e4946d1 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/AddpermGrant.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.PermGrant;
+import org.apache.directory.fortress.core.model.PermGrant;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link FortressAntTask} to create new {@link PermGrant}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#grantPermission(org.apache.directory.fortress.core.rbac.Permission, org.apache.directory.fortress.core.rbac.Role)}.
+ * The class is used by {@link FortressAntTask} to create new {@link PermGrant}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#grantPermission(org.apache.directory.fortress.core.model.Permission, org.apache.directory.fortress.core.model.Role)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'AddpermGrant', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java b/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java
index c7b2bac..d7591b1 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/AddpermObj.java
@@ -22,10 +22,10 @@ package org.apache.directory.fortress.core.ant;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.directory.fortress.core.rbac.PermObj;
+import org.apache.directory.fortress.core.model.PermObj;
 
 /**
- * The class is used by {@link FortressAntTask} to load {@link PermObj}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addPermObj(org.apache.directory.fortress.core.rbac.PermObj)}.
+ * The class is used by {@link FortressAntTask} to load {@link PermObj}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addPermObj(org.apache.directory.fortress.core.model.PermObj)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'AddpermObj', is used for the xml tag in the load script.</p>
  * <pre>
@@ -78,7 +78,7 @@ public class AddpermObj
     /**
      * Used by {@link FortressAntTask#addPermObjs()} to retrieve list of PermObjs as defined in input xml file.
      *
-     * @return collection containing {@link org.apache.directory.fortress.core.rbac.PermObj}s targeted for insertion.
+     * @return collection containing {@link org.apache.directory.fortress.core.model.PermObj}s targeted for insertion.
      */
     public List<PermObj> getPermObjs()
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java b/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java
index 9e2fb84..fc14101 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/AddpermOp.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.ant.PermAnt}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addPermission(org.apache.directory.fortress.core.rbac.Permission)}.
+ * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.ant.PermAnt}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addPermission(org.apache.directory.fortress.core.model.Permission)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'AddpermOp', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java
index 789c8c3..f2bd4f6 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addpermorgunitinheritance.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.Relationship;
+import org.apache.directory.fortress.core.model.Relationship;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addInheritance(org.apache.directory.fortress.core.rbac.Role, org.apache.directory.fortress.core.rbac.Role)}.
+ * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addInheritance(org.apache.directory.fortress.core.model.Role, org.apache.directory.fortress.core.model.Role)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Addpermorgunitinheritance', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java b/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java
index e276460..57a9543 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addpwpolicy.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.PwPolicy;
+import org.apache.directory.fortress.core.model.PwPolicy;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.rbac.PwPolicy}s used to drive {@link org.apache.directory.fortress.core.PwPolicyMgr#add(org.apache.directory.fortress.core.rbac.PwPolicy)}.
+ * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.model.PwPolicy}s used to drive {@link org.apache.directory.fortress.core.PwPolicyMgr#add(org.apache.directory.fortress.core.model.PwPolicy)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Addpwpolicy', is used for the xml tag in the load script.</p>
  * <pre>
@@ -87,7 +87,7 @@ public class Addpwpolicy
     /**
      * Used by {@link FortressAntTask#addPolicies()} to retrieve list of PwPolicy as defined in input xml file.
      *
-     * @return collection containing {@link org.apache.directory.fortress.core.rbac.PwPolicy}s targeted for insertion.
+     * @return collection containing {@link org.apache.directory.fortress.core.model.PwPolicy}s targeted for insertion.
      */
     public List<PwPolicy> getPolicies()
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java
index 038b4ac..154f51e 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addrole.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.Role;
+import org.apache.directory.fortress.core.model.Role;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.rbac.Role}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addRole(org.apache.directory.fortress.core.rbac.Role)}}.
+ * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.model.Role}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addRole(org.apache.directory.fortress.core.model.Role)}}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Addrole', is used for the xml tag in the load script.</p>
  * <pre>
@@ -74,7 +74,7 @@ public class Addrole
     /**
      * Used by {@link FortressAntTask#addRoles()} to retrieve list of Roles as defined in input xml file.
      *
-     * @return collection containing {@link org.apache.directory.fortress.core.rbac.Role}s targeted for insertion.
+     * @return collection containing {@link org.apache.directory.fortress.core.model.Role}s targeted for insertion.
      */
     public List<Role> getRoles()
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java
index 715610f..4b091b1 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addroleinheritance.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.Relationship;
+import org.apache.directory.fortress.core.model.Relationship;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addInheritance(org.apache.directory.fortress.core.rbac.Role, org.apache.directory.fortress.core.rbac.Role)}.
+ * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addInheritance(org.apache.directory.fortress.core.model.Role, org.apache.directory.fortress.core.model.Role)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Addroleinheritance', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java b/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java
index b81f037..0f44464 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Addsdset.java
@@ -23,7 +23,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link FortressAntTask} to create new {@link SDSetAnt}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#createSsdSet(org.apache.directory.fortress.core.rbac.SDSet)} or {@link org.apache.directory.fortress.core.AdminMgr#createDsdSet(org.apache.directory.fortress.core.rbac.SDSet)}.
+ * The class is used by {@link FortressAntTask} to create new {@link SDSetAnt}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#createSsdSet(org.apache.directory.fortress.core.model.SDSet)} or {@link org.apache.directory.fortress.core.AdminMgr#createDsdSet(org.apache.directory.fortress.core.model.SDSet)}.
+ *
  *
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Addsdset', is used for the xml tag in the load script.</p>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java b/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java
index 16f7c2c..77672ef 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Adduser.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link FortressAntTask} to load {@link UserAnt}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addUser(org.apache.directory.fortress.core.rbac.User)}.
+ * The class is used by {@link FortressAntTask} to load {@link UserAnt}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#addUser(org.apache.directory.fortress.core.model.User)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Adduser', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java
index 118c1e7..9735f6c 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Adduseradminrole.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.UserAdminRole;
+import org.apache.directory.fortress.core.model.UserAdminRole;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link org.apache.directory.fortress.core.rbac.UserAdminRole}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#assignUser(org.apache.directory.fortress.core.rbac.UserAdminRole)}.
+ * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link org.apache.directory.fortress.core.model.UserAdminRole}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#assignUser(org.apache.directory.fortress.core.model.UserAdminRole)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Adduseradminrole', is used for the xml tag in the load script.</p>
  * <pre>
@@ -82,7 +82,7 @@ public class Adduseradminrole
     /**
      * Used by {@link org.apache.directory.fortress.core.ant.FortressAntTask#addUserAdminRoles()} to retrieve list of UserAdminRoles as defined in input xml file.
      *
-     * @return collection containing {@link org.apache.directory.fortress.core.rbac.UserAdminRole}s targeted for insertion.
+     * @return collection containing {@link org.apache.directory.fortress.core.model.UserAdminRole}s targeted for insertion.
      */
     public List<UserAdminRole> getUserRoles()
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java
index 9f6a7d8..abc3327 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Adduserorgunitinheritance.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.Relationship;
+import org.apache.directory.fortress.core.model.Relationship;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#addAscendant(org.apache.directory.fortress.core.rbac.OrgUnit, org.apache.directory.fortress.core.rbac.OrgUnit)}.
+ * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#addAscendant(org.apache.directory.fortress.core.model.OrgUnit, org.apache.directory.fortress.core.model.OrgUnit)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Adduserorgunitinheritance', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java
index 0f03465..721887e 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Adduserrole.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.UserRole;
+import org.apache.directory.fortress.core.model.UserRole;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.rbac.UserRole}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#assignUser(org.apache.directory.fortress.core.rbac.UserRole)}.
+ * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.model.UserRole}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#assignUser(org.apache.directory.fortress.core.model.UserRole)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Adduserrole', is used for the xml tag in the load script.</p>
  * <pre>
@@ -79,7 +79,7 @@ public class Adduserrole
     /**
      * Used by {@link FortressAntTask#addUserRoles()} to retrieve list of UserRoles as defined in input xml file.
      *
-     * @return collection containing {@link org.apache.directory.fortress.core.rbac.UserRole}s targeted for insertion.
+     * @return collection containing {@link org.apache.directory.fortress.core.model.UserRole}s targeted for insertion.
      */
     public List<UserRole> getUserRoles()
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java
index 4b99ee5..a95e021 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/AdminRoleAnt.java
@@ -20,7 +20,7 @@
 package org.apache.directory.fortress.core.ant;
 
 
-import org.apache.directory.fortress.core.rbac.AdminRole;
+import org.apache.directory.fortress.core.model.AdminRole;
 
 import java.util.StringTokenizer;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
index bb84a39..84a6e89 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deladminrole.java
@@ -25,7 +25,7 @@ import java.util.List;
 
 
 /**
- * This class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.rbac.AdminRole}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#deleteRole(org.apache.directory.fortress.core.rbac.AdminRole)}.
+ * This class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.model.AdminRole}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#deleteRole(org.apache.directory.fortress.core.model.AdminRole)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>The class name, 'Deladminrole', is used for the xml tag in the load script.</p>
  * <pre>
@@ -65,7 +65,7 @@ public class Deladminrole
      * }
      * </pre>
      *
-     * @param role contains extension of {@link org.apache.directory.fortress.core.rbac.AdminRole}.
+     * @param role contains extension of {@link org.apache.directory.fortress.core.model.AdminRole}.
      */
     public void addRole( AdminRoleAnt role )
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java
index a0f9c41..2c091eb 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deladminroleinheritance.java
@@ -19,14 +19,14 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.Relationship;
+import org.apache.directory.fortress.core.model.Relationship;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
 /**
- * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#deleteInheritance(org.apache.directory.fortress.core.rbac.AdminRole, org.apache.directory.fortress.core.rbac.AdminRole)}.
+ * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#deleteInheritance(org.apache.directory.fortress.core.model.AdminRole, org.apache.directory.fortress.core.model.AdminRole)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Deladminroleinheritance', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java b/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java
index 588d20e..f95bd1e 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delorgunit.java
@@ -22,11 +22,9 @@ package org.apache.directory.fortress.core.ant;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.directory.fortress.core.rbac.OrgUnitAnt;
-
 
 /**
- * The class is used by {@link FortressAntTask} to delete {@link org.apache.directory.fortress.core.rbac.OrgUnit}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#delete(org.apache.directory.fortress.core.rbac.OrgUnit)}.
+ * The class is used by {@link FortressAntTask} to delete {@link org.apache.directory.fortress.core.model.OrgUnit}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#delete(org.apache.directory.fortress.core.model.OrgUnit)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Delorgunit', is used for the xml tag in the load script.</p>
  * <pre>
@@ -80,7 +78,7 @@ public class Delorgunit
     /**
      * Used by {@link FortressAntTask#addOrgunits()} to retrieve list of OrgUnits as defined in input xml file.
      *
-     * @return collection containing {@link org.apache.directory.fortress.core.rbac.OrgUnit}s targeted for removal.
+     * @return collection containing {@link org.apache.directory.fortress.core.model.OrgUnit}s targeted for removal.
      */
     public List<OrgUnitAnt> getOrgUnits()
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java b/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java
index f077499..8e5d2e1 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/DelpermGrant.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.PermGrant;
+import org.apache.directory.fortress.core.model.PermGrant;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link FortressAntTask} to revoke {@link PermGrant}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#revokePermission(org.apache.directory.fortress.core.rbac.Permission, org.apache.directory.fortress.core.rbac.Role)}.
+ * The class is used by {@link FortressAntTask} to revoke {@link PermGrant}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#revokePermission(org.apache.directory.fortress.core.model.Permission, org.apache.directory.fortress.core.model.Role)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'DelpermGrant', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java b/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java
index 77d2d18..f4e2fa4 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/DelpermObj.java
@@ -22,11 +22,11 @@ package org.apache.directory.fortress.core.ant;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.directory.fortress.core.rbac.PermObj;
+import org.apache.directory.fortress.core.model.PermObj;
 
 
 /**
- * The class is used by {@link FortressAntTask} to load {@link PermObj}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deletePermObj(org.apache.directory.fortress.core.rbac.PermObj)}.
+ * The class is used by {@link FortressAntTask} to load {@link PermObj}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deletePermObj(org.apache.directory.fortress.core.model.PermObj)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'DelpermObj', is used for the xml tag in the load script.</p>
  * <pre>
@@ -75,7 +75,7 @@ public class DelpermObj
     /**
      * Used by {@link FortressAntTask#addPermObjs()} to retrieve list of PermObjs as defined in input xml file.
      *
-     * @return collection containing {@link org.apache.directory.fortress.core.rbac.PermObj}s targeted for deletion.
+     * @return collection containing {@link org.apache.directory.fortress.core.model.PermObj}s targeted for deletion.
      */
     public List<PermObj> getObjs()
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java b/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java
index 1abde49..a3efa67 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/DelpermOp.java
@@ -24,7 +24,7 @@ import java.util.List;
 
 
 /**
- * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.ant.PermAnt}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deletePermission(org.apache.directory.fortress.core.rbac.Permission)}.
+ * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.ant.PermAnt}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deletePermission(org.apache.directory.fortress.core.model.Permission)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'DelpermOp', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java
index 8362aaf..0a254b1 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delpermorgunitinheritance.java
@@ -19,14 +19,14 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.Relationship;
+import org.apache.directory.fortress.core.model.Relationship;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
 /**
- * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deleteInheritance(org.apache.directory.fortress.core.rbac.Role, org.apache.directory.fortress.core.rbac.Role)}.
+ * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deleteInheritance(org.apache.directory.fortress.core.model.Role, org.apache.directory.fortress.core.model.Role)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Delpermorgunitinheritance', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java b/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java
index f562388..bd0ab71 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delpwpolicy.java
@@ -19,14 +19,14 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.PwPolicy;
+import org.apache.directory.fortress.core.model.PwPolicy;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
 /**
- * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.rbac.PwPolicy}s used to drive {@link org.apache.directory.fortress.core.PwPolicyMgr#delete(org.apache.directory.fortress.core.rbac.PwPolicy)}.
+ * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.model.PwPolicy}s used to drive {@link org.apache.directory.fortress.core.PwPolicyMgr#delete(org.apache.directory.fortress.core.model.PwPolicy)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Delpwpolicy', is used for the xml tag in the load script.</p>
  * <pre>
@@ -74,7 +74,7 @@ public class Delpwpolicy
     /**
      * Used by {@link FortressAntTask#deletePolicies()} to retrieve list of PwPolicy as defined in input xml file.
      *
-     * @return collection containing {@link org.apache.directory.fortress.core.rbac.PwPolicy}s targeted for removal.
+     * @return collection containing {@link org.apache.directory.fortress.core.model.PwPolicy}s targeted for removal.
      */
     public List<PwPolicy> getPolicies()
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java
index 02482a5..3405eb3 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delrole.java
@@ -19,14 +19,14 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.Role;
+import org.apache.directory.fortress.core.model.Role;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
 /**
- * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.rbac.Role}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deleteRole(org.apache.directory.fortress.core.rbac.Role)}}.
+ * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.model.Role}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deleteRole(org.apache.directory.fortress.core.model.Role)}}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Delrole', is used for the xml tag in the load script.</p>
  * <pre>
@@ -75,7 +75,7 @@ public class Delrole
     /**
      * Used by {@link FortressAntTask#deleteRoles()} to retrieve list of Roles as defined in input xml file.
      *
-     * @return collection containing {@link org.apache.directory.fortress.core.rbac.Role}s targeted for removal.
+     * @return collection containing {@link org.apache.directory.fortress.core.model.Role}s targeted for removal.
      */
     public List<Role> getRoles()
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java
index 40cbcb3..e0d6800 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delroleinheritance.java
@@ -19,14 +19,14 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.Relationship;
+import org.apache.directory.fortress.core.model.Relationship;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
 /**
- * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deleteInheritance(org.apache.directory.fortress.core.rbac.Role, org.apache.directory.fortress.core.rbac.Role)}.
+ * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deleteInheritance(org.apache.directory.fortress.core.model.Role, org.apache.directory.fortress.core.model.Role)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Delroleinheritance', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java b/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java
index f3b42a1..8e6282d 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Delsdset.java
@@ -24,7 +24,8 @@ import java.util.List;
 
 
 /**
- * The class is used by {@link FortressAntTask} to create new {@link SDSetAnt}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deleteSsdSet(org.apache.directory.fortress.core.rbac.SDSet)} or {@link org.apache.directory.fortress.core.AdminMgr#deleteDsdSet(org.apache.directory.fortress.core.rbac.SDSet)}.
+ * The class is used by {@link FortressAntTask} to create new {@link SDSetAnt}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deleteSsdSet(org.apache.directory.fortress.core.model.SDSet)} or {@link org.apache.directory.fortress.core.AdminMgr#deleteDsdSet(org.apache.directory.fortress.core.model.SDSet)}.
+ *
  *
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Delsdset', is used for the xml tag in the load script.</p>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java b/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java
index 1a97e80..26e1061 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deluser.java
@@ -24,7 +24,7 @@ import java.util.List;
 
 
 /**
- * The class is used by {@link FortressAntTask} to load {@link UserAnt}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#disableUser(org.apache.directory.fortress.core.rbac.User)}.
+ * The class is used by {@link FortressAntTask} to load {@link UserAnt}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#disableUser(org.apache.directory.fortress.core.model.User)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Deluser', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java
index fefca6b..32d0e17 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deluseradminrole.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.UserAdminRole;
+import org.apache.directory.fortress.core.model.UserAdminRole;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link org.apache.directory.fortress.core.rbac.UserAdminRole}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#deassignUser(org.apache.directory.fortress.core.rbac.UserAdminRole)}.
+ * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link org.apache.directory.fortress.core.model.UserAdminRole}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#deassignUser(org.apache.directory.fortress.core.model.UserAdminRole)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Deluseradminrole', is used for the xml tag in the load script.</p>
  * <pre>
@@ -73,7 +73,7 @@ public class Deluseradminrole
     /**
      * Used by {@link org.apache.directory.fortress.core.ant.FortressAntTask#delUserAdminRoles()} to retrieve list of UserAdminRoles as defined in input xml file.
      *
-     * @return collection containing {@link org.apache.directory.fortress.core.rbac.UserAdminRole}s targeted for removal.
+     * @return collection containing {@link org.apache.directory.fortress.core.model.UserAdminRole}s targeted for removal.
      */
     public List<UserAdminRole> getUserRoles()
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java b/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java
index 3e14177..3e36987 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deluserorgunitinheritance.java
@@ -19,14 +19,14 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.Relationship;
+import org.apache.directory.fortress.core.model.Relationship;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
 /**
- * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#deleteInheritance(org.apache.directory.fortress.core.rbac.OrgUnit, org.apache.directory.fortress.core.rbac.OrgUnit)}.
+ * The class is used by {@link org.apache.directory.fortress.core.ant.FortressAntTask} to load {@link Relationship}s used to drive {@link org.apache.directory.fortress.core.DelAdminMgr#deleteInheritance(org.apache.directory.fortress.core.model.OrgUnit, org.apache.directory.fortress.core.model.OrgUnit)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Deluserorgunitinheritance', is used for the xml tag in the load script.</p>
  * <pre>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java b/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java
index 09ed769..9b6eebb 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/Deluserrole.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.core.ant;
 
-import org.apache.directory.fortress.core.rbac.UserRole;
+import org.apache.directory.fortress.core.model.UserRole;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.rbac.UserRole}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deassignUser(org.apache.directory.fortress.core.rbac.UserRole)}.
+ * The class is used by {@link FortressAntTask} to load {@link org.apache.directory.fortress.core.model.UserRole}s used to drive {@link org.apache.directory.fortress.core.AdminMgr#deassignUser(org.apache.directory.fortress.core.model.UserRole)}.
  * It is not intended to be callable by programs outside of the Ant load utility.  The class name itself maps to the xml tag used by load utility.
  * <p>This class name, 'Deluserrole', is used for the xml tag in the load script.</p>
  * <pre>
@@ -76,7 +76,7 @@ public class Deluserrole
     /**
      * Used by {@link FortressAntTask#delUserRoles()} to retrieve list of UserRoles as defined in input xml file.
      *
-     * @return collection containing {@link org.apache.directory.fortress.core.rbac.UserRole}s targeted for removal.
+     * @return collection containing {@link org.apache.directory.fortress.core.model.UserRole}s targeted for removal.
      */
     public List<UserRole> getUserRoles()
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java b/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
index 800c583..14dd242 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/FortressAntTask.java
@@ -54,21 +54,20 @@ import org.apache.directory.fortress.core.ldap.container.OrganizationalUnitP;
 import org.apache.directory.fortress.core.ldap.suffix.Suffix;
 import org.apache.directory.fortress.core.ldap.suffix.SuffixP;
 
-import org.apache.directory.fortress.core.rbac.AdminRole;
+import org.apache.directory.fortress.core.model.AdminRole;
 import org.apache.directory.fortress.core.rbac.ClassUtil;
-import org.apache.directory.fortress.core.rbac.Context;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.rbac.OrgUnitAnt;
-import org.apache.directory.fortress.core.rbac.PermGrant;
-import org.apache.directory.fortress.core.rbac.PermObj;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.PwPolicy;
-import org.apache.directory.fortress.core.rbac.Relationship;
-import org.apache.directory.fortress.core.rbac.Role;
-import org.apache.directory.fortress.core.rbac.SDSet;
-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.model.Context;
+import org.apache.directory.fortress.core.model.OrgUnit;
+import org.apache.directory.fortress.core.model.PermGrant;
+import org.apache.directory.fortress.core.model.PermObj;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.PwPolicy;
+import org.apache.directory.fortress.core.model.Relationship;
+import org.apache.directory.fortress.core.model.Role;
+import org.apache.directory.fortress.core.model.SDSet;
+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.Testable;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 
@@ -135,28 +134,31 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
  * The order of operations in the XML does not effect the order or precedence which has been "hard-wired" by the
  * processing order within this class.
  * <ol>
- * <li>Delete User Role Assignments {@link org.apache.directory.fortress.core.AdminMgr#deassignUser(org.apache.directory.fortress.core.rbac.UserRole)}</li>
+ * <li>Delete User Role Assignments {@link org.apache.directory.fortress.core.AdminMgr#deassignUser(org.apache.directory.fortress.core.model.UserRole)}</li>
  * <li>Delete User AdminRole Assignments {@link DelAdminMgr#deassignUser(UserAdminRole)}</li>
- * <li>Revoke Permission Assignments Delete{@link AdminMgr#revokePermission(org.apache.directory.fortress.core.rbac.Permission,
- * org.apache.directory.fortress.core.rbac.Role)}</li>
- * <li>Delete Users {@link org.apache.directory.fortress.core.AdminMgr#disableUser(org.apache.directory.fortress.core.rbac.User)}</li>
- * <li>Delete Password Policies {@link org.apache.directory.fortress.core.PwPolicyMgr#delete(org.apache.directory.fortress.core.rbac.PwPolicy)}</li>
+ * <li>Revoke Permission Assignments Delete{@link AdminMgr#revokePermission(org.apache.directory.fortress.core.model.Permission,
  *
- * <li>Delete Permission Operations {@link org.apache.directory.fortress.core.AdminMgr#deletePermission(org.apache.directory.fortress.core.rbac.Permission)
+ * org.apache.directory.fortress.core.model.Role)}</li>
+ * <li>Delete Users {@link org.apache.directory.fortress.core.AdminMgr#disableUser(org.apache.directory.fortress.core.model.User)}</li>
+ * <li>Delete Password Policies {@link org.apache.directory.fortress.core.PwPolicyMgr#delete(org.apache.directory.fortress.core.model.PwPolicy)}</li>
+ *
+ * <li>Delete Permission Operations {@link org.apache.directory.fortress.core.AdminMgr#deletePermission(org.apache.directory.fortress.core.model.Permission)
  * }</li>
- * <li>Delete Permission Objects {@link org.apache.directory.fortress.core.AdminMgr#deletePermObj(org.apache.directory.fortress.core.rbac.PermObj)}</li>
+ * <li>Delete Permission Objects {@link org.apache.directory.fortress.core.AdminMgr#deletePermObj(org.apache.directory.fortress.core.model.PermObj)}</li>
+ *
+ * <li>Delete SSD and DSD Sets {@link org.apache.directory.fortress.core.AdminMgr#deleteDsdSet(org.apache.directory.fortress.core.model.SDSet)} and {@link
+ * org.apache.directory.fortress.core.AdminMgr#deleteSsdSet(org.apache.directory.fortress.core.model.SDSet)}</li>
+ * <li>Delete RBAC Roles Inheritances {@link org.apache.directory.fortress.core.AdminMgr#deleteInheritance(org.apache.directory.fortress.core.model.Role,
+ * org.apache.directory.fortress.core.model.Role)}</li>
+ * <li>Delete RBAC Roles {@link org.apache.directory.fortress.core.AdminMgr#deleteRole(org.apache.directory.fortress.core.model.Role)}</li>
+ * <li>Delete ARBAC Role Inheritances {@link DelAdminMgr#deleteInheritance(org.apache.directory.fortress.core.model.AdminRole,
+ *
+ * org.apache.directory.fortress.core.model.AdminRole)}</li>
+ * <li>Delete ARBAC Roles {@link org.apache.directory.fortress.core.DelAdminMgr#deleteRole(org.apache.directory.fortress.core.model.AdminRole)}</li>
+ * <li>Delete User and Perm OU Inheritances {@link DelAdminMgr#deleteInheritance(org.apache.directory.fortress.core.model.OrgUnit,
  *
- * <li>Delete SSD and DSD Sets {@link org.apache.directory.fortress.core.AdminMgr#deleteDsdSet(org.apache.directory.fortress.core.rbac.SDSet)} and {@link
- * org.apache.directory.fortress.core.AdminMgr#deleteSsdSet(org.apache.directory.fortress.core.rbac.SDSet)}</li>
- * <li>Delete RBAC Roles Inheritances {@link org.apache.directory.fortress.core.AdminMgr#deleteInheritance(org.apache.directory.fortress.core.rbac.Role,
- * org.apache.directory.fortress.core.rbac.Role)}</li>
- * <li>Delete RBAC Roles {@link org.apache.directory.fortress.core.AdminMgr#deleteRole(org.apache.directory.fortress.core.rbac.Role)}</li>
- * <li>Delete ARBAC Role Inheritances {@link DelAdminMgr#deleteInheritance(org.apache.directory.fortress.core.rbac.AdminRole,
- * org.apache.directory.fortress.core.rbac.AdminRole)}</li>
- * <li>Delete ARBAC Roles {@link org.apache.directory.fortress.core.DelAdminMgr#deleteRole(org.apache.directory.fortress.core.rbac.AdminRole)}</li>
- * <li>Delete User and Perm OU Inheritances {@link DelAdminMgr#deleteInheritance(org.apache.directory.fortress.core.rbac.OrgUnit,
- * org.apache.directory.fortress.core.rbac.OrgUnit)} USER and PERM</li>
- * <li>Delete User and Perm OUs {@link org.apache.directory.fortress.core.DelAdminMgr#delete(org.apache.directory.fortress.core.rbac.OrgUnit)} USER and
+ * org.apache.directory.fortress.core.model.OrgUnit)} USER and PERM</li>
+ * <li>Delete User and Perm OUs {@link org.apache.directory.fortress.core.DelAdminMgr#delete(org.apache.directory.fortress.core.model.OrgUnit)} USER and
  * PERM</li>
  * <li>Delete Configuration Entries {@link org.apache.directory.fortress.core.cfg.ConfigMgr#delete(String, java.util.Properties)}</li>
  * <li>Delete Containers {@link OrganizationalUnitP#delete(OrganizationalUnit)}</li>
@@ -164,24 +166,26 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
  * <li>Add Suffix {@link SuffixP#add(Suffix)}}</li>
  * <li>Add Containers {@link OrganizationalUnitP#add(OrganizationalUnit)}</li>
  * <li>Add Configuration Parameters {@link ConfigMgr#add(String, java.util.Properties)}</li>
- * <li>Add User and Perm OUs {@link org.apache.directory.fortress.core.DelAdminMgr#add(org.apache.directory.fortress.core.rbac.OrgUnit)} USER and PERM</li>
- * <li>Add User and Perm OU Inheritances {@link DelAdminMgr#addInheritance(org.apache.directory.fortress.core.rbac.OrgUnit,
- * org.apache.directory.fortress.core.rbac.OrgUnit)} USER and PERM</li>
- * <li>Add ARBAC Roles {@link org.apache.directory.fortress.core.DelAdminMgr#addRole(org.apache.directory.fortress.core.rbac.AdminRole)}</li>
- * <li>Add ARBAC Role Inheritances {@link org.apache.directory.fortress.core.DelAdminMgr#addInheritance(org.apache.directory.fortress.core.rbac.AdminRole,
- * org.apache.directory.fortress.core.rbac.AdminRole)}</li>
- * <li>Add RBAC Roles {@link org.apache.directory.fortress.core.AdminMgr#addRole(org.apache.directory.fortress.core.rbac.Role)}</li>
- * <li>Add RBAC Role Inheritances {@link org.apache.directory.fortress.core.AdminMgr#addInheritance(org.apache.directory.fortress.core.rbac.Role,
- * org.apache.directory.fortress.core.rbac.Role)}</li>
- * <li>Add DSD and SSD Sets {@link org.apache.directory.fortress.core.AdminMgr#createDsdSet(org.apache.directory.fortress.core.rbac.SDSet)} and {@link org.apache.directory.fortress.core.AdminMgr#createSsdSet(org.apache.directory.fortress.core.rbac.SDSet)}</li>
- * <li>Add Permission Objects {@link org.apache.directory.fortress.core.AdminMgr#addPermObj(org.apache.directory.fortress.core.rbac.PermObj)}</li>
- * <li>Add Permission Operations {@link org.apache.directory.fortress.core.AdminMgr#addPermission(org.apache.directory.fortress.core.rbac.Permission)}</li>
- * <li>Add Password Policies {@link org.apache.directory.fortress.core.PwPolicyMgr#add(org.apache.directory.fortress.core.rbac.PwPolicy)}</li>
- * <li>Add Users {@link org.apache.directory.fortress.core.AdminMgr#addUser(org.apache.directory.fortress.core.rbac.User)}</li>
- * <li>Grant RBAC Permissions {@link org.apache.directory.fortress.core.AdminMgr#grantPermission(org.apache.directory.fortress.core.rbac.Permission,
- * org.apache.directory.fortress.core.rbac.Role)}</li>
- * <li>Assign ARBAC Roles {@link org.apache.directory.fortress.core.DelAdminMgr#assignUser(org.apache.directory.fortress.core.rbac.UserAdminRole)}</li>
- * <li>Assign RBAC Roles {@link org.apache.directory.fortress.core.AdminMgr#assignUser(org.apache.directory.fortress.core.rbac.UserRole)}</li>
+ * <li>Add User and Perm OUs {@link org.apache.directory.fortress.core.DelAdminMgr#add(org.apache.directory.fortress.core.model.OrgUnit)} USER and PERM</li>
+ * <li>Add User and Perm OU Inheritances {@link DelAdminMgr#addInheritance(org.apache.directory.fortress.core.model.OrgUnit,
+ * org.apache.directory.fortress.core.model.OrgUnit)} USER and PERM</li>
+ * <li>Add ARBAC Roles {@link org.apache.directory.fortress.core.DelAdminMgr#addRole(org.apache.directory.fortress.core.model.AdminRole)}</li>
+ * <li>Add ARBAC Role Inheritances {@link org.apache.directory.fortress.core.DelAdminMgr#addInheritance(org.apache.directory.fortress.core.model.AdminRole,
+ * org.apache.directory.fortress.core.model.AdminRole)}</li>
+ * <li>Add RBAC Roles {@link org.apache.directory.fortress.core.AdminMgr#addRole(org.apache.directory.fortress.core.model.Role)}</li>
+ *
+ * <li>Add RBAC Role Inheritances {@link org.apache.directory.fortress.core.AdminMgr#addInheritance(org.apache.directory.fortress.core.model.Role,
+ * org.apache.directory.fortress.core.model.Role)}</li>
+ * <li>Add DSD and SSD Sets {@link org.apache.directory.fortress.core.AdminMgr#createDsdSet(org.apache.directory.fortress.core.model.SDSet)} and {@link org.apache.directory.fortress.core.AdminMgr#createSsdSet(org.apache.directory.fortress.core.model.SDSet)}</li>
+ *
+ * <li>Add Permission Objects {@link org.apache.directory.fortress.core.AdminMgr#addPermObj(org.apache.directory.fortress.core.model.PermObj)}</li>
+ * <li>Add Permission Operations {@link org.apache.directory.fortress.core.AdminMgr#addPermission(org.apache.directory.fortress.core.model.Permission)}</li>
+ * <li>Add Password Policies {@link org.apache.directory.fortress.core.PwPolicyMgr#add(org.apache.directory.fortress.core.model.PwPolicy)}</li>
+ * <li>Add Users {@link org.apache.directory.fortress.core.AdminMgr#addUser(org.apache.directory.fortress.core.model.User)}</li>
+ * <li>Grant RBAC Permissions {@link org.apache.directory.fortress.core.AdminMgr#grantPermission(org.apache.directory.fortress.core.model.Permission,
+ * org.apache.directory.fortress.core.model.Role)}</li>
+ * <li>Assign ARBAC Roles {@link org.apache.directory.fortress.core.DelAdminMgr#assignUser(org.apache.directory.fortress.core.model.UserAdminRole)}</li>
+ * <li>Assign RBAC Roles {@link org.apache.directory.fortress.core.AdminMgr#assignUser(org.apache.directory.fortress.core.model.UserRole)}</li>
  * </li>
  * </ol>
  * <p/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/OrgUnitAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/OrgUnitAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/OrgUnitAnt.java
new file mode 100755
index 0000000..0094b56
--- /dev/null
+++ b/src/main/java/org/apache/directory/fortress/core/ant/OrgUnitAnt.java
@@ -0,0 +1,69 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.apache.directory.fortress.core.ant;
+
+import org.apache.directory.fortress.core.model.OrgUnit;
+
+import java.io.Serializable;
+
+
+/**
+ * Entity is used by custom Apache Ant task for special handling of collections.  This is necessary because the
+ * Ant parser cannot deal with complex data attribute types.  The class extends a base entity.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class OrgUnitAnt extends OrgUnit implements Serializable
+{
+    /** Default serialVersionUID */
+    private static final long serialVersionUID = 1L;
+
+    private String typeName;
+
+
+    /**
+     * Return the type of OU in string format.
+     *
+     * @return String that represents static or dynamic relations.
+     */
+    public String getTypeName()
+    {
+        return typeName;
+    }
+
+
+    /**
+     * Method accepts a String variable that maps to its parent's set type.
+     *
+     * @param typeName String value represents perm or user ou data sets.
+     */
+    public void setTypeName( String typeName )
+    {
+        this.typeName = typeName;
+        if ( typeName != null && typeName.equalsIgnoreCase( "PERM" ) )
+        {
+            setType( OrgUnit.Type.PERM );
+        }
+        else
+        {
+            setType( OrgUnit.Type.USER );
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java
index f8684e5..80d1c4d 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/PermAnt.java
@@ -20,7 +20,7 @@
 package org.apache.directory.fortress.core.ant;
 
 
-import org.apache.directory.fortress.core.rbac.Permission;
+import org.apache.directory.fortress.core.model.Permission;
 
 import java.util.StringTokenizer;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java
index 1963ee2..bb734f7 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/SDSetAnt.java
@@ -20,7 +20,7 @@
 package org.apache.directory.fortress.core.ant;
 
 
-import org.apache.directory.fortress.core.rbac.SDSet;
+import org.apache.directory.fortress.core.model.SDSet;
 
 import java.util.StringTokenizer;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
index 3634f69..0b7811f 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
@@ -23,7 +23,7 @@ package org.apache.directory.fortress.core.ant;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.util.attr.AttrHelper;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java b/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
index 4223169..3055a2f 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
+++ b/src/main/java/org/apache/directory/fortress/core/cli/CommandLineInterpreter.java
@@ -36,19 +36,19 @@ import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.ldap.group.Group;
 import org.apache.directory.fortress.core.ldap.group.GroupMgr;
 import org.apache.directory.fortress.core.ldap.group.GroupMgrFactory;
-import org.apache.directory.fortress.core.rbac.Address;
-import org.apache.directory.fortress.core.rbac.PermObj;
-import org.apache.directory.fortress.core.rbac.Permission;
-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.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserRole;
+import org.apache.directory.fortress.core.model.Address;
+import org.apache.directory.fortress.core.model.PermObj;
+import org.apache.directory.fortress.core.model.Permission;
+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.model.User;
+import org.apache.directory.fortress.core.model.UserRole;
 import org.slf4j.LoggerFactory;
-import org.apache.directory.fortress.core.rbac.AdminRole;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.rbac.UserAdminRole;
-import org.apache.directory.fortress.core.rbac.Relationship;
+import org.apache.directory.fortress.core.model.AdminRole;
+import org.apache.directory.fortress.core.model.OrgUnit;
+import org.apache.directory.fortress.core.model.UserAdminRole;
+import org.apache.directory.fortress.core.model.Relationship;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 import org.apache.directory.fortress.core.util.time.Constraint;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/cli/Options.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/Options.java b/src/main/java/org/apache/directory/fortress/core/cli/Options.java
index 34aef5d..977e567 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/Options.java
+++ b/src/main/java/org/apache/directory/fortress/core/cli/Options.java
@@ -21,15 +21,15 @@ package org.apache.directory.fortress.core.cli;
 
 import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.ldap.group.Group;
-import org.apache.directory.fortress.core.rbac.Address;
-import org.apache.directory.fortress.core.rbac.AdminRole;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
-import org.apache.directory.fortress.core.rbac.PermObj;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Relationship;
-import org.apache.directory.fortress.core.rbac.Role;
-import org.apache.directory.fortress.core.rbac.SDSet;
-import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.model.Address;
+import org.apache.directory.fortress.core.model.AdminRole;
+import org.apache.directory.fortress.core.model.OrgUnit;
+import org.apache.directory.fortress.core.model.PermObj;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Relationship;
+import org.apache.directory.fortress.core.model.Role;
+import org.apache.directory.fortress.core.model.SDSet;
+import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 import org.apache.directory.fortress.core.util.time.Constraint;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
index f2549c1..7663e53 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
@@ -67,7 +67,6 @@ import org.apache.directory.api.ldap.model.message.controls.ProxiedAuthz;
 import org.apache.directory.api.ldap.model.message.controls.ProxiedAuthzImpl;
 
 import org.apache.directory.api.ldap.model.name.Dn;
-import org.apache.directory.ldap.client.api.DefaultPoolableLdapConnectionFactory;
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.ldap.client.api.LdapConnectionConfig;
 import org.apache.directory.ldap.client.api.LdapConnectionPool;
@@ -75,9 +74,9 @@ import org.apache.directory.fortress.core.CfgRuntimeException;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.cfg.Config;
-import org.apache.directory.fortress.core.rbac.FortEntity;
-import org.apache.directory.fortress.core.rbac.Hier;
-import org.apache.directory.fortress.core.rbac.Relationship;
+import org.apache.directory.fortress.core.model.FortEntity;
+import org.apache.directory.fortress.core.model.Hier;
+import org.apache.directory.fortress.core.model.Relationship;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 import org.apache.directory.fortress.core.util.crypto.EncryptUtil;
 import org.apache.directory.fortress.core.util.time.CUtil;
@@ -1130,14 +1129,14 @@ public abstract class ApacheDsDataProvider
 
 
     /**
-     * Given a collection of {@link org.apache.directory.fortress.core.rbac.Relationship}s, convert to raw data name-value format and
+     * Given a collection of {@link org.apache.directory.fortress.core.model.Relationship}s, convert to raw data name-value format and
      * load into ldap modification set in preparation for ldap modify.
      *
-     * @param list     contains List of type {@link org.apache.directory.fortress.core.rbac.Relationship} targeted for updating in ldap.
+     * @param list     contains List of type {@link org.apache.directory.fortress.core.model.Relationship} targeted for updating in ldap.
      * @param mods     ldap modification set containing parent-child relationships in raw ldap format.
      * @param attrName contains the name of the ldap attribute to be updated.
-     * @param op       specifies type of mod: {@link org.apache.directory.fortress.core.rbac.Hier.Op#ADD},
-     * {@link org.apache.directory.fortress.core.rbac.Hier.Op#MOD}, {@link org.apache.directory.fortress.core.rbac.Hier.Op#REM}.
+     * @param op       specifies type of mod: {@link org.apache.directory.fortress.core.model.Hier.Op#ADD},
+     * {@link org.apache.directory.fortress.core.model.Hier.Op#MOD}, {@link org.apache.directory.fortress.core.model.Hier.Op#REM}.
      */
     protected void loadRelationshipAttrs( List<Relationship> list, List<Modification> mods, String attrName,
         Hier.Op op )

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ldap/group/Group.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/group/Group.java b/src/main/java/org/apache/directory/fortress/core/ldap/group/Group.java
index 13b54b4..2884cad 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/group/Group.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/group/Group.java
@@ -20,8 +20,8 @@
 package org.apache.directory.fortress.core.ldap.group;
 
 
-import org.apache.directory.fortress.core.rbac.FortEntity;
-import org.apache.directory.fortress.core.rbac.Props;
+import org.apache.directory.fortress.core.model.FortEntity;
+import org.apache.directory.fortress.core.model.Props;
 import org.apache.directory.fortress.core.util.attr.AttrHelper;
 
 import javax.xml.bind.annotation.XmlAccessType;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java
index ea69e4f..9b4d5fd 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupDAO.java
@@ -39,7 +39,7 @@ import org.apache.directory.fortress.core.ObjectFactory;
 import org.apache.directory.fortress.core.UpdateException;
 import org.apache.directory.fortress.core.cfg.Config;
 import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
-import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.util.attr.AttrHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgr.java b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgr.java
index 2f78f21..313b712 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgr.java
@@ -22,7 +22,7 @@ package org.apache.directory.fortress.core.ldap.group;
 
 import org.apache.directory.fortress.core.*;
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.model.User;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrFactory.java
index 33f6ae5..f8de6df 100755
--- a/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/group/GroupMgrFactory.java
@@ -25,7 +25,7 @@ import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.cfg.Config;
 import org.apache.directory.fortress.core.rbac.ClassUtil;
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 
 /**


Mime
View raw message