You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/05/19 13:30:23 UTC
[4/5] directory-fortress-core git commit: Replaced tabs by spaces
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java
index 67549ac..b2f23e3 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PermDAO.java
@@ -61,7 +61,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <h4>PermObj Base - ftObject STRUCTURAL Object Class is used to store object name, id and type variables on target entity.</h4>
* <ul>
* <li> ------------------------------------------
- * <li> <code>objectclass ( 1.3.6.1.4.1.38088.2.2</code>
+ * <li> <code>objectclass ( 1.3.6.1.4.1.38088.2.2</code>
* <li> <code>NAME 'ftObject'</code>
* <li> <code>DESC 'Fortress Permission Object Class'</code>
* <li> <code>SUP organizationalunit</code> GlobalIds
@@ -103,7 +103,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* using either 'checkAccess' or 'sessionPermissions APIs both methods that reside in the 'AccessMgrImpl' class.
* <ul>
* <li> ------------------------------------------
- * <li> <code>objectclass ( 1.3.6.1.4.1.38088.2.3</code>
+ * <li> <code>objectclass ( 1.3.6.1.4.1.38088.2.3</code>
* <li> <code>NAME 'ftOperation'</code>
* <li> <code>DESC 'Fortress Permission Operation Object Class'</code>
* <li> <code>SUP organizationalrole</code>
@@ -177,8 +177,17 @@ final class PermDAO extends ApacheDsDataProvider
private static final String USERS = "ftUsers";
private static final String[] PERMISSION_OP_ATRS =
{
- GlobalIds.FT_IID, PERM_NAME, GlobalIds.POBJ_NAME, GlobalIds.POP_NAME, SchemaConstants.DESCRIPTION_AT, SchemaConstants.OU_AT,
- GlobalIds.POBJ_ID, TYPE, ROLES, USERS, GlobalIds.PROPS
+ GlobalIds.FT_IID,
+ PERM_NAME,
+ GlobalIds.POBJ_NAME,
+ GlobalIds.POP_NAME,
+ SchemaConstants.DESCRIPTION_AT,
+ SchemaConstants.OU_AT,
+ GlobalIds.POBJ_ID,
+ TYPE,
+ ROLES,
+ USERS,
+ GlobalIds.PROPS
};
private static final String[] PERMISION_OBJ_ATRS =
@@ -781,7 +790,7 @@ final class PermDAO extends ApacheDsDataProvider
String warning = "getPerm Obj no entry found dn [" + dn + "]";
throw new FinderException( GlobalErrIds.PERM_OBJ_NOT_FOUND, warning );
}
- entity = unloadPobjLdapEntry( findEntry, 0,permObj.isAdmin() );
+ entity = unloadPobjLdapEntry( findEntry, 0, permObj.isAdmin() );
}
catch ( LdapNoSuchObjectException e )
{
@@ -826,10 +835,11 @@ final class PermDAO extends ApacheDsDataProvider
// LDAP Operation #1: Read the targeted permission from ldap server
Entry entry = read( ld, dn, PERMISSION_OP_ATRS );
- if(entry == null)
+ if ( entry == null )
{
// if permission not found, cannot continue.
- String error = "checkPermission DOES NOT EXIST : obj name [" + inPerm.getObjName() + "], obj id [" + inPerm.getObjId() + "], op name [" + inPerm.getOpName() + "], idAdmin [" + inPerm.isAdmin() + "]";
+ String error = "checkPermission DOES NOT EXIST : obj name [" + inPerm.getObjName() + "], obj id ["
+ + inPerm.getObjId() + "], op name [" + inPerm.getOpName() + "], idAdmin [" + inPerm.isAdmin() + "]";
throw new FinderException( GlobalErrIds.PERM_NOT_EXIST, error );
}
@@ -994,7 +1004,8 @@ final class PermDAO extends ApacheDsDataProvider
* @throws LdapInvalidAttributeValueException
* @throws LdapException
*/
- private Permission unloadPopLdapEntry( Entry le, long sequence, boolean isAdmin ) throws LdapInvalidAttributeValueException
+ private Permission unloadPopLdapEntry( Entry le, long sequence, boolean isAdmin )
+ throws LdapInvalidAttributeValueException
{
Permission entity = new ObjectFactory().createPermission();
entity.setSequenceId( sequence );
@@ -1011,7 +1022,7 @@ final class PermDAO extends ApacheDsDataProvider
entity.setAdmin( isAdmin );
// TODO: find out the correct way to do this:
- if(le != null)
+ if ( le != null )
{
entity.setDn( le.getDn().getNormName() );
}
@@ -1026,7 +1037,8 @@ final class PermDAO extends ApacheDsDataProvider
* @throws LdapInvalidAttributeValueException
* @throws LdapException
*/
- private PermObj unloadPobjLdapEntry( Entry le, long sequence, boolean isAdmin ) throws LdapInvalidAttributeValueException
+ private PermObj unloadPobjLdapEntry( Entry le, long sequence, boolean isAdmin )
+ throws LdapInvalidAttributeValueException
{
PermObj entity = new ObjectFactory().createPermObj();
entity.setSequenceId( sequence );
@@ -1334,7 +1346,7 @@ final class PermDAO extends ApacheDsDataProvider
while ( searchResults.next() )
{
- permList.add( unloadPopLdapEntry( searchResults.getEntry(), sequence++,false ) );
+ permList.add( unloadPopLdapEntry( searchResults.getEntry(), sequence++, false ) );
}
}
catch ( LdapException e )
@@ -1379,7 +1391,7 @@ final class PermDAO extends ApacheDsDataProvider
filterbuf.append( USERS );
filterbuf.append( "=" );
filterbuf.append( user.getUserId() );
- filterbuf.append( "))" );
+ filterbuf.append( "))" );
ld = getAdminConnection();
SearchCursor searchResults = search( ld, permRoot,
SearchScope.SUBTREE, filterbuf.toString(), PERMISSION_OP_ATRS, false, GlobalIds.BATCH_SIZE );
@@ -1428,7 +1440,7 @@ final class PermDAO extends ApacheDsDataProvider
String filter = GlobalIds.FILTER_PREFIX + PERM_OP_OBJECT_CLASS_NAME + ")(|";
filter += "(" + USERS + "=" + session.getUserId() + ")";
Set<String> roles;
- if(isAdmin)
+ if ( isAdmin )
{
roles = AdminRoleUtil.getInheritedRoles( session.getAdminRoles(), session.getContextId() );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java b/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java
index 018c497..6eb0b14 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/PermObj.java
@@ -33,6 +33,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
+
/**
* All entities ({@link org.apache.directory.fortress.core.rbac.User}, {@link org.apache.directory.fortress.core.rbac.Role}, {@link Permission},
* {@link PwPolicy} {@link org.apache.directory.fortress.core.rbac.SDSet} etc...) are used to carry data between three Fortress
@@ -74,7 +75,7 @@ import javax.xml.bind.annotation.XmlType;
* 1. ftObject STRUCTURAL Object Class is used to store object name, id and type variables on target entity.
* <pre>
* Fortress Permission Structural Object Class
- * objectclass ( 1.3.6.1.4.1.38088.2.2
+ * objectclass ( 1.3.6.1.4.1.38088.2.2
* NAME 'ftObject'
* DESC 'Fortress Permission Object Class'
* SUP organizationalunit
@@ -139,7 +140,7 @@ import javax.xml.bind.annotation.XmlType;
public class PermObj extends FortEntity implements Serializable
{
private static final long serialVersionUID = 1L;
-
+
private boolean admin;
private String internalId;
private String objName;
@@ -536,6 +537,7 @@ public class PermObj extends FortEntity implements Serializable
return result;
}
+
/**
* Matches the objName from two PermObj entities.
*
@@ -557,6 +559,7 @@ public class PermObj extends FortEntity implements Serializable
return thatPermObj.getObjName().equalsIgnoreCase( this.getObjName() );
}
+
@Override
public String toString()
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java b/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java
index 7c5aa77..b8c11c7 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Permission.java
@@ -37,7 +37,7 @@ import javax.xml.bind.annotation.XmlType;
/*
## OC2: Fortress Permission Structural Object Class
- objectclass ( 1.3.6.1.4.1.38088.2.2
+ objectclass ( 1.3.6.1.4.1.38088.2.2
NAME 'ftObject'
DESC 'Fortress Permission Object Class'
SUP organizationalunit
@@ -149,7 +149,7 @@ import javax.xml.bind.annotation.XmlType;
* <pre>
* ------------------------------------------
* Fortress Operation Structural Object Class
- * objectclass ( 1.3.6.1.4.1.38088.2.3
+ * objectclass ( 1.3.6.1.4.1.38088.2.3
* NAME 'ftOperation'
* DESC 'Fortress Permission Operation Structural Object Class'
* SUP organizationalrole
@@ -744,6 +744,7 @@ public class Permission extends FortEntity implements Serializable
.getOpName().equalsIgnoreCase( this.getOpName() ) ) );
}
+
@Override
public int hashCode()
{
@@ -762,6 +763,7 @@ public class Permission extends FortEntity implements Serializable
return result;
}
+
@Override
public String toString()
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/rbac/Role.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/Role.java b/src/main/java/org/apache/directory/fortress/core/rbac/Role.java
index f4b3de4..6a7d168 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/Role.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/Role.java
@@ -111,7 +111,7 @@ import org.apache.directory.fortress.core.util.time.Constraint;
* <pre>
* ------------------------------------------
* Fortress Roles Structural Object Class
- * objectclass ( 1.3.6.1.4.1.38088.2.1
+ * objectclass ( 1.3.6.1.4.1.38088.2.1
* NAME 'ftRls'
* DESC 'Fortress Role Structural Object Class'
* SUP organizationalrole
@@ -191,636 +191,638 @@ import org.apache.directory.fortress.core.util.time.Constraint;
})
public class Role extends FortEntity implements Constraint, Graphable, java.io.Serializable
{
- private static final long serialVersionUID = 1L;
- private String id; // this maps to ftId
- private String name; // this is ftRoleName
- private String description; // this is description
- @XmlTransient
- private String dn; // this attribute is automatically saved to each ldap record.
- @XmlTransient
- private List<String> occupants;
- private Set<String> parents;
- private Set<String> children;
- private String beginTime; // this attribute is ftCstr
- private String endTime; // this attribute is ftCstr
- private String beginDate; // this attribute is ftCstr
- private String endDate; // this attribute is ftCstr
- private String beginLockDate;// this attribute is ftCstr
- private String endLockDate; // this attribute is ftCstr
- private String dayMask; // this attribute is ftCstr
- private int timeout; // this attribute is ftCstr
-
-
- /**
- * Default constructor is used by internal Fortress classes.
- */
- public Role()
- {
- }
-
-
- /**
- * Construct a Role entity with a given name.
- *
- * @param name maps to 'cn' attribute on 'organizationalrole' object class.
- */
- public Role( String name )
- {
- this.name = name;
- }
-
-
- /**
- * Construct an RBAC Role with a given temporal constraint.
- *
- * @param con maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- public Role( Constraint con )
- {
- CUtil.copy( con, this );
- }
-
-
- /**
- * Required on DAO classes convert Temporal attributes stored on entity to raw data object format needed for ldap. For internal use only.
- *
- * @return String that maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- public String getRawData()
- {
- return rawData;
- }
-
-
- /**
- * Required on DAO classes convert Temporal from raw ldap data to entity attributes. For internal use only.
- *
- * @param rawData maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- public void setRawData( String rawData )
- {
- this.rawData = rawData;
- }
-
- private String rawData;
-
-
- /**
- * Gets the name required attribute of the Role object
- *
- * @return attribute maps to 'cn' attribute on 'organizationalrole' object class.
- */
- public String getName()
- {
- return name;
- }
-
-
- /**
- * Sets the required name attribute on the Role object
- *
- */
- public void setName( String name )
- {
- this.name = name;
- }
-
-
- /**
- * Set the occupant attribute with the contents of the User dn.
- * @param occupant maps to 'roleOccupant' attribute on 'organizationalrole' object class.
- */
- public void setOccupant( String occupant )
- {
- if ( this.occupants == null )
- {
- this.occupants = new ArrayList<>();
- }
- this.occupants.add( occupant );
- }
-
-
- /**
- * Return list of occupants for a particular Role entity.
- * @return List of type String containing User dn that maps to 'roleOccupant' attribute on 'organizationalrole' object class.
- */
- public List<String> getOccupants()
- {
- return occupants;
- }
-
-
- /**
- * Set a list of occupants for a particular Role entity.
- * @param occupants contains a List of type String which maps to 'roleOccupant' attribute on 'organizationalrole' object class.
- */
- public void setOccupants( List<String> occupants )
- {
- this.occupants = occupants;
- }
-
-
- /**
- * Returns optional description that is associated with Role. This attribute is validated but not constrained by Fortress.
- *
- * @return value that is mapped to 'description' in 'organizationalrole' object class.
- */
- public String getDescription()
- {
- return this.description;
- }
-
-
- /**
- * Sets the optional description that is associated with Role. This attribute is validated but not constrained by Fortress.
- *
- * @param description that is mapped to same name in 'organizationalrole' object class.
- */
- public void setDescription( String description )
- {
- this.description = description;
- }
-
-
- /**
- * Return the internal id that is associated with Role. This attribute is generated automatically
- * by Fortress when new Role is added to directory and is not known or changeable by external client.
- *
- * @return attribute maps to 'ftId' in 'ftRls' object class.
- */
- public String getId()
- {
- return id;
- }
-
-
- /**
- * Generate an internal Id that is associated with Role. This method is used by DAO class and
- * is not available to outside classes. The generated attribute maps to 'ftId' in 'ftRls' object class.
- */
- public void setId()
- {
- // generate a unique id that will be used as the rDn for this entry:
- UUID uuid = UUID.randomUUID();
- this.id = uuid.toString();
- }
-
-
- /**
- * Set the internal Id that is associated with Role. This method is used by DAO class and
- * is generated automatically by Fortress. Attribute stored in LDAP cannot be changed by external caller.
- * This method can be used by client for search purposes only.
- *
- * @param id maps to 'ftId' in 'ftRls' object class.
- */
- public void setId( String id )
- {
- this.id = id;
- }
+private static final long serialVersionUID = 1L;
+private String id; // this maps to ftId
+private String name; // this is ftRoleName
+private String description; // this is description
+@XmlTransient
+private String dn; // this attribute is automatically saved to each ldap record.
+@XmlTransient
+private List<String> occupants;
+private Set<String> parents;
+private Set<String> children;
+private String beginTime; // this attribute is ftCstr
+private String endTime; // this attribute is ftCstr
+private String beginDate; // this attribute is ftCstr
+private String endDate; // this attribute is ftCstr
+private String beginLockDate;// this attribute is ftCstr
+private String endLockDate; // this attribute is ftCstr
+private String dayMask; // this attribute is ftCstr
+private int timeout; // this attribute is ftCstr
- /**
- * temporal boolean flag is used by internal Fortress components.
- *
- * @return boolean indicating if temporal constraints are placed on Role.
- */
- @Override
- public boolean isTemporalSet()
- {
- return ( beginTime != null || endTime != null || beginDate != null || endDate != null || beginLockDate != null
- || endLockDate != null || dayMask != null );
- }
-
-
- /**
- * Contains the begin time of day Role is allowed to be activated in session. The format is military time - HHMM, i.e. 0800 (8:00 am) or 1700 (5:00 p.m.).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public String getBeginTime()
- {
- return this.beginTime;
- }
-
-
- /**
- * Set the begin time of day Role is allowed to be activated in session. The format is military time - HHMM, i.e. 0800 (8:00 am) or 1700 (5:00 p.m.).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @param beginTime maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public void setBeginTime( String beginTime )
- {
- this.beginTime = beginTime;
- }
-
-
- /**
- * Contains the end time of day Role is allowed to be activated in session. The format is military time - HHMM, i.e. 0000 (12:00 am) or 2359 (11:59 p.m.).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public String getEndTime()
- {
- return this.endTime;
- }
-
-
- /**
- * Set the end time of day Role is allowed to be activated in session. The format is military time - HHMM, i.e. 0000 (12:00 am) or 2359 (11:59 p.m.).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @param endTime maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public void setEndTime( String endTime )
- {
- this.endTime = endTime;
- }
-
-
- /**
- * Contains the begin date when Role is allowed to be activated in session. The format is - YYYYMMDD, i.e. 20100101 (January 1. 2010).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public String getBeginDate()
- {
- return this.beginDate;
- }
-
-
- /**
- * Set the beginDate when Role is allowed to be activated in session. The format is - YYYYMMDD, i.e. 20100101 (January 1. 2010).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @param beginDate maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public void setBeginDate( String beginDate )
- {
- this.beginDate = beginDate;
- }
-
-
- /**
- * Contains the end date when Role is allowed to be activated in session. The format is - YYYYMMDD, i.e. 20101231 (December 31, 2010).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public String getEndDate()
- {
- return this.endDate;
- }
-
-
- /**
- * Set the end date when Role is not allowed to be activated in session. The format is - YYYYMMDD, i.e. 20100101 (January 1. 2010).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @param endDate maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public void setEndDate( String endDate )
- {
- this.endDate = endDate;
- }
-
-
- /**
- * Contains the begin lock date when Role is temporarily not allowed to be activated in session. The format is - YYMMDD, i.e. 20100101 (January 1. 2010).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public String getBeginLockDate()
- {
- return this.beginLockDate;
- }
-
-
- /**
- * Set the begin lock date when Role is temporarily not allowed to be activated in session. The format is - YYYYMMDD, i.e. 20100101 (January 1. 2010).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @param beginLockDate maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public void setBeginLockDate( String beginLockDate )
- {
- this.beginLockDate = beginLockDate;
- }
-
-
- /**
- * Contains the end lock date when Role is allowed to be activated in session once again. The format is - YYYYMMDD, i.e. 20100101 (January 1. 2010).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public String getEndLockDate()
- {
- return this.endLockDate;
- }
-
-
- /**
- * Set the end lock date when Role is allowed to be activated in session once again. The format is - YYYYMMDD, i.e. 20100101 (January 1. 2010).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @param endLockDate maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public void setEndLockDate( String endLockDate )
- {
- this.endLockDate = endLockDate;
- }
-
-
- /**
- * Get the daymask that indicates what days of week Role is allowed to be activated in session. The format is 1234567, i.e. 23456 (Monday, Tuesday, Wednesday, Thursday, Friday).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public String getDayMask()
- {
- return this.dayMask;
- }
-
-
- /**
- * Set the daymask that specifies what days of week Role is allowed to be activated in session. The format is 1234567, i.e. 23456 (Monday, Tuesday, Wednesday, Thursday, Friday).
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @param dayMask maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public void setDayMask( String dayMask )
+/**
+ * Default constructor is used by internal Fortress classes.
+ */
+public Role()
+{
+}
+
+
+/**
+ * Construct a Role entity with a given name.
+ *
+ * @param name maps to 'cn' attribute on 'organizationalrole' object class.
+ */
+public Role( String name )
+{
+ this.name = name;
+}
+
+
+/**
+ * Construct an RBAC Role with a given temporal constraint.
+ *
+ * @param con maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+public Role( Constraint con )
+{
+ CUtil.copy( con, this );
+}
+
+
+/**
+ * Required on DAO classes convert Temporal attributes stored on entity to raw data object format needed for ldap. For internal use only.
+ *
+ * @return String that maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+public String getRawData()
+{
+ return rawData;
+}
+
+
+/**
+ * Required on DAO classes convert Temporal from raw ldap data to entity attributes. For internal use only.
+ *
+ * @param rawData maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+public void setRawData( String rawData )
+{
+ this.rawData = rawData;
+}
+
+private String rawData;
+
+
+/**
+ * Gets the name required attribute of the Role object
+ *
+ * @return attribute maps to 'cn' attribute on 'organizationalrole' object class.
+ */
+public String getName()
+{
+ return name;
+}
+
+
+/**
+ * Sets the required name attribute on the Role object
+ *
+ */
+public void setName( String name )
+{
+ this.name = name;
+}
+
+
+/**
+ * Set the occupant attribute with the contents of the User dn.
+ * @param occupant maps to 'roleOccupant' attribute on 'organizationalrole' object class.
+ */
+public void setOccupant( String occupant )
+{
+ if ( this.occupants == null )
{
- this.dayMask = dayMask;
+ this.occupants = new ArrayList<>();
}
-
-
- /**
- * Return the integer timeout that contains total time (in seconds) that Role may remain inactive in User's session before it is deactivated.
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @return int maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public Integer getTimeout()
+ this.occupants.add( occupant );
+}
+
+
+/**
+ * Return list of occupants for a particular Role entity.
+ * @return List of type String containing User dn that maps to 'roleOccupant' attribute on 'organizationalrole' object class.
+ */
+public List<String> getOccupants()
+{
+ return occupants;
+}
+
+
+/**
+ * Set a list of occupants for a particular Role entity.
+ * @param occupants contains a List of type String which maps to 'roleOccupant' attribute on 'organizationalrole' object class.
+ */
+public void setOccupants( List<String> occupants )
+{
+ this.occupants = occupants;
+}
+
+
+/**
+ * Returns optional description that is associated with Role. This attribute is validated but not constrained by Fortress.
+ *
+ * @return value that is mapped to 'description' in 'organizationalrole' object class.
+ */
+public String getDescription()
+{
+ return this.description;
+}
+
+
+/**
+ * Sets the optional description that is associated with Role. This attribute is validated but not constrained by Fortress.
+ *
+ * @param description that is mapped to same name in 'organizationalrole' object class.
+ */
+public void setDescription( String description )
+{
+ this.description = description;
+}
+
+
+/**
+ * Return the internal id that is associated with Role. This attribute is generated automatically
+ * by Fortress when new Role is added to directory and is not known or changeable by external client.
+ *
+ * @return attribute maps to 'ftId' in 'ftRls' object class.
+ */
+public String getId()
+{
+ return id;
+}
+
+
+/**
+ * Generate an internal Id that is associated with Role. This method is used by DAO class and
+ * is not available to outside classes. The generated attribute maps to 'ftId' in 'ftRls' object class.
+ */
+public void setId()
+{
+ // generate a unique id that will be used as the rDn for this entry:
+ UUID uuid = UUID.randomUUID();
+ this.id = uuid.toString();
+}
+
+
+/**
+ * Set the internal Id that is associated with Role. This method is used by DAO class and
+ * is generated automatically by Fortress. Attribute stored in LDAP cannot be changed by external caller.
+ * This method can be used by client for search purposes only.
+ *
+ * @param id maps to 'ftId' in 'ftRls' object class.
+ */
+public void setId( String id )
+{
+ this.id = id;
+}
+
+
+/**
+ * temporal boolean flag is used by internal Fortress components.
+ *
+ * @return boolean indicating if temporal constraints are placed on Role.
+ */
+@Override
+public boolean isTemporalSet()
+{
+ return ( beginTime != null || endTime != null || beginDate != null || endDate != null || beginLockDate != null
+ || endLockDate != null || dayMask != null );
+}
+
+
+/**
+ * Contains the begin time of day Role is allowed to be activated in session. The format is military time - HHMM, i.e. 0800 (8:00 am) or 1700 (5:00 p.m.).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public String getBeginTime()
+{
+ return this.beginTime;
+}
+
+
+/**
+ * Set the begin time of day Role is allowed to be activated in session. The format is military time - HHMM, i.e. 0800 (8:00 am) or 1700 (5:00 p.m.).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @param beginTime maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public void setBeginTime( String beginTime )
+{
+ this.beginTime = beginTime;
+}
+
+
+/**
+ * Contains the end time of day Role is allowed to be activated in session. The format is military time - HHMM, i.e. 0000 (12:00 am) or 2359 (11:59 p.m.).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public String getEndTime()
+{
+ return this.endTime;
+}
+
+
+/**
+ * Set the end time of day Role is allowed to be activated in session. The format is military time - HHMM, i.e. 0000 (12:00 am) or 2359 (11:59 p.m.).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @param endTime maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public void setEndTime( String endTime )
+{
+ this.endTime = endTime;
+}
+
+
+/**
+ * Contains the begin date when Role is allowed to be activated in session. The format is - YYYYMMDD, i.e. 20100101 (January 1. 2010).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public String getBeginDate()
+{
+ return this.beginDate;
+}
+
+
+/**
+ * Set the beginDate when Role is allowed to be activated in session. The format is - YYYYMMDD, i.e. 20100101 (January 1. 2010).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @param beginDate maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public void setBeginDate( String beginDate )
+{
+ this.beginDate = beginDate;
+}
+
+
+/**
+ * Contains the end date when Role is allowed to be activated in session. The format is - YYYYMMDD, i.e. 20101231 (December 31, 2010).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public String getEndDate()
+{
+ return this.endDate;
+}
+
+
+/**
+ * Set the end date when Role is not allowed to be activated in session. The format is - YYYYMMDD, i.e. 20100101 (January 1. 2010).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @param endDate maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public void setEndDate( String endDate )
+{
+ this.endDate = endDate;
+}
+
+
+/**
+ * Contains the begin lock date when Role is temporarily not allowed to be activated in session. The format is - YYMMDD, i.e. 20100101 (January 1. 2010).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public String getBeginLockDate()
+{
+ return this.beginLockDate;
+}
+
+
+/**
+ * Set the begin lock date when Role is temporarily not allowed to be activated in session. The format is - YYYYMMDD, i.e. 20100101 (January 1. 2010).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @param beginLockDate maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public void setBeginLockDate( String beginLockDate )
+{
+ this.beginLockDate = beginLockDate;
+}
+
+
+/**
+ * Contains the end lock date when Role is allowed to be activated in session once again. The format is - YYYYMMDD, i.e. 20100101 (January 1. 2010).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public String getEndLockDate()
+{
+ return this.endLockDate;
+}
+
+
+/**
+ * Set the end lock date when Role is allowed to be activated in session once again. The format is - YYYYMMDD, i.e. 20100101 (January 1. 2010).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @param endLockDate maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public void setEndLockDate( String endLockDate )
+{
+ this.endLockDate = endLockDate;
+}
+
+
+/**
+ * Get the daymask that indicates what days of week Role is allowed to be activated in session. The format is 1234567, i.e. 23456 (Monday, Tuesday, Wednesday, Thursday, Friday).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @return attribute maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public String getDayMask()
+{
+ return this.dayMask;
+}
+
+
+/**
+ * Set the daymask that specifies what days of week Role is allowed to be activated in session. The format is 1234567, i.e. 23456 (Monday, Tuesday, Wednesday, Thursday, Friday).
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @param dayMask maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public void setDayMask( String dayMask )
+{
+ this.dayMask = dayMask;
+}
+
+
+/**
+ * Return the integer timeout that contains total time (in seconds) that Role may remain inactive in User's session before it is deactivated.
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @return int maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public Integer getTimeout()
+{
+ return this.timeout;
+}
+
+
+/**
+ * Set the integer timeout that contains max time (in seconds) that Role may remain inactive in User's session before it is deactivated.
+ * This attribute is optional but if set will be validated for reasonableness.
+ *
+ * @param timeout maps to 'ftCstr' attribute in 'ftRls' object class.
+ */
+@Override
+public void setTimeout( Integer timeout )
+{
+ this.timeout = timeout;
+}
+
+
+/**
+ * Get the names of roles that are parents (direct ascendants) of this role.
+ * @return Set of parent role names assigned to this role.
+ */
+@Override
+public Set<String> getParents()
+{
+ if ( this.parents == null )
{
- return this.timeout;
+ this.parents = new HashSet<>();
}
-
-
- /**
- * Set the integer timeout that contains max time (in seconds) that Role may remain inactive in User's session before it is deactivated.
- * This attribute is optional but if set will be validated for reasonableness.
- *
- * @param timeout maps to 'ftCstr' attribute in 'ftRls' object class.
- */
- @Override
- public void setTimeout( Integer timeout )
+ return parents;
+}
+
+
+/**
+ * Set the names of roles names that are parents (direct ascendants) of this role.
+ * @param parents contains the Set of parent role names assigned to this role.
+ */
+@Override
+public void setParents( Set<String> parents )
+{
+ this.parents = parents;
+}
+
+
+/**
+ * Set the occupant attribute with the contents of the User dn.
+ * @param parent maps to 'ftParents' attribute on 'ftRls' object class.
+ */
+@Override
+public void setParent( String parent )
+{
+ if ( this.parents == null )
{
- this.timeout = timeout;
+ this.parents = new HashSet<>();
}
-
-
- /**
- * Get the names of roles that are parents (direct ascendants) of this role.
- * @return Set of parent role names assigned to this role.
- */
- @Override
- public Set<String> getParents()
+ this.parents.add( parent );
+}
+
+
+/**
+ * Set the occupant attribute with the contents of the User dn.
+ * @param parent maps to 'ftParents' attribute on 'ftRls' object class.
+ */
+@Override
+public void delParent( String parent )
+{
+ if ( this.parents != null )
{
- if ( this.parents == null )
- {
- this.parents = new HashSet<>();
- }
- return parents;
+ this.parents.remove( parent );
}
-
-
- /**
- * Set the names of roles names that are parents (direct ascendants) of this role.
- * @param parents contains the Set of parent role names assigned to this role.
- */
- @Override
- public void setParents( Set<String> parents )
+}
+
+
+/**
+ * Return the Set of child role names (direct descendants) of this role.
+ * @return Set of child role names assigned to this role.
+ */
+public Set<String> getChildren()
+{
+ return children;
+}
+
+
+/**
+ * Set the Set of child role names (direct descendants) of this role
+ * @param children contains the Set of child role names assigned to this role.
+ */
+public void setChildren( Set<String> children )
+{
+ this.children = children;
+}
+
+
+/**
+ * Matches the name from two Role entities.
+ *
+ * @param thatObj contains a Role entity.
+ * @return boolean indicating both objects contain matching Role names.
+ */
+public boolean equals( Object thatObj )
+{
+ if ( this == thatObj )
{
- this.parents = parents;
+ return true;
}
-
-
- /**
- * Set the occupant attribute with the contents of the User dn.
- * @param parent maps to 'ftParents' attribute on 'ftRls' object class.
- */
- @Override
- public void setParent( String parent )
+
+ if ( name == null )
{
- if ( this.parents == null )
- {
- this.parents = new HashSet<>();
- }
- this.parents.add( parent );
+ return false;
}
-
-
- /**
- * Set the occupant attribute with the contents of the User dn.
- * @param parent maps to 'ftParents' attribute on 'ftRls' object class.
- */
- @Override
- public void delParent( String parent )
+
+ if ( !( thatObj instanceof Role ) )
{
- if ( this.parents != null )
- {
- this.parents.remove( parent );
- }
+ return false;
}
-
-
- /**
- * Return the Set of child role names (direct descendants) of this role.
- * @return Set of child role names assigned to this role.
- */
- public Set<String> getChildren()
+
+ Role thatRole = ( Role ) thatObj;
+
+ if ( thatRole.getName() == null )
{
- return children;
+ return false;
}
-
-
- /**
- * Set the Set of child role names (direct descendants) of this role
- * @param children contains the Set of child role names assigned to this role.
- */
- public void setChildren( Set<String> children )
+
+ return thatRole.getName().equalsIgnoreCase( name );
+}
+
+
+@Override
+public int hashCode()
+{
+ int result = id != null ? id.hashCode() : 0;
+ result = 31 * result + ( name != null ? name.hashCode() : 0 );
+ result = 31 * result + ( description != null ? description.hashCode() : 0 );
+ result = 31 * result + ( dn != null ? dn.hashCode() : 0 );
+ result = 31 * result + ( occupants != null ? occupants.hashCode() : 0 );
+ result = 31 * result + ( parents != null ? parents.hashCode() : 0 );
+ result = 31 * result + ( children != null ? children.hashCode() : 0 );
+ result = 31 * result + ( beginTime != null ? beginTime.hashCode() : 0 );
+ result = 31 * result + ( endTime != null ? endTime.hashCode() : 0 );
+ result = 31 * result + ( beginDate != null ? beginDate.hashCode() : 0 );
+ result = 31 * result + ( endDate != null ? endDate.hashCode() : 0 );
+ result = 31 * result + ( beginLockDate != null ? beginLockDate.hashCode() : 0 );
+ result = 31 * result + ( endLockDate != null ? endLockDate.hashCode() : 0 );
+ result = 31 * result + ( dayMask != null ? dayMask.hashCode() : 0 );
+ result = 31 * result + timeout;
+ result = 31 * result + ( rawData != null ? rawData.hashCode() : 0 );
+ return result;
+}
+
+
+/**
+ * @see Object#toString()
+ */
+protected String toString( String tabs )
+{
+ StringBuilder sb = new StringBuilder();
+
+ sb.append( tabs ).append( "Role[" );
+
+ // The name
+ sb.append( name ).append( ", " );
+
+ if ( ( description != null ) && ( description.length() > 0 ) )
{
- this.children = children;
+ sb.append( description ).append( ", " );
}
-
-
- /**
- * Matches the name from two Role entities.
- *
- * @param thatObj contains a Role entity.
- * @return boolean indicating both objects contain matching Role names.
- */
- public boolean equals( Object thatObj )
+
+ // the date
+ sb.append( "date : <" ).append( beginDate ).append( ", " ).append( endDate ).append( ">, " );
+
+ // The time
+ sb.append( "time : <" ).append( beginTime ).append( ", " ).append( endTime ).append( ">, " );
+
+ // The lock date
+ sb.append( "lock date : <" ).append( beginLockDate ).append( ", " ).append( endLockDate ).append( ">, " );
+
+ // The timeout
+ sb.append( "timeout : " ).append( timeout ).append( ", " );
+
+ // The day mask
+ sb.append( "daymask : " ).append( dayMask );
+
+ // The parents if any
+ if ( ( parents != null ) && ( parents.size() > 0 ) )
{
- if ( this == thatObj )
- {
- return true;
- }
-
- if ( name == null )
- {
- return false;
- }
-
- if ( !( thatObj instanceof Role ) )
- {
- return false;
- }
-
- Role thatRole = ( Role ) thatObj;
-
- if ( thatRole.getName() == null )
+ sb.append( ", parents : {" );
+
+ boolean isFirst = true;
+
+ for ( String parent : parents )
{
- return false;
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
+ {
+ sb.append( '|' );
+ }
+
+ sb.append( parent );
}
-
- return thatRole.getName().equalsIgnoreCase( name );
- }
- @Override
- public int hashCode()
- {
- int result = id != null ? id.hashCode() : 0;
- result = 31 * result + ( name != null ? name.hashCode() : 0 );
- result = 31 * result + ( description != null ? description.hashCode() : 0 );
- result = 31 * result + ( dn != null ? dn.hashCode() : 0 );
- result = 31 * result + ( occupants != null ? occupants.hashCode() : 0 );
- result = 31 * result + ( parents != null ? parents.hashCode() : 0 );
- result = 31 * result + ( children != null ? children.hashCode() : 0 );
- result = 31 * result + ( beginTime != null ? beginTime.hashCode() : 0 );
- result = 31 * result + ( endTime != null ? endTime.hashCode() : 0 );
- result = 31 * result + ( beginDate != null ? beginDate.hashCode() : 0 );
- result = 31 * result + ( endDate != null ? endDate.hashCode() : 0 );
- result = 31 * result + ( beginLockDate != null ? beginLockDate.hashCode() : 0 );
- result = 31 * result + ( endLockDate != null ? endLockDate.hashCode() : 0 );
- result = 31 * result + ( dayMask != null ? dayMask.hashCode() : 0 );
- result = 31 * result + timeout;
- result = 31 * result + ( rawData != null ? rawData.hashCode() : 0 );
- return result;
+ sb.append( '}' );
}
- /**
- * @see Object#toString()
- */
- protected String toString( String tabs )
+ // The children if any
+ if ( ( children != null ) && ( children.size() > 0 ) )
{
- StringBuilder sb = new StringBuilder();
-
- sb.append( tabs ).append( "Role[" );
-
- // The name
- sb.append( name ).append( ", " );
-
- if ( ( description != null ) && ( description.length() > 0 ) )
- {
- sb.append( description ).append( ", " );
- }
-
- // the date
- sb.append( "date : <" ).append( beginDate ).append( ", " ).append( endDate ).append( ">, " );
-
- // The time
- sb.append( "time : <" ).append( beginTime ).append( ", " ).append( endTime ).append( ">, " );
-
- // The lock date
- sb.append( "lock date : <" ).append( beginLockDate ).append( ", " ).append( endLockDate ).append( ">, " );
-
- // The timeout
- sb.append( "timeout : " ).append( timeout ).append( ", " );
-
- // The day mask
- sb.append( "daymask : " ).append( dayMask );
-
- // The parents if any
- if ( ( parents != null ) && ( parents.size() > 0 ) )
+ sb.append( ", children : {" );
+
+ boolean isFirst = true;
+
+ for ( String child : children )
{
- sb.append( ", parents : {" );
-
- boolean isFirst = true;
-
- for ( String parent : parents )
+ if ( isFirst )
{
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- sb.append( '|' );
- }
-
- sb.append( parent );
+ isFirst = false;
}
-
- sb.append( '}' );
- }
-
- // The children if any
- if ( ( children != null ) && ( children.size() > 0 ) )
- {
- sb.append( ", children : {" );
-
- boolean isFirst = true;
-
- for ( String child : children )
+ else
{
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- sb.append( '|' );
- }
-
- sb.append( child );
+ sb.append( '|' );
}
-
- sb.append( '}' );
+
+ sb.append( child );
}
-
- sb.append( ']' );
-
- return sb.toString();
- }
-
-
- /**
- * @see Object#toString()
- */
- public String toString()
- {
- return toString( "" );
+
+ sb.append( '}' );
}
+
+ sb.append( ']' );
+
+ return sb.toString();
+}
+
+
+/**
+ * @see Object#toString()
+ */
+public String toString()
+{
+ return toString( "" );
+}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/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 31a8e81..537cfc9 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
@@ -58,7 +58,7 @@ import org.apache.directory.fortress.core.util.time.CUtil;
* <h4>1. ftRls Structural objectclass is used to store the Role information like name and temporal constraint attributes</h4>
* <ul>
* <li> ------------------------------------------
- * <li> <code>objectclass ( 1.3.6.1.4.1.38088.2.1</code>
+ * <li> <code>objectclass ( 1.3.6.1.4.1.38088.2.1</code>
* <li> <code>NAME 'ftRls'</code>
* <li> <code>DESC 'Fortress Role Object Class'</code>
* <li> <code>SUP organizationalrole</code>
@@ -112,7 +112,12 @@ final class RoleDAO extends ApacheDsDataProvider
private static final String[] ROLE_ATRS =
{
- GlobalIds.FT_IID, ROLE_NM, SchemaConstants.DESCRIPTION_AT, GlobalIds.CONSTRAINT, SchemaConstants.ROLE_OCCUPANT_AT, GlobalIds.PARENT_NODES
+ GlobalIds.FT_IID,
+ ROLE_NM,
+ SchemaConstants.DESCRIPTION_AT,
+ GlobalIds.CONSTRAINT,
+ SchemaConstants.ROLE_OCCUPANT_AT,
+ GlobalIds.PARENT_NODES
};
/**
@@ -124,7 +129,8 @@ final class RoleDAO extends ApacheDsDataProvider
GlobalIds.ROLE_OBJECT_CLASS_NM,
GlobalIds.PROPS_AUX_OBJECT_CLASS_NAME,
GlobalIds.FT_MODIFIER_AUX_OBJECT_CLASS_NAME
- };
+ };
+
/**
* @param entity
@@ -296,7 +302,8 @@ final class RoleDAO extends ApacheDsDataProvider
{
//ld = getAdminConnection();
List<Modification> mods = new ArrayList<Modification>();
- mods.add( new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, SchemaConstants.ROLE_OCCUPANT_AT, userDn ) );
+ mods.add( new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, SchemaConstants.ROLE_OCCUPANT_AT,
+ userDn ) );
ld = getAdminConnection();
modify( ld, dn, mods, entity );
}
@@ -329,7 +336,8 @@ final class RoleDAO extends ApacheDsDataProvider
try
{
List<Modification> mods = new ArrayList<Modification>();
- mods.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE, SchemaConstants.ROLE_OCCUPANT_AT, userDn ) );
+ mods.add( new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
+ SchemaConstants.ROLE_OCCUPANT_AT, userDn ) );
ld = getAdminConnection();
modify( ld, dn, mods, entity );
}
@@ -392,7 +400,7 @@ final class RoleDAO extends ApacheDsDataProvider
{
ld = getAdminConnection();
Entry findEntry = read( ld, dn, ROLE_ATRS );
- if(findEntry != null)
+ if ( findEntry != null )
{
entity = unloadLdapEntry( findEntry, 0, role.getContextId() );
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java b/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java
index 7b928b1..518f2fd 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/SDSet.java
@@ -63,7 +63,7 @@ import java.util.UUID;
* <pre>
* ------------------------------------------
* Fortress Dynamic Separation of Duties Structural Object Class
- * objectclass ( 1.3.6.1.4.1.38088.2.5
+ * objectclass ( 1.3.6.1.4.1.38088.2.5
* NAME 'ftDSDSet'
* DESC 'Fortress Role Dynamic Separation of Duty Set Structural Object Class'
* SUP organizationalrole
@@ -87,7 +87,7 @@ import java.util.UUID;
* <pre>
* ------------------------------------------
* Fortress Static Separation of Duties Structural Object Class
- * objectclass ( 1.3.6.1.4.1.38088.2.4
+ * objectclass ( 1.3.6.1.4.1.38088.2.4
* NAME 'ftSSDSet'
* DESC 'Fortress Role Static Separation of Duty Set Structural Object Class'
* SUP organizationalrole
@@ -413,6 +413,7 @@ public class SDSet extends FortEntity implements Serializable, Comparable<SDSet>
return thatSet.getName().equalsIgnoreCase( this.getName() );
}
+
@Override
public int hashCode()
{
@@ -425,6 +426,7 @@ public class SDSet extends FortEntity implements Serializable, Comparable<SDSet>
return result;
}
+
@Override
public String toString()
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/f02712d4/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java b/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java
index 21fe30d..3935ff6 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/SdDAO.java
@@ -74,7 +74,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <h4>2. The RBAC Separation of Duties</h4>
* <ul>
* <li> ---Static Separation of Duties Set-------
- * <li> <code>objectclass ( 1.3.6.1.4.1.38088.2.4</code>
+ * <li> <code>objectclass ( 1.3.6.1.4.1.38088.2.4</code>
* <li> <code>NAME 'ftSSDSet'</code>
* <li> <code>DESC 'Fortress Role Static Separation of Duty Set Object Class'</code>
* <li> <code>SUP organizationalrole</code>
@@ -88,7 +88,7 @@ import org.apache.directory.fortress.core.util.attr.VUtil;
* <h4>Dynamic Separation of Duties Set</h4>
* <ul>
* <li>
- * <li> <code>objectclass ( 1.3.6.1.4.1.38088.2.5</code>
+ * <li> <code>objectclass ( 1.3.6.1.4.1.38088.2.5</code>
* <li> <code>NAME 'ftDSDSet'</code>
* <li> <code>DESC 'Fortress Role Dynamic Separation of Duty Set Object Class'</code>
* <li> <code>SUP organizationalrole</code>