directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [01/19] directory-fortress-core git commit: FC-109 - break core package cycles
Date Mon, 01 Jun 2015 23:02:06 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/1.0-RC41 [created] 0c46e4deb


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
index 9cf3230..52233bd 100755
--- a/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
@@ -23,13 +23,13 @@ import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.ReviewMgr;
 import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.rbac.Manageable;
-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.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.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.User;
+import org.apache.directory.fortress.core.model.UserRole;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 
 import java.util.ArrayList;
@@ -240,7 +240,7 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
      * <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 org.apache.directory.fortress.core.SecurityException
      *          thrown in the event of system error.
@@ -471,7 +471,7 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
      * <li>{@link OrgUnit#name} - contains one or more characters of org unit associated with existing object(s) being targeted</li>
      * </ul>
      *
-     * @param ou contains name of User OU, {@link org.apache.directory.fortress.core.rbac.OrgUnit#name} that match ou attribute associated with User entity in the directory.
+     * @param ou contains name of User OU, {@link org.apache.directory.fortress.core.model.OrgUnit#name} that match ou attribute associated with User entity in the directory.
      * @return List of type User.
      * @throws SecurityException 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/util/attr/AttrHelper.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java b/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java
index a766b57..17bd489 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/attr/AttrHelper.java
@@ -25,8 +25,8 @@ import org.apache.directory.api.ldap.model.name.Rdn;
 import org.apache.directory.api.util.DateUtils;
 import org.apache.directory.fortress.core.GlobalIds;
 import org.apache.directory.fortress.core.rbac.Administrator;
-import org.apache.directory.fortress.core.rbac.AuthZ;
-import org.apache.directory.fortress.core.rbac.Permission;
+import org.apache.directory.fortress.core.model.AuthZ;
+import org.apache.directory.fortress.core.model.Permission;
 
 import java.text.ParseException;
 import java.util.Date;
@@ -56,7 +56,7 @@ public final class AttrHelper
     }
 
     /**
-     * Perform copy on ARBAC attributes.  This is used during assignment of {@link org.apache.directory.fortress.core.rbac.AdminRole} to {@link org.apache.directory.fortress.core.rbac.User}.
+     * Perform copy on ARBAC attributes.  This is used during assignment of {@link org.apache.directory.fortress.core.model.AdminRole} to {@link org.apache.directory.fortress.core.model.User}.
      * This method does not perform input validations.
      *
      * @param srcR contains source attributes to copy.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java b/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
index fae2d1d..4381f0d 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/attr/VUtil.java
@@ -187,7 +187,7 @@ public final class VUtil
     /**
      * Simple null, {@link org.apache.directory.fortress.core.GlobalErrIds#USER_ID_NULL}, and length checks, {@link org.apache.directory.fortress.core.GlobalErrIds#CONST_INVLD_FIELD_LEN}, on userId.
      *
-     * @param userId contains the userId, maps to {@link org.apache.directory.fortress.core.rbac.User#userId}.
+     * @param userId contains the userId, maps to {@link org.apache.directory.fortress.core.model.User#userId}.
      * @throws ValidationException in the event of failure, {@link GlobalErrIds#CONST_INVLD_FIELD_LEN}.
      */
     public static void userId( String userId ) throws ValidationException

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java b/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java
index 0b56fc6..13fc3fd 100644
--- a/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/cache/DsdCacheEntry.java
@@ -19,7 +19,7 @@
  */
 package org.apache.directory.fortress.core.util.cache;
 
-import org.apache.directory.fortress.core.rbac.SDSet;
+import org.apache.directory.fortress.core.model.SDSet;
 
 /**
  * Value object wraps {@link SDSet} for caching purposes.  This class also provides attributes that are used for
@@ -36,10 +36,10 @@ public class DsdCacheEntry
     private String contextId;
 
     /**
-     * Non-default contructor takes a {@link DsdCacheEntry#member} that maps to  {@link org.apache.directory.fortress.core.rbac.Role#name}, along
-     * with a reference to {@link org.apache.directory.fortress.core.rbac.SDSet} and a boolean value to indicate if DSD not found for member, which indicates empty.
+     * Non-default contructor takes a {@link DsdCacheEntry#member} that maps to  {@link org.apache.directory.fortress.core.model.Role#name}, along
+     * with a reference to {@link org.apache.directory.fortress.core.model.SDSet} and a boolean value to indicate if DSD not found for member, which indicates empty.
      *
-     * @param member maps to {@link org.apache.directory.fortress.core.rbac.Role#name}
+     * @param member maps to {@link org.apache.directory.fortress.core.model.Role#name}
      * @param sdSet contains DSD entry.
      * @param empty if true, the DSD entry was not found for a corresponding Role.
      */
@@ -94,7 +94,7 @@ public class DsdCacheEntry
     /**
      * Get the DSD for this cache entry.
      *
-     * @return SDSet of type {@link org.apache.directory.fortress.core.rbac.SDSet.SDType#DYNAMIC}.
+     * @return SDSet of type {@link org.apache.directory.fortress.core.model.SDSet.SDType#DYNAMIC}.
      */
     public SDSet getSdSet()
     {
@@ -104,7 +104,7 @@ public class DsdCacheEntry
     /**
      * Set the DSD for this cache entry.
      *
-     * @param sdSet reference to non-null {@link SDSet} of type {@link org.apache.directory.fortress.core.rbac.SDSet.SDType#DYNAMIC}.
+     * @param sdSet reference to non-null {@link SDSet} of type {@link org.apache.directory.fortress.core.model.SDSet.SDType#DYNAMIC}.
      */
     public void setSdSet(SDSet sdSet)
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java b/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
index a75bad3..0951708 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
@@ -27,8 +27,8 @@ import org.apache.directory.fortress.core.cfg.Config;
 import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.ValidationException;
 import org.apache.directory.fortress.core.rbac.ClassUtil;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.rbac.UserRole;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.UserRole;
 import org.apache.directory.fortress.core.rbac.Warning;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 import org.slf4j.Logger;
@@ -350,11 +350,11 @@ public class CUtil
     public static enum ConstraintType
     {
         /**
-         * Specifies {@link org.apache.directory.fortress.core.rbac.User}
+         * Specifies {@link org.apache.directory.fortress.core.model.User}
          */
         USER,
         /**
-         * Specifies {@link org.apache.directory.fortress.core.rbac.Role}
+         * Specifies {@link org.apache.directory.fortress.core.model.Role}
          */
         ROLE
     }
@@ -423,9 +423,9 @@ public class CUtil
 
     /**
      * This utility iterates over all of the Validators initialized for runtime and calls them passing the {@link Constraint} contained within the
-     * targeted entity.  If a particular {@link org.apache.directory.fortress.core.rbac.UserRole} violates constraint it will not be activated.  If {@link org.apache.directory.fortress.core.rbac.User} validation fails a ValidationException will be thrown thus preventing User logon.
+     * targeted entity.  If a particular {@link org.apache.directory.fortress.core.model.UserRole} violates constraint it will not be activated.  If {@link org.apache.directory.fortress.core.model.User} validation fails a ValidationException will be thrown thus preventing User logon.
      *
-     * @param session contains {@link org.apache.directory.fortress.core.rbac.User} and {@link org.apache.directory.fortress.core.rbac.UserRole} constraints {@link Constraint} to be checked.
+     * @param session contains {@link org.apache.directory.fortress.core.model.User} and {@link org.apache.directory.fortress.core.model.UserRole} constraints {@link Constraint} to be checked.
      * @param type    specifies User {@link ConstraintType#USER} or rOLE {@link ConstraintType#ROLE}.
      * @param checkDsd will check DSD constraints if true
      * @throws org.apache.directory.fortress.core.SecurityException in the event validation fails for User or system error occurs.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java b/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
index a6753f8..9cc6f57 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/ClockTime.java
@@ -22,7 +22,7 @@ package org.apache.directory.fortress.core.util.time;
 
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.GlobalIds;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 
 
 /**
@@ -31,11 +31,11 @@ import org.apache.directory.fortress.core.rbac.Session;
  * for {@link Constraint} validations that occur in
  * <h4> Constraint Targets include</h4>
  * <ol>
- * <li>{@link org.apache.directory.fortress.core.rbac.User} maps to 'ftCstr' attribute on 'ftUserAttrs' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.UserRole} maps to 'ftRC' attribute on 'ftUserAttrs' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.Role}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.AdminRole}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.UserAdminRole}  maps to 'ftARC' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.User} maps to 'ftCstr' attribute on 'ftUserAttrs' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.UserRole} maps to 'ftRC' attribute on 'ftUserAttrs' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.Role}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.AdminRole}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.UserAdminRole}  maps to 'ftARC' attribute on 'ftRls' object class</li>
  * </ol>
  * </p>
  *

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/util/time/Constraint.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Constraint.java b/src/main/java/org/apache/directory/fortress/core/util/time/Constraint.java
index 13722c8..11178db 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Constraint.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Constraint.java
@@ -22,8 +22,8 @@ package org.apache.directory.fortress.core.util.time;
 
 /**
  * The Fortress Constraint interface prescribes attributes that are used to store, process and retrieve temporal validation attributes on
- * {@link org.apache.directory.fortress.core.rbac.User}, {@link org.apache.directory.fortress.core.rbac.UserRole}, {@link org.apache.directory.fortress.core.rbac.Role},
- * {@link org.apache.directory.fortress.core.rbac.AdminRole}, {@link org.apache.directory.fortress.core.rbac.UserAdminRole} entities.
+ * {@link org.apache.directory.fortress.core.model.User}, {@link org.apache.directory.fortress.core.model.UserRole}, {@link org.apache.directory.fortress.core.model.Role},
+ * {@link org.apache.directory.fortress.core.model.AdminRole}, {@link org.apache.directory.fortress.core.model.UserAdminRole} entities.
  * <p/>
  * <img src="../../doc-files/TemporalRbac.png">
  * <p/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/util/time/Date.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Date.java b/src/main/java/org/apache/directory/fortress/core/util/time/Date.java
index 30a2935..c66ca2f 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Date.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Date.java
@@ -21,18 +21,18 @@ package org.apache.directory.fortress.core.util.time;
 
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.GlobalIds;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 
 /**
  * This class performs date validation for {@link Constraint}.  This validator will ensure the current date falls between {@link Constraint#getBeginDate()} and {@link Constraint#getEndDate()}
  * The format requires YYYYMMDD, i.e. 20110101 for January 1, 2011.  The constant {@link org.apache.directory.fortress.core.GlobalIds#NONE} may be used to disable checks for a particular entity.
  * <h4> Constraint Targets include</h4>
  * <ol>
- * <li>{@link org.apache.directory.fortress.core.rbac.User} maps to 'ftCstr' attribute on 'ftUserAttrs' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.UserRole} maps to 'ftRC' attribute on 'ftUserAttrs' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.Role}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.AdminRole}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.UserAdminRole}  maps to 'ftARC' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.User} maps to 'ftCstr' attribute on 'ftUserAttrs' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.UserRole} maps to 'ftRC' attribute on 'ftUserAttrs' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.Role}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.AdminRole}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.UserAdminRole}  maps to 'ftARC' attribute on 'ftRls' object class</li>
  * </ol>
  * </p>
  *

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/util/time/Day.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Day.java b/src/main/java/org/apache/directory/fortress/core/util/time/Day.java
index 0041176..2391690 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Day.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Day.java
@@ -21,18 +21,18 @@ package org.apache.directory.fortress.core.util.time;
 
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.GlobalIds;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 
 /**
  * This class performs lock day of week validation for {@link Constraint}.  This validator will ensure the current day is allowed for {@link Constraint#getDayMask()}.
  * The data format requires 1234567 for Sun, Mon, Tue, Wed, Thur, Fri, Sat, Sun respectively.  i.e. 23456 will allow entity to activated Monday - Friday.  The constant {@link org.apache.directory.fortress.core.GlobalIds#ALL} may be used to disable checks for a particular entity.
  * <h4> Constraint Targets include</h4>
  * <ol>
- * <li>{@link org.apache.directory.fortress.core.rbac.User} maps to 'ftCstr' attribute on 'ftUserAttrs' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.UserRole} maps to 'ftRC' attribute on 'ftUserAttrs' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.Role}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.AdminRole}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.UserAdminRole}  maps to 'ftARC' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.User} maps to 'ftCstr' attribute on 'ftUserAttrs' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.UserRole} maps to 'ftRC' attribute on 'ftUserAttrs' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.Role}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.AdminRole}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.UserAdminRole}  maps to 'ftARC' attribute on 'ftRls' object class</li>
  * </ol>
  * </p>
  *

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java b/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java
index 5596ae1..3bbf81f 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/LockDate.java
@@ -22,7 +22,7 @@ package org.apache.directory.fortress.core.util.time;
 
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.GlobalIds;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 
 /**
  * This class performs lock date validation for {@link Constraint}.  This validator will ensure the current date falls outside {@link Constraint#getBeginLockDate()} and {@link Constraint#getEndLockDate()} range.
@@ -30,11 +30,11 @@ import org.apache.directory.fortress.core.rbac.Session;
  * The data format requires YYYYMMDD, i.e. 20110101 for January 1, 2011.  The constant {@link org.apache.directory.fortress.core.GlobalIds#NONE} may be used to disable checks for a particular entity.
  * <h4> Constraint Targets include</h4>
  * <ol>
- * <li>{@link org.apache.directory.fortress.core.rbac.User} maps to 'ftCstr' attribute on 'ftUserAttrs' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.UserRole} maps to 'ftRC' attribute on 'ftUserAttrs' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.Role}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.AdminRole}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.UserAdminRole}  maps to 'ftARC' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.User} maps to 'ftCstr' attribute on 'ftUserAttrs' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.UserRole} maps to 'ftRC' attribute on 'ftUserAttrs' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.Role}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.AdminRole}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.UserAdminRole}  maps to 'ftARC' attribute on 'ftRls' object class</li>
  * </ol>
  * </p>
  *

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java b/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
index dd2bb61..ee631d4 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/TUtil.java
@@ -24,7 +24,7 @@ import java.util.GregorianCalendar;
 
 
 /**
- * Utility class to convert current time/date into internal format, {@link Time}, used for {@link Constraint} checks {@link CUtil#validateConstraints(org.apache.directory.fortress.core.rbac.Session, CUtil.ConstraintType, boolean)}.
+ * Utility class to convert current time/date into internal format, {@link Time}, used for {@link Constraint} checks {@link CUtil#validateConstraints(org.apache.directory.fortress.core.model.Session, CUtil.ConstraintType, boolean)}.
  * This utility processes custom date formats and should not be used by external programs.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java b/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
index e49a554..65af03a 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Timeout.java
@@ -21,7 +21,7 @@ package org.apache.directory.fortress.core.util.time;
 
 
 import org.apache.directory.fortress.core.GlobalErrIds;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 
 
 /**
@@ -29,11 +29,11 @@ import org.apache.directory.fortress.core.rbac.Session;
  * The timeout is in minutes and is stored as integer value.  i.e. 30 for 30 minutes.  A value of '0' specifies no timeout for a particular entity.
  * <h4> Constraint Targets include</h4>
  * <ol>
- * <li>{@link org.apache.directory.fortress.core.rbac.User} maps to 'ftCstr' attribute on 'ftUserAttrs' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.UserRole} maps to 'ftRC' attribute on 'ftUserAttrs' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.Role}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.AdminRole}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.UserAdminRole}  maps to 'ftARC' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.User} maps to 'ftCstr' attribute on 'ftUserAttrs' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.UserRole} maps to 'ftRC' attribute on 'ftUserAttrs' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.Role}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.AdminRole}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
+ * <li>{@link org.apache.directory.fortress.core.model.UserAdminRole}  maps to 'ftARC' attribute on 'ftRls' object class</li>
  * </ol>
  * </p>
  *

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java b/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java
index dc23385..314b781 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/Validator.java
@@ -20,7 +20,7 @@
 package org.apache.directory.fortress.core.util.time;
 
 
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 
 
 /**
@@ -28,11 +28,11 @@ import org.apache.directory.fortress.core.rbac.Session;
  *
  * <h4> Constraint Targets</h4>
  * <ol>
- * <li>{@link org.apache.directory.fortress.core.rbac.User}</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.UserRole}</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.Role}</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.AdminRole}</li>
- * <li>{@link org.apache.directory.fortress.core.rbac.UserAdminRole}</li>
+ * <li>{@link org.apache.directory.fortress.core.model.User}</li>
+ * <li>{@link org.apache.directory.fortress.core.model.UserRole}</li>
+ * <li>{@link org.apache.directory.fortress.core.model.Role}</li>
+ * <li>{@link org.apache.directory.fortress.core.model.AdminRole}</li>
+ * <li>{@link org.apache.directory.fortress.core.model.UserAdminRole}</li>
  * </ol>
  * </p>
  * <h4> Constraint Processors </h4>
@@ -60,7 +60,7 @@ import org.apache.directory.fortress.core.rbac.Session;
 public interface Validator
 {
     /**
-     * This method is called during activation of {@link org.apache.directory.fortress.core.rbac.UserRole} and {@link org.apache.directory.fortress.core.rbac.UserAdminRole}
+     * This method is called during activation of {@link org.apache.directory.fortress.core.model.UserRole} and {@link org.apache.directory.fortress.core.model.UserAdminRole}
      * </p>
      * The following error codes can be returned for validations:
      * <ol>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
index bf0f79e..0b8c945 100644
--- a/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AccelMgrConsole.java
@@ -20,13 +20,11 @@
 package org.apache.directory.fortress.core;
 
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.UserAdminRole;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserRole;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserRole;
 
-import java.util.Enumeration;
 import java.util.List;
 
 import org.apache.directory.fortress.core.util.attr.VUtil;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
index 41e9403..180bf1e 100755
--- a/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AccessMgrConsole.java
@@ -20,11 +20,11 @@
 package org.apache.directory.fortress.core;
 
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.UserAdminRole;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserRole;
+import org.apache.directory.fortress.core.model.UserAdminRole;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserRole;
 
 import java.util.Collections;
 import java.util.Comparator;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
index 3143931..83aaade 100755
--- a/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AdminMgrConsole.java
@@ -25,16 +25,16 @@ import org.apache.directory.fortress.core.example.ExampleAdminMgr;
 import org.apache.directory.fortress.core.example.ExampleAdminMgrFactory;
 import org.apache.directory.fortress.core.rbac.MyAnnotation;
 import org.apache.directory.fortress.core.rbac.PolicyTestData;
-import org.apache.directory.fortress.core.rbac.Hier;
-import org.apache.directory.fortress.core.rbac.PermObj;
-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.Session;
+import org.apache.directory.fortress.core.model.Hier;
+import org.apache.directory.fortress.core.model.PermObj;
+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.Session;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-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.model.Permission;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserRole;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 import org.apache.directory.fortress.core.util.time.Constraint;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
index 6e98de6..1b4ee42 100755
--- a/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/AuditMgrConsole.java
@@ -20,14 +20,12 @@
 package org.apache.directory.fortress.core;
 
 import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.api.ldap.model.name.Dn;
-import org.apache.directory.api.ldap.model.name.Rdn;
-import org.apache.directory.fortress.core.rbac.Bind;
-import org.apache.directory.fortress.core.rbac.AuthZ;
-import org.apache.directory.fortress.core.rbac.Mod;
+import org.apache.directory.fortress.core.model.Bind;
+import org.apache.directory.fortress.core.model.AuthZ;
+import org.apache.directory.fortress.core.model.Mod;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.UserAudit;
-import org.apache.directory.fortress.core.rbac.Permission;
+import org.apache.directory.fortress.core.model.UserAudit;
+import org.apache.directory.fortress.core.model.Permission;
 import org.apache.directory.fortress.core.util.attr.AttrHelper;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 import org.slf4j.Logger;
@@ -859,7 +857,7 @@ class AuditMgrConsole
      * Parse slapd access raw data to pull the permission name out.
      *
      * @param authZ raw data contained in Fortress audit entity.
-     * @return Permission contains {@link org.apache.directory.fortress.core.rbac.Permission#objName} and {@link org.apache.directory.fortress.core.rbac.Permission#opName}
+     * @return Permission contains {@link org.apache.directory.fortress.core.model.Permission#objName} and {@link org.apache.directory.fortress.core.model.Permission#opName}
      */
     private Permission getAuthZPerm2(AuthZ authZ)
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java
index da9afa3..7fc1347 100755
--- a/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/ConfigMgrConsole.java
@@ -21,7 +21,7 @@ package org.apache.directory.fortress.core;
 
 import org.apache.directory.fortress.core.cfg.ConfigMgr;
 import org.apache.directory.fortress.core.cfg.ConfigMgrFactory;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 
 import java.util.Enumeration;
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
index afa2c40..3638147 100755
--- a/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/DelegatedAccessMgrConsole.java
@@ -20,11 +20,11 @@
 package org.apache.directory.fortress.core;
 
 
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Role;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Role;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java
index 00a2b55..05ddc1b 100755
--- a/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/DelegatedAdminMgrConsole.java
@@ -19,13 +19,13 @@
  */
 package org.apache.directory.fortress.core;
 
-import org.apache.directory.fortress.core.rbac.AdminRole;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
+import org.apache.directory.fortress.core.model.AdminRole;
+import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.UserAdminRole;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Role;
-import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.model.UserAdminRole;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Role;
+import org.apache.directory.fortress.core.model.User;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java
index 4b138f6..62462a3 100755
--- a/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/DelegatedReviewMgrConsole.java
@@ -20,10 +20,10 @@
 package org.apache.directory.fortress.core;
 
 
-import org.apache.directory.fortress.core.rbac.AdminRole;
+import org.apache.directory.fortress.core.model.AdminRole;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.UserAdminRole;
-import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.model.UserAdminRole;
+import org.apache.directory.fortress.core.model.User;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/PolicyMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/PolicyMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/PolicyMgrConsole.java
index 10e7f52..8f878ae 100755
--- a/src/test/java/org/apache/directory/fortress/core/PolicyMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/PolicyMgrConsole.java
@@ -20,7 +20,7 @@
 package org.apache.directory.fortress.core;
 
 
-import org.apache.directory.fortress.core.rbac.PwPolicy;
+import org.apache.directory.fortress.core.model.PwPolicy;
 import org.apache.directory.fortress.core.rbac.TestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java b/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
index 702aa35..ee7745b 100755
--- a/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
+++ b/src/test/java/org/apache/directory/fortress/core/ReviewMgrConsole.java
@@ -21,14 +21,14 @@ package org.apache.directory.fortress.core;
 
 
 import org.slf4j.LoggerFactory;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
+import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.UserAdminRole;
-import org.apache.directory.fortress.core.rbac.Address;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Role;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserRole;
+import org.apache.directory.fortress.core.model.UserAdminRole;
+import org.apache.directory.fortress.core.model.Address;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Role;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserRole;
 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/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java b/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
index 040c653..863362b 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/AccelCreateSession.java
@@ -26,9 +26,9 @@ import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
 import org.apache.jmeter.samplers.SampleResult;
 import org.slf4j.LoggerFactory;
 import org.apache.directory.fortress.core.AccelMgr;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.model.User;
 
 import static org.junit.Assert.*;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
index 4b4cb3f..920b444 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/CheckAccess.java
@@ -27,10 +27,10 @@ import org.apache.jmeter.samplers.SampleResult;
 import org.slf4j.LoggerFactory;
 import org.apache.directory.fortress.core.AccelMgr;
 import org.apache.directory.fortress.core.AccessMgr;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 
 import static org.junit.Assert.*;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java b/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java
index 1b8fbae..44b3651 100644
--- a/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java
+++ b/src/test/java/org/apache/directory/fortress/core/jmeter/FortressCreateSession.java
@@ -26,9 +26,9 @@ import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
 import org.apache.jmeter.samplers.SampleResult;
 import org.slf4j.LoggerFactory;
 import org.apache.directory.fortress.core.AccessMgr;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.model.User;
 
 import static org.junit.Assert.*;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
index d40e4d5..60029c2 100644
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AccelMgrImplTest.java
@@ -26,6 +26,10 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserRole;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
index 633a181..f3237f2 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AccessMgrImplTest.java
@@ -29,6 +29,11 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import org.apache.directory.fortress.core.model.Permission;
+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.apache.directory.fortress.core.util.attr.VUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/AdminMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AdminMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/AdminMgrImplTest.java
index ec22e60..a5722ae 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AdminMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AdminMgrImplTest.java
@@ -27,6 +27,13 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+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.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java
index a81da0c..c6f1b7a 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AdminRoleTestData.java
@@ -26,6 +26,7 @@ import java.util.StringTokenizer;
 
 import junit.framework.TestCase;
 
+import org.apache.directory.fortress.core.model.AdminRole;
 import org.apache.directory.fortress.core.util.time.Constraint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java
index ad99bfc..2866fbf 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/AuditMgrImplTest.java
@@ -28,6 +28,12 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import org.apache.directory.fortress.core.model.AuthZ;
+import org.apache.directory.fortress.core.model.Bind;
+import org.apache.directory.fortress.core.model.Mod;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserAudit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/CacheSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/CacheSample.java b/src/test/java/org/apache/directory/fortress/core/rbac/CacheSample.java
index 17dcacf..a2bc978 100644
--- a/src/test/java/org/apache/directory/fortress/core/rbac/CacheSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/CacheSample.java
@@ -29,6 +29,7 @@ import net.sf.ehcache.search.Query;
 import net.sf.ehcache.search.Result;
 import net.sf.ehcache.search.Results;
 
+import org.apache.directory.fortress.core.model.SDSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/DelegatedMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/DelegatedMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/DelegatedMgrImplTest.java
index 23e3bad..69e8023 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/DelegatedMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/DelegatedMgrImplTest.java
@@ -30,6 +30,14 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+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.Role;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserAdminRole;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/FortressAntLoadTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/FortressAntLoadTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/FortressAntLoadTest.java
index c825cb0..a686a1d 100644
--- a/src/test/java/org/apache/directory/fortress/core/rbac/FortressAntLoadTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/FortressAntLoadTest.java
@@ -27,6 +27,13 @@ import java.util.Date;
 import java.util.List;
 
 import au.com.bytecode.opencsv.CSVWriter;
+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.Role;
+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.apache.tools.ant.Task;
 import org.junit.Test;
 import org.junit.runner.JUnitCore;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java
index 7e0d525..b52d16f 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/OrgUnitTestData.java
@@ -27,6 +27,7 @@ import java.util.StringTokenizer;
 
 import junit.framework.TestCase;
 
+import org.apache.directory.fortress.core.model.OrgUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/PermTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/PermTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/PermTestData.java
index 4c42c38..8327f77 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/PermTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/PermTestData.java
@@ -22,6 +22,8 @@ package org.apache.directory.fortress.core.rbac;
 
 import junit.framework.TestCase;
 
+import org.apache.directory.fortress.core.model.PermObj;
+import org.apache.directory.fortress.core.model.Permission;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/PolicyTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/PolicyTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/PolicyTestData.java
index b69c60f..6171900 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/PolicyTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/PolicyTestData.java
@@ -27,6 +27,7 @@ import java.lang.annotation.Target;
 
 import junit.framework.TestCase;
 
+import org.apache.directory.fortress.core.model.PwPolicy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/PswdPolicyMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/PswdPolicyMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/PswdPolicyMgrImplTest.java
index d8ec5fd..e16602a 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/PswdPolicyMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/PswdPolicyMgrImplTest.java
@@ -28,6 +28,9 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+import org.apache.directory.fortress.core.model.PwPolicy;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/ReviewMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/ReviewMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/ReviewMgrImplTest.java
index 20dd2d4..a17b74f 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/ReviewMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/ReviewMgrImplTest.java
@@ -29,6 +29,13 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
+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.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java
index 6e01b44..86ac5f0 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/RoleTestData.java
@@ -30,6 +30,9 @@ import java.util.StringTokenizer;
 
 import junit.framework.TestCase;
 
+import org.apache.directory.fortress.core.model.Role;
+import org.apache.directory.fortress.core.model.SDSet;
+import org.apache.directory.fortress.core.model.UserRole;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
index 7943981..51db3c3 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
@@ -31,6 +31,8 @@ import java.util.TreeSet;
 
 import junit.framework.TestCase;
 import org.apache.directory.fortress.core.GlobalIds;
+import org.apache.directory.fortress.core.model.Address;
+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/test/java/org/apache/directory/fortress/core/rbac/accelerator/TestAccelerator.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/accelerator/TestAccelerator.java b/src/test/java/org/apache/directory/fortress/core/rbac/accelerator/TestAccelerator.java
index 9593e14..dc3e3a6 100644
--- a/src/test/java/org/apache/directory/fortress/core/rbac/accelerator/TestAccelerator.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/accelerator/TestAccelerator.java
@@ -27,11 +27,11 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.directory.fortress.core.AccelMgr;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserRole;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserRole;
 
 import static org.junit.Assert.*;
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/AdminManagerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/AdminManagerTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/AdminManagerTest.java
index 03c4f64..1dc76c5 100644
--- a/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/AdminManagerTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/AdminManagerTest.java
@@ -46,10 +46,10 @@ import org.apache.directory.fortress.core.ldap.LdapCounters;
 import org.apache.directory.fortress.core.rbac.DelegatedMgrImplTest;
 import org.apache.directory.fortress.core.rbac.FortressJUnitTest;
 import org.apache.directory.fortress.core.rbac.OrgUnitTestData;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserRole;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserRole;
 import org.apache.directory.fortress.core.rbac.UserTestData;
 import org.apache.directory.fortress.core.util.LogUtil;
 import org.apache.directory.fortress.core.util.cache.CacheMgr;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/FortressJUnitApachedsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/FortressJUnitApachedsTest.java b/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/FortressJUnitApachedsTest.java
index 8649332..2731941 100644
--- a/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/FortressJUnitApachedsTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/apacheds/FortressJUnitApachedsTest.java
@@ -42,13 +42,13 @@ import org.apache.directory.fortress.core.rbac.DelegatedMgrImplTest;
 import org.apache.directory.fortress.core.rbac.DelegatedMgrImplTest.ASSIGN_OP;
 import org.apache.directory.fortress.core.rbac.DelegatedMgrImplTest.GRANT_OP;
 import org.apache.directory.fortress.core.rbac.FortressJUnitTest;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
+import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.rbac.OrgUnitTestData;
 import org.apache.directory.fortress.core.rbac.PRATestData;
 import org.apache.directory.fortress.core.rbac.PermTestData;
 import org.apache.directory.fortress.core.rbac.ReviewMgrImplTest;
 import org.apache.directory.fortress.core.rbac.RoleTestData;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.rbac.TestUtils;
 import org.apache.directory.fortress.core.rbac.URATestData;
 import org.apache.directory.fortress.core.rbac.UserTestData;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java b/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java
index f85724f..ecd7c6f 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/AccessMgrSample.java
@@ -33,12 +33,12 @@ import org.slf4j.LoggerFactory;
 import org.apache.directory.fortress.core.AccessMgr;
 import org.apache.directory.fortress.core.AccessMgrFactory;
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.rbac.Permission;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-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.User;
+import org.apache.directory.fortress.core.model.UserAdminRole;
+import org.apache.directory.fortress.core.model.UserRole;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java
index 2386777..6187a2d 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgHierarchySample.java
@@ -21,7 +21,7 @@ package org.apache.directory.fortress.core.samples;
 
 import org.apache.directory.fortress.core.DelAdminMgr;
 import org.apache.directory.fortress.core.DelAdminMgrFactory;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
+import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.rbac.TestUtils;
 import junit.framework.Test;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java
index 772092b..d07f74d 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermOrgSample.java
@@ -26,7 +26,7 @@ import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.DelAdminMgr;
 import org.apache.directory.fortress.core.DelAdminMgrFactory;
 import org.apache.directory.fortress.core.DelReviewMgrFactory;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
+import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.rbac.TestUtils;
 import junit.framework.Test;
 import junit.framework.TestCase;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java
index 3207141..bb62a55 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreatePermSample.java
@@ -24,12 +24,12 @@ import org.apache.directory.fortress.core.AdminMgrFactory;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.ReviewMgr;
 import org.apache.directory.fortress.core.ReviewMgrFactory;
-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.model.PermObj;
+import org.apache.directory.fortress.core.model.Permission;
+import org.apache.directory.fortress.core.model.Role;
 import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.model.User;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java
index 7771395..0090e20 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleHierarchySample.java
@@ -22,7 +22,7 @@ package org.apache.directory.fortress.core.samples;
 import org.apache.directory.fortress.core.AdminMgr;
 import org.apache.directory.fortress.core.AdminMgrFactory;
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.rbac.Role;
+import org.apache.directory.fortress.core.model.Role;
 import org.apache.directory.fortress.core.rbac.TestUtils;
 import junit.framework.Test;
 import junit.framework.TestCase;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java
index 0380dc9..52e8d4d 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateRoleSample.java
@@ -25,7 +25,7 @@ import org.apache.directory.fortress.core.FinderException;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.ReviewMgr;
 import org.apache.directory.fortress.core.ReviewMgrFactory;
-import org.apache.directory.fortress.core.rbac.Role;
+import org.apache.directory.fortress.core.model.Role;
 import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.rbac.TestUtils;
 import junit.framework.Test;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
index bd04c5a..93949e2 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
@@ -25,9 +25,9 @@ import org.apache.directory.fortress.core.PasswordException;
 import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.Session;
-import org.apache.directory.fortress.core.rbac.UserRole;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.UserRole;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java
index 77954ed..9c606f9 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgHierarchySample.java
@@ -22,7 +22,7 @@ package org.apache.directory.fortress.core.samples;
 import org.apache.directory.fortress.core.DelAdminMgr;
 import org.apache.directory.fortress.core.DelAdminMgrFactory;
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
+import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.rbac.TestUtils;
 import junit.framework.Test;
 import junit.framework.TestCase;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java
index 9312fda..cd90d61 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserOrgSample.java
@@ -25,7 +25,7 @@ import org.apache.directory.fortress.core.DelReviewMgr;
 import org.apache.directory.fortress.core.DelReviewMgrFactory;
 import org.apache.directory.fortress.core.FinderException;
 import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.rbac.OrgUnit;
+import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.rbac.TestUtils;
 import junit.framework.Test;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java
index 837c1b6..5c01bd8 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserRoleSample.java
@@ -25,8 +25,8 @@ import org.apache.directory.fortress.core.ReviewMgr;
 import org.apache.directory.fortress.core.ReviewMgrFactory;
 import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.User;
-import org.apache.directory.fortress.core.rbac.UserRole;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.UserRole;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
index b436539..7da9cbc 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
@@ -26,7 +26,7 @@ import org.apache.directory.fortress.core.AdminMgrFactory;
 import org.apache.directory.fortress.core.ReviewMgr;
 import org.apache.directory.fortress.core.ReviewMgrFactory;
 import org.apache.directory.fortress.core.rbac.TestUtils;
-import org.apache.directory.fortress.core.rbac.User;
+import org.apache.directory.fortress.core.model.User;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -166,7 +166,7 @@ public class CreateUserSample extends TestCase
             // You do not have to assign a Role to User when calling 'addUser'.  Role assignment may be done using the 'assignUser' API.
             /**
              * Create new User entity:
-             *   {@link org.apache.directory.fortress.core.rbac.User#userId}="sampleUser1"
+             *   {@link org.apache.directory.fortress.core.model.User#userId}="sampleUser1"
              *   {@link User#password}="password1"
              *   {@link User#setRole(String)}="sampleRole1"
              *   {@link User#ou}="sampleUserOU1"


Mime
View raw message