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 2016/01/07 14:40:03 UTC

[3/5] directory-fortress-core git commit: Many javadoc fixes

Many javadoc fixes

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/bf2de884
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/bf2de884
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/bf2de884

Branch: refs/heads/master
Commit: bf2de884afd3c23e0bf8bbff69f5bf592b66351f
Parents: 14c7151
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Thu Jan 7 11:07:45 2016 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Thu Jan 7 11:07:45 2016 +0100

----------------------------------------------------------------------
 .../directory/fortress/core/ant/UserAnt.java    |   2 +-
 .../fortress/core/cli/CmdLineParser.java        |  15 +++
 .../fortress/core/impl/AdminRoleDAO.java        |   4 +-
 .../fortress/core/impl/AdminRoleP.java          |   2 -
 .../fortress/core/impl/AdminRoleUtil.java       |   5 +-
 .../directory/fortress/core/impl/AuditDAO.java  |  14 +--
 .../directory/fortress/core/impl/AuditP.java    |   6 +-
 .../directory/fortress/core/impl/ConfigDAO.java |   9 +-
 .../directory/fortress/core/impl/ConfigP.java   |   6 +-
 .../fortress/core/impl/DSDChecker.java          |  26 ++--
 .../directory/fortress/core/impl/HierUtil.java  |   3 +-
 .../fortress/core/impl/Manageable.java          |   3 +-
 .../fortress/core/impl/OrgUnitDAO.java          |   4 +-
 .../directory/fortress/core/impl/OrgUnitP.java  |   1 -
 .../core/impl/OrganizationalUnitDAO.java        |   6 +-
 .../fortress/core/impl/OrganizationalUnitP.java |  57 +++++----
 .../directory/fortress/core/impl/PermDAO.java   |   5 +-
 .../directory/fortress/core/impl/PolicyDAO.java |   2 +-
 .../directory/fortress/core/impl/PolicyP.java   |   6 +-
 .../directory/fortress/core/impl/PsoUtil.java   |   5 +-
 .../fortress/core/impl/PwPolicyMgrImpl.java     |   3 +-
 .../fortress/core/impl/ReviewMgrImpl.java       |   1 -
 .../directory/fortress/core/impl/RoleDAO.java   |   4 +-
 .../directory/fortress/core/impl/RoleUtil.java  |   5 +-
 .../directory/fortress/core/impl/SDUtil.java    |   2 +-
 .../directory/fortress/core/impl/SdDAO.java     |   7 +-
 .../directory/fortress/core/impl/SdP.java       |   5 +-
 .../directory/fortress/core/impl/SuffixDAO.java |   9 +-
 .../directory/fortress/core/impl/SuffixP.java   |  44 +++----
 .../directory/fortress/core/impl/UserDAO.java   |  10 +-
 .../directory/fortress/core/impl/UsoUtil.java   |   5 +-
 .../core/ldap/ApacheDsDataProvider.java         |   3 +-
 .../core/ldap/LdapClientTrustStoreManager.java  |   2 +-
 .../directory/fortress/core/model/Address.java  |  18 +--
 .../fortress/core/model/AdminRole.java          |  24 ++--
 .../core/model/AdminRoleRelationship.java       |   2 +-
 .../fortress/core/model/Administrator.java      |   2 -
 .../directory/fortress/core/model/AuthZ.java    |  12 +-
 .../directory/fortress/core/model/Bind.java     |   5 +-
 .../fortress/core/model/Constraint.java         |  14 +--
 .../directory/fortress/core/model/Context.java  |   1 -
 .../directory/fortress/core/model/Hier.java     |  11 +-
 .../directory/fortress/core/model/Mod.java      |  13 +-
 .../directory/fortress/core/model/OrgUnit.java  |  31 +++--
 .../core/model/OrgUnitRelationship.java         |   2 +-
 .../fortress/core/model/OrganizationalUnit.java |   3 +-
 .../fortress/core/model/PermGrant.java          |   1 -
 .../directory/fortress/core/model/PermObj.java  |  15 ++-
 .../fortress/core/model/Permission.java         | 124 ++++++++++++-------
 .../directory/fortress/core/model/Props.java    |   4 +-
 .../fortress/core/model/PwMessage.java          |   2 -
 .../directory/fortress/core/model/PwPolicy.java | 100 +++++++--------
 .../fortress/core/model/Relationship.java       |   2 -
 .../directory/fortress/core/model/Role.java     |   3 +-
 .../directory/fortress/core/model/RolePerm.java |   2 +-
 .../fortress/core/model/RoleRelationship.java   |   2 +-
 .../directory/fortress/core/model/SDSet.java    |  21 ++--
 .../directory/fortress/core/model/Session.java  |  36 +++---
 .../directory/fortress/core/model/User.java     | 118 +++++++++++-------
 .../fortress/core/model/UserAdminRole.java      |   3 +-
 .../fortress/core/model/UserAudit.java          |  10 +-
 .../directory/fortress/core/model/UserRole.java |   3 +-
 .../directory/fortress/core/model/Warning.java  |   6 +-
 .../fortress/core/rest/AccessMgrRestImpl.java   |  23 ++--
 .../fortress/core/rest/AdminMgrRestImpl.java    |  22 ++--
 .../fortress/core/rest/AuditMgrRestImpl.java    |   7 +-
 .../fortress/core/rest/CachedJaxbContext.java   |   2 +-
 .../fortress/core/rest/ConfigMgrRestImpl.java   |   3 +-
 .../core/rest/DelAccessMgrRestImpl.java         |   8 +-
 .../fortress/core/rest/DelAdminMgrRestImpl.java |   5 +-
 .../core/rest/DelReviewMgrRestImpl.java         |   9 +-
 .../fortress/core/rest/PwPolicyMgrRestImpl.java |  11 +-
 .../fortress/core/rest/ReviewMgrRestImpl.java   |  21 ++--
 .../directory/fortress/core/util/AuditUtil.java |   4 +-
 .../fortress/core/util/AuthNValidator.java      |   4 +-
 .../fortress/core/AccessMgrConsole.java         |   7 +-
 .../fortress/core/impl/FortressJUnitTest.java   |   2 +-
 .../core/impl/PswdPolicyMgrImplTest.java        |  36 +++---
 .../samples/CreatePermOrgHierarchySample.java   |  12 +-
 .../core/samples/CreateRoleHierarchySample.java |  12 +-
 .../samples/CreateUserOrgHierarchySample.java   |  12 +-
 81 files changed, 563 insertions(+), 508 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java b/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
index a484a11..f55e206 100755
--- a/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
+++ b/src/main/java/org/apache/directory/fortress/core/ant/UserAnt.java
@@ -417,7 +417,7 @@ public class UserAnt extends User
     /**
      * Set a photo on user's record
      *
-     * @param photo
+     * @param photo The photo to store
      */
     public void setPhoto( String photo )
     {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/cli/CmdLineParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/CmdLineParser.java b/src/main/java/org/apache/directory/fortress/core/cli/CmdLineParser.java
index 9ac2e72..d6e963b 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/CmdLineParser.java
+++ b/src/main/java/org/apache/directory/fortress/core/cli/CmdLineParser.java
@@ -402,6 +402,8 @@ public class CmdLineParser
     /**
      * Convenience method for adding a string option.
      *
+     * @param shortForm The short form for this option
+     * @param longForm The long form for this option
      * @return the new Option
      */
     public final Option addStringOption( char shortForm, String longForm )
@@ -412,6 +414,7 @@ public class CmdLineParser
     /**
      * Convenience method for adding a string option.
      *
+     * @param longForm The long form for this option
      * @return the new Option
      */
     public final Option addStringOption( String longForm )
@@ -422,6 +425,8 @@ public class CmdLineParser
     /**
      * Convenience method for adding an integer option.
      *
+     * @param shortForm The short form for this option
+     * @param longForm The long form for this option
      * @return the new Option
      */
     public final Option addIntegerOption( char shortForm, String longForm )
@@ -432,6 +437,7 @@ public class CmdLineParser
     /**
      * Convenience method for adding an integer option.
      *
+     * @param longForm The long form for this option
      * @return the new Option
      */
     public final Option addIntegerOption( String longForm )
@@ -442,6 +448,8 @@ public class CmdLineParser
     /**
      * Convenience method for adding a long integer option.
      *
+     * @param shortForm The short form for this option
+     * @param longForm The long form for this option
      * @return the new Option
      */
     public final Option addLongOption( char shortForm, String longForm )
@@ -452,6 +460,7 @@ public class CmdLineParser
     /**
      * Convenience method for adding a long integer option.
      *
+     * @param longForm The long form for this option
      * @return the new Option
      */
     public final Option addLongOption( String longForm )
@@ -462,6 +471,8 @@ public class CmdLineParser
     /**
      * Convenience method for adding a double option.
      *
+     * @param shortForm The short form for this option
+     * @param longForm The long form for this option
      * @return the new Option
      */
     public final Option addDoubleOption( char shortForm, String longForm )
@@ -472,6 +483,7 @@ public class CmdLineParser
     /**
      * Convenience method for adding a double option.
      *
+     * @param longForm The long form for this option
      * @return the new Option
      */
     public final Option addDoubleOption( String longForm )
@@ -482,6 +494,8 @@ public class CmdLineParser
     /**
      * Convenience method for adding a boolean option.
      *
+     * @param shortForm The short form for this option
+     * @param longForm The long form for this option
      * @return the new Option
      */
     public final Option addBooleanOption( char shortForm, String longForm )
@@ -492,6 +506,7 @@ public class CmdLineParser
     /**
      * Convenience method for adding a boolean option.
      *
+     * @param longForm The long form for this option
      * @return the new Option
      */
     public final Option addBooleanOption( String longForm )

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
index f807b98..999662f 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
@@ -54,7 +54,7 @@ import org.apache.directory.ldap.client.api.LdapConnection;
 
 /**
  * The AdminRoleDAO is called by {@link AdminRoleP} and processes data via its entity {@link org.apache.directory.fortress.core.model.AdminRole}.
- * <p/>
+ * <p>
  * The Fortress AdminRoleDAO uses the following other Fortress structural and aux object classes:
  * <h4>1. ftRls Structural objectclass is used to store the AdminRole information like name, and temporal constraints</h4>
  * <ul>
@@ -102,7 +102,7 @@ import org.apache.directory.ldap.client.api.LdapConnection;
  * <li> <code>ftModId ) )</code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * This class is thread safe.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
index 7caaae4..fc96d7a 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleP.java
@@ -54,8 +54,6 @@ import org.apache.directory.fortress.core.util.VUtil;
  * error id from {@link GlobalErrIds}.
  * <p>
  * This class is thread safe.
- * <p/>
-
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
index 9df9e95..8deca27 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleUtil.java
@@ -54,12 +54,11 @@ import org.apache.directory.fortress.core.util.cache.CacheMgr;
  * <li>is a simple directed graph thus does not allow cycles.</li>
  * </ol>
  * After update is performed to ldap, the singleton is refreshed with latest info.
- * <p/>
+ * <p>
  * Static methods on this class are intended for use by other Fortress classes, i.e. {@link DelAdminMgrImpl} and {@link org.apache.directory.fortress.core.impl.PermDAO}
  * and cannot be directly invoked by outside programs.
- * <p/>
+ * <p>
  * This class contains singleton that can be updated but is thread safe.
- * <p/>
 
  *  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
index 6844f5d..77c2200 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AuditDAO.java
@@ -48,9 +48,9 @@ import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
 
 /**
  * This class performs data access for OpenLDAP synch repl log data
- * <p/>
+ * <p>
  * <h3>1. Binds</h3>
- * <p/>
+ * <p>
  * The auditBind Structural object class is used to store authentication events that can later be queried via ldap API.<br>
  * <code># The Bind class includes the reqVersion attribute which contains the LDAP</code>
  * <code># protocol version specified in the Bind as well as the reqMethod attribute</code>
@@ -91,13 +91,13 @@ import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
  * <li> <code>reqTimeLimit ) )</code>
  * <li> ------------------------------------------
  * </ul>
- * <p/>
- * <p/>
+ * <p>
+ * <p>
  * <h3>3. Modifications</h3>
  * The auditModify Structural object class is used to store Fortress update and delete events that can later be queried via ldap API.<br>
  * The deletions can be recorded in this manner and associated with Fortress context because deletions will perform a modification first
  * if audit is enabled.
- * <p/>
+ * <p>
  * <code>The Modify operation contains a description  of  modifications  in  the</code><br>
  * <code>reqMod  attribute,  which  was  already  described  above  in  the  Add</code><br>
  * <code>operation. It may optionally  contain  the  previous  contents  of  any</code><br>
@@ -114,9 +114,9 @@ import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
  * <li> <code>MAY reqOld MUST reqMod )</code>
  * <li> ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * Note this class used descriptions pulled from man pages on slapd access log.
- * <p/>
+ * <p>
  * This class is thread safe.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/AuditP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AuditP.java b/src/main/java/org/apache/directory/fortress/core/impl/AuditP.java
index 0a45993..ca6960e 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AuditP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AuditP.java
@@ -36,14 +36,14 @@ import org.apache.directory.fortress.core.model.UserAudit;
  * The audit data is passed using {@link org.apache.directory.fortress.core.model.AuthZ} class.  This class does perform simple data validations to ensure data reasonability and
  * the required fields are present..<BR>
  * The methods in this class are called by {@link AuditMgrImpl} methods during audit log interrogations.
- * <p/>
+ * <p>
  * Class will throw {@link SecurityException} to caller in the event of security policy, data constraint violation or system
  * error internal to DAO object. This class will forward DAO exception {@link org.apache.directory.fortress.core.FinderException},
  * or {@link org.apache.directory.fortress.core.ValidationException} as {@link SecurityException}s with appropriate
  * error id from {@link org.apache.directory.fortress.core.GlobalErrIds}.
- * <p/>
+ * <p>
  * This class performs simple data validations.
- * <p/>
+ * <p>
  * This class is thread safe.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
index 27a9c99..107724b 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/ConfigDAO.java
@@ -48,9 +48,9 @@ import org.apache.directory.fortress.core.UpdateException;
 /**
  * This class provides data access for the standard ldap object device that has been extended to support name/value pairs.
  * Fortress uses this data structure to store its remote cfg parameters.
- * <p/>
+ * <p>
  * The Fortress Config node is a combination of:
- * <p/>
+ * <p>
  * 'device' Structural Object Class is used to store basic attributes like cn which will be used for config node name.
  * <ul>
  * <li>  ------------------------------------------
@@ -61,7 +61,7 @@ import org.apache.directory.fortress.core.UpdateException;
  * <li> <code>MAY ( serialNumber $ seeAlso $ owner $ ou $ o $ l $ description ) )</code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * 'ftProperties' AUXILIARY Object Class is used to store name/value pairs on target node.<br>
  * <code>This aux object class can be used to store custom attributes.</code><br>
  * <code>The properties collections consist of name/value pairs and are not constrainted by Fortress.</code><br>
@@ -74,8 +74,7 @@ import org.apache.directory.fortress.core.UpdateException;
  * <li> <code>MAY ( ftProps ) ) </code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
- * <p/>
+ * <p>
  * This class is thread safe.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/ConfigP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/ConfigP.java b/src/main/java/org/apache/directory/fortress/core/impl/ConfigP.java
index f3a4321..6d06c1f 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/ConfigP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/ConfigP.java
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
  *  error id from {@link org.apache.directory.fortress.core.GlobalErrIds}.
  * <p>
  * This class performs simple data validation on properties to ensure length does not exceed 100 and contents are safe text.
- * <p/>
+ * <p>
 
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -109,13 +109,13 @@ final class ConfigP
      * Delete existing cfg node which will remove all properties associated with that node.
      * The name is required.  If node does not exist, a {@link SecurityException} with error
      * {@link GlobalErrIds#FT_CONFIG_NOT_FOUND} will be thrown.
-     * <p/>
+     * <p>
      * <font size="2" color="red">
      * This method is destructive and will remove the cfg node completely from directory.<BR>
      * Care should be taken during execution to ensure target name is correct and permanent removal of all parameters located
      * there is intended.  There is no 'undo' for this operation.
      * </font>
-     * <p/>
+     * 
      * @param name attribute is required and maps to 'cn' attribute in 'device' object class.
      * @return {@link Properties} containing the collection of name/value pairs to be added to existing node.
      * @throws SecurityException in the event entry not present or other system error.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/DSDChecker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DSDChecker.java b/src/main/java/org/apache/directory/fortress/core/impl/DSDChecker.java
index bcfe90b..ee00c3d 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DSDChecker.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DSDChecker.java
@@ -39,21 +39,23 @@ import org.apache.directory.fortress.core.util.time.Validator;
 
 
 /**
- * This class performs Dynamic Separation of Duty checking on a collection of roles targeted for
- * activation within a particular user's session.  This method is called from {@link org.apache.directory.fortress.core.util.VUtil#validateConstraints} during createSession
- * sequence for users.  If DSD constraint violation is detected for a particular role method will remove the role
- * from collection of activation candidates and log a warning.  This proc will also consider hierarchical relations
- * between roles (RBAC spec calls these authorized roles).
- * This validator will ensure the role being targeted for activation does not violate RBAC dynamic separation of duty constraints.
+ * This class performs Dynamic Separation of Duty checking on a collection of roles targeted for activation within a 
+ * particular user's session.  This method is called from 
+ * {@link org.apache.directory.fortress.core.util.VUtil#validateConstraints} during createSession sequence for users.  If 
+ * DSD constraint violation is detected for a particular role method will remove the role from collection of activation 
+ * candidates and log a warning.  This proc will also consider hierarchical relations between roles (RBAC spec calls these 
+ * authorized roles).
+ * This validator will ensure the role being targeted for activation does not violate RBAC dynamic separation of duty 
+ * constraints.
+ * <h3></h3>
  * <h4> Constraint Targets include</h4>
  * <ol>
- * <li>{@link org.apache.directory.fortress.core.model.User} maps to 'ftCstr' attribute on 'ftUserAttrs' object class</li>
- * <li>{@link org.apache.directory.fortress.core.model.UserRole} maps to 'ftRC' attribute on 'ftUserAttrs' object class</li>
- * <li>{@link org.apache.directory.fortress.core.model.Role}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
- * <li>{@link org.apache.directory.fortress.core.model.AdminRole}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
- * <li>{@link org.apache.directory.fortress.core.model.UserAdminRole}  maps to 'ftARC' attribute on 'ftRls' object class</li>
+ *   <li>{@link org.apache.directory.fortress.core.model.User} maps to 'ftCstr' attribute on 'ftUserAttrs' object class</li>
+ *   <li>{@link org.apache.directory.fortress.core.model.UserRole} maps to 'ftRC' attribute on 'ftUserAttrs' object class</li>
+ *   <li>{@link org.apache.directory.fortress.core.model.Role}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
+ *   <li>{@link org.apache.directory.fortress.core.model.AdminRole}  maps to 'ftCstr' attribute on 'ftRls' object class</li>
+ *   <li>{@link org.apache.directory.fortress.core.model.UserAdminRole}  maps to 'ftARC' attribute on 'ftRls' object class</li>
  * </ol>
- * <p>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java
index 735b217..9b2c1d4 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/HierUtil.java
@@ -59,9 +59,8 @@ import org.apache.directory.fortress.core.ValidationException;
  * <li>constructs and parses simple directed graphs.</li>
  * </ol>
  * Static methods on this class are intended for use by other Fortress classes, and cannot be directly invoked by outside programs.
- * <p/>
+ * <p>
  * This class is thread safe.
- * <p/>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java b/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
index e5a71d2..da3c89a 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/Manageable.java
@@ -128,8 +128,6 @@ public abstract class Manageable implements org.apache.directory.fortress.core.M
      * @param opName contains operation name.
      * @param entity  used to pass contextual information through Fortress layers for administrative security checks and 
      * audit.
-     * @throws org.apache.directory.fortress.core.SecurityException
-     *          in the event of data validation or system error.
      */
     protected final void setAdminData(String className, String opName, FortEntity entity)
     {
@@ -139,6 +137,7 @@ public abstract class Manageable implements org.apache.directory.fortress.core.M
             entity.setAdminSession(this.adminSess);
             entity.setModCode(AdminUtil.getObjName(perm.getObjName()) + "." + perm.getOpName());
         }
+        
         entity.setContextId(this.contextId);
     }
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
index c238c18..0d7616e 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitDAO.java
@@ -57,7 +57,7 @@ import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
 
 /**
  * This class provides dataaccess to the OrgUnit datasets in LDAP.
- * <p/>
+ * <p>
  * The OrgUnitDAO maintains the following structural and aux object classes:
  * <h4>1. organizationalUnit Structural Object Class is used to store basic attributes like ou and description</h4>
  * <ul>
@@ -97,7 +97,7 @@ import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
  * <li> <code>ftModId ) )</code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * This class is thread safe.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitP.java b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitP.java
index 7b893f1..3c87d7d 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrgUnitP.java
@@ -55,7 +55,6 @@ import org.apache.directory.fortress.core.util.cache.CacheMgr;
  * error id from {@link GlobalErrIds}.
  * <p>
  * This class uses synchronized data sets ({@link #ouCache} but is thread safe.
- * <p/>
 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
index cb934f4..ea69cef 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitDAO.java
@@ -42,9 +42,9 @@ import org.apache.directory.fortress.core.GlobalIds;
  * entity is used to provide containers in DIT for organization of related nodes..
  * A container node is used to group other related nodes, i.e. 'ou=People' or 'ou'Roles'.
  * <br>The organizational unit object class is 'organizationalUnit' <br>
- * <p/>
+ * <p>
  * The OrganizationalUnitDAO maintains the following structural object class:
- * <p/>
+ * <p>
  * organizationalUnit Structural Object Class is used to store basic attributes like ou and description.
  * <ul>
  * <li>  ------------------------------------------
@@ -60,7 +60,7 @@ import org.apache.directory.fortress.core.GlobalIds;
  * <li> <code>postalAddress $ physicalDeliveryOfficeName $ st $ l $ description ) )</code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * This class is thread safe.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitP.java b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitP.java
index 1d5a5c0..14907a9 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/OrganizationalUnitP.java
@@ -33,28 +33,32 @@ import org.apache.directory.fortress.core.util.VUtil;
 
 
 /**
- * Process module for the container node used for grouping  related nodes within Fortress directory structure. The organizational unit represents
- * the middle nodes that act as containers for other nodes, i.e. ou=People container which groups Users.
- * The organizational unit data is passed using {@link org.apache.directory.fortress.core.model.OrganizationalUnit} class.  This class does perform simple data validations.
- * The {@link org.apache.directory.fortress.core.ant.FortressAntTask#addContainers()} method calls the {@link #add} from this class during initial base loads.
- * Removal {@link org.apache.directory.fortress.core.ant.FortressAntTask#deleteContainers()} is performed during regression tests and should never
- * be executed targeting enabled production directory system datasets.<BR>
- * This class will accept {@link org.apache.directory.fortress.core.model.OrganizationalUnit}, and forward on to it's corresponding DAO class {@link OrganizationalUnitDAO} for add/delete of container.
+ * Process module for the container node used for grouping  related nodes within Fortress directory structure. The 
+ * organizational unit represents the middle nodes that act as containers for other nodes, i.e. ou=People container which 
+ * groups Users.
+ * The organizational unit data is passed using {@link org.apache.directory.fortress.core.model.OrganizationalUnit} class.  
+ * This class does perform simple data validations.
+ * The {@link org.apache.directory.fortress.core.ant.FortressAntTask#addContainers()} method calls the {@link #add} from this 
+ * class during initial base loads.
+ * Removal {@link org.apache.directory.fortress.core.ant.FortressAntTask#deleteContainers()} is performed during regression 
+ * tests and should never be executed targeting enabled production directory system datasets.<br>
+ * This class will accept {@link org.apache.directory.fortress.core.model.OrganizationalUnit}, and forward on to it's 
+ * corresponding DAO class {@link OrganizationalUnitDAO} for add/delete of container.
  * <p>
  * Class will throw {@link SecurityException} to caller in the event of security policy, data constraint violation or system
  * error internal to DAO object. This class will forward DAO exceptions (
  * {@link org.apache.directory.fortress.core.CreateException},,{@link org.apache.directory.fortress.core.RemoveException}),
- *  or {@link org.apache.directory.fortress.core.ValidationException} as {@link org.apache.directory.fortress.core.SecurityException}s with appropriate
- *  error id from {@link org.apache.directory.fortress.core.GlobalErrIds}.
+ * or {@link org.apache.directory.fortress.core.ValidationException} as 
+ * {@link org.apache.directory.fortress.core.SecurityException}s with appropriate
+ * error id from {@link org.apache.directory.fortress.core.GlobalErrIds}.
+ * <p style="font-size:2em; color:red;">
+ * The {@link #delete} method in this class is destructive as it will remove all nodes below the container using recursive 
+ * delete function.<br>
+ * Extreme care should be taken during execution to ensure target dn is correct and permanent removal of data is intended.  
+ * There is no 'undo' for this operation.
  * <p>
- * <font size="3" color="red">
- * The {@link #delete} method in this class is destructive as it will remove all nodes below the container using recursive delete function.<BR>
- * Extreme care should be taken during execution to ensure target dn is correct and permanent removal of data is intended.  There is no
- * 'undo' for this operation.
- * </font>
- * <p/>
  * Simple error mapping is performed in {@link #validate} class.
- * <p/>
+ * <p>
  * This class is thread safe.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -70,7 +74,9 @@ public class OrganizationalUnitP
      * node will be inserted after suffix, i.e. ou=NewContainerName, dc=companyName, dc=com.
      *
      * @param orgUnit contains the ou name and description for target node.
-     * @throws org.apache.directory.fortress.core.SecurityException in the event node already present, {@link GlobalErrIds#CNTR_CREATE_FAILED}, validation, {@link GlobalErrIds#CNTR_NAME_NULL}, {@link org.apache.directory.fortress.core.GlobalErrIds#CNTR_NAME_INVLD} or system error.
+     * @throws org.apache.directory.fortress.core.SecurityException in the event node already present, 
+     * {@link GlobalErrIds#CNTR_CREATE_FAILED}, validation, {@link GlobalErrIds#CNTR_NAME_NULL}, 
+     * {@link org.apache.directory.fortress.core.GlobalErrIds#CNTR_NAME_INVLD} or system error.
      */
     public final void add( OrganizationalUnit orgUnit )
         throws SecurityException
@@ -85,16 +91,17 @@ public class OrganizationalUnitP
      * Remove a container from the Directory Information Tree (DIT).  After this operation the
      * node will be removed after suffix.
      *
-     * <p>
-     * <font size="4" color="red">
-     * The {@link #delete} method in this class is destructive as it will remove all nodes below the container using recursive delete function.<BR>
+     * <p style="font-size:2em; color:red;">
+     * The {@link #delete} method in this class is destructive as it will remove all nodes below the container using 
+     * recursive delete function.<br>
      * Extreme care should be taken during execution to ensure target dn is correct and permanent removal of data is intended.  There is no
      * 'undo' for this operation.
-     * </font>
-     * <p/>
      *
      * @param orgUnit contains the ou name of container targeted for removal.
-     * @throws org.apache.directory.fortress.core.SecurityException in the event node not present, {@link org.apache.directory.fortress.core.GlobalErrIds#CNTR_DELETE_FAILED}, validation, {@link org.apache.directory.fortress.core.GlobalErrIds#CNTR_NAME_NULL}, {@link org.apache.directory.fortress.core.GlobalErrIds#CNTR_NAME_INVLD} or system error.
+     * @throws org.apache.directory.fortress.core.SecurityException in the event node not present, 
+     * {@link org.apache.directory.fortress.core.GlobalErrIds#CNTR_DELETE_FAILED}, validation, 
+     * {@link org.apache.directory.fortress.core.GlobalErrIds#CNTR_NAME_NULL}, 
+     * {@link org.apache.directory.fortress.core.GlobalErrIds#CNTR_NAME_INVLD} or system error.
      */
     public final void delete( OrganizationalUnit orgUnit )
         throws SecurityException
@@ -105,8 +112,8 @@ public class OrganizationalUnitP
 
 
     /**
-     * Method will perform simple validations to ensure the integrity of the {@link OrganizationalUnit} entity targeted for insertion
-     * or deletion in directory.
+     * Method will perform simple validations to ensure the integrity of the {@link OrganizationalUnit} entity targeted for 
+     * insertion or deletion in directory.
      *
      * @param entity contains the enum type to validate
      * @throws SecurityException thrown in the event the attribute is null.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/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 bc90abd..e62b40e 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
@@ -63,7 +63,7 @@ import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
 
 /**
  * Permission data access class for LDAP. 
- * <p/>
+ * <p>
  * This DAO class maintains the PermObj and Permission entities.
  * <h3>The Fortress PermObj Entity Class is a composite of 3 LDAP Schema object classes</h2>
  * <h4>PermObj Base - ftObject STRUCTURAL Object Class is used to store object name, id and type variables on target entity.</h4>
@@ -147,8 +147,7 @@ import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
  * <li>  ------------------------------------------
  * </ul>
  * This class is thread safe.
- * <p/>
- *
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 final class PermDAO extends ApacheDsDataProvider

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
index 8a25ff2..42638d0 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PolicyDAO.java
@@ -90,7 +90,7 @@ import org.apache.directory.fortress.core.model.PwPolicy;
  * <li> <code>ftModId ) )</code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * This class is thread safe.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/PolicyP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PolicyP.java b/src/main/java/org/apache/directory/fortress/core/impl/PolicyP.java
index 68a5d15..827e758 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PolicyP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PolicyP.java
@@ -43,17 +43,15 @@ import org.apache.directory.fortress.core.util.cache.CacheMgr;
  * needed by {@link org.apache.directory.fortress.core.impl.UserP#validate(org.apache.directory.fortress.core.model.User, boolean)}
  * This class is not intended to be used by external programs.  This class will accept Fortress entity, {@link org.apache.directory.fortress.core.model.PwPolicy}, on its
  * methods, validate contents and forward on to it's corresponding DAO class {@link PolicyDAO}.
- * <p/>
+ * <p>
  * Class will throw {@link SecurityException} to caller in the event of security policy, data constraint violation or system
  * error internal to DAO object. This class will forward DAO exceptions ({@link org.apache.directory.fortress.core.FinderException},
  *
  * {@link org.apache.directory.fortress.core.CreateException},{@link org.apache.directory.fortress.core.UpdateException},{@link org.apache.directory.fortress.core.RemoveException}),
  * or {@link org.apache.directory.fortress.core.ValidationException} as {@link SecurityException}s with appropriate
  * error id from {@link org.apache.directory.fortress.core.GlobalErrIds}.
- * <p/>
+ * <p>
  * This class uses one reference to synchronized data set {@link #policyCache} but is thread safe.
- * <p/>
-
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
index 538b99a..481e012 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PsoUtil.java
@@ -54,12 +54,11 @@ import org.apache.directory.fortress.core.util.cache.CacheMgr;
  * <li>is a simple directed graph thus does not allow cycles.</li>
  * </ol>
  * After update is performed to ldap, the singleton is refreshed with latest info.
- * <p/>
+ * <p>
  * Static methods on this class are intended for use by other Fortress classes, i.e. {@link DelAdminMgrImpl}.
  * and cannot be directly invoked by outside programs.
- * <p/>
+ * <p>
  * This class contains singleton that can be updated but is thread safe.
- * <p/>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/PwPolicyMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/PwPolicyMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/PwPolicyMgrImpl.java
index 74cb0fa..0c7746a 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/PwPolicyMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/PwPolicyMgrImpl.java
@@ -33,7 +33,8 @@ import java.util.List;
  * <h3></h3>
  * <h4>Password Policies</h4>
  * <a href="http://www.openldap.org/">OpenLDAP</a> supports the IETF draft 
- * <a href="http://tools.ietf.org/html/draft-behera-ldap-password-policy-10/">Password Policies for LDAP directories</a></li>.  Policies may be applied at the user, group or global level.
+ * <a href="http://tools.ietf.org/html/draft-behera-ldap-password-policy-10/">Password Policies for LDAP directories</a>.
+ * Policies may be applied at the user, group or global level.
  * <p>
  * <img src="../doc-files/PasswordPolicy.png" alt="">
  * <p>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
index 48014bc..70d16d2 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/ReviewMgrImpl.java
@@ -45,7 +45,6 @@ import java.util.Set;
  * and maintenance of RBAC element sets and relations; administrative review functions for
  * performing administrative queries; and system functions for creating and managing
  * RBAC attributes on user sessions and making access control decisions.
- * <p>
  * <hr>
  * <h3></h3>
  * <h4>RBAC0 - Core</h4>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
index 5fbe957..6b009a1 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/RoleDAO.java
@@ -52,7 +52,7 @@ import org.apache.directory.fortress.core.model.Role;
 
 /**
  * This class perform data access for Fortress Role entity.
- * <p/>
+ * <p>
  * The Fortress Role entity is a composite of the following other Fortress structural and aux object classes:
  * <h4>1. ftRls Structural objectclass is used to store the Role information like name and temporal constraint attributes</h4>
  * <ul>
@@ -90,7 +90,7 @@ import org.apache.directory.fortress.core.model.Role;
  * <li> <code>ftModId ) )</code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * This class is thread safe.
  *
  * @author Kevin McKinney

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
index d4e2ee4..a79fc59 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/RoleUtil.java
@@ -55,12 +55,11 @@ import org.apache.directory.fortress.core.util.cache.CacheMgr;
  * <li>is a simple directed graph thus does not allow cycles.</li>
  * </ol>
  * After update is performed to ldap, the singleton is refreshed with latest info.
- * <p/>
+ * <p>
  * Static methods on this class are intended for use by other Fortress classes, i.e. {@link org.apache.directory.fortress.core.impl.UserDAO} and {@link org.apache.directory.fortress.core.impl.PermDAO}
  * and cannot be directly invoked by outside programs.
- * <p/>
+ * <p>
  * This class contains singleton that can be updated but is thread safe.
- * <p/>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
index 3f3b291..7986f68 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SDUtil.java
@@ -50,7 +50,7 @@ import java.util.Set;
 /**
  * This utilty provides functionality necessary for SSD and DSD processing and cannot be called by components outside fortress.
  * This class also contains utility functions for maintaining the SSD and DSD cache.
- * <p/>
+ * <p>
  * This class is thread safe.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
index a848ef2..9ba98e4 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SdDAO.java
@@ -54,7 +54,7 @@ import org.apache.directory.fortress.core.model.Role;
 
 /**
  * This class performs persistence on the RBAC Static Separation of Duties and Dynamic Separation of Duties data sets.
- * <p/>
+ * <p>
  * The Fortress SDSet entity is a composite of the following other Fortress structural and aux object classes:
  * <h4>1. organizationalRole Structural Object Class is used to store basic attributes like cn and description</h4>
  * <ul>
@@ -83,7 +83,7 @@ import org.apache.directory.fortress.core.model.Role;
  * <li> <code>MAY ( ftRoles $ description ) )</code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * OR
  * <h4>Dynamic Separation of Duties Set</h4>
  * <ul>
@@ -109,9 +109,8 @@ import org.apache.directory.fortress.core.model.Role;
  * <li> <code>ftModId ) )</code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * This class is thread safe.
- * <p/>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/SdP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SdP.java b/src/main/java/org/apache/directory/fortress/core/impl/SdP.java
index aac801d..e4362f0 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SdP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SdP.java
@@ -34,8 +34,8 @@ import org.apache.directory.fortress.core.util.VUtil;
 /**
  * Process module for Separation of Duty Relation data sets. The Fortress SD data set can be of two types:
  * <ol>
- * <li>Static Separation of Duties (SSD)</li>
- * <li>Dynamic Separation of Duties (DSD)</li>
+ *   <li>Static Separation of Duties (SSD)</li>
+ *   <li>Dynamic Separation of Duties (DSD)</li>
  * </ol>
  * The SDSet entity itself distinguishes which is being targeted by {@link org.apache.directory.fortress.core.model.SDSet.SDType} which is equal to {@link org.apache.directory.fortress.core.model.SDSet.SDType#STATIC} or {@link org.apache.directory.fortress.core.model.SDSet.SDType#DYNAMIC}.
  * This class performs data validations and error mapping in addition to calling DAO methods.  It is typically called
@@ -50,7 +50,6 @@ import org.apache.directory.fortress.core.util.VUtil;
  * error id from {@link org.apache.directory.fortress.core.GlobalErrIds}.
  * <p>
  * This class is thread safe.
- * <p/>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
index 7ea83d9..1dd8a6c 100644
--- a/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SuffixDAO.java
@@ -39,7 +39,7 @@ import org.apache.directory.fortress.core.RemoveException;
 /**
  * This class contains the Suffix node for OpenLDAP Directory Information Tree.
  * <br>The domain component object class is 'dcObject' <br>
- * <p/>
+ * <p>
  * dcObject Auxiliary Object Class is used to store basic attributes like domain component names and description.
  * <ul>
  * <li>  ------------------------------------------
@@ -48,7 +48,7 @@ import org.apache.directory.fortress.core.RemoveException;
  * <li> <code>SUP top AUXILIARY MUST dc )</code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * Following wikipedia excerpt describes usage of this object <a href="http://http://en.wikipedia.org/wiki/LDAP/">Wikipedia LDAP</a>
  * <font size="2" color="blue">
  * <blockquote>
@@ -60,7 +60,7 @@ import org.apache.directory.fortress.core.RemoveException;
  * Below the top level, the entry names will typically reflect the organization's internal structure or needs rather than DNS names.
  * </blockquote>
  * </font>
- * <p/>
+ * <p>
  * This class is thread safe.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -117,13 +117,12 @@ final class SuffixDAO extends ApacheDsDataProvider
 
 
     /**
-     * <p/>
+     * <p>
      * <font size="4" color="red">
      * This method is destructive as it will remove all nodes below the suffix using recursive delete function.<BR>
      * Extreme care should be taken during execution to ensure target directory is correct and permanent removal of data is intended.  There is no
      * 'undo' for this operation.
      * </font>
-     * <p/>
      *
      * @param se
      * @throws org.apache.directory.fortress.core.RemoveException

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/SuffixP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/SuffixP.java b/src/main/java/org/apache/directory/fortress/core/impl/SuffixP.java
index 6bf40e9..55db66f 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/SuffixP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/SuffixP.java
@@ -33,27 +33,29 @@ import org.apache.directory.fortress.core.util.VUtil;
 
 
 /**
- * Process module for the suffix or root node of Fortress directory structure. The suffix represents the topmost node in a directory information
- * tree.  For example dc=companyName,dc=com.  The suffix data is passed using {@link org.apache.directory.fortress.core.model.Suffix} class.  This class does perform simple data validations.
- * The {@link org.apache.directory.fortress.core.ant.FortressAntTask#addSuffixes()} method calls the {@link #add} from this class during initial base loads.
- * Removal {@link org.apache.directory.fortress.core.ant.FortressAntTask#deleteSuffixes()} is performed during regression tests and should never
- * be executed targeting production directory systems.<BR>
- * This class will accept {@link org.apache.directory.fortress.core.model.Suffix}, and forward on to it's corresponding DAO class {@link SuffixDAO} for add/delete of suffix.
+ * Process module for the suffix or root node of Fortress directory structure. The suffix represents the topmost node in a 
+ * directory information tree.  For example dc=companyName,dc=com.  The suffix data is passed using 
+ * {@link org.apache.directory.fortress.core.model.Suffix} class.  This class does perform simple data validations.
+ * The {@link org.apache.directory.fortress.core.ant.FortressAntTask#addSuffixes()} method calls the {@link #add} from this 
+ * class during initial base loads. Removal {@link org.apache.directory.fortress.core.ant.FortressAntTask#deleteSuffixes()} 
+ * is performed during regression tests and should never be executed targeting production directory systems.<br>
+ * This class will accept {@link org.apache.directory.fortress.core.model.Suffix}, and forward on to it's corresponding DAO 
+ * class {@link SuffixDAO} for add/delete of suffix.
  * <p>
- * Class will throw {@link org.apache.directory.fortress.core.SecurityException} to caller in the event of security policy, data constraint violation or system
- * error internal to DAO object. This class will forward DAO exceptions ({@link org.apache.directory.fortress.core.FinderException},
- * {@link org.apache.directory.fortress.core.CreateException},{@link org.apache.directory.fortress.core.UpdateException},{@link org.apache.directory.fortress.core.RemoveException}),
- *  or {@link org.apache.directory.fortress.core.ValidationException} as {@link org.apache.directory.fortress.core.SecurityException}s with appropriate
- * error id from {@link GlobalErrIds}.
+ * Class will throw {@link org.apache.directory.fortress.core.SecurityException} to caller in the event of security policy, 
+ * data constraint violation or system error internal to DAO object. This class will forward DAO exceptions 
+ * ({@link org.apache.directory.fortress.core.FinderException}, {@link org.apache.directory.fortress.core.CreateException},
+ * {@link org.apache.directory.fortress.core.UpdateException},{@link org.apache.directory.fortress.core.RemoveException}),
+ * or {@link org.apache.directory.fortress.core.ValidationException} as 
+ * {@link org.apache.directory.fortress.core.SecurityException}s with appropriate error id from {@link GlobalErrIds}.
+ * <p style="font-size:2em; color:red;">
+ * The {@link #delete} method in this class is destructive as it will remove all nodes below the suffix using recursive 
+ * delete function.<br>
+ * Extreme care should be taken during execution to ensure target dn is correct and permanent removal of data is intended.
+ * There is no 'undo' for this operation.
  * <p>
- * <font size="3" color="red">
- * The {@link #delete} method in this class is destructive as it will remove all nodes below the suffix using recursive delete function.<BR>
- * Extreme care should be taken during execution to ensure target dn is correct and permanent removal of data is intended.  There is no
- * 'undo' for this operation.
- * </font>
- * <p/>
  * Simple error mapping is performed in {@link #validate} class.
- * <p/>
+ * <p>
  * This class is thread safe.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -83,13 +85,11 @@ public class SuffixP
     /**
      * Remove the suffix along with descendant nodes.  This is a destructive method which will remove all DIT nodes under
      * the specified.
-     * <p/>
-     * <font size="2" color="red">
+     * <p>
+     * <p style="font-size:2em; color:red;">
      * This method is destructive and will remove all nodes below.<BR>
      * Extreme care should be taken during execution to ensure target dn is correct and permanent removal of data is intended.  There is no
      * 'undo' for this operation.
-     * </font>
-     * <p/>
      *
      * @param suffix contains the dc name and top level dc for target node.
      * @throws SecurityException in event of validation or system error.

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
index 8067ac8..7da42ea 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserDAO.java
@@ -79,10 +79,10 @@ import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
 
 /**
  * Data access class for LDAP User entity.
- * <p/>
- * <p/>
+ * <p>
+ * <p>
  * The Fortress User LDAP schema follows:
- * <p/>
+ * <p>
  * <h4>1. InetOrgPerson Structural Object Class </h4>
  * <code># The inetOrgPerson represents people who are associated with an</code><br>
  * <code># organization in some way.  It is a structural class and is derived</code><br>
@@ -115,7 +115,7 @@ import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
  * <li> <code>MAY ( ftProps ) ) </code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * <h4>3. ftUserAttrs is used to store user RBAC and Admin role assignment and other security attributes on User
  * entity</h4>
  * <ul>
@@ -140,7 +140,7 @@ import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
  * <li> <code>ftModId ) )</code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * This class is thread safe.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java b/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
index 4756188..d558a88 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UsoUtil.java
@@ -53,12 +53,11 @@ import org.apache.directory.fortress.core.util.cache.CacheMgr;
  * <li>is a simple directed graph thus does not allow cycles.</li>
  * </ol>
  * After update is performed to ldap, the singleton is refreshed with latest info.
- * <p/>
+ * <p>
  * Static methods on this class are intended for use by other Fortress classes, i.e. {@link DelAdminMgrImpl}.
  * and cannot be directly invoked by outside programs.
- * <p/>
+ * <p>
  * This class contains singleton that can be updated but is thread safe.
- * <p/>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
index 7f49c74..e63b8f3 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
@@ -91,9 +91,8 @@ import org.slf4j.LoggerFactory;
  * Fortress DAO's, i.e. {@link org.apache.directory.fortress.core.impl.UserDAO}. {@link org.apache.directory.fortress.core.impl.RoleDAO},
  * {@link org.apache.directory.fortress.core.impl.PermDAO}, ....
  * These are low-level data utilities, very little if any data validations are performed here.
- * <p/>
+ * <p>
  * This class is thread safe.
- * <p/>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java b/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
index 5b7efb7..b7b2670 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/LdapClientTrustStoreManager.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
  * Implement the X509TrustManager interface which will be used during JSSE truststore manager initialization for LDAP
  * client-to-server communications over TLS/SSL.
  * It is used during certificate validation operations within JSSE.
- * <p/>
+ * <p>
  * Note: This class allows self-signed certificates to pass the validation checks.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/model/Address.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Address.java b/src/main/java/org/apache/directory/fortress/core/model/Address.java
index 0763dfe..959061b 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/Address.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Address.java
@@ -33,17 +33,17 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * This entity is stored on {@link User} and is used to store postal address information in LDAP.
- * <p/>
+ * <p>
  * Contains data retrieved from the following LDAP attributes:
- * <p/>
+ * <p>
  * <ul>
- * <li>  ------------------------------------------
- * <li> <code>postalAddress</code>
- * <li> <code>st</code>
- * <li> <code>postalCode</code>
- * <li> <code>postOfficeBox</code>
- * <li> <code>c</code>
- * <li>  ------------------------------------------
+ *   <li>  ------------------------------------------</li>
+ *   <li> <code>postalAddress</code></li>
+ *   <li> <code>st</code></li>
+ *   <li> <code>postalCode</code></li>
+ *   <li> <code>postOfficeBox</code></li>
+ *   <li> <code>c</code></li>
+ *   <li>  ------------------------------------------</li>
  * </ul>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
index b9104bd..7c64471 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
@@ -46,26 +46,26 @@ import org.apache.commons.lang.StringUtils;
  * provide enough information to uniquely identity the entity target within ldap.<br>
  * For example, this entity requires {@link #name} set before passing into {@link org.apache.directory.fortress.core.impl.DelAdminMgrImpl} or  {@link org.apache.directory.fortress.core.impl.DelReviewMgrImpl} APIs.
  * Create methods usually require more attributes (than Read) due to constraints enforced between entities.
- * <p/>
+ * <p>
  * This entity extends the {@link org.apache.directory.fortress.core.model.Role} entity and is used to store the ARBAC AdminRole assignments that comprise the many-to-many relationships between Users and Administrative Permissions.
  * In addition it is used to store the ARBAC {@link org.apache.directory.fortress.core.model.OrgUnit.Type#PERM} and {@link org.apache.directory.fortress.core.model.OrgUnit.Type#USER} OU information that adheres to the AdminRole entity in the ARBAC02 model.
  * <br>The unique key to locate AdminRole entity (which is subsequently assigned both to Users and administrative Permissions) is {@link AdminRole#name}.<br>
- * <p/>
+ * <p>
  * There is a many-to-many relationship between User's, Administrative Roles and Administrative Permissions.
  * <h3>{@link org.apache.directory.fortress.core.model.User}*<->*{@link AdminRole}*<->*{@link org.apache.directory.fortress.core.model.Permission}</h3>
  * Example to create new ARBAC AdminRole:
- * <p/>
+ * <p>
  * <code>AdminRole myRole = new AdminRole("MyRoleName");</code><br>
  * <code>myRole.setDescription("This is a test admin role");</code><br>
  * <code>DelAdminMgr delAdminMgr = DelAdminMgrFactory.createInstance();</code><br>
  * <code>delAdminMgr.addRole(myRole);</code><br>
- * <p/>
+ * <p>
  * This will create a AdminRole name that can be used as a target for User-AdminRole assignments and AdminRole-AdminPermission grants.
- * <p/>
- * <p/>
+ * <p>
+ * <p>
  * <h4>Administrative Role Schema</h4>
  * The Fortress AdminRole entity is a composite of the following other Fortress structural and aux object classes:
- * <p/>
+ * <p>
  * 1. organizationalRole Structural Object Class is used to store basic attributes like cn and description.
  * <pre>
  * ------------------------------------------
@@ -84,7 +84,7 @@ import org.apache.commons.lang.StringUtils;
  * )
  * ------------------------------------------
  * </pre>
- * <p/>
+ * <p>
  * 2. ftRls Structural objectclass is used to store the AdminRole information like name, and temporal constraints.
  * <pre>
  * ------------------------------------------
@@ -106,7 +106,7 @@ import org.apache.commons.lang.StringUtils;
  * )
  * ------------------------------------------
  * </pre>
- * <p/>
+ * <p>
  * 3. ftProperties AUXILIARY Object Class is used to store client specific name/value pairs on target entity.<br>
  * <code># This aux object class can be used to store custom attributes.</code><br>
  * <code># The properties collections consist of name/value pairs and are not constrainted by Fortress.</code><br>
@@ -123,7 +123,7 @@ import org.apache.commons.lang.StringUtils;
  * )
  * ------------------------------------------
  * </pre>
- * <p/>
+ * <p>
  * 4. ftPools Auxiliary object class store the ARBAC Perm and User OU assignments on AdminRole entity.
  * <pre>
  * ------------------------------------------
@@ -140,7 +140,7 @@ import org.apache.commons.lang.StringUtils;
  * )
  * ------------------------------------------
  * </pre>
- * <p/>
+ * <p>
  * 5. ftMods AUXILIARY Object Class is used to store Fortress audit variables on target entity.
  * <pre>
  * ------------------------------------------
@@ -157,8 +157,6 @@ import org.apache.commons.lang.StringUtils;
  * )
  * ------------------------------------------
  * </pre>
- * <p/>
-
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/model/AdminRoleRelationship.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AdminRoleRelationship.java b/src/main/java/org/apache/directory/fortress/core/model/AdminRoleRelationship.java
index a519279..f0d4065 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AdminRoleRelationship.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AdminRoleRelationship.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * This entity is used by en masse to communicate parent and child {@link AdminRole} information to the server.
- * <p/>
+ *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @XmlRootElement(name = "fortAdminRoleRelationship")

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
index 6bba8b8..4d9551d 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
@@ -26,8 +26,6 @@ import java.util.Set;
 /**
  * This interface is used by Fortress admin role processing.  It prescribes the APIs that are necessary for an Administrative
  * Role entity to fullfill the ARBAC functionality.
- * <p/>
-
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/model/AuthZ.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AuthZ.java b/src/main/java/org/apache/directory/fortress/core/model/AuthZ.java
index 9f06291..b4eac4d 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AuthZ.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AuthZ.java
@@ -29,10 +29,10 @@ import java.io.Serializable;
 
 /**
  * This entity class contains OpenLDAP slapo-accesslog records that correspond to authorization attempts made to the directory.
- * <p/>
+ * <p>
  * The auditCompare Structural object class is used by the slapo-accesslog overlay to store record of fortress authorization events.
  * These events can later be pulled as audit trail using ldap protocol.  The data pertaining to authZ events are stored in this entity record.<br/>
- * <p/>
+ * <p>
  * <pre>
  * ------------------------------------------
  * objectclass (  1.3.6.1.4.1.4203.666.11.5.2.7
@@ -43,9 +43,9 @@ import java.io.Serializable;
  * ------------------------------------------
  * </pre>
  * For the Compare operation the reqAssertion attribute carries the Attribute Value Assertion used in the compare request
- * <p/>
+ * <p>
  * Note this class uses descriptions pulled from man pages on slapo-accesslog.
- * <p/>
+ * <p>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -659,7 +659,7 @@ public class AuthZ extends FortEntity implements Serializable
 
     /**
      * The reqFilter attribute carries the filter used in the search request.
-     * <p/>
+     * <p>
      * For Fortress authorization events this will contain the following:
      * <ul>
      * <li>userId: {@link User#userId}
@@ -678,7 +678,7 @@ public class AuthZ extends FortEntity implements Serializable
 
     /**
      * The reqFilter attribute carries the filter used in the search request.
-     * <p/>
+     * <p>
      * For Fortress authorization events this will contain the following:
      * <ul>
      * <li>userId: {@link User#userId}

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/model/Bind.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Bind.java b/src/main/java/org/apache/directory/fortress/core/model/Bind.java
index 8e7d861..5f8f821 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Bind.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Bind.java
@@ -29,7 +29,7 @@ import java.io.Serializable;
 
 /**
  * This entity class contains OpenLDAP slapd access log records that correspond to bind attempts made to the directory.
- * <p/>
+ * <p>
  * The auditBind Structural object class is used to store authentication events that can later be queried via ldap API.<br>
  * <code># The Bind class includes the reqVersion attribute which contains the LDAP</code>
  * <code># protocol version specified in the Bind as well as the reqMethod attribute</code>
@@ -45,9 +45,8 @@ import java.io.Serializable;
  * MUST ( reqVersion $ reqMethod ) )</code>
  * ------------------------------------------
  * </pre>
- * <p/>
+ * <p>
  * Note this class used descriptions pulled from man pages on slapd access log.
- * <p/>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/model/Constraint.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Constraint.java b/src/main/java/org/apache/directory/fortress/core/model/Constraint.java
index 3f350a9..e3bde8c 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Constraint.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Constraint.java
@@ -24,17 +24,17 @@ package org.apache.directory.fortress.core.model;
  * The Fortress Constraint interface prescribes attributes that are used to store, process and retrieve temporal validation attributes on
  * {@link org.apache.directory.fortress.core.model.User}, {@link org.apache.directory.fortress.core.model.UserRole}, {@link org.apache.directory.fortress.core.model.Role},
  * {@link org.apache.directory.fortress.core.model.AdminRole}, {@link org.apache.directory.fortress.core.model.UserAdminRole} entities.
- * <p/>
- * <img src="../../doc-files/TemporalRbac.png">
- * <p/>
+ * <p>
+ * <img src="../../doc-files/TemporalRbac.png" alt="">
+ * <p>
  * <h3>Temporal Constraints on User and Role Assignments</h3>
  * In addition to the standard RBAC support, Fortress provides coverage for temporal constraints on role and user activation into session.
  * Temporal constraints affect when Users may activate Roles within runtime system at a particular point in time.  For example a nurse may be assigned to the "ChargeNurse" role but be limited as to when she is permitted to perform those duties, i.e. weekend graveyard shift.  Another example is a bank teller who is assigned to a "Teller" role but may only act within role between the hours of 9:00 to 5:00 on Monday thru Friday during normal business hours.
  * Additionally Fortress temporal constraints are checked during user authentication to control when a user is actually permitted to sign-on to a system.  The constraints may also be applied to enforce temporary blackout periods to cover vacations, leave of absences, sabbaticals, etc.
- * <p/>
+ * <p>
  * <h4>Constraint Schema</h4>
  * The entity maps to Fortress LDAP Schema object classes:
- * <p/>
+ * <p>
  * 1. ftRls Structural objectclass is used to store the Role information like name and temporal constraint attributes.
  * <ul>
  * <li>  ------------------------------------------
@@ -47,7 +47,7 @@ package org.apache.directory.fortress.core.model;
  * <li> <code>MAY ( description $ ftCstr ) )</code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * 2. ftUserAttrs is used to store user RBAC and Admin role assignment and other security attributes on User entity.
  * <ul>
  * <li>  ------------------------------------------
@@ -59,7 +59,7 @@ package org.apache.directory.fortress.core.model;
  * <li> <code>MAY ( ftRC $ ftRA $ ftARC $ ftARA $ ftCstr</code>
  * <li>  ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/model/Context.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Context.java b/src/main/java/org/apache/directory/fortress/core/model/Context.java
index 64105e7..eac9d1f 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/Context.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Context.java
@@ -23,7 +23,6 @@ package org.apache.directory.fortress.core.model;
 /**
  * This class contains the Context id which is used as container for segregating data by customer 
  * within the LDAP Directory Information Tree.
- * <p/>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/model/Hier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Hier.java b/src/main/java/org/apache/directory/fortress/core/model/Hier.java
index b6d145d..cb5f3ce 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Hier.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Hier.java
@@ -32,12 +32,12 @@ import org.apache.directory.api.util.Strings;
  * layers starting with the (1) Manager layer down thru middle (2) Process layer and it's processing rules into
  * (3) DAO layer where persistence with the OpenLDAP server occurs.  The clients must instantiate an Fortress entity before use
  * and must provide enough information to uniquely identity target record for reads.
- * <p/>
+ * <p>
  * <h4>Hierarchical Relationship Schema</h4>
- * <p/>
+ * <p>
  * The Fortress ftHier Entity Class is used internal to Fortress and usually does not require manipulation by external program.  The
  * entity is a composite of 3 different LDAP Schema object classes:
- * <p/>
+ * <p>
  * 1. organizationalRole Structural Object Class is used to store basic attributes like cn and description.
  * <pre>
  * ------------------------------------------
@@ -56,7 +56,7 @@ import org.apache.directory.api.util.Strings;
  * )
  * ------------------------------------------
  * </pre>
- * <p/>
+ * <p>
  * 2. ftHier AUXILIARY Object Class is used to store parent to child relationships on target entity.
  * <pre>
  * ------------------------------------------
@@ -74,7 +74,7 @@ import org.apache.directory.api.util.Strings;
  *      description
  *  )
  * )
- * <p/>
+ * <p>
  * 3. ftMods AUXILIARY Object Class is used to store Fortress audit variables on target entity.
  * <pre>
  * ------------------------------------------
@@ -91,7 +91,6 @@ import org.apache.directory.api.util.Strings;
  * )
  * ------------------------------------------
  * </pre>
- * <p/>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/bf2de884/src/main/java/org/apache/directory/fortress/core/model/Mod.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Mod.java b/src/main/java/org/apache/directory/fortress/core/model/Mod.java
index d562ad2..558835c 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Mod.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Mod.java
@@ -31,12 +31,11 @@ import java.util.List;
 
 /**
  * This entity class contains OpenLDAP slapd access log records that correspond to modifications made to the directory.
- * <p/>
- * <p/>
+ * <p>
  * The auditModify Structural object class is used to store Fortress update and delete events that can later be queried via ldap API.<br>
  * The deletions can be recorded in this manner and associated with Fortress context because deletions will perform a modification first
  * if audit is enabled.
- * <p/>
+ * <p>
  * <code>The Modify operation contains a description  of  modifications  in  the</code><br>
  * <code>reqMod  attribute,  which  was  already  described  above  in  the  Add</code><br>
  * <code>operation. It may optionally  contain  the  previous  contents  of  any</code><br>
@@ -53,10 +52,8 @@ import java.util.List;
  * <li> <code>MAY reqOld MUST reqMod )</code>
  * <li> ------------------------------------------
  * </ul>
- * <p/>
+ * <p>
  * Note this class uses descriptions pulled from man pages on slapd access log.
- * <p/>
-
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -95,7 +92,7 @@ public class Mod extends FortEntity implements Serializable
     /**
      * The reqMod attribute carries all of the attributes of the original entry being added.
      * (Or in the case of a Modify operation, all of the modifications being performed.)
-     * The values are formatted as attribute:<+|-|=|#> [ value] Where '+' indicates an Add of a value,
+     * The values are formatted as attribute:&lt;+|-|=|#&gt; [ value] Where '+' indicates an Add of a value,
      * '-' for Delete, '=' for Replace, and '#' for Increment. In an Add operation, all of  the
      * reqMod  values will have the '+' designator.
      *
@@ -110,7 +107,7 @@ public class Mod extends FortEntity implements Serializable
     /**
      * The reqMod attribute carries all of the attributes of the original entry being added.
      * (Or in the case of a Modify operation, all of the modifications being performed.)
-     * The values are formatted as attribute:<+|-|=|#> [ value] Where '+' indicates an Add of a value,
+     * The values are formatted as attribute:&lt;+|-|=|#&gt; [ value] Where '+' indicates an Add of a value,
      * '-' for Delete, '=' for Replace, and '#' for Increment. In an Add operation, all of  the
      * reqMod  values will have the '+' designator.
      *