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 2019/11/13 01:42:48 UTC
[directory-fortress-core] branch master updated: comment
multivalued attribute (not multi-occurring)
This is an automated email from the ASF dual-hosted git repository.
smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git
The following commit(s) were added to refs/heads/master by this push:
new 592a20d comment multivalued attribute (not multi-occurring)
592a20d is described below
commit 592a20d33f851acb8e5af758e064a56522a62d22
Author: smckinney <sm...@apache.org>
AuthorDate: Tue Nov 12 19:42:05 2019 -0600
comment multivalued attribute (not multi-occurring)
---
.../apache/directory/fortress/core/AdminMgr.java | 36 +++++++--------
.../directory/fortress/core/DelAdminMgr.java | 8 ++--
.../apache/directory/fortress/core/GlobalIds.java | 10 ++--
.../apache/directory/fortress/core/GroupMgr.java | 2 +-
.../directory/fortress/core/cli/package.html | 54 +++++++++++-----------
.../directory/fortress/core/impl/AdminMgrImpl.java | 2 +-
.../fortress/core/impl/DelAdminMgrImpl.java | 4 +-
.../fortress/core/ldap/LdapDataProvider.java | 6 +--
8 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/src/main/java/org/apache/directory/fortress/core/AdminMgr.java b/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
index 210fdbc..ef0eaab 100755
--- a/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
@@ -93,11 +93,11 @@ public interface AdminMgr extends Manageable
* <li>{@link User#description} - maps to INetOrgPerson description attribute</li>
* <li>{@link User#title} - maps to INetOrgPerson title attribute</li>
* <li>{@link User#employeeType} - maps to INetOrgPerson employeeType attribute</li>
- * <li>{@link User#phones} * - multi-occurring attribute maps to organizationalPerson telephoneNumber attribute</li>
- * <li>{@link User#mobiles} * - multi-occurring attribute maps to INetOrgPerson mobile attribute</li>
- * <li>{@link User#emails} * - multi-occurring attribute maps to INetOrgPerson mail attribute</li>
+ * <li>{@link User#phones} * - multivalued attribute maps to organizationalPerson telephoneNumber attribute</li>
+ * <li>{@link User#mobiles} * - multivalued attribute maps to INetOrgPerson mobile attribute</li>
+ * <li>{@link User#emails} * - multivalued attribute maps to INetOrgPerson mail attribute</li>
* <li>
- * {@link User#address} * - multi-occurring attribute maps to organizationalPerson postalAddress, st,
+ * {@link User#address} * - multivalued attribute maps to organizationalPerson postalAddress, st,
* l, postalCode, postOfficeBox attributes
* </li>
* <li>{@link User#beginTime} - HHMM - determines begin hour user may activate session</li>
@@ -109,14 +109,14 @@ public interface AdminMgr extends Manageable
* <li>{@link User#dayMask} - 1234567, 1 = Sunday, 2 = Monday, etc - specifies which day of user may sign on</li>
* <li>{@link User#timeout} - number (in minutes) of session inactivity time allowed</li>
* <li>
- * {@link User#props} * - multi-occurring attribute contains property key and values are separated with a ':'.
+ * {@link User#props} * - multivalued attribute contains property key and values are separated with a ':'.
* e.g. mykey1:myvalue1
* </li>
* <li>
- * {@link User#roles} * - multi-occurring attribute contains the name of already existing role to assign to user
+ * {@link User#roles} * - multivalued attribute contains the name of already existing role to assign to user
* </li>
* <li>
- * {@link User#adminRoles} * - multi-occurring attribute contains the name of already existing adminRole to assign
+ * {@link User#adminRoles} * - multivalued attribute contains the name of already existing adminRole to assign
* to user
* </li>
* </ul>
@@ -191,11 +191,11 @@ public interface AdminMgr extends Manageable
* <li>{@link User#description} - maps to INetOrgPerson description attribute</li>
* <li>{@link User#title} - maps to INetOrgPerson title attribute</li>
* <li>{@link User#employeeType} - maps to INetOrgPerson employeeType attribute</li>
- * <li>{@link User#phones} * - multi-occurring attribute maps to organizationalPerson telephoneNumber attribute</li>
- * <li>{@link User#mobiles} * - multi-occurring attribute maps to INetOrgPerson mobile attribute</li>
- * <li>{@link User#emails} * - multi-occurring attribute maps to INetOrgPerson mail attribute</li>
+ * <li>{@link User#phones} * - multivalued attribute maps to organizationalPerson telephoneNumber attribute</li>
+ * <li>{@link User#mobiles} * - multivalued attribute maps to INetOrgPerson mobile attribute</li>
+ * <li>{@link User#emails} * - multivalued attribute maps to INetOrgPerson mail attribute</li>
* <li>
- * {@link User#address} * - multi-occurring attribute maps to organizationalPerson postalAddress, st, l,
+ * {@link User#address} * - multivalued attribute maps to organizationalPerson postalAddress, st, l,
* postalCode, postOfficeBox attributes
* </li>
* <li>{@link User#beginTime} - HHMM - determines begin hour user may activate session</li>
@@ -207,14 +207,14 @@ public interface AdminMgr extends Manageable
* <li>{@link User#dayMask} - 1234567, 1 = Sunday, 2 = Monday, etc - specifies which day of user may sign on</li>
* <li>{@link User#timeout} - number (in minutes) of session inactivity time allowed</li>
* <li>
- * {@link User#props} * - multi-occurring attribute contains property key and values are separated with a ':'.
+ * {@link User#props} * - multivalued attribute contains property key and values are separated with a ':'.
* e.g. mykey1:myvalue1
* </li>
* <li>
- * {@link User#roles} * - multi-occurring attribute contains the name of already existing role to assign to user
+ * {@link User#roles} * - multivalued attribute contains the name of already existing role to assign to user
* </li>
* <li>
- * {@link User#adminRoles} * - multi-occurring attribute contains the name of already existing adminRole to assign
+ * {@link User#adminRoles} * - multivalued attribute contains the name of already existing adminRole to assign
* to user
* </li>
* </ul>
@@ -1118,7 +1118,7 @@ public interface AdminMgr extends Manageable
* </ul>
* <h4>optional parameters</h4>
* <ul>
- * <li>{@link SDSet#members} * - multi-occurring attribute contains the RBAC Role names to be added to this set</li>
+ * <li>{@link SDSet#members} * - multivalued attribute contains the RBAC Role names to be added to this set</li>
* <li>
* {@link SDSet#cardinality} - default is 2 which is one more than maximum number of Roles that may be assigned to
* User from a particular set
@@ -1154,7 +1154,7 @@ public interface AdminMgr extends Manageable
* </ul>
* <h4>optional parameters</h4>
* <ul>
- * <li>{@link SDSet#members} * - multi-occurring attribute contains the RBAC Role names to be added to this set</li>
+ * <li>{@link SDSet#members} * - multivalued attribute contains the RBAC Role names to be added to this set</li>
* <li>
* {@link SDSet#cardinality} - default is 2 which is one more than maximum number of Roles that may be assigned to
* User from a particular set
@@ -1290,7 +1290,7 @@ public interface AdminMgr extends Manageable
* </ul>
* <h4>optional parameters</h4>
* <ul>
- * <li>{@link SDSet#members} * - multi-occurring attribute contains the RBAC Role names to be added to this set</li>
+ * <li>{@link SDSet#members} * - multivalued attribute contains the RBAC Role names to be added to this set</li>
* <li>
* {@link SDSet#cardinality} - default is 2 which is one more than maximum number of Roles that may be assigned to
* User from a particular set
@@ -1327,7 +1327,7 @@ public interface AdminMgr extends Manageable
* </ul>
* <h4>optional parameters</h4>
* <ul>
- * <li>{@link SDSet#members} * - multi-occurring attribute contains the RBAC Role names to be added to this set</li>
+ * <li>{@link SDSet#members} * - multivalued attribute contains the RBAC Role names to be added to this set</li>
* <li>
* {@link SDSet#cardinality} - default is 2 which is one more than maximum number of Roles that may be assigned
* to User from a particular set
diff --git a/src/main/java/org/apache/directory/fortress/core/DelAdminMgr.java b/src/main/java/org/apache/directory/fortress/core/DelAdminMgr.java
index 0c946ca..7195faa 100755
--- a/src/main/java/org/apache/directory/fortress/core/DelAdminMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/DelAdminMgr.java
@@ -62,8 +62,8 @@ public interface DelAdminMgr extends Manageable
* <h4>optional parameters</h4>
* <ul>
* <li>{@link AdminRole#description} - contains any safe text</li>
- * <li>{@link AdminRole#osPs} * - multi-occurring attribute used to set associations to existing PERMS OrgUnits</li>
- * <li>{@link AdminRole#osUs} * - multi-occurring attribute used to set associations to existing USERS OrgUnits</li>
+ * <li>{@link AdminRole#osPs} * - multivalued attribute used to set associations to existing PERMS OrgUnits</li>
+ * <li>{@link AdminRole#osUs} * - multivalued attribute used to set associations to existing USERS OrgUnits</li>
* <li>
* {@link AdminRole#beginRange} - contains the name of an existing RBAC Role that represents the lowest role in
* hierarchy that administrator (whoever has this AdminRole activated) controls
@@ -135,8 +135,8 @@ public interface DelAdminMgr extends Manageable
* <h4>optional parameters</h4>
* <ul>
* <li>{@link AdminRole#description} - contains any safe text</li>
- * <li>{@link AdminRole#osPs} * - multi-occurring attribute used to set associations to existing PERMS OrgUnits</li>
- * <li>{@link AdminRole#osUs} * - multi-occurring attribute used to set associations to existing USERS OrgUnits</li>
+ * <li>{@link AdminRole#osPs} * - multivalued attribute used to set associations to existing PERMS OrgUnits</li>
+ * <li>{@link AdminRole#osUs} * - multivalued attribute used to set associations to existing USERS OrgUnits</li>
* <li>
* {@link AdminRole#beginRange} - contains the name of an existing RBAC Role that represents the lowest role in
* hierarchy that administrator (whoever has this AdminRole activated) controls
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 74e817d..352fc43 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
@@ -304,22 +304,22 @@ public final class GlobalIds
// USER Role Definitions:
/**
- * Multi-occurring attribute contains RBAC Role assignments for Users.
+ * multivalued attribute contains RBAC Role assignments for Users.
*/
//public static final String USER_ROLE_ASSIGN = "ftRA";
/**
- * Multi-occurring attribute contains constraint policies for RBAC Role assignments for Users.
+ * multivalued attribute contains constraint policies for RBAC Role assignments for Users.
*/
public static final String USER_ROLE_DATA = "ftRC";
/**
- * Multi-occurring attribute contains Administrative Role assignments for Users.
+ * multivalued attribute contains Administrative Role assignments for Users.
*/
public static final String USER_ADMINROLE_ASSIGN = "ftARA";
/**
- * Multi-occurring attribute contains constraint policies for Administrative Role assignments for Users.
+ * multivalued attribute contains constraint policies for Administrative Role assignments for Users.
*/
public static final String USER_ADMINROLE_DATA = "ftARC";
@@ -495,7 +495,7 @@ public final class GlobalIds
public static final String CONFIG_GID_NUMBER = "config.gid.number";
/**
- * Fortress stores name-value pairs within multi-occurring attributes in ldap. Usually a separator of ':' is used
+ * Fortress stores name-value pairs within multivalued attributes in ldap. Usually a separator of ':' is used
* format: {@code name:value},
*/
public static final char PROP_SEP = ':';
diff --git a/src/main/java/org/apache/directory/fortress/core/GroupMgr.java b/src/main/java/org/apache/directory/fortress/core/GroupMgr.java
index 2cbe83c..da72f16 100755
--- a/src/main/java/org/apache/directory/fortress/core/GroupMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/GroupMgr.java
@@ -51,7 +51,7 @@ public interface GroupMgr extends Manageable
* Modify existing group node. The name is required. Does not update members or properties.
* Use {@link GroupMgr#add( Group group, String key, String value )}, {@link GroupMgr#delete( Group group, String key,
* String value )}, {@link GroupMgr#assign( Group group, String member) }, or
- * {@link GroupMgr#deassign( Group group, String member) } for multi-occurring attributes.
+ * {@link GroupMgr#deassign( Group group, String member) } for multivalued attributes.
*
* @param group contains {@link Group}.
* @return {@link Group} containing entity just modified.
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/package.html b/src/main/java/org/apache/directory/fortress/core/cli/package.html
index 1ad6e2e..8577d0d 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/package.html
+++ b/src/main/java/org/apache/directory/fortress/core/cli/package.html
@@ -122,12 +122,12 @@ Currently the following groups of functions are supported:
<li>d : description - maps to INetOrgPerson description attribute</li>
<li>3 : title - maps to INetOrgPerson title attribute</li>
<li>4 : employeeType - maps to INetOrgPerson employeeType attribute</li>
- <li>y : phones * - multi-occurring attribute maps to organizationalPerson telephoneNumber
+ <li>y : phones * - multivalued attribute maps to organizationalPerson telephoneNumber
attribute
</li>
- <li>Y : mobiles * - multi-occurring attribute maps to INetOrgPerson mobile attribute</li>
- <li>@ : emails * - multi-occurring attribute maps to INetOrgPerson mail attribute</li>
- <li>> : address * - multi-occurring attribute maps to organizationalPerson postalAddress attribute
+ <li>Y : mobiles * - multivalued attribute maps to INetOrgPerson mobile attribute</li>
+ <li>@ : emails * - multivalued attribute maps to INetOrgPerson mail attribute</li>
+ <li>> : address * - multivalued attribute maps to organizationalPerson postalAddress attribute
</li>
<li>< : state - maps to organizationalPerson st attribute</li>
<li>3 : city - maps to organizationalPerson l attribute</li>
@@ -142,14 +142,14 @@ Currently the following groups of functions are supported:
<li>m : dayMask - 1234567, 1 = Sunday, 2 = Monday, etc - specifies which day of user may sign on
</li>
<li>t : timeout - number (in minutes) of session inactivity time allowed</li>
- <li>v : properties * - multi-occurring attribute contains property key and values are separated with
+ <li>v : properties * - multivalued attribute contains property key and values are separated with
a ':'. e.g.
mykey1:myvalue1
</li>
- <li>r : roles * - multi-occurring attribute contains the name of already existing role to assign to
+ <li>r : roles * - multivalued attribute contains the name of already existing role to assign to
user
</li>
- <li>a : adminRoles * - multi-occurring attribute contains the name of already existing adminRole to
+ <li>a : adminRoles * - multivalued attribute contains the name of already existing adminRole to
assign to
user
</li>
@@ -195,12 +195,12 @@ Currently the following groups of functions are supported:
<li>d : description - maps to INetOrgPerson description attribute</li>
<li>3 : title - maps to INetOrgPerson title attribute</li>
<li>4 : employeeType - maps to INetOrgPerson employeeType attribute</li>
- <li>y : phones * - multi-occurring attribute maps to organizationalPerson telephoneNumber
+ <li>y : phones * - multivalued attribute maps to organizationalPerson telephoneNumber
attribute
</li>
- <li>Y : mobiles * - multi-occurring attribute maps to INetOrgPerson mobile attribute</li>
- <li>@ : emails * - multi-occurring attribute maps to INetOrgPerson mail attribute</li>
- <li>> : address * - multi-occurring attribute maps to organizationalPerson postalAddress attribute
+ <li>Y : mobiles * - multivalued attribute maps to INetOrgPerson mobile attribute</li>
+ <li>@ : emails * - multivalued attribute maps to INetOrgPerson mail attribute</li>
+ <li>> : address * - multivalued attribute maps to organizationalPerson postalAddress attribute
</li>
<li>< : state - maps to organizationalPerson st attribute</li>
<li>3 : city - maps to organizationalPerson l attribute</li>
@@ -215,14 +215,14 @@ Currently the following groups of functions are supported:
<li>m : dayMask - 1234567, 1 = Sunday, 2 = Monday, etc - specifies which day of user may sign on
</li>
<li>t : timeout - number (in minutes) of session inactivity time allowed</li>
- <li>v : properties * - multi-occurring attribute contains property key and values are separated with
+ <li>v : properties * - multivalued attribute contains property key and values are separated with
a ':'. e.g.
mykey1:myvalue1
</li>
- <li>r : roles * - multi-occurring attribute contains the name of already existing role to assign to
+ <li>r : roles * - multivalued attribute contains the name of already existing role to assign to
user
</li>
- <li>a : adminRoles * - multi-occurring attribute contains the name of already existing adminRole to
+ <li>a : adminRoles * - multivalued attribute contains the name of already existing adminRole to
assign to
user
</li>
@@ -597,7 +597,7 @@ Currently the following groups of functions are supported:
</ul>
<h4>optional parameters</h4>
<ul>
- <li>r : roles * - multi-occurring attribute contains the RBAC Role names to be added to this set
+ <li>r : roles * - multivalued attribute contains the RBAC Role names to be added to this set
</li>
<li>C : cardinality - default is 2 which is one more than maximum number of Roles that may be
assigned to User
@@ -655,7 +655,7 @@ Currently the following groups of functions are supported:
</ul>
<h4>optional parameters</h4>
<ul>
- <li>r : roles * - multi-occurring attribute contains the RBAC Role names to be added to this set
+ <li>r : roles * - multivalued attribute contains the RBAC Role names to be added to this set
</li>
<li>C : cardinality - default is 2 which is one more than maximum number of Roles that may be
activated into RBAC
@@ -827,7 +827,7 @@ Currently the following groups of functions are supported:
</ul>
<h4>optional parameters</h4>
<ul>
- <li>r : roles * - multi-occurring attribute contains RBAC Roles that permission operation is being
+ <li>r : roles * - multivalued attribute contains RBAC Roles that permission operation is being
granted to
</li>
<li>v : properties * - multi-occurring property key and values are separated with a ':'. e.g.
@@ -932,8 +932,8 @@ Currently the following groups of functions are supported:
<h4>optional parameters</h4>
<ul>
<li>d : description - contains any safe text</li>
- <li>P : osPs * - multi-occurring attribute used to set associations to existing PERMS OrgUnits</li>
- <li>U : osUs * - multi-occurring attribute used to set associations to existing USERS OrgUnits</li>
+ <li>P : osPs * - multivalued attribute used to set associations to existing PERMS OrgUnits</li>
+ <li>U : osUs * - multivalued attribute used to set associations to existing USERS OrgUnits</li>
<li>x : beginRange - contains the name of an existing RBAC Role that represents the lowest role in
hierarchy
that administrator (whoever has this AdminRole activated) controls
@@ -992,8 +992,8 @@ Currently the following groups of functions are supported:
<h4>optional parameters</h4>
<ul>
<li>d : description - contains any safe text</li>
- <li>P : osPs * - multi-occurring attribute used to set associations to existing PERMS OrgUnits</li>
- <li>U : osUs * - multi-occurring attribute used to set associations to existing USERS OrgUnits</li>
+ <li>P : osPs * - multivalued attribute used to set associations to existing PERMS OrgUnits</li>
+ <li>U : osUs * - multivalued attribute used to set associations to existing USERS OrgUnits</li>
<li>x : beginRange - contains the name of an existing RBAC Role that represents the lowest role in
hierarchy
that administrator (whoever has this AdminRole activated) controls
@@ -1852,7 +1852,7 @@ Currently the following groups of functions are supported:
<h4>required parameters</h4>
<ul>
<li>n : name - contains the name to use for new LDAP group. It must be unique.</li>
- <li>M : members * - multi-occurring attribute (must include at least one) - maps to userId in LDAP
+ <li>M : members * - multivalued attribute (must include at least one) - maps to userId in LDAP
directory"
</li>
</ul>
@@ -1860,7 +1860,7 @@ Currently the following groups of functions are supported:
<ul>
<li>d : description - maps to description attribute on object class</li>
<li>X : protocol - used to specify protocol</li>
- <li>v : properties * - multi-occurring attribute contains property key and values are separated with
+ <li>v : properties * - multivalued attribute contains property key and values are separated with
a '='. e.g.: key1=val1
</li>
</ul>
@@ -1880,7 +1880,7 @@ Currently the following groups of functions are supported:
<p>
Modify existing group node. The name is required. Does not update members or properties.
- Use ASSIGN_GROUP, DEASSIGN_GROUP, ADD_GROUP_PROP or DEL_GROUP_PROP for multi-occurring attributes.
+ Use ASSIGN_GROUP, DEASSIGN_GROUP, ADD_GROUP_PROP or DEL_GROUP_PROP for multivalued attributes.
</p>
<h4>required parameters</h4>
@@ -1889,7 +1889,7 @@ Currently the following groups of functions are supported:
</ul>
<h4>optional parameters</h4>
<ul>
- <li>M : members * - multi-occurring attribute maps to a userId in the LDAP directory"</li>
+ <li>M : members * - multivalued attribute maps to a userId in the LDAP directory"</li>
<li>d : description - maps to description attribute on object class</li>
</ul>
<h4>example</h4>
@@ -1925,7 +1925,7 @@ Currently the following groups of functions are supported:
<h4>required parameters</h4>
<ul>
<li>n : name - contains the name of an existing LDAP group.</li>
- <li>M : members * - multi-occurring attribute (must include at least one) - maps to userId in LDAP
+ <li>M : members * - multivalued attribute (must include at least one) - maps to userId in LDAP
directory"
</li>
</ul>
@@ -1945,7 +1945,7 @@ Currently the following groups of functions are supported:
<h4>required parameters</h4>
<ul>
<li>n : name - contains the name of an existing LDAP group.</li>
- <li>M : members * - multi-occurring attribute (must include at least one) - maps to userId in LDAP
+ <li>M : members * - multivalued attribute (must include at least one) - maps to userId in LDAP
directory"
</li>
</ul>
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
index 6467b10..6d2a28b 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminMgrImpl.java
@@ -897,7 +897,7 @@ public final class AdminMgrImpl extends Manageable implements AdminMgr, Serializ
// are there any parents left?
if ( !CollectionUtils.isNotEmpty( cRole2.getParents() ) )
{
- // The updates only update non-empty multi-occurring attributes
+ // The updates only update non-empty multivalued attributes
// so if last parent assigned, so must remove the attribute completely:
roleP.deleteParent( cRole2 );
}
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
index cbfc2ff..a120e27 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
@@ -479,7 +479,7 @@ public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr, Se
// are there any parents left?
if(!CollectionUtils.isNotEmpty( cOrg.getParents() ))
{
- // The updates only update non-empty multi-occurring attributes
+ // The updates only update non-empty multivalued attributes
// so if last parent assigned, so must remove the attribute completely:
ouP.deleteParent(cOrg);
}
@@ -596,7 +596,7 @@ public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr, Se
// are there any parents left?
if(!CollectionUtils.isNotEmpty( cRole2.getParents() ))
{
- // The updates only update non-empty multi-occurring attributes
+ // The updates only update non-empty multivalued attributes
// so if last parent assigned, so must remove the attribute completely:
admRP.deleteParent(cRole2);
}
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
index 3643b6b..270a37a 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapDataProvider.java
@@ -698,7 +698,7 @@ public abstract class LdapDataProvider
/**
- * Method wraps ldap client to return multi-occurring attribute values by name within a given entry and returns
+ * Method wraps ldap client to return multivalued attribute by name within a given entry and returns
* as a list of strings.
*
* @param entry contains the target ldap entry.
@@ -751,7 +751,7 @@ public abstract class LdapDataProvider
/**
- * Method wraps ldap client to return multi-occurring attribute values by name within a given entry and returns
+ * Method wraps ldap client to return multivalued attribute by name within a given entry and returns
* as a set of strings.
*
* @param entry contains the target ldap entry.
@@ -842,7 +842,7 @@ public abstract class LdapDataProvider
*
* @param name contains attribute name to create.
* @param values array of string that contains attribute values.
- * @return Attribute containing multi-occurring attribute set.
+ * @return Attribute containing multivalued attribute set.
* @throws LdapException in the event of ldap client error.
*/
protected Attribute createAttributes( String name, String values[] ) throws LdapException