directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: FC-45 - Normalize fortress test policies
Date Fri, 07 Nov 2014 20:47:02 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master b72a41bec -> cac29bb6c


FC-45 - Normalize fortress test policies


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/cac29bb6
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/cac29bb6
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/cac29bb6

Branch: refs/heads/master
Commit: cac29bb6c9a84be6a7d0a9e54077e767e86efcff
Parents: b72a41b
Author: Shawn McKinney <smckinney@apache.org>
Authored: Fri Nov 7 14:46:28 2014 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Fri Nov 7 14:46:28 2014 -0600

----------------------------------------------------------------------
 ldap/setup/DelegatedAdminManagerLoad.xml        | 224 +++++++++----------
 ldap/setup/FortressDemoUsers.xml                |   7 +-
 ldap/setup/refreshLDAPData-src.xml              |   3 +-
 .../fortress/core/rbac/AdminRoleTestData.java   |   4 +-
 4 files changed, 120 insertions(+), 118 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/cac29bb6/ldap/setup/DelegatedAdminManagerLoad.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/DelegatedAdminManagerLoad.xml b/ldap/setup/DelegatedAdminManagerLoad.xml
index d265c8c..3903285 100644
--- a/ldap/setup/DelegatedAdminManagerLoad.xml
+++ b/ldap/setup/DelegatedAdminManagerLoad.xml
@@ -32,127 +32,127 @@
             </addorgunit>
 
             <addadminrole>
-                <role name="FortressSuperAdmin" description="Fortress Super User" osps="APP0"
osus="DEV0" begininclusive="true" endinclusive="true" beginTime="0000" endTime="0000" beginDate="none"
endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0" beginrange=""
endrange=""/>
+                <role name="fortress-core-super-admin" description="Fortress Super User"
osps="APP0" osus="DEV0" begininclusive="true" endinclusive="true" beginTime="0000" endTime="0000"
beginDate="none" endDate="none" beginLockDate="none" endLockDate="none" dayMask="all" timeout="0"
beginrange="" endrange=""/>
             </addadminrole>
 
             <addpermgrant>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl"
opName="searchBinds" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl"
opName="searchAuthZs" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl"
opName="getUserAuthZs" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl"
opName="searchUserSessions" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl"
opName="searchAdminMods" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl"
opName="searchInvalidUsers" roleNm="FortressSuperAdmin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl"
opName="searchBinds" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl"
opName="searchAuthZs" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl"
opName="getUserAuthZs" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl"
opName="searchUserSessions" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl"
opName="searchAdminMods" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl"
opName="searchInvalidUsers" roleNm="fortress-core-super-admin" admin="true"/>
 
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="readPermission" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="readPermObj" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="findPermissions" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="findPermObjs" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="readRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="findRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="readUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="findUsers" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="assignedUsers" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="assignedRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="authorizedUsers" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="authorizedRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="rolePermissions" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="userPermissions" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="permissionRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="authorizedPermissionRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="permissionUsers" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="authorizedPermissionUsers" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="ssdRoleSets" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="ssdRoleSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="ssdRoleSetRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="ssdRoleSetCardinality" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="dsdRoleSets" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="ssdSets" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="dsdRoleSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="dsdRoleSetRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="dsdRoleSetCardinality" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="dsdSets" roleNm="FortressSuperAdmin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="readPermission" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="readPermObj" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="findPermissions" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="findPermObjs" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="readRole" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="findRoles" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="readUser" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="findUsers" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="assignedUsers" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="assignedRoles" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="authorizedUsers" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="authorizedRoles" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="rolePermissions" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="userPermissions" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="permissionRoles" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="authorizedPermissionRoles" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="permissionUsers" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="authorizedPermissionUsers" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="ssdRoleSets" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="ssdRoleSet" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="ssdRoleSetRoles" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="ssdRoleSetCardinality" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="dsdRoleSets" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="ssdSets" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="dsdRoleSet" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="dsdRoleSetRoles" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="dsdRoleSetCardinality" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl"
opName="dsdSets" roleNm="fortress-core-super-admin" admin="true"/>
 
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl"
opName="readRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl"
opName="findRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl"
opName="assignedRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl"
opName="assignedUsers" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl"
opName="readOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl"
opName="searchOU" roleNm="FortressSuperAdmin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl"
opName="readRole" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl"
opName="findRoles" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl"
opName="assignedRoles" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl"
opName="assignedUsers" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl"
opName="readOU" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl"
opName="searchOU" roleNm="fortress-core-super-admin" admin="true"/>
 
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="disableUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="updateUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="changePassword" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="lockUserAccount" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="unlockUserAccount" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="resetPassword" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="updateRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="assignUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deassignUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addPermission" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addPermObj" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deletePermission" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deletePermObj" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="updatePermission" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="updatePermObj" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="grantPermission" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="revokePermission" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="grantPermissionUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="revokePermissionUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addDescendant" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addAscendant" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addInheritance" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteInheritance" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="createSsdSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="updateSsdSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addSsdRoleMember" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteSsdRoleMember" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteSsdSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="setSsdSetCardinality" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="createDsdSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="updateDsdSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addDsdRoleMember" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteDsdRoleMember" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteDsdSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="setDsdSetCardinality" roleNm="FortressSuperAdmin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addUser" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="disableUser" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteUser" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="updateUser" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="changePassword" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="lockUserAccount" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="unlockUserAccount" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="resetPassword" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addRole" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteRole" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="updateRole" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="assignUser" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deassignUser" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addPermission" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addPermObj" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deletePermission" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deletePermObj" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="updatePermission" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="updatePermObj" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="grantPermission" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="revokePermission" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="grantPermissionUser" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="revokePermissionUser" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addDescendant" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addAscendant" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addInheritance" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteInheritance" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="createSsdSet" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="updateSsdSet" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addSsdRoleMember" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteSsdRoleMember" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteSsdSet" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="setSsdSetCardinality" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="createDsdSet" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="updateDsdSet" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="addDsdRoleMember" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteDsdRoleMember" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="deleteDsdSet" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl"
opName="setDsdSetCardinality" roleNm="fortress-core-super-admin" admin="true"/>
 
-                <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl"
opName="add" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl"
opName="update" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl"
opName="delete" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl"
opName="updateUserPolicy" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl"
opName="deletePasswordPolicy" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl"
opName="search" roleNm="FortressSuperAdmin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl"
opName="add" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl"
opName="update" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl"
opName="delete" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl"
opName="updateUserPolicy" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl"
opName="deletePasswordPolicy" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl"
opName="search" roleNm="fortress-core-super-admin" admin="true"/>
 
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="deleteRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="updateRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="assignUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="deassignUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="updateOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="deleteOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addDescendantOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addAscendantOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addInheritanceOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="deleteInheritanceOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addDescendantRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addAscendantRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addInheritanceRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="deleteInheritanceRole" roleNm="FortressSuperAdmin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addRole" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="deleteRole" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="updateRole" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="assignUser" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="deassignUser" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addOU" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="updateOU" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="deleteOU" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addDescendantOU" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addAscendantOU" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addInheritanceOU" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="deleteInheritanceOU" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addDescendantRole" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addAscendantRole" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="addInheritanceRole" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl"
opName="deleteInheritanceRole" roleNm="fortress-core-super-admin" admin="true"/>
 
-                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="add" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="update" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="delete" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="addProperty" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="deleteProperty" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="assign" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="deassign" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="read" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="find" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="findWithUsers" roleNm="FortressSuperAdmin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="add" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="update" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="delete" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="addProperty" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="deleteProperty" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="assign" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="deassign" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="read" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="find" roleNm="fortress-core-super-admin" admin="true"/>
+                <permgrant objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl"
opName="findWithUsers" roleNm="fortress-core-super-admin" admin="true"/>
 
             </addpermgrant>
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/cac29bb6/ldap/setup/FortressDemoUsers.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/FortressDemoUsers.xml b/ldap/setup/FortressDemoUsers.xml
index 67f4da1..73a6eb0 100755
--- a/ldap/setup/FortressDemoUsers.xml
+++ b/ldap/setup/FortressDemoUsers.xml
@@ -131,8 +131,10 @@
 
                 <userrole userId="demoUser2" name="role1"  beginTime="0000" endTime="0000"
beginDate="" endDate="" beginLockDate="" endLockDate="" dayMask="" timeout="0"/>
                 <userrole userId="demoUser3" name="role1"  beginTime="0000" endTime="0000"
beginDate="" endDate="" beginLockDate="" endLockDate="" dayMask="" timeout="0"/>
+
                 <userrole userId="demoUser4" name="role1"  beginTime="0000" endTime="0000"
beginDate="" endDate="" beginLockDate="" endLockDate="" dayMask="" timeout="0"/>
-                <userrole userId="demoUser4" name="EnmasseSuperUser"  beginTime="0000"
endTime="0000" beginDate="" endDate="" beginLockDate="" endLockDate="" dayMask="" timeout="0"/>
+                <userrole userId="demoUser4" name="fortress-rest-user"  beginTime="0000"
endTime="0000" beginDate="" endDate="" beginLockDate="" endLockDate="" dayMask="" timeout="0"/>
+                <userrole userId="demoUser4" name="fortress-rest-super-user"  beginTime="0000"
endTime="0000" beginDate="" endDate="" beginLockDate="" endLockDate="" dayMask="" timeout="0"/>
                 <!-- Bad - role end time -->
                 <userrole userId="demoUser5" name="role1"  beginTime="0700" endTime="0800"
beginDate="20100101" endDate="21000101" beginLockDate="" endLockDate="" dayMask="" timeout="0"/>
                 <userrole userId="demoUser6" name="role1"  beginTime="0000" endTime="0000"
beginDate="" endDate="" beginLockDate="" endLockDate="" dayMask="" timeout="0"/>
@@ -154,7 +156,8 @@
                 <role name="manager-gui" description="Tomcat 7 Manager Role for Manager
UI"/>
                 <role name="manager-script" description="Tomcat 7 Manager Role for Management
Scripts"/>
                 <role name="manager" description="Tomcat Manager Role"/>
-                <role name="EnmasseSuperUser" description="Role to access En Masse services"/>
+                <role name="fortress-rest-super-user" description="Role to gain access
to the Fortress Rest services"/>
+                <role name="fortress-rest-user" description="Role to gain access to the
Fortress Rest server"/>
             </addrole>
 
             <addadminrole>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/cac29bb6/ldap/setup/refreshLDAPData-src.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/refreshLDAPData-src.xml b/ldap/setup/refreshLDAPData-src.xml
index 4b7fee4..cdf801b 100755
--- a/ldap/setup/refreshLDAPData-src.xml
+++ b/ldap/setup/refreshLDAPData-src.xml
@@ -26,8 +26,7 @@
         <FortressAdmin>
 
             <addsuffix>
-                <!--suffix name="@SUFFIX_NAME@" dc="@SUFFIX_DC@" description="JoshuaTree
Software"/-->
-                <suffix name="@SUFFIX_NAME@" dc="@SUFFIX_DC@"  dc2="@SUFFIX_DC2@" description="JoshuaTree
Software"/>
+                <suffix name="@SUFFIX_NAME@" dc="@SUFFIX_DC@"  dc2="@SUFFIX_DC2@" description="Apache
Fortress DIT Suffix"/>
             </addsuffix>
 
             <addcontainer>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/cac29bb6/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 b9f4162..df1d095 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
@@ -46,8 +46,8 @@ public class AdminRoleTestData extends TestCase
     public final static String[][] AROLES_SUPER =
         {
             {
-                "FortressSuperAdmin", /* NAME_COL */
-                "Super Admin Role", /* DESC_COL */
+                "fortress-core-super-admin", /* NAME_COL */
+                "fortress core super admin role", /* DESC_COL */
                 "0", /* TIMEOUT_COL */
                 "0000", /* BTIME_COL */
                 "0000", /* ETIME_COL */


Mime
View raw message