You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by cp...@apache.org on 2017/05/08 00:52:48 UTC
directory-fortress-core git commit: FC-209 setting correct object
class on attributes and attribute sets
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 10120f8de -> e52535186
FC-209 setting correct object class on attributes and attribute sets
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/e5253518
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/e5253518
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/e5253518
Branch: refs/heads/master
Commit: e525351864292a41a88174e385b9cf07d6de1227
Parents: 10120f8
Author: clp207 <cl...@psu.edu>
Authored: Sun May 7 20:52:37 2017 -0400
Committer: clp207 <cl...@psu.edu>
Committed: Sun May 7 20:52:37 2017 -0400
----------------------------------------------------------------------
.../directory/fortress/core/impl/PermDAO.java | 22 ++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e5253518/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
index 85c3afd..f786b5c 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PermDAO.java
@@ -183,6 +183,24 @@ class PermDAO extends LdapDataProvider
GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME,
GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
};
+
+ private static final String PERM_ATTR_SET_OBJ_CLASS[] =
+ {
+ SchemaConstants.TOP_OC,
+ SchemaConstants.ORGANIZATIONAL_UNIT_OC,
+ PERMISSION_ATTRIBUTE_SET_OBJECT_CLASS_NAME,
+ GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME,
+ GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
+ };
+
+ private static final String PERM_ATTR_OBJ_CLASS[] =
+ {
+ SchemaConstants.TOP_OC,
+ SchemaConstants.ORGANIZATIONAL_ROLE_OC,
+ PERMISSION_ATTRIBUTE_OBJECT_CLASS_NAME,
+ GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME,
+ GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
+ };
private static final String PERM_NAME = "ftPermName";
private static final String ROLES = "ftRoles";
@@ -486,7 +504,7 @@ class PermDAO extends LdapDataProvider
{
Entry entry = new DefaultEntry( dn );
- entry.add( SchemaConstants.OBJECT_CLASS_AT, PERMISSION_ATTRIBUTE_SET_OBJECT_CLASS_NAME );
+ entry.add( SchemaConstants.OBJECT_CLASS_AT, PERM_ATTR_SET_OBJ_CLASS );
entry.add( GlobalIds.FT_PERMISSION_ATTRIBUTE_SET, entity.getName() );
@@ -551,7 +569,7 @@ class PermDAO extends LdapDataProvider
{
Entry entry = new DefaultEntry( dn );
- entry.add( SchemaConstants.OBJECT_CLASS_AT, PERMISSION_ATTRIBUTE_OBJECT_CLASS_NAME );
+ entry.add( SchemaConstants.OBJECT_CLASS_AT, PERM_ATTR_OBJ_CLASS );
// this will generate a new random, unique id on this entity:
entity.setInternalId();