You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2014/10/22 17:45:09 UTC

[50/51] [partial] Rename packages from org.openldap.fortress to org.apache.directory.fortress.core. Change default suffix to org.apache. Switch default ldap api from unbound to apache ldap.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/687ee1ad/ldap/setup/DelegatedAdminManagerLoad.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/DelegatedAdminManagerLoad.xml b/ldap/setup/DelegatedAdminManagerLoad.xml
index 5b308f6..d265c8c 100644
--- a/ldap/setup/DelegatedAdminManagerLoad.xml
+++ b/ldap/setup/DelegatedAdminManagerLoad.xml
@@ -18,7 +18,7 @@
    under the License.
 -->
 <project basedir="." default="all" name="Fortress Sample Data">
-    <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
+    <taskdef classname="org.apache.directory.fortress.core.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>
     </taskdef>
 
@@ -36,255 +36,255 @@
             </addadminrole>
 
             <addpermgrant>
-                <permgrant objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchBinds" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchAuthZs" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="getUserAuthZs" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchUserSessions" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchAdminMods" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchInvalidUsers" roleNm="FortressSuperAdmin" admin="true"/>
+                <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.openldap.fortress.rbac.ReviewMgrImpl" opName="readPermission" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="readPermObj" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="findPermissions" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="findPermObjs" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="readRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="findRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="readUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="findUsers" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="assignedUsers" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="assignedRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="authorizedUsers" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="authorizedRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="rolePermissions" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="userPermissions" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="permissionRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="authorizedPermissionRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="permissionUsers" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="authorizedPermissionUsers" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="ssdRoleSets" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="ssdRoleSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="ssdRoleSetRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="ssdRoleSetCardinality" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="dsdRoleSets" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="ssdSets" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="dsdRoleSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="dsdRoleSetRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="dsdRoleSetCardinality" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="dsdSets" roleNm="FortressSuperAdmin" 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.openldap.fortress.rbac.DelReviewMgrImpl" opName="readRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelReviewMgrImpl" opName="findRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelReviewMgrImpl" opName="assignedRoles" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelReviewMgrImpl" opName="assignedUsers" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelReviewMgrImpl" opName="readOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelReviewMgrImpl" opName="searchOU" roleNm="FortressSuperAdmin" 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.openldap.fortress.rbac.AdminMgrImpl" opName="addUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="disableUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="updateUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="changePassword" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="lockUserAccount" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="unlockUserAccount" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="resetPassword" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="updateRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="assignUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deassignUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addPermission" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addPermObj" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deletePermission" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deletePermObj" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="updatePermission" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="updatePermObj" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="grantPermission" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="revokePermission" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="grantPermissionUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="revokePermissionUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addDescendant" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addAscendant" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addInheritance" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteInheritance" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="createSsdSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="updateSsdSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addSsdRoleMember" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteSsdRoleMember" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteSsdSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="setSsdSetCardinality" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="createDsdSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="updateDsdSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addDsdRoleMember" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteDsdRoleMember" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteDsdSet" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="setDsdSetCardinality" roleNm="FortressSuperAdmin" 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.openldap.fortress.rbac.PwPolicyMgrImpl" opName="add" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.PwPolicyMgrImpl" opName="update" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.PwPolicyMgrImpl" opName="delete" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.PwPolicyMgrImpl" opName="updateUserPolicy" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.PwPolicyMgrImpl" opName="deletePasswordPolicy" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.PwPolicyMgrImpl" opName="search" roleNm="FortressSuperAdmin" 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.openldap.fortress.rbac.DelAdminMgrImpl" opName="addRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="deleteRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="updateRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="assignUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="deassignUser" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="updateOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="deleteOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addDescendantOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addAscendantOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addInheritanceOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="deleteInheritanceOU" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addDescendantRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addAscendantRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addInheritanceRole" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="deleteInheritanceRole" roleNm="FortressSuperAdmin" 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.openldap.fortress.ldap.group.GroupMgrImpl" opName="add" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="update" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="delete" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="addProperty" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="deleteProperty" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="assign" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="deassign" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="read" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="find" roleNm="FortressSuperAdmin" admin="true"/>
-                <permgrant objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="findWithUsers" roleNm="FortressSuperAdmin" 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"/>
 
             </addpermgrant>
 
             <addpermobj>
-                <permobj objName="org.openldap.fortress.rbac.DelAdminMgrImpl" description="ARBAC02 admin policies" ou="default" type="ARBAC" admin="true"/>
-                <permobj objName="org.openldap.fortress.rbac.PwPolicyMgrImpl" description="Password policies" ou="default" type="ARBAC" admin="true"/>
-                <permobj objName="org.openldap.fortress.rbac.AdminMgrImpl" description="RBAC admin policies" ou="default" type="ARBAC" admin="true"/>
-                <permobj objName="org.openldap.fortress.rbac.DelReviewMgrImpl" description="ARBAC review policies" ou="default" type="ARBAC" admin="true"/>
-                <permobj objName="org.openldap.fortress.rbac.ReviewMgrImpl" description="RBAC review policies" ou="default" type="ARBAC" admin="true"/>
-                <permobj objName="org.openldap.fortress.rbac.AuditMgrImpl" description="RBAC audit review" ou="default" type="ARBAC" admin="true"/>
-                <permobj objName="org.openldap.fortress.ldap.group.GroupMgrImpl" description="LDAP Group admin policies" ou="default" type="ARBAC" admin="true"/>
+                <permobj objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" description="ARBAC02 admin policies" ou="default" type="ARBAC" admin="true"/>
+                <permobj objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl" description="Password policies" ou="default" type="ARBAC" admin="true"/>
+                <permobj objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" description="RBAC admin policies" ou="default" type="ARBAC" admin="true"/>
+                <permobj objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl" description="ARBAC review policies" ou="default" type="ARBAC" admin="true"/>
+                <permobj objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" description="RBAC review policies" ou="default" type="ARBAC" admin="true"/>
+                <permobj objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" description="RBAC audit review" ou="default" type="ARBAC" admin="true"/>
+                <permobj objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" description="LDAP Group admin policies" ou="default" type="ARBAC" admin="true"/>
             </addpermobj>
 
             <addpermop>
 
-                <permop objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchBinds" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchAuthZs" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="getUserAuthZs" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchUserSessions" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchAdminMods" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AuditMgrImpl" opName="searchInvalidUsers" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchBinds" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchAuthZs" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="getUserAuthZs" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchUserSessions" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchAdminMods" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AuditMgrImpl" opName="searchInvalidUsers" admin="true"/>
 
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="readPermission" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="readPermObj" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="findPermissions" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="findPermObjs" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="readRole" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="findRoles" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="readUser" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="findUsers" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="assignedUsers" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="assignedRoles" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="authorizedUsers" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="authorizedRoles" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="rolePermissions" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="userPermissions" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="permissionRoles" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="authorizedPermissionRoles" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="permissionUsers" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="authorizedPermissionUsers" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="ssdRoleSets" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="ssdRoleSet" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="ssdRoleSetRoles" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="ssdRoleSetCardinality" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="dsdRoleSets" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="ssdSets" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="dsdRoleSet" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="dsdRoleSetRoles" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="dsdRoleSetCardinality" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.ReviewMgrImpl" opName="dsdSets" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="readPermission" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="readPermObj" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findPermissions" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findPermObjs" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="readRole" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findRoles" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="readUser" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="findUsers" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="assignedUsers" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="assignedRoles" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="authorizedUsers" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="authorizedRoles" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="rolePermissions" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="userPermissions" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="permissionRoles" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="authorizedPermissionRoles" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="permissionUsers" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="authorizedPermissionUsers" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="ssdRoleSets" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="ssdRoleSet" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="ssdRoleSetRoles" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="ssdRoleSetCardinality" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="dsdRoleSets" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="ssdSets" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="dsdRoleSet" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="dsdRoleSetRoles" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="dsdRoleSetCardinality" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.ReviewMgrImpl" opName="dsdSets" admin="true"/>
 
-                <permop objName="org.openldap.fortress.rbac.DelReviewMgrImpl" opName="readRole" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelReviewMgrImpl" opName="findRoles" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelReviewMgrImpl" opName="assignedRoles" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelReviewMgrImpl" opName="assignedUsers" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelReviewMgrImpl" opName="readOU" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelReviewMgrImpl" opName="searchOU" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl" opName="readRole" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl" opName="findRoles" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl" opName="assignedRoles" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl" opName="assignedUsers" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl" opName="readOU" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelReviewMgrImpl" opName="searchOU" admin="true"/>
 
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addUser" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="disableUser" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteUser" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="updateUser" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="changePassword" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="lockUserAccount" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="unlockUserAccount" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="resetPassword" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addRole" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteRole" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="updateRole" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="assignUser" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deassignUser" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addPermission" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addPermObj" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deletePermission" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deletePermObj" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="updatePermission" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="updatePermObj" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="grantPermission" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="revokePermission" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="grantPermissionUser" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="revokePermissionUser" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addDescendant" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addAscendant" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addInheritance" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteInheritance" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="createSsdSet" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="updateSsdSet" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addSsdRoleMember" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteSsdRoleMember" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteSsdSet" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="setSsdSetCardinality" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="createDsdSet" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="updateDsdSet" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="addDsdRoleMember" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteDsdRoleMember" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="deleteDsdSet" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.AdminMgrImpl" opName="setDsdSetCardinality" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="addUser" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="disableUser" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deleteUser" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="updateUser" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="changePassword" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="lockUserAccount" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="unlockUserAccount" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="resetPassword" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="addRole" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deleteRole" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="updateRole" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="assignUser" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deassignUser" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="addPermission" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="addPermObj" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deletePermission" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deletePermObj" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="updatePermission" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="updatePermObj" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="grantPermission" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="revokePermission" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="grantPermissionUser" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="revokePermissionUser" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="addDescendant" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="addAscendant" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="addInheritance" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deleteInheritance" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="createSsdSet" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="updateSsdSet" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="addSsdRoleMember" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deleteSsdRoleMember" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deleteSsdSet" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="setSsdSetCardinality" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="createDsdSet" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="updateDsdSet" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="addDsdRoleMember" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deleteDsdRoleMember" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="deleteDsdSet" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AdminMgrImpl" opName="setDsdSetCardinality" admin="true"/>
 
-                <permop objName="org.openldap.fortress.rbac.PwPolicyMgrImpl" opName="add" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.PwPolicyMgrImpl" opName="update" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.PwPolicyMgrImpl" opName="delete" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.PwPolicyMgrImpl" opName="updateUserPolicy" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.PwPolicyMgrImpl" opName="deletePasswordPolicy" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.PwPolicyMgrImpl" opName="search" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl" opName="add" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl" opName="update" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl" opName="delete" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl" opName="updateUserPolicy" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl" opName="deletePasswordPolicy" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.PwPolicyMgrImpl" opName="search" admin="true"/>
 
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addRole" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="deleteRole" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="updateRole" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="assignUser" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="deassignUser" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addOU" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="updateOU" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="deleteOU" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addDescendantOU" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addAscendantOU" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addInheritanceOU" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="deleteInheritanceOU" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addDescendantRole" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addAscendantRole" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="addInheritanceRole" admin="true"/>
-                <permop objName="org.openldap.fortress.rbac.DelAdminMgrImpl" opName="deleteInheritanceRole" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="addRole" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="deleteRole" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="updateRole" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="assignUser" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="deassignUser" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="addOU" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="updateOU" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="deleteOU" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="addDescendantOU" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="addAscendantOU" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="addInheritanceOU" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="deleteInheritanceOU" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="addDescendantRole" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="addAscendantRole" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="addInheritanceRole" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.DelAdminMgrImpl" opName="deleteInheritanceRole" admin="true"/>
 
-                <permop objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="add" admin="true"/>
-                <permop objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="update" admin="true"/>
-                <permop objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="delete" admin="true"/>
-                <permop objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="addProperty" admin="true"/>
-                <permop objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="deleteProperty" admin="true"/>
-                <permop objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="read" admin="true"/>
-                <permop objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="find" admin="true"/>
-                <permop objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="findWithUsers" admin="true"/>
-                <permop objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="assign" admin="true"/>
-                <permop objName="org.openldap.fortress.ldap.group.GroupMgrImpl" opName="deassign" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="add" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="update" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="delete" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="addProperty" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="deleteProperty" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="read" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="find" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="findWithUsers" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="assign" admin="true"/>
+                <permop objName="org.apache.directory.fortress.core.ldap.group.GroupMgrImpl" opName="deassign" admin="true"/>
             </addpermop>
 
          </FortressAdmin>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/687ee1ad/ldap/setup/FortressDemoUsers.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/FortressDemoUsers.xml b/ldap/setup/FortressDemoUsers.xml
index dde1d30..67f4da1 100755
--- a/ldap/setup/FortressDemoUsers.xml
+++ b/ldap/setup/FortressDemoUsers.xml
@@ -18,7 +18,7 @@
    under the License.
 -->
 <project basedir="." default="all" name="Fortress Sample Data">
-    <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
+    <taskdef classname="org.apache.directory.fortress.core.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>
     </taskdef>
 
@@ -221,7 +221,7 @@
 
 <!--
                 <permobj admin="true"
-                         objName="org.openldap.fortress.audit.AuditMgrImpl"
+                         objName="org.apache.directory.fortress.audit.AuditMgrImpl"
                          description="AuditMgr Object"
                          ou="demoapps1" type="Ant"/>
 -->
@@ -243,12 +243,12 @@
                 <permop opName="6pm" objName="/cal/cal2.jsp" type="Ant"/>
 
 <!--
-                <permop admin="true" opName="searchBinds" objName="org.openldap.fortress.audit.AuditMgrImpl" type="Ant"/>
-                <permop admin="true" opName="searchAuthZs" objName="org.openldap.fortress.audit.AuditMgrImpl" type="Ant"/>
-                <permop admin="true" opName="getUserAuthZs" objName="org.openldap.fortress.audit.AuditMgrImpl" type="Ant"/>
-                <permop admin="true" opName="searchUserSessions" objName="org.openldap.fortress.audit.AuditMgrImpl" type="Ant"/>
-                <permop admin="true" opName="searchAdminMods" objName="org.openldap.fortress.audit.AuditMgrImpl" type="Ant"/>
-                <permop admin="true" opName="searchInvalidUsers" objName="org.openldap.fortress.audit.AuditMgrImpl" type="Ant"/>
+                <permop admin="true" opName="searchBinds" objName="org.apache.directory.fortress.audit.AuditMgrImpl" type="Ant"/>
+                <permop admin="true" opName="searchAuthZs" objName="org.apache.directory.fortress.audit.AuditMgrImpl" type="Ant"/>
+                <permop admin="true" opName="getUserAuthZs" objName="org.apache.directory.fortress.audit.AuditMgrImpl" type="Ant"/>
+                <permop admin="true" opName="searchUserSessions" objName="org.apache.directory.fortress.audit.AuditMgrImpl" type="Ant"/>
+                <permop admin="true" opName="searchAdminMods" objName="org.apache.directory.fortress.audit.AuditMgrImpl" type="Ant"/>
+                <permop admin="true" opName="searchInvalidUsers" objName="org.apache.directory.fortress.audit.AuditMgrImpl" type="Ant"/>
 -->
             </addpermop>
 
@@ -262,12 +262,12 @@
                 <permgrant objName="/cal/cal2.jsp" opName="6pm" roleNm="role1"/>
 
 <!--
-                <permgrant admin="true" objName="org.openldap.fortress.audit.AuditMgrImpl" opName="searchBinds" roleNm="DemoAdminUsers"/>
-                <permgrant admin="true" objName="org.openldap.fortress.audit.AuditMgrImpl" opName="searchAuthZs" roleNm="DemoAdminUsers"/>
-                <permgrant admin="true" objName="org.openldap.fortress.audit.AuditMgrImpl" opName="getUserAuthZs" roleNm="DemoAdminUsers"/>
-                <permgrant admin="true" objName="org.openldap.fortress.audit.AuditMgrImpl" opName="searchUserSessions" roleNm="DemoAdminUsers"/>
-                <permgrant admin="true" objName="org.openldap.fortress.audit.AuditMgrImpl" opName="searchAdminMods" roleNm="DemoAdminUsers"/>
-                <permgrant admin="true" objName="org.openldap.fortress.audit.AuditMgrImpl" opName="searchInvalidUsers" roleNm="DemoAdminUsers"/>
+                <permgrant admin="true" objName="org.apache.directory.fortress.audit.AuditMgrImpl" opName="searchBinds" roleNm="DemoAdminUsers"/>
+                <permgrant admin="true" objName="org.apache.directory.fortress.audit.AuditMgrImpl" opName="searchAuthZs" roleNm="DemoAdminUsers"/>
+                <permgrant admin="true" objName="org.apache.directory.fortress.audit.AuditMgrImpl" opName="getUserAuthZs" roleNm="DemoAdminUsers"/>
+                <permgrant admin="true" objName="org.apache.directory.fortress.audit.AuditMgrImpl" opName="searchUserSessions" roleNm="DemoAdminUsers"/>
+                <permgrant admin="true" objName="org.apache.directory.fortress.audit.AuditMgrImpl" opName="searchAdminMods" roleNm="DemoAdminUsers"/>
+                <permgrant admin="true" objName="org.apache.directory.fortress.audit.AuditMgrImpl" opName="searchInvalidUsers" roleNm="DemoAdminUsers"/>
 -->
             </addpermgrant>
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/687ee1ad/ldap/setup/HierarchicalAdminRoleExample.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/HierarchicalAdminRoleExample.xml b/ldap/setup/HierarchicalAdminRoleExample.xml
index 384c818..25989ce 100755
--- a/ldap/setup/HierarchicalAdminRoleExample.xml
+++ b/ldap/setup/HierarchicalAdminRoleExample.xml
@@ -36,7 +36,7 @@
     <property name="ehcache-core.jar" value="${lib.dir}/ehcache-core-2.6.5.jar"/>
     <property name="slf4j-api.jar" value="${lib.dir}/slf4j-api-1.7.5.jar"/>
     <property name="slf4j-log4j.jar" value="${lib.dir}/slf4j-log4j12-1.7.5.jar"/>
-    <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
+    <taskdef classname="org.apache.directory.fortress.core.ant.FortressAntTask" name="FortressAdmin" >
     	<classpath path="${config}:${Fortress.jar}:${log4j.jar}:${ldapjdk.jar}:${jgrapht.jar}:${jasypt.jar}:${commons-configuration.jar}:${commons-lang.jar}:${commons-collections.jar}:${commons-logging.jar}:${ehcache-core.jar}:${slf4j-api.jar}:${slf4j-log4j.jar}"/>
     </taskdef>
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/687ee1ad/ldap/setup/HierarchicalRoleExample.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/HierarchicalRoleExample.xml b/ldap/setup/HierarchicalRoleExample.xml
index e4c3eeb..55022f4 100755
--- a/ldap/setup/HierarchicalRoleExample.xml
+++ b/ldap/setup/HierarchicalRoleExample.xml
@@ -35,7 +35,7 @@
     <property name="ehcache-core.jar" value="${lib.dir}/ehcache-core-2.6.5.jar"/>
     <property name="slf4j-api.jar" value="${lib.dir}/slf4j-api-1.7.5.jar"/>
     <property name="slf4j-log4j.jar" value="${lib.dir}/slf4j-log4j12-1.7.5.jar"/>
-    <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
+    <taskdef classname="org.apache.directory.fortress.core.ant.FortressAntTask" name="FortressAdmin" >
     	<classpath path="${config}:${Fortress.jar}:${log4j.jar}:${ldapjdk.jar}:${jgrapht.jar}:${jasypt.jar}:${commons-configuration.jar}:${commons-lang.jar}:${commons-collections.jar}:${commons-logging.jar}:${ehcache-core.jar}:${slf4j-api.jar}:${slf4j-log4j.jar}"/>
     </taskdef>
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/687ee1ad/ldap/setup/LdapGroupSetup.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/LdapGroupSetup.xml b/ldap/setup/LdapGroupSetup.xml
index 936c174..5665569 100644
--- a/ldap/setup/LdapGroupSetup.xml
+++ b/ldap/setup/LdapGroupSetup.xml
@@ -18,7 +18,7 @@
    under the License.
 -->
 <project basedir="." default="all" name="Fortress LDAP Group Test 002 Data">
-    <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
+    <taskdef classname="org.apache.directory.fortress.core.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>
     </taskdef>
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/687ee1ad/ldap/setup/LoadTestUsers.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/LoadTestUsers.xml b/ldap/setup/LoadTestUsers.xml
index 8ff6729..757588b 100644
--- a/ldap/setup/LoadTestUsers.xml
+++ b/ldap/setup/LoadTestUsers.xml
@@ -18,7 +18,7 @@
    under the License.
 -->
 <project basedir="." default="all" name="Fortress Sample Data">
-    <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
+    <taskdef classname="org.apache.directory.fortress.core.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>
     </taskdef>
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/687ee1ad/ldap/setup/OrgUnitExample.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/OrgUnitExample.xml b/ldap/setup/OrgUnitExample.xml
index 11223e2..09d94c1 100755
--- a/ldap/setup/OrgUnitExample.xml
+++ b/ldap/setup/OrgUnitExample.xml
@@ -36,7 +36,7 @@
     <property name="ehcache-core.jar" value="${lib.dir}/ehcache-core-2.6.5.jar"/>
     <property name="slf4j-api.jar" value="${lib.dir}/slf4j-api-1.7.5.jar"/>
     <property name="slf4j-log4j.jar" value="${lib.dir}/slf4j-log4j12-1.7.5.jar"/>
-    <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
+    <taskdef classname="org.apache.directory.fortress.core.ant.FortressAntTask" name="FortressAdmin" >
     	<classpath path="${config}:${Fortress.jar}:${log4j.jar}:${ldapjdk.jar}:${jgrapht.jar}:${jasypt.jar}:${commons-configuration.jar}:${commons-lang.jar}:${commons-collections.jar}:${commons-logging.jar}:${ehcache-core.jar}:${slf4j-api.jar}:${slf4j-log4j.jar}"/>
     </taskdef>
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/687ee1ad/ldap/setup/RbacAcceleratorTestUsers.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/RbacAcceleratorTestUsers.xml b/ldap/setup/RbacAcceleratorTestUsers.xml
index 7c329f2..061b9f2 100644
--- a/ldap/setup/RbacAcceleratorTestUsers.xml
+++ b/ldap/setup/RbacAcceleratorTestUsers.xml
@@ -18,7 +18,7 @@
    under the License.
 -->
 <project basedir="." default="all" name="Fortress Sample Data">
-    <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
+    <taskdef classname="org.apache.directory.fortress.core.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>
     </taskdef>
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/687ee1ad/ldap/setup/demo-fortressproject-users.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/demo-fortressproject-users.xml b/ldap/setup/demo-fortressproject-users.xml
index 6fdbc93..48e21dc 100644
--- a/ldap/setup/demo-fortressproject-users.xml
+++ b/ldap/setup/demo-fortressproject-users.xml
@@ -19,7 +19,7 @@
 -->
 <project basedir="." default="all" name="Fortress Sample Data">
 
-    <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
+    <taskdef classname="org.apache.directory.fortress.core.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>
     </taskdef>
 
@@ -99,14 +99,14 @@
                 <permobj objName="com.mycompany.Page1"/>
                 <permobj objName="com.mycompany.Page2"/>
                 <permobj objName="com.mycompany.Page3"/>
-                <permobj objName="org.openldap.fortress.rbac.AccessMgrImpl"/>
+                <permobj objName="org.apache.directory.fortress.core.rbac.AccessMgrImpl"/>
             </delpermobj>
 
             <addpermobj>
                 <permobj objName="com.mycompany.Page1" description="Wicket Test Page 1" ou="WicketPerms" type="Page"/>
                 <permobj objName="com.mycompany.Page2" description="Wicket Test Page 2" ou="WicketPerms" type="Page"/>
                 <permobj objName="com.mycompany.Page3" description="Wicket Test Page 3" ou="WicketPerms" type="Page"/>
-                <permobj objName="org.openldap.fortress.rbac.AccessMgrImpl" description="Used to perform role activation functions" ou="WicketPerms" type="Page"/>
+                <permobj objName="org.apache.directory.fortress.core.rbac.AccessMgrImpl" description="Used to perform role activation functions" ou="WicketPerms" type="Page"/>
                 <permobj objName="ROLE_TEST1" description="Used to perform ROLE_TEST1 role activation functions" ou="WicketPerms" type="Page"/>
                 <permobj objName="ROLE_TEST2" description="Used to perform ROLE_TEST2 role activation functions" ou="WicketPerms" type="Page"/>
                 <permobj objName="ROLE_TEST3" description="Used to perform ROLE_TEST3 role activation functions" ou="WicketPerms" type="Page"/>
@@ -122,8 +122,8 @@
                 <permop objName="com.mycompany.Page3" opName="Button1"/>
                 <permop objName="com.mycompany.Page3" opName="Button2"/>
                 <permop objName="com.mycompany.Page3" opName="Button3"/>
-                <permop objName="org.openldap.fortress.rbac.AccessMgrImpl" opName="addActiveRole"/>
-                <permop objName="org.openldap.fortress.rbac.AccessMgrImpl" opName="dropActiveRole"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AccessMgrImpl" opName="addActiveRole"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AccessMgrImpl" opName="dropActiveRole"/>
                 <permop objName="ROLE_TEST1" opName="dropActiveRole"/>
                 <permop objName="ROLE_TEST1" opName="dropActiveRole" type="Button"/>
                 <permop objName="ROLE_TEST2" opName="addActiveRole" type="Button"/>
@@ -142,8 +142,8 @@
                 <permop objName="com.mycompany.Page3" opName="Button1" type="Button"/>
                 <permop objName="com.mycompany.Page3" opName="Button2" type="Button"/>
                 <permop objName="com.mycompany.Page3" opName="Button3" type="Button"/>
-                <permop objName="org.openldap.fortress.rbac.AccessMgrImpl" opName="addActiveRole" type="Button"/>
-                <permop objName="org.openldap.fortress.rbac.AccessMgrImpl" opName="dropActiveRole" type="Button"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AccessMgrImpl" opName="addActiveRole" type="Button"/>
+                <permop objName="org.apache.directory.fortress.core.rbac.AccessMgrImpl" opName="dropActiveRole" type="Button"/>
                 <permop objName="ROLE_TEST1" opName="addActiveRole" type="Button"/>
                 <permop objName="ROLE_TEST1" opName="dropActiveRole" type="Button"/>
                 <permop objName="ROLE_TEST2" opName="addActiveRole" type="Button"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/687ee1ad/ldap/setup/refreshLDAPData-src.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/refreshLDAPData-src.xml b/ldap/setup/refreshLDAPData-src.xml
index 39120f6..90c7941 100755
--- a/ldap/setup/refreshLDAPData-src.xml
+++ b/ldap/setup/refreshLDAPData-src.xml
@@ -18,7 +18,7 @@
    under the License.
 -->
 <project basedir="." default="all" name="Fortress Properties">
-    <taskdef classname="org.openldap.fortress.ant.FortressAntTask" name="FortressAdmin" >
+    <taskdef classname="org.apache.directory.fortress.core.ant.FortressAntTask" name="FortressAdmin" >
         <classpath path="${java.class.path}"/>
     </taskdef>
 
@@ -74,16 +74,16 @@
                 <config props="adminrole.root:@ADMINROLES_DN@"/>
                 <config props="adminperm.root:@ADMINPERMS_DN@"/>
                 <config props="example.root:ou=Examples,@SUFFIX@"/>
-                <!--config props="accessmgr.implementation:org.openldap.fortress.rbac.AccessMgrImpl"/-->
-                <!--config props="auditmgr.implementation:org.openldap.fortress.audit.AuditMgrImpl"/-->
+                <!--config props="accessmgr.implementation:org.apache.directory.fortress.core.rbac.AccessMgrImpl"/-->
+                <!--config props="auditmgr.implementation:org.apache.directory.fortress.audit.AuditMgrImpl"/-->
                 <config props="audit.root:@AUDITS_DN@"/>
                 <config props="superadmin.role:FortressSuperAdmin"/>
-                <config props="temporal.validator.0:org.openldap.fortress.util.time.Date"/>
-                <config props="temporal.validator.1:org.openldap.fortress.util.time.LockDate"/>
-                <config props="temporal.validator.2:org.openldap.fortress.util.time.Timeout"/>
-                <config props="temporal.validator.3:org.openldap.fortress.util.time.ClockTime"/>
-                <config props="temporal.validator.4:org.openldap.fortress.util.time.Day"/>
-                <config props="temporal.validator.dsd:org.openldap.fortress.rbac.DSDChecker"/>
+                <config props="temporal.validator.0:org.apache.directory.fortress.core.util.time.Date"/>
+                <config props="temporal.validator.1:org.apache.directory.fortress.core.util.time.LockDate"/>
+                <config props="temporal.validator.2:org.apache.directory.fortress.core.util.time.Timeout"/>
+                <config props="temporal.validator.3:org.apache.directory.fortress.core.util.time.ClockTime"/>
+                <config props="temporal.validator.4:org.apache.directory.fortress.core.util.time.Day"/>
+                <config props="temporal.validator.dsd:org.apache.directory.fortress.core.rbac.DSDChecker"/>
                 <config props="user.objectclass:inetOrgPerson"/>
                 <config props="group.objectclass:@GROUP_OBJECT_CLASS@"/>
                 <config props="group.protocol:@GROUP_PROTOCOL@"/>
@@ -143,14 +143,14 @@
                 <config props="adminperm.root:ou=AdminPerms,ou=ARBAC,@SUFFIX@"/>
                 <config props="audit.root:cn=log"/>
                 <config props="superadmin.role:oamSuperAdmin"/>
-                <config props="temporal.validator.0:org.openldap.fortress.util.time.Date"/>
-                <config props="temporal.validator.1:org.openldap.fortress.util.time.LockDate"/>
-                <config props="temporal.validator.2:org.openldap.fortress.util.time.Timeout"/>
-                <config props="temporal.validator.3:org.openldap.fortress.util.time.ClockTime"/>
-                <config props="temporal.validator.4:org.openldap.fortress.util.time.Day"/>
-                <config props="temporal.validator.dsd:org.openldap.fortress.rbac.DSDChecker"/>
-                <config props="accessmgr.implementation:org.openldap.fortress.rbac.AccessMgrImpl"/>
-                <config props="auditmgr.implementation:org.openldap.fortress.rbac.AuditMgrImpl"/>
+                <config props="temporal.validator.0:org.apache.directory.fortress.core.util.time.Date"/>
+                <config props="temporal.validator.1:org.apache.directory.fortress.core.util.time.LockDate"/>
+                <config props="temporal.validator.2:org.apache.directory.fortress.core.util.time.Timeout"/>
+                <config props="temporal.validator.3:org.apache.directory.fortress.core.util.time.ClockTime"/>
+                <config props="temporal.validator.4:org.apache.directory.fortress.core.util.time.Day"/>
+                <config props="temporal.validator.dsd:org.apache.directory.fortress.core.rbac.DSDChecker"/>
+                <config props="accessmgr.implementation:org.apache.directory.fortress.core.rbac.AccessMgrImpl"/>
+                <config props="auditmgr.implementation:org.apache.directory.fortress.core.rbac.AuditMgrImpl"/>
                 <config props="user.objectclass:inetOrgPerson"/>
                 <config props="group.objectclass:@GROUP_OBJECT_CLASS@"/>
                 <config props="group.protocol:@GROUP_PROTOCOL@"/>