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 2015/05/18 17:26:44 UTC
directory-fortress-core git commit: FC-105 - [fortress-core] -
org.apache.directory.fortress.core.GlobalIds.ROLE_OBJ_CLASS is a mutable
array
Repository: directory-fortress-core
Updated Branches:
refs/heads/master b0ad9410b -> 222266cf9
FC-105 - [fortress-core] - org.apache.directory.fortress.core.GlobalIds.ROLE_OBJ_CLASS is a mutable array
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/222266cf
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/222266cf
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/222266cf
Branch: refs/heads/master
Commit: 222266cf991234d03e2cffa288b88679ec279019
Parents: b0ad941
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon May 18 10:26:32 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon May 18 10:26:32 2015 -0500
----------------------------------------------------------------------
.../org/apache/directory/fortress/core/GlobalIds.java | 11 -----------
.../apache/directory/fortress/core/rbac/RoleDAO.java | 12 +++++++++++-
2 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/222266cf/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
index 20a044c..091e505 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
@@ -295,17 +295,6 @@ public class GlobalIds
*/
public static final String ROLE_OBJECT_CLASS_NM = "ftRls";
- /**
- * Defines the object class structure used within Fortress Role processing.
- */
- public static final String ROLE_OBJ_CLASS[] =
- {
- SchemaConstants.TOP_OC,
- ROLE_OBJECT_CLASS_NM,
- GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME,
- GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
- };
-
/*
* *************************************************************************
* ** OpenAccessMgr CONSTRAINTS are used by USER, ROLE, ADMINROLE DAO'S.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/222266cf/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java
index 91b82ff..31a8e81 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/RoleDAO.java
@@ -115,6 +115,16 @@ final class RoleDAO extends ApacheDsDataProvider
GlobalIds.FT_IID, ROLE_NM, SchemaConstants.DESCRIPTION_AT, GlobalIds.CONSTRAINT, SchemaConstants.ROLE_OCCUPANT_AT, GlobalIds.PARENT_NODES
};
+ /**
+ * Defines the object class structure used within Fortress Role processing.
+ */
+ private static final String ROLE_OBJ_CLASS[] =
+ {
+ SchemaConstants.TOP_OC,
+ GlobalIds.ROLE_OBJECT_CLASS_NM,
+ GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME,
+ GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
+ };
/**
* @param entity
@@ -129,7 +139,7 @@ final class RoleDAO extends ApacheDsDataProvider
try
{
Entry entry = new DefaultEntry( dn );
- entry.add( SchemaConstants.OBJECT_CLASS_AT, GlobalIds.ROLE_OBJ_CLASS );
+ entry.add( SchemaConstants.OBJECT_CLASS_AT, ROLE_OBJ_CLASS );
entity.setId();
entry.add( GlobalIds.FT_IID, entity.getId() );
entry.add( ROLE_NM, entity.getName() );