directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [19/19] directory-fortress-core git commit: FC-109 - break core package cycles
Date Mon, 01 Jun 2015 23:02:24 GMT
FC-109 - break core package cycles


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

Branch: refs/heads/1.0-RC41
Commit: 0c46e4deb0a13913dbcd383929f04cbf64084f33
Parents: 6355593
Author: Shawn McKinney <smckinney@apache.org>
Authored: Mon Jun 1 18:02:02 2015 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Mon Jun 1 18:02:02 2015 -0500

----------------------------------------------------------------------
 .../directory/fortress/core/AccelMgr.java       |   36 +-
 .../directory/fortress/core/AccessMgr.java      |   36 +-
 .../directory/fortress/core/AdminMgr.java       |   22 +-
 .../fortress/core/AdminMgrFactory.java          |    2 +-
 .../directory/fortress/core/AuditMgr.java       |   62 +-
 .../fortress/core/AuditMgrFactory.java          |    2 +-
 .../directory/fortress/core/DelAccessMgr.java   |   14 +-
 .../fortress/core/DelAccessMgrFactory.java      |    2 +-
 .../directory/fortress/core/DelAdminMgr.java    |  214 +--
 .../fortress/core/DelAdminMgrFactory.java       |    2 +-
 .../directory/fortress/core/DelReviewMgr.java   |   16 +-
 .../fortress/core/DelReviewMgrFactory.java      |    2 +-
 .../directory/fortress/core/GlobalErrIds.java   |    2 +-
 .../directory/fortress/core/Manageable.java     |    4 +-
 .../directory/fortress/core/ObjectFactory.java  |   51 +-
 .../directory/fortress/core/PwPolicyMgr.java    |   86 +-
 .../fortress/core/PwPolicyMgrFactory.java       |    2 +-
 .../directory/fortress/core/ReviewMgr.java      |   18 +-
 .../fortress/core/ReviewMgrFactory.java         |    2 +-
 .../fortress/core/SecurityException.java        |    2 +-
 .../fortress/core/ant/Addadminrole.java         |    4 +-
 .../core/ant/Addadminroleinheritance.java       |    4 +-
 .../directory/fortress/core/ant/Addcontext.java |    2 +-
 .../directory/fortress/core/ant/Addorgunit.java |    6 +-
 .../fortress/core/ant/AddpermGrant.java         |    4 +-
 .../directory/fortress/core/ant/AddpermObj.java |    6 +-
 .../directory/fortress/core/ant/AddpermOp.java  |    2 +-
 .../core/ant/Addpermorgunitinheritance.java     |    4 +-
 .../fortress/core/ant/Addpwpolicy.java          |    6 +-
 .../directory/fortress/core/ant/Addrole.java    |    6 +-
 .../fortress/core/ant/Addroleinheritance.java   |    4 +-
 .../directory/fortress/core/ant/Addsdset.java   |    3 +-
 .../directory/fortress/core/ant/Adduser.java    |    2 +-
 .../fortress/core/ant/Adduseradminrole.java     |    6 +-
 .../core/ant/Adduserorgunitinheritance.java     |    4 +-
 .../fortress/core/ant/Adduserrole.java          |    6 +-
 .../fortress/core/ant/AdminRoleAnt.java         |    2 +-
 .../fortress/core/ant/Deladminrole.java         |    4 +-
 .../core/ant/Deladminroleinheritance.java       |    4 +-
 .../directory/fortress/core/ant/Delorgunit.java |    6 +-
 .../fortress/core/ant/DelpermGrant.java         |    4 +-
 .../directory/fortress/core/ant/DelpermObj.java |    6 +-
 .../directory/fortress/core/ant/DelpermOp.java  |    2 +-
 .../core/ant/Delpermorgunitinheritance.java     |    4 +-
 .../fortress/core/ant/Delpwpolicy.java          |    6 +-
 .../directory/fortress/core/ant/Delrole.java    |    6 +-
 .../fortress/core/ant/Delroleinheritance.java   |    4 +-
 .../directory/fortress/core/ant/Delsdset.java   |    3 +-
 .../directory/fortress/core/ant/Deluser.java    |    2 +-
 .../fortress/core/ant/Deluseradminrole.java     |    6 +-
 .../core/ant/Deluserorgunitinheritance.java     |    4 +-
 .../fortress/core/ant/Deluserrole.java          |    6 +-
 .../fortress/core/ant/FortressAntTask.java      |  104 +-
 .../directory/fortress/core/ant/OrgUnitAnt.java |   69 +
 .../directory/fortress/core/ant/PermAnt.java    |    2 +-
 .../directory/fortress/core/ant/SDSetAnt.java   |    2 +-
 .../directory/fortress/core/ant/UserAnt.java    |    2 +-
 .../core/cli/CommandLineInterpreter.java        |   24 +-
 .../directory/fortress/core/cli/Options.java    |   18 +-
 .../core/ldap/ApacheDsDataProvider.java         |   15 +-
 .../fortress/core/ldap/group/Group.java         |    4 +-
 .../fortress/core/ldap/group/GroupDAO.java      |    2 +-
 .../fortress/core/ldap/group/GroupMgr.java      |    2 +-
 .../core/ldap/group/GroupMgrFactory.java        |    2 +-
 .../fortress/core/ldap/group/GroupMgrImpl.java  |    2 +-
 .../fortress/core/ldap/group/GroupP.java        |    2 +-
 .../directory/fortress/core/model/Address.java  |  469 +++++
 .../fortress/core/model/AdminRole.java          |  600 +++++++
 .../core/model/AdminRoleRelationship.java       |   85 +
 .../directory/fortress/core/model/AuthZ.java    |  830 +++++++++
 .../directory/fortress/core/model/Bind.java     |  624 +++++++
 .../directory/fortress/core/model/Context.java  |  118 ++
 .../fortress/core/model/FortEntity.java         |  236 +++
 .../directory/fortress/core/model/Hier.java     |  389 ++++
 .../directory/fortress/core/model/Mod.java      |  350 ++++
 .../directory/fortress/core/model/OrgUnit.java  |  522 ++++++
 .../core/model/OrgUnitRelationship.java         |   87 +
 .../fortress/core/model/ParentUtil.java         |   37 +
 .../fortress/core/model/PermGrant.java          |  213 +++
 .../directory/fortress/core/model/PermObj.java  |  583 ++++++
 .../fortress/core/model/Permission.java         |  790 ++++++++
 .../directory/fortress/core/model/Props.java    |  222 +++
 .../directory/fortress/core/model/PwPolicy.java |  881 +++++++++
 .../fortress/core/model/Relationship.java       |  167 ++
 .../directory/fortress/core/model/Role.java     |  829 +++++++++
 .../directory/fortress/core/model/RolePerm.java |   89 +
 .../fortress/core/model/RoleRelationship.java   |   87 +
 .../directory/fortress/core/model/SDSet.java    |  437 +++++
 .../directory/fortress/core/model/Session.java  |  775 ++++++++
 .../directory/fortress/core/model/User.java     | 1685 ++++++++++++++++++
 .../fortress/core/model/UserAdminRole.java      |  663 +++++++
 .../fortress/core/model/UserAudit.java          |  312 ++++
 .../directory/fortress/core/model/UserRole.java |  640 +++++++
 .../apache/directory/fortress/core/package.html |    4 +-
 .../fortress/core/rbac/AccelMgrImpl.java        |   42 +-
 .../fortress/core/rbac/AcceleratorDAO.java      |   22 +-
 .../fortress/core/rbac/AccessMgrImpl.java       |   10 +-
 .../directory/fortress/core/rbac/Address.java   |  469 -----
 .../fortress/core/rbac/AdminMgrImpl.java        |  147 +-
 .../directory/fortress/core/rbac/AdminRole.java |  599 -------
 .../fortress/core/rbac/AdminRoleDAO.java        |    6 +-
 .../fortress/core/rbac/AdminRoleP.java          |    5 +-
 .../core/rbac/AdminRoleRelationship.java        |   85 -
 .../fortress/core/rbac/AdminRoleUtil.java       |   46 +-
 .../directory/fortress/core/rbac/AdminUtil.java |   19 +-
 .../directory/fortress/core/rbac/AuditDAO.java  |    4 +
 .../fortress/core/rbac/AuditMgrImpl.java        |   38 +-
 .../directory/fortress/core/rbac/AuditP.java    |   12 +-
 .../directory/fortress/core/rbac/AuthZ.java     |  830 ---------
 .../directory/fortress/core/rbac/Bind.java      |  624 -------
 .../fortress/core/rbac/CharArrayAdapter.java    |   42 -
 .../directory/fortress/core/rbac/Context.java   |  118 --
 .../fortress/core/rbac/DSDChecker.java          |   15 +-
 .../fortress/core/rbac/DelAccessMgrImpl.java    |    8 +-
 .../fortress/core/rbac/DelAdminMgrImpl.java     |  150 +-
 .../fortress/core/rbac/DelReviewMgrImpl.java    |   12 +-
 .../fortress/core/rbac/FortEntity.java          |  236 ---
 .../directory/fortress/core/rbac/Graphable.java |    2 +-
 .../directory/fortress/core/rbac/Hier.java      |  389 ----
 .../directory/fortress/core/rbac/HierUtil.java  |   10 +-
 .../fortress/core/rbac/Manageable.java          |    7 +-
 .../directory/fortress/core/rbac/Mod.java       |  350 ----
 .../directory/fortress/core/rbac/OrgUnit.java   |  520 ------
 .../fortress/core/rbac/OrgUnitAnt.java          |   67 -
 .../fortress/core/rbac/OrgUnitDAO.java          |    1 +
 .../directory/fortress/core/rbac/OrgUnitP.java  |    7 +-
 .../fortress/core/rbac/OrgUnitRelationship.java |   87 -
 .../directory/fortress/core/rbac/PermDAO.java   |   17 +-
 .../directory/fortress/core/rbac/PermGrant.java |  213 ---
 .../directory/fortress/core/rbac/PermObj.java   |  583 ------
 .../directory/fortress/core/rbac/PermP.java     |    7 +
 .../fortress/core/rbac/Permission.java          |  789 --------
 .../directory/fortress/core/rbac/PolicyDAO.java |    2 +-
 .../directory/fortress/core/rbac/PolicyP.java   |    5 +-
 .../directory/fortress/core/rbac/Props.java     |  222 ---
 .../directory/fortress/core/rbac/PsoUtil.java   |   47 +-
 .../directory/fortress/core/rbac/PwMessage.java |    6 +-
 .../directory/fortress/core/rbac/PwPolicy.java  |  881 ---------
 .../fortress/core/rbac/PwPolicyMgrImpl.java     |   40 +-
 .../fortress/core/rbac/Relationship.java        |  167 --
 .../fortress/core/rbac/ReviewMgrImpl.java       |   35 +-
 .../directory/fortress/core/rbac/Role.java      |  828 ---------
 .../directory/fortress/core/rbac/RoleDAO.java   |    4 +-
 .../directory/fortress/core/rbac/RoleP.java     |    4 +-
 .../directory/fortress/core/rbac/RolePerm.java  |   85 -
 .../fortress/core/rbac/RoleRelationship.java    |   84 -
 .../directory/fortress/core/rbac/RoleUtil.java  |   62 +-
 .../directory/fortress/core/rbac/SDSet.java     |  437 -----
 .../directory/fortress/core/rbac/SDUtil.java    |    5 +
 .../directory/fortress/core/rbac/SdDAO.java     |    5 +-
 .../directory/fortress/core/rbac/SdP.java       |    6 +-
 .../directory/fortress/core/rbac/Session.java   |  772 --------
 .../directory/fortress/core/rbac/User.java      | 1685 ------------------
 .../fortress/core/rbac/UserAdminRole.java       |  659 -------
 .../directory/fortress/core/rbac/UserAudit.java |  312 ----
 .../directory/fortress/core/rbac/UserDAO.java   |   16 +-
 .../directory/fortress/core/rbac/UserP.java     |   10 +-
 .../directory/fortress/core/rbac/UserRole.java  |  637 -------
 .../directory/fortress/core/rbac/UsoUtil.java   |   45 +-
 .../directory/fortress/core/rbac/Warning.java   |    2 +-
 .../directory/fortress/core/rbac/package.html   |    2 +-
 .../fortress/core/rest/AccessMgrRestImpl.java   |   12 +-
 .../fortress/core/rest/AdminMgrRestImpl.java    |  152 +-
 .../fortress/core/rest/AuditMgrRestImpl.java    |   58 +-
 .../fortress/core/rest/ConfigMgrRestImpl.java   |    2 +-
 .../core/rest/DelAccessMgrRestImpl.java         |   16 +-
 .../fortress/core/rest/DelAdminMgrRestImpl.java |  292 +--
 .../core/rest/DelReviewMgrRestImpl.java         |   14 +-
 .../fortress/core/rest/FortRequest.java         |    4 +-
 .../fortress/core/rest/FortResponse.java        |    4 +-
 .../fortress/core/rest/PwPolicyMgrRestImpl.java |   80 +-
 .../directory/fortress/core/rest/RestUtils.java |    2 +-
 .../fortress/core/rest/ReviewMgrRestImpl.java   |   18 +-
 .../fortress/core/util/attr/AttrHelper.java     |    6 +-
 .../fortress/core/util/attr/VUtil.java          |    2 +-
 .../fortress/core/util/cache/DsdCacheEntry.java |   12 +-
 .../fortress/core/util/time/CUtil.java          |   12 +-
 .../fortress/core/util/time/ClockTime.java      |   12 +-
 .../fortress/core/util/time/Constraint.java     |    4 +-
 .../directory/fortress/core/util/time/Date.java |   12 +-
 .../directory/fortress/core/util/time/Day.java  |   12 +-
 .../fortress/core/util/time/LockDate.java       |   12 +-
 .../fortress/core/util/time/TUtil.java          |    2 +-
 .../fortress/core/util/time/Timeout.java        |   12 +-
 .../fortress/core/util/time/Validator.java      |   14 +-
 .../fortress/core/AccelMgrConsole.java          |   10 +-
 .../fortress/core/AccessMgrConsole.java         |   10 +-
 .../fortress/core/AdminMgrConsole.java          |   18 +-
 .../fortress/core/AuditMgrConsole.java          |   14 +-
 .../fortress/core/ConfigMgrConsole.java         |    2 +-
 .../core/DelegatedAccessMgrConsole.java         |    8 +-
 .../fortress/core/DelegatedAdminMgrConsole.java |   12 +-
 .../core/DelegatedReviewMgrConsole.java         |    6 +-
 .../fortress/core/PolicyMgrConsole.java         |    2 +-
 .../fortress/core/ReviewMgrConsole.java         |   14 +-
 .../core/jmeter/AccelCreateSession.java         |    4 +-
 .../fortress/core/jmeter/CheckAccess.java       |    6 +-
 .../core/jmeter/FortressCreateSession.java      |    4 +-
 .../fortress/core/rbac/AccelMgrImplTest.java    |    4 +
 .../fortress/core/rbac/AccessMgrImplTest.java   |    5 +
 .../fortress/core/rbac/AdminMgrImplTest.java    |    7 +
 .../fortress/core/rbac/AdminRoleTestData.java   |    1 +
 .../fortress/core/rbac/AuditMgrImplTest.java    |    6 +
 .../fortress/core/rbac/CacheSample.java         |    1 +
 .../core/rbac/DelegatedMgrImplTest.java         |    8 +
 .../fortress/core/rbac/FortressAntLoadTest.java |    7 +
 .../fortress/core/rbac/OrgUnitTestData.java     |    1 +
 .../fortress/core/rbac/PermTestData.java        |    2 +
 .../fortress/core/rbac/PolicyTestData.java      |    1 +
 .../core/rbac/PswdPolicyMgrImplTest.java        |    3 +
 .../fortress/core/rbac/ReviewMgrImplTest.java   |    7 +
 .../fortress/core/rbac/RoleTestData.java        |    3 +
 .../fortress/core/rbac/UserTestData.java        |    2 +
 .../core/rbac/accelerator/TestAccelerator.java  |    8 +-
 .../core/rbac/apacheds/AdminManagerTest.java    |    6 +-
 .../apacheds/FortressJUnitApachedsTest.java     |    4 +-
 .../fortress/core/samples/AccessMgrSample.java  |   10 +-
 .../samples/CreatePermOrgHierarchySample.java   |    2 +-
 .../core/samples/CreatePermOrgSample.java       |    2 +-
 .../fortress/core/samples/CreatePermSample.java |    8 +-
 .../core/samples/CreateRoleHierarchySample.java |    2 +-
 .../fortress/core/samples/CreateRoleSample.java |    2 +-
 .../core/samples/CreateSessionSample.java       |    6 +-
 .../samples/CreateUserOrgHierarchySample.java   |    2 +-
 .../core/samples/CreateUserOrgSample.java       |    2 +-
 .../core/samples/CreateUserRoleSample.java      |    4 +-
 .../fortress/core/samples/CreateUserSample.java |    4 +-
 227 files changed, 14280 insertions(+), 14058 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/AccelMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AccelMgr.java b/src/main/java/org/apache/directory/fortress/core/AccelMgr.java
index 19c6d4d..11576c2 100644
--- a/src/main/java/org/apache/directory/fortress/core/AccelMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccelMgr.java
@@ -22,10 +22,10 @@ package org.apache.directory.fortress.core;
 
 import java.util.List;
 
-import org.apache.directory.fortress.core.rbac.Permission;
-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.Permission;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.UserRole;
 
 
 /**
@@ -60,7 +60,7 @@ import org.apache.directory.fortress.core.rbac.UserRole;
  * <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>
  */
 public interface AccelMgr extends Manageable
@@ -70,11 +70,11 @@ public interface AccelMgr extends Manageable
      * Perform user authentication {@link User#password} and role activations.
      * <br>
      * This method must be called once per user prior to calling other methods within this class.
-     * The successful result is {@link org.apache.directory.fortress.core.rbac.Session} that contains target user's RBAC {@link User#roles} and Admin role {@link User#adminRoles}.
+     * The successful result is {@link org.apache.directory.fortress.core.model.Session} that contains target user's RBAC {@link User#roles} and Admin role {@link User#adminRoles}.
      * <br>
-     * In addition to checking user password validity it will apply configured password policy checks {@link org.apache.directory.fortress.core.rbac.User#pwPolicy}.
+     * In addition to checking user password validity it will apply configured password policy checks {@link org.apache.directory.fortress.core.model.User#pwPolicy}.
      * <br>
-     * Method may also store parms passed in for audit trail {@link org.apache.directory.fortress.core.rbac.FortEntity}.
+     * Method may also store parms passed in for audit trail {@link org.apache.directory.fortress.core.model.FortEntity}.
      * <h4>
      * This API will...
      * </h4>
@@ -82,12 +82,12 @@ public interface AccelMgr extends Manageable
      * <li> authenticate user password if trusted == false.
      * <li> perform <a href="http://www.openldap.org/">OpenLDAP</a> <a href="http://tools.ietf.org/html/draft-behera-ldap-password-policy-10">password policy evaluation</a>.
      *
-     * <li> fail for any user who is locked by OpenLDAP's policies {@link org.apache.directory.fortress.core.rbac.User#isLocked()}, regardless of trusted flag being set as parm on API.
-     * <li> evaluate temporal {@link org.apache.directory.fortress.core.util.time.Constraint}(s) on {@link User}, {@link UserRole} and {@link org.apache.directory.fortress.core.rbac.UserAdminRole} entities.
+     * <li> fail for any user who is locked by OpenLDAP's policies {@link org.apache.directory.fortress.core.model.User#isLocked()}, regardless of trusted flag being set as parm on API.
+     * <li> evaluate temporal {@link org.apache.directory.fortress.core.util.time.Constraint}(s) on {@link User}, {@link UserRole} and {@link org.apache.directory.fortress.core.model.UserAdminRole} entities.
      * <li> process selective role activations into User RBAC Session {@link User#roles}.
-     * <li> check Dynamic Separation of Duties {@link org.apache.directory.fortress.core.rbac.DSDChecker#validate(org.apache.directory.fortress.core.rbac.Session, org.apache.directory.fortress.core.util.time.Constraint, org.apache.directory.fortress.core.util.time.Time)} on {@link org.apache.directory.fortress.core.rbac.User#roles}.
+     * <li> check Dynamic Separation of Duties {@link org.apache.directory.fortress.core.rbac.DSDChecker#validate(org.apache.directory.fortress.core.model.Session, org.apache.directory.fortress.core.util.time.Constraint, org.apache.directory.fortress.core.util.time.Time)} on {@link org.apache.directory.fortress.core.model.User#roles}.
      * <li> process selective administrative role activations {@link User#adminRoles}.
-     * <li> return a {@link org.apache.directory.fortress.core.rbac.Session} containing {@link org.apache.directory.fortress.core.rbac.Session#getUser()}, {@link org.apache.directory.fortress.core.rbac.Session#getRoles()} and (if admin user) {@link org.apache.directory.fortress.core.rbac.Session#getAdminRoles()} if everything checks out good.
+     * <li> return a {@link org.apache.directory.fortress.core.model.Session} containing {@link org.apache.directory.fortress.core.model.Session#getUser()}, {@link org.apache.directory.fortress.core.model.Session#getRoles()} and (if admin user) {@link org.apache.directory.fortress.core.model.Session#getAdminRoles()} if everything checks out good.
      * <li> throw a checked exception that will be {@link SecurityException} or its derivation.
      * <li> throw a {@link SecurityException} for system failures.
      * <li> throw a {@link PasswordException} for authentication and password policy violations.
@@ -107,9 +107,9 @@ public interface AccelMgr extends Manageable
      * </h4>
      * <ul>
      * <li> {@link User#userId} - required
-     * <li> {@link org.apache.directory.fortress.core.rbac.User#password}
-     * <li> {@link org.apache.directory.fortress.core.rbac.User#roles} contains a list of RBAC role names authorized for user and targeted for activation within this session.  Default is all authorized RBAC roles will be activated into this Session.
-     * <li> {@link org.apache.directory.fortress.core.rbac.User#adminRoles} contains a list of Admin role names authorized for user and targeted for activation.  Default is all authorized ARBAC roles will be activated into this Session.
+     * <li> {@link org.apache.directory.fortress.core.model.User#password}
+     * <li> {@link org.apache.directory.fortress.core.model.User#roles} contains a list of RBAC role names authorized for user and targeted for activation within this session.  Default is all authorized RBAC roles will be activated into this Session.
+     * <li> {@link org.apache.directory.fortress.core.model.User#adminRoles} contains a list of Admin role names authorized for user and targeted for activation.  Default is all authorized ARBAC roles will be activated into this Session.
      * <li> {@link User#props} collection of name value pairs collected on behalf of User during signon.  For example hostname:myservername or ip:192.168.1.99
      * </ul>
      * <h4>
@@ -121,9 +121,9 @@ public interface AccelMgr extends Manageable
      * </ul>
      * <p>
      *
-     * @param user      Contains {@link User#userId}, {@link org.apache.directory.fortress.core.rbac.User#password} (optional if {@code isTrusted} is 'true'), optional {@link User#roles}, optional {@link org.apache.directory.fortress.core.rbac.User#adminRoles}
+     * @param user      Contains {@link User#userId}, {@link org.apache.directory.fortress.core.model.User#password} (optional if {@code isTrusted} is 'true'), optional {@link User#roles}, optional {@link org.apache.directory.fortress.core.model.User#adminRoles}
      * @param isTrusted if true password is not required.
-     * @return Session object will contain authentication result code {@link org.apache.directory.fortress.core.rbac.Session#errorId}, RBAC role activations {@link org.apache.directory.fortress.core.rbac.Session#getRoles()}, Admin Role activations {@link org.apache.directory.fortress.core.rbac.Session#getAdminRoles()},OpenLDAP pw policy codes {@link org.apache.directory.fortress.core.rbac.Session#warnings}, {@link org.apache.directory.fortress.core.rbac.Session#expirationSeconds}, {@link org.apache.directory.fortress.core.rbac.Session#graceLogins} and more.
+     * @return Session object will contain authentication result code {@link org.apache.directory.fortress.core.model.Session#errorId}, RBAC role activations {@link org.apache.directory.fortress.core.model.Session#getRoles()}, Admin Role activations {@link org.apache.directory.fortress.core.model.Session#getAdminRoles()},OpenLDAP pw policy codes {@link org.apache.directory.fortress.core.model.Session#warnings}, {@link org.apache.directory.fortress.core.model.Session#expirationSeconds}, {@link org.apache.directory.fortress.core.model.Session#graceLogins} and more.
      * @throws SecurityException
      *          in the event of data validation failure, security policy violation or DAO error.
      */
@@ -214,7 +214,7 @@ public interface AccelMgr extends Manageable
      * and the role is an active role of that session.
      *
      * @param session object contains the user's returned RBAC session from the createSession method.
-     * @param role    object contains the role name, {@link org.apache.directory.fortress.core.rbac.UserRole#name}, to be deactivated.
+     * @param role    object contains the role name, {@link org.apache.directory.fortress.core.model.UserRole#name}, to be deactivated.
      * @throws SecurityException is thrown if user is not allowed to deactivate or runtime error occurs with system.
      */
     void dropActiveRole( Session session, UserRole role )

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/AccessMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AccessMgr.java b/src/main/java/org/apache/directory/fortress/core/AccessMgr.java
index ceb3955..c20a43b 100755
--- a/src/main/java/org/apache/directory/fortress/core/AccessMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AccessMgr.java
@@ -23,10 +23,10 @@ package org.apache.directory.fortress.core;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.directory.fortress.core.rbac.Permission;
-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.Permission;
+import org.apache.directory.fortress.core.model.User;
+import org.apache.directory.fortress.core.model.Session;
+import org.apache.directory.fortress.core.model.UserRole;
 
 
 /**
@@ -61,7 +61,7 @@ import org.apache.directory.fortress.core.rbac.UserRole;
  * <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>
  */
 public interface AccessMgr extends Manageable
@@ -83,20 +83,20 @@ public interface AccessMgr extends Manageable
     /**
      * Perform user authentication {@link User#password} and role activations.<br />
      * This method must be called once per user prior to calling other methods within this class.
-     * The successful result is {@link org.apache.directory.fortress.core.rbac.Session} that contains target user's RBAC {@link User#roles} and Admin role {@link User#adminRoles}.<br />
-     * In addition to checking user password validity it will apply configured password policy checks {@link org.apache.directory.fortress.core.rbac.User#pwPolicy}..<br />
-     * Method may also store parms passed in for audit trail {@link org.apache.directory.fortress.core.rbac.FortEntity}.
+     * The successful result is {@link org.apache.directory.fortress.core.model.Session} that contains target user's RBAC {@link User#roles} and Admin role {@link User#adminRoles}.<br />
+     * In addition to checking user password validity it will apply configured password policy checks {@link org.apache.directory.fortress.core.model.User#pwPolicy}..<br />
+     * Method may also store parms passed in for audit trail {@link org.apache.directory.fortress.core.model.FortEntity}.
      * <h4> This API will...</h4>
      * <ul>
      * <li> authenticate user password if trusted == false.
      * <li> perform <a href="http://www.openldap.org/">OpenLDAP</a> <a href="http://tools.ietf.org/html/draft-behera-ldap-password-policy-10">password policy evaluation</a>.
      *
-     * <li> fail for any user who is locked by OpenLDAP's policies {@link org.apache.directory.fortress.core.rbac.User#isLocked()}, regardless of trusted flag being set as parm on API.
-     * <li> evaluate temporal {@link org.apache.directory.fortress.core.util.time.Constraint}(s) on {@link User}, {@link UserRole} and {@link org.apache.directory.fortress.core.rbac.UserAdminRole} entities.
+     * <li> fail for any user who is locked by OpenLDAP's policies {@link org.apache.directory.fortress.core.model.User#isLocked()}, regardless of trusted flag being set as parm on API.
+     * <li> evaluate temporal {@link org.apache.directory.fortress.core.util.time.Constraint}(s) on {@link User}, {@link UserRole} and {@link org.apache.directory.fortress.core.model.UserAdminRole} entities.
      * <li> process selective role activations into User RBAC Session {@link User#roles}.
-     * <li> check Dynamic Separation of Duties {@link org.apache.directory.fortress.core.rbac.DSDChecker#validate(org.apache.directory.fortress.core.rbac.Session, org.apache.directory.fortress.core.util.time.Constraint, org.apache.directory.fortress.core.util.time.Time)} on {@link org.apache.directory.fortress.core.rbac.User#roles}.
+     * <li> check Dynamic Separation of Duties {@link org.apache.directory.fortress.core.rbac.DSDChecker#validate(org.apache.directory.fortress.core.model.Session, org.apache.directory.fortress.core.util.time.Constraint, org.apache.directory.fortress.core.util.time.Time)} on {@link org.apache.directory.fortress.core.model.User#roles}.
      * <li> process selective administrative role activations {@link User#adminRoles}.
-     * <li> return a {@link org.apache.directory.fortress.core.rbac.Session} containing {@link org.apache.directory.fortress.core.rbac.Session#getUser()}, {@link org.apache.directory.fortress.core.rbac.Session#getRoles()} and (if admin user) {@link org.apache.directory.fortress.core.rbac.Session#getAdminRoles()} if everything checks out good.
+     * <li> return a {@link org.apache.directory.fortress.core.model.Session} containing {@link org.apache.directory.fortress.core.model.Session#getUser()}, {@link org.apache.directory.fortress.core.model.Session#getRoles()} and (if admin user) {@link org.apache.directory.fortress.core.model.Session#getAdminRoles()} if everything checks out good.
      * <li> throw a checked exception that will be {@link SecurityException} or its derivation.
      * <li> throw a {@link SecurityException} for system failures.
      * <li> throw a {@link PasswordException} for authentication and password policy violations.
@@ -116,9 +116,9 @@ public interface AccessMgr extends Manageable
      * </h4>
      * <ul>
      * <li> {@link User#userId} - required
-     * <li> {@link org.apache.directory.fortress.core.rbac.User#password}
-     * <li> {@link org.apache.directory.fortress.core.rbac.User#roles} contains a list of RBAC role names authorized for user and targeted for activation within this session.  Default is all authorized RBAC roles will be activated into this Session.
-     * <li> {@link org.apache.directory.fortress.core.rbac.User#adminRoles} contains a list of Admin role names authorized for user and targeted for activation.  Default is all authorized ARBAC roles will be activated into this Session.
+     * <li> {@link org.apache.directory.fortress.core.model.User#password}
+     * <li> {@link org.apache.directory.fortress.core.model.User#roles} contains a list of RBAC role names authorized for user and targeted for activation within this session.  Default is all authorized RBAC roles will be activated into this Session.
+     * <li> {@link org.apache.directory.fortress.core.model.User#adminRoles} contains a list of Admin role names authorized for user and targeted for activation.  Default is all authorized ARBAC roles will be activated into this Session.
      * <li> {@link User#props} collection of name value pairs collected on behalf of User during signon.  For example hostname:myservername or ip:192.168.1.99
      * </ul>
      * <h4>
@@ -130,9 +130,9 @@ public interface AccessMgr extends Manageable
      * </ul>
      * </p>
      *
-     * @param user      Contains {@link User#userId}, {@link org.apache.directory.fortress.core.rbac.User#password} (optional if {@code isTrusted} is 'true'), optional {@link User#roles}, optional {@link org.apache.directory.fortress.core.rbac.User#adminRoles}
+     * @param user      Contains {@link User#userId}, {@link org.apache.directory.fortress.core.model.User#password} (optional if {@code isTrusted} is 'true'), optional {@link User#roles}, optional {@link org.apache.directory.fortress.core.model.User#adminRoles}
      * @param isTrusted if true password is not required.
-     * @return Session object will contain authentication result code {@link org.apache.directory.fortress.core.rbac.Session#errorId}, RBAC role activations {@link org.apache.directory.fortress.core.rbac.Session#getRoles()}, Admin Role activations {@link org.apache.directory.fortress.core.rbac.Session#getAdminRoles()},OpenLDAP pw policy codes {@link org.apache.directory.fortress.core.rbac.Session#warnings}, {@link org.apache.directory.fortress.core.rbac.Session#expirationSeconds}, {@link org.apache.directory.fortress.core.rbac.Session#graceLogins} and more.
+     * @return Session object will contain authentication result code {@link org.apache.directory.fortress.core.model.Session#errorId}, RBAC role activations {@link org.apache.directory.fortress.core.model.Session#getRoles()}, Admin Role activations {@link org.apache.directory.fortress.core.model.Session#getAdminRoles()},OpenLDAP pw policy codes {@link org.apache.directory.fortress.core.model.Session#warnings}, {@link org.apache.directory.fortress.core.model.Session#expirationSeconds}, {@link org.apache.directory.fortress.core.model.Session#graceLogins} and more.
      * @throws SecurityException
      *          in the event of data validation failure, security policy violation or DAO error.
      */
@@ -224,7 +224,7 @@ public interface AccessMgr extends Manageable
      * and the role is an active role of that session.
      *
      * @param session object contains the user's returned RBAC session from the createSession method.
-     * @param role    object contains the role name, {@link org.apache.directory.fortress.core.rbac.UserRole#name}, to be deactivated.
+     * @param role    object contains the role name, {@link org.apache.directory.fortress.core.model.UserRole#name}, to be deactivated.
      * @throws SecurityException is thrown if user is not allowed to deactivate or runtime error occurs with system.
      */
     void dropActiveRole( Session session, UserRole role )

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AdminMgr.java b/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
index e7b51ea..80f535d 100755
--- a/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
@@ -20,12 +20,12 @@
 package org.apache.directory.fortress.core;
 
 
-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.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;
 
 
 /**
@@ -59,7 +59,7 @@ import org.apache.directory.fortress.core.rbac.UserRole;
  * <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>
  */
@@ -402,7 +402,7 @@ public interface AdminMgr extends Manageable
      * <li>{@link UserRole#name} - contains the name for already existing Role to be deassigned</li>
      * <li>{@link UserRole#userId} - contains the userId for existing User</li>
      * </ul>
-     * @param uRole must contain {@link org.apache.directory.fortress.core.rbac.UserRole#userId} and {@link UserRole#name}.
+     * @param uRole must contain {@link org.apache.directory.fortress.core.model.UserRole#userId} and {@link UserRole#name}.
      * @throws SecurityException - in the event data error in user or role objects or system error.
      */
     void deassignUser( UserRole uRole )
@@ -411,7 +411,7 @@ public interface AdminMgr extends Manageable
 
     /**
      * This method will add permission operation to an existing permission object which resides under {@code ou=Permissions,ou=RBAC,dc=yourHostName,dc=com} container in directory information tree.
-     * The perm operation entity may have {@link org.apache.directory.fortress.core.rbac.Role} or {@link org.apache.directory.fortress.core.rbac.User} associations.  The target {@link Permission} must not exist prior to calling.
+     * The perm operation entity may have {@link org.apache.directory.fortress.core.model.Role} or {@link org.apache.directory.fortress.core.model.User} associations.  The target {@link Permission} must not exist prior to calling.
      * A Fortress Permission instance exists in a hierarchical, one-many relationship between its parent and itself as stored in ldap tree: ({@link PermObj}*->{@link Permission}).
      * <h4>required parameters</h4>
      * <ul>
@@ -426,7 +426,7 @@ public interface AdminMgr extends Manageable
      * <li>{@link Permission#type} - any safe text</li>
      * </ul>
      *
-     * @param perm must contain the object, {@link org.apache.directory.fortress.core.rbac.Permission#objName}, and operation, {@link Permission#opName}, that identifies target along with optional other attributes..
+     * @param perm must contain the object, {@link org.apache.directory.fortress.core.model.Permission#objName}, and operation, {@link Permission#opName}, that identifies target along with optional other attributes..
      * @return copy of Permission entity.
      * @throws SecurityException - thrown in the event of perm object data or system error.
      */
@@ -436,7 +436,7 @@ public interface AdminMgr extends Manageable
 
     /**
      * This method will update permission operation pre-existing in target directory under {@code ou=Permissions,ou=RBAC,dc=yourHostName,dc=com} container in directory information tree.
-     * The perm operation entity may also contain {@link org.apache.directory.fortress.core.rbac.Role} or {@link org.apache.directory.fortress.core.rbac.User} associations to add or remove using this function.
+     * The perm operation entity may also contain {@link org.apache.directory.fortress.core.model.Role} or {@link org.apache.directory.fortress.core.model.User} associations to add or remove using this function.
      * The perm operation must exist before making this call.  Only non-null attributes will be updated.
      * <h4>required parameters</h4>
      * <ul>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
index 79a55d2..a867cd1 100755
--- a/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AdminMgrFactory.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.AdminMgrImpl;
 import org.apache.directory.fortress.core.rbac.ClassUtil;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.rest.AdminMgrRestImpl;
 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/AuditMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AuditMgr.java b/src/main/java/org/apache/directory/fortress/core/AuditMgr.java
index 9f63315..3ef0c15 100755
--- a/src/main/java/org/apache/directory/fortress/core/AuditMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AuditMgr.java
@@ -20,10 +20,10 @@
 package org.apache.directory.fortress.core;
 
 
-import org.apache.directory.fortress.core.rbac.AuthZ;
-import org.apache.directory.fortress.core.rbac.Mod;
-import org.apache.directory.fortress.core.rbac.UserAudit;
-import org.apache.directory.fortress.core.rbac.Bind;
+import org.apache.directory.fortress.core.model.AuthZ;
+import org.apache.directory.fortress.core.model.Mod;
+import org.apache.directory.fortress.core.model.UserAudit;
+import org.apache.directory.fortress.core.model.Bind;
 
 import java.util.List;
 
@@ -31,7 +31,7 @@ import java.util.List;
 /**
  * This interface prescribes methods used to search <a href="http://www.openldap.org/">OpenLDAP</a>'s slapd access log.  The access log events are
  * persisted in <a href="http://www.oracle.com/technetwork/database/berkeleydb/overview/index.html">BDB</a> and available for inquiry via common LDAP protocols.
- * Audit entries stored on behalf of Fortress operations correspond to runtime authentication {@link org.apache.directory.fortress.core.rbac.Bind}, authorization {@link org.apache.directory.fortress.core.rbac.AuthZ} and modification {@link org.apache.directory.fortress.core.rbac.Mod}
+ * Audit entries stored on behalf of Fortress operations correspond to runtime authentication {@link org.apache.directory.fortress.core.model.Bind}, authorization {@link org.apache.directory.fortress.core.model.AuthZ} and modification {@link org.apache.directory.fortress.core.model.Mod}
  * events as they occur automatically on the server when audit is enabled.
  * <h4>Audit Interrogator</h4>
  * Provides an OpenLDAP access log retrieval mechanism that enables security event monitoring.
@@ -44,7 +44,7 @@ import java.util.List;
  * </ol>
  * <img src="./doc-files/Audit.png">
  * <p/>
- * All events include Fortress context, see {@link org.apache.directory.fortress.core.rbac.FortEntity}.
+ * All events include Fortress context, see {@link org.apache.directory.fortress.core.model.FortEntity}.
  * <p/>
  * <h4>
  * The following APIs generate events subsequently stored in this access log:
@@ -58,30 +58,30 @@ import java.util.List;
  * <li> {@link PwPolicyMgr}
  * </ul>
  * <h4>
- * The following reports are supported using search input: {@link org.apache.directory.fortress.core.rbac.UserAudit}
+ * The following reports are supported using search input: {@link org.apache.directory.fortress.core.model.UserAudit}
  * </h4>
  * <ul>
- * <li>User Authentications:     <code>List<{@link org.apache.directory.fortress.core.rbac.Bind}>  {@link AuditMgr#searchBinds(org.apache.directory.fortress.core.rbac.UserAudit)}</code>
- * <li>Invalid User AuthN:       <code>List<{@link org.apache.directory.fortress.core.rbac.Bind}>  {@link AuditMgr#searchInvalidUsers(org.apache.directory.fortress.core.rbac.UserAudit)} </code>
- * <li>User Authorizations 1:    <code>List<{@link org.apache.directory.fortress.core.rbac.AuthZ}> {@link AuditMgr#getUserAuthZs(org.apache.directory.fortress.core.rbac.UserAudit)} </code>
- * <li>User Authorizations 2:    <code>List<{@link org.apache.directory.fortress.core.rbac.AuthZ}> {@link AuditMgr#searchAuthZs(org.apache.directory.fortress.core.rbac.UserAudit)} </code>
- * <li>User Session Activations: <code>List<{@link org.apache.directory.fortress.core.rbac.Mod}>   {@link AuditMgr#searchUserSessions(org.apache.directory.fortress.core.rbac.UserAudit)} </code>
- * <li>Entity Modifications:     <code>List<{@link org.apache.directory.fortress.core.rbac.Mod}>   {@link AuditMgr#searchAdminMods(org.apache.directory.fortress.core.rbac.UserAudit)} </code>
+ * <li>User Authentications:     <code>List<{@link org.apache.directory.fortress.core.model.Bind}>  {@link AuditMgr#searchBinds(org.apache.directory.fortress.core.model.UserAudit)}</code>
+ * <li>Invalid User AuthN:       <code>List<{@link org.apache.directory.fortress.core.model.Bind}>  {@link AuditMgr#searchInvalidUsers(org.apache.directory.fortress.core.model.UserAudit)} </code>
+ * <li>User Authorizations 1:    <code>List<{@link org.apache.directory.fortress.core.model.AuthZ}> {@link AuditMgr#getUserAuthZs(org.apache.directory.fortress.core.model.UserAudit)} </code>
+ * <li>User Authorizations 2:    <code>List<{@link org.apache.directory.fortress.core.model.AuthZ}> {@link AuditMgr#searchAuthZs(org.apache.directory.fortress.core.model.UserAudit)} </code>
+ * <li>User Session Activations: <code>List<{@link org.apache.directory.fortress.core.model.Mod}>   {@link AuditMgr#searchUserSessions(org.apache.directory.fortress.core.model.UserAudit)} </code>
+ * <li>Entity Modifications:     <code>List<{@link org.apache.directory.fortress.core.model.Mod}>   {@link AuditMgr#searchAdminMods(org.apache.directory.fortress.core.model.UserAudit)} </code>
  * </ul>
  * <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>
  */
 public interface AuditMgr extends Manageable
 {
     /**
-     * This method returns a list of authorization events for a particular user {@link org.apache.directory.fortress.core.rbac.UserAudit#userId}
-     * and given timestamp field {@link org.apache.directory.fortress.core.rbac.UserAudit#beginDate}.<BR>
-     * Method also can discriminate between all events or failed only by setting {@link org.apache.directory.fortress.core.rbac.UserAudit#failedOnly}.
+     * This method returns a list of authorization events for a particular user {@link org.apache.directory.fortress.core.model.UserAudit#userId}
+     * and given timestamp field {@link org.apache.directory.fortress.core.model.UserAudit#beginDate}.<BR>
+     * Method also can discriminate between all events or failed only by setting {@link org.apache.directory.fortress.core.model.UserAudit#failedOnly}.
      * <h4>optional parameters</h4>
      * <ul>
-     * <li>{@link org.apache.directory.fortress.core.rbac.UserAudit#userId} - contains the target userId</li>
+     * <li>{@link org.apache.directory.fortress.core.model.UserAudit#userId} - contains the target userId</li>
      * <li>{@link UserAudit#beginDate} - contains the date in which to begin search</li>
      * <li>{@link UserAudit#failedOnly} - if set to 'true', return only failed authorization events</li>
      * </ul>
@@ -95,8 +95,8 @@ public interface AuditMgr extends Manageable
 
 
     /**
-     * This method returns a list of authorization events for a particular user {@link org.apache.directory.fortress.core.rbac.UserAudit#userId},
-     * object {@link org.apache.directory.fortress.core.rbac.UserAudit#objName}, and given timestamp field {@link org.apache.directory.fortress.core.rbac.UserAudit#beginDate}.<BR>
+     * This method returns a list of authorization events for a particular user {@link org.apache.directory.fortress.core.model.UserAudit#userId},
+     * object {@link org.apache.directory.fortress.core.model.UserAudit#objName}, and given timestamp field {@link org.apache.directory.fortress.core.model.UserAudit#beginDate}.<BR>
      * Method also can discriminate between all events or failed only by setting flag {@link UserAudit#failedOnly}..
      * <h4>required parameters</h4>
      * <ul>
@@ -119,12 +119,12 @@ public interface AuditMgr extends Manageable
 
 
     /**
-     * This method returns a list of authentication audit events for a particular user {@link org.apache.directory.fortress.core.rbac.UserAudit#userId},
-     * and given timestamp field {@link org.apache.directory.fortress.core.rbac.UserAudit#beginDate}.<BR>
+     * This method returns a list of authentication audit events for a particular user {@link org.apache.directory.fortress.core.model.UserAudit#userId},
+     * and given timestamp field {@link org.apache.directory.fortress.core.model.UserAudit#beginDate}.<BR>
      * <h4>optional parameters</h4>
      * <ul>
-     * <li>{@link org.apache.directory.fortress.core.rbac.UserAudit#userId} - contains the target userId<</li>
-     * <li>{@link org.apache.directory.fortress.core.rbac.UserAudit#beginDate} - contains the date in which to begin search</li>
+     * <li>{@link org.apache.directory.fortress.core.model.UserAudit#userId} - contains the target userId<</li>
+     * <li>{@link org.apache.directory.fortress.core.model.UserAudit#beginDate} - contains the date in which to begin search</li>
      * <li>{@link UserAudit#failedOnly} - if set to 'true', return only failed authorization events</li>
      * </ul>
      *
@@ -139,7 +139,7 @@ public interface AuditMgr extends Manageable
 
     /**
      * This method returns a list of sessions created for a given user {@link UserAudit#userId},
-     * and timestamp {@link org.apache.directory.fortress.core.rbac.UserAudit#beginDate}.<BR>
+     * and timestamp {@link org.apache.directory.fortress.core.model.UserAudit#beginDate}.<BR>
      * <h4>required parameters</h4>
      * <ul>
      * <li>{@link UserAudit#userId} - contains the target userId<</li>
@@ -158,16 +158,16 @@ public interface AuditMgr extends Manageable
 
 
     /**
-     * This method returns a list of admin operations events for a particular entity {@link org.apache.directory.fortress.core.rbac.UserAudit#dn},
-     * object {@link UserAudit#objName} and timestamp {@link org.apache.directory.fortress.core.rbac.UserAudit#beginDate}.  If the internal
-     * userId {@link org.apache.directory.fortress.core.rbac.UserAudit#internalUserId} is set it will limit search by that field.
+     * This method returns a list of admin operations events for a particular entity {@link org.apache.directory.fortress.core.model.UserAudit#dn},
+     * object {@link UserAudit#objName} and timestamp {@link org.apache.directory.fortress.core.model.UserAudit#beginDate}.  If the internal
+     * userId {@link org.apache.directory.fortress.core.model.UserAudit#internalUserId} is set it will limit search by that field.
      * <h4>optional parameters</h4>
      * <ul>
      * <li>{@link UserAudit#dn} - contains the LDAP distinguished name for the updated object.  For example if caller
      * wants to find out what changes were made to John Doe's user object this would be 'uid=jdoe,ou=People,dc=example,dc=com'</li>
      * <li>{@link UserAudit#objName} - contains the object (authorization resource) name corresponding to the event.  For example if caller
      * wants to return events where User object was modified, this would be 'updateUser'</li>
-     * <li>{@link org.apache.directory.fortress.core.rbac.UserAudit#internalUserId} - maps to the internalUserId of user who changed the record in LDAP.  This maps to {@link org.apache.directory.fortress.core.rbac.User#internalId}.</li>
+     * <li>{@link org.apache.directory.fortress.core.model.UserAudit#internalUserId} - maps to the internalUserId of user who changed the record in LDAP.  This maps to {@link org.apache.directory.fortress.core.model.User#internalId}.</li>
      * <li>{@link UserAudit#beginDate} - contains the date in which to begin search</li>
      * <li>{@link UserAudit#endDate} - contains the date in which to end search</li>
      * </ul>
@@ -182,8 +182,8 @@ public interface AuditMgr extends Manageable
 
 
     /**
-     * This method returns a list of failed authentication attempts on behalf of an invalid identity {@link org.apache.directory.fortress.core.rbac.UserAudit#userId},
-     * and given timestamp {@link UserAudit#beginDate}.  If the {@link org.apache.directory.fortress.core.rbac.UserAudit#failedOnly} is true it will
+     * This method returns a list of failed authentication attempts on behalf of an invalid identity {@link org.apache.directory.fortress.core.model.UserAudit#userId},
+     * and given timestamp {@link UserAudit#beginDate}.  If the {@link org.apache.directory.fortress.core.model.UserAudit#failedOnly} is true it will
      * return only authentication attempts made with invalid userId.  This event represents either User incorrectly entering userId during signon or
      * possible fraudulent logon attempt by hostile agent.
      * </p>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
index acf1ef2..8119e0a 100755
--- a/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/AuditMgrFactory.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.AuditMgrImpl;
 import org.apache.directory.fortress.core.rbac.ClassUtil;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.rest.AuditMgrRestImpl;
 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/DelAccessMgr.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAccessMgr.java b/src/main/java/org/apache/directory/fortress/core/DelAccessMgr.java
index b2003db..7d11f9a 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAccessMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAccessMgr.java
@@ -20,11 +20,11 @@
 package org.apache.directory.fortress.core;
 
 
-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.Session;
-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.Session;
+import org.apache.directory.fortress.core.model.User;
 
 import java.util.List;
 import java.util.Set;
@@ -42,7 +42,7 @@ import java.util.Set;
  * Fortress fully supports the Oh/Sandhu/Zhang ARBAC02 model for delegated administration.  ARBAC provides large enterprises the capability to delegate administrative authority to users that reside outside of the security admin group.
  * Decentralizing administration helps because it provides security provisioning capability to work groups without sacrificing regulations for accountability or traceability.
  * <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>
  */
@@ -52,7 +52,7 @@ public interface DelAccessMgr extends Manageable
      * This function will determine if the user contains an AdminRole that is authorized assignment control over
      * User-Role Assignment (URA).  This adheres to the ARBAC02 functional specification for can-assign URA.
      *
-     * @param session This object must be instantiated by calling {@link AccessMgr#createSession(org.apache.directory.fortress.core.rbac.User, boolean)} before passing into the method.  No variables need to be set by client after returned from createSession.
+     * @param session This object must be instantiated by calling {@link AccessMgr#createSession(org.apache.directory.fortress.core.model.User, boolean)} before passing into the method.  No variables need to be set by client after returned from createSession.
      * @param user    Instantiated User entity requires only valid userId attribute set.
      * @param role    Instantiated Role entity requires only valid role name attribute set.
      * @return boolean value true indicates access allowed.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/0c46e4de/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
index 169e76f..9608f3e 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAccessMgrFactory.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.DelAccessMgrImpl;
-import org.apache.directory.fortress.core.rbac.Session;
+import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.rest.DelAccessMgrRestImpl;
 import org.apache.directory.fortress.core.util.attr.VUtil;
 


Mime
View raw message