directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject [directory-server] branch master updated: Hundreds of Javadoc fixes... More to come (Around 2 000)
Date Fri, 10 Aug 2018 11:46:31 GMT
This is an automated email from the ASF dual-hosted git repository.

elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git


The following commit(s) were added to refs/heads/master by this push:
     new bc917ba  Hundreds of Javadoc fixes... More to come (Around 2 000)
bc917ba is described below

commit bc917ba2aa797ab19f8233a24a91fc04fe1df49c
Author: Emmanuel L├ęcharny <elecharny@symas.com>
AuthorDate: Fri Aug 10 13:46:25 2018 +0200

    Hundreds of Javadoc fixes... More to come (Around 2 000)
---
 .../directory/server/core/avltree/ArrayTree.java   |   3 +-
 .../directory/server/core/avltree/AvlTree.java     |  16 +--
 .../directory/server/core/avltree/AvlTreeMap.java  |  16 +--
 .../server/core/avltree/AvlTreeMarshaller.java     |  14 +--
 .../server/core/avltree/KeyTupleAvlCursor.java     |   5 +-
 .../server/core/avltree/LinkedAvlMapNode.java      |   5 +-
 .../server/core/integ/IntegrationUtils.java        |  70 ++++++-----
 .../server/core/shared/DefaultDnFactory.java       |   3 +-
 .../server/core/shared/ReferralManagerImpl.java    |   2 +-
 .../server/core/shared/SortedEntrySerializer.java  |   3 +
 .../shared/partition/DefaultPartitionNexus.java    |   3 +-
 .../server/core/DefaultDirectoryService.java       |  22 +---
 .../server/core/security/CoreKeyStoreSpi.java      |   1 +
 .../server/core/security/TlsKeyGenerator.java      |   7 ++
 .../server/integration/http/HttpServer.java        |   7 +-
 .../server/installers/AbstractMojoCommand.java     |  25 ++--
 .../directory/server/installers/GenerateMojo.java  |   1 +
 .../apache/directory/server/installers/Target.java |  18 +++
 .../server/installers/archive/ArchiveTarget.java   |   2 +-
 .../core/kerberos/KeyDerivationInterceptor.java    |   1 +
 .../partition/impl/btree/jdbm/DnSerializer.java    |   7 +-
 .../impl/btree/jdbm/DnSerializerComparator.java    |   2 +-
 .../impl/btree/jdbm/DupsContainerCursor.java       |   5 +-
 .../core/partition/impl/btree/jdbm/JdbmIndex.java  |  12 +-
 .../partition/impl/btree/jdbm/JdbmMasterTable.java |   2 +-
 .../partition/impl/btree/jdbm/JdbmPartition.java   |   5 +-
 .../impl/btree/jdbm/JdbmPartitionWriteTxn.java     |   5 +-
 .../core/partition/impl/btree/jdbm/JdbmTable.java  |   2 +-
 .../partition/impl/btree/jdbm/KeyBTreeCursor.java  |   1 -
 .../impl/btree/jdbm/KeyTupleBTreeCursor.java       |   5 +-
 .../impl/btree/jdbm/ParentIdAndRdnSerializer.java  |   7 +-
 .../directory/kerberos/client/KdcConnection.java   |  15 +--
 .../apache/directory/kerberos/client/Kinit.java    |  77 ++++++------
 .../credentials/cache/CredentialsCache.java        |  68 +++++-----
 .../cache/SampleCredentialsCacheResource.java      | 140 +++++++++++----------
 .../changepwd/messages/ChangePasswordReply.java    |  10 +-
 .../changepwd/messages/ChangePasswordRequest.java  |   6 +-
 .../crypto/encryption/CipherTextHandler.java       |   2 +-
 .../shared/crypto/encryption/DesStringToKey.java   |   1 -
 .../server/kerberos/shared/keytab/Keytab.java      |   4 +-
 .../kerberos/shared/store/PrincipalStore.java      |   3 +-
 .../shared/store/PrincipalStoreEntryModifier.java  |   8 +-
 .../shared/kerberos/codec/KerberosDecoder.java     |   2 +-
 .../shared/kerberos/codec/types/HostAddrType.java  |   2 +-
 .../shared/kerberos/components/AdAndOr.java        |  10 +-
 .../shared/kerberos/components/AdKdcIssued.java    |  16 +--
 .../kerberos/components/AuthorizationData.java     |   8 +-
 .../shared/kerberos/components/Checksum.java       |   8 +-
 .../shared/kerberos/components/ETypeInfo.java      |  12 +-
 .../shared/kerberos/components/ETypeInfo2.java     |   8 +-
 .../kerberos/components/ETypeInfo2Entry.java       |  14 +--
 .../shared/kerberos/components/ETypeInfoEntry.java |  10 +-
 .../shared/kerberos/components/EncKdcRepPart.java  |  52 ++++----
 .../shared/kerberos/components/EncKrbCredPart.java |  30 ++---
 .../shared/kerberos/components/EncKrbPrivPart.java |  24 ++--
 .../shared/kerberos/components/EncTicketPart.java  |  46 +++----
 .../shared/kerberos/components/EncryptedData.java  |  12 +-
 .../shared/kerberos/components/EncryptionKey.java  |   8 +-
 .../shared/kerberos/components/HostAddress.java    |   8 +-
 .../shared/kerberos/components/HostAddresses.java  |   8 +-
 .../shared/kerberos/components/KdcRep.java         |  38 +++---
 .../shared/kerberos/components/KdcReq.java         |  24 ++--
 .../shared/kerberos/components/KdcReqBody.java     |  58 ++++-----
 .../shared/kerberos/components/KrbCredInfo.java    |  44 +++----
 .../shared/kerberos/components/KrbSafeBody.java    |  24 ++--
 .../shared/kerberos/components/LastReq.java        |  10 +-
 .../shared/kerberos/components/MethodData.java     |  12 +-
 .../shared/kerberos/components/PaData.java         |   8 +-
 .../shared/kerberos/components/PaEncTsEnc.java     |   8 +-
 .../shared/kerberos/components/PrincipalName.java  |  14 +--
 .../kerberos/components/TransitedEncoding.java     |   8 +-
 .../shared/kerberos/components/TypedData.java      |   8 +-
 .../shared/kerberos/exceptions/ErrorType.java      |   2 +-
 .../directory/shared/kerberos/messages/ApRep.java  |  16 +--
 .../directory/shared/kerberos/messages/ApReq.java  |  26 ++--
 .../directory/shared/kerberos/messages/AsRep.java  |   4 +-
 .../directory/shared/kerberos/messages/AsReq.java  |   4 +-
 .../shared/kerberos/messages/Authenticator.java    |  38 +++---
 .../shared/kerberos/messages/ChangePasswdData.java |  13 +-
 .../shared/kerberos/messages/EncApRepPart.java     |  18 +--
 .../shared/kerberos/messages/EncAsRepPart.java     |   2 +-
 .../shared/kerberos/messages/EncTgsRepPart.java    |   2 +-
 .../shared/kerberos/messages/KerberosMessage.java  |   6 +-
 .../shared/kerberos/messages/KrbCred.java          |  23 ++--
 .../shared/kerberos/messages/KrbError.java         |  54 ++++----
 .../shared/kerberos/messages/KrbPriv.java          |  15 +--
 .../shared/kerberos/messages/KrbSafe.java          |  18 +--
 .../directory/shared/kerberos/messages/TgsRep.java |   6 +-
 .../directory/shared/kerberos/messages/TgsReq.java |   4 +-
 .../directory/shared/kerberos/messages/Ticket.java |  22 ++--
 .../shared/client/api/LdapApiIntegrationUtils.java |  26 ++--
 .../server/core/partition/ldif/LdifPartition.java  |  13 +-
 .../partition/ldif/SingleFileLdifPartition.java    |   8 +-
 .../partition/impl/btree/mavibot/DnSerializer.java |  10 +-
 .../impl/btree/mavibot/KeyTupleValueCursor.java    |   5 +-
 .../impl/btree/mavibot/MavibotEntrySerializer.java |   2 +-
 .../partition/impl/btree/mavibot/MavibotIndex.java |  16 ++-
 .../mavibot/MavibotParentIdAndRdnSerializer.java   |   2 +-
 .../server/dhcp/messages/HardwareAddress.java      |   1 -
 .../directory/server/dhcp/store/DhcpStore.java     |   2 +-
 .../server/kerberos/changepwd/package-info.java    |   3 +-
 .../protocol/ChangePasswordProtocolHandler.java    |   4 +-
 .../protocol/MinaChangePasswordDecoder.java        |   2 +-
 .../kerberos/kdc/DirectoryPrincipalStore.java      |   1 +
 .../directory/server/kerberos/kdc/KdcContext.java  |   2 +-
 .../server/kerberos/kdc/package-info.java          |   2 +-
 .../kdc/ticketgrant/TicketGrantingService.java     |   8 +-
 .../kerberos/protocol/KerberosProtocolHandler.java |   7 +-
 .../server/kerberos/sam/SamException.java          |   2 +-
 .../directory/server/kerberos/sam/SamVerifier.java |   6 +-
 .../server/integ/ServerIntegrationUtils.java       |  67 ++++++----
 .../directory/server/configuration/ApacheDS.java   |  19 +--
 .../server/config/builder/ServiceBuilder.java      |  84 +++++++------
 .../config/listener/ConfigChangeListener.java      |   2 +-
 .../apache/directory/server/ApacheDsService.java   |   4 +-
 .../org/apache/directory/server/UberjarMain.java   |   4 +-
 .../core/integ/CreateLdapConnectionPoolRule.java   |   1 +
 .../server/core/integ/CreateLdapServerRule.java    |   1 +
 .../core/integ/DelayInducingInterceptor.java       |   1 +
 .../server/core/integ/FrameworkRunner.java         |   3 +
 .../apache/directory/server/wrapper/ExitCodes.java |   2 +-
 .../org/apache/directory/server/xdbm/Index.java    |  32 +++++
 122 files changed, 958 insertions(+), 802 deletions(-)

diff --git a/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTree.java b/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTree.java
index a542a33..4ce7f04 100644
--- a/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTree.java
+++ b/core-avl/src/main/java/org/apache/directory/server/core/avltree/ArrayTree.java
@@ -63,6 +63,7 @@ public class ArrayTree<K>
      * Creates a new instance of AVLTree.
      *
      * @param comparator the comparator to be used for comparing keys
+     * @param array The array of keys
      */
     public ArrayTree( Comparator<K> comparator, K[] array )
     {
@@ -312,7 +313,7 @@ public class ArrayTree<K>
      * element.
      *
      * @param key the key to find
-     * @return the LinkedAvlNode<K> whose key is greater than the given key ,<br>
+     * @return the LinkedAvlNode whose key is greater than the given key ,<br>
      *         null if there is no node with a higher key than the given key.
      */
     public K findGreater( K key )
diff --git a/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java b/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java
index 35d5525..c2fe245 100644
--- a/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java
+++ b/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTree.java
@@ -106,40 +106,40 @@ public interface AvlTree<K>
 
 
     /**
-     * Finds a LinkedAvlNode<K> whose key is higher than the given key.
+     * Finds a LinkedAvlNode whose key is higher than the given key.
      *
      * @param key the key
-     * @return the LinkedAvlNode<K> whose key is greater than the given key ,<br>
+     * @return the LinkedAvlNode whose key is greater than the given key ,<br>
      *         null if there is no node with a higher key than the given key.
      */
     LinkedAvlNode<K> findGreater( K key );
 
 
     /**
-     * Finds a LinkedAvlNode<K> whose key is higher than the given key.
+     * Finds a LinkedAvlNode whose key is higher than the given key.
      *
      * @param key the key
-     * @return the LinkedAvlNode<K> whose key is greater than the given key ,<br>
+     * @return the LinkedAvlNode whose key is greater than the given key ,<br>
      *         null if there is no node with a higher key than the given key.
      */
     LinkedAvlNode<K> findGreaterOrEqual( K key );
 
 
     /**
-     * Finds a LinkedAvlNode<K> whose key is lower than the given key.
+     * Finds a LinkedAvlNode whose key is lower than the given key.
      *
      * @param key the key
-     * @return the LinkedAvlNode<K> whose key is lower than the given key ,<br>
+     * @return the LinkedAvlNode whose key is lower than the given key ,<br>
      *         null if there is no node with a lower key than the given key.
      */
     LinkedAvlNode<K> findLess( K key );
 
 
     /**
-     * Finds a LinkedAvlNode<K> whose key is lower than the given key.
+     * Finds a LinkedAvlNode whose key is lower than the given key.
      *
      * @param key the key
-     * @return the LinkedAvlNode<K> whose key is lower than the given key ,<br>
+     * @return the LinkedAvlNode whose key is lower than the given key ,<br>
      *         null if there is no node with a lower key than the given key.
      */
     LinkedAvlNode<K> findLessOrEqual( K key );
diff --git a/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMap.java b/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMap.java
index c4a4ee5..c736406 100644
--- a/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMap.java
+++ b/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMap.java
@@ -128,40 +128,40 @@ public interface AvlTreeMap<K, V>
 
 
     /**
-     * Finds a LinkedAvlMapNode<K,V> whose key is higher than the given key.
+     * Finds a LinkedAvlMapNode whose key is higher than the given key.
      *
      * @param key the key
-     * @return the LinkedAvlMapNode<K,V> whose key is greater than the given key ,<br>
+     * @return the LinkedAvlMapNode whose key is greater than the given key ,<br>
      *         null if there is no node with a higher key than the given key.
      */
     LinkedAvlMapNode<K, V> findGreater( K key );
 
 
     /**
-     * Finds a LinkedAvlMapNode<K,V> whose key is higher than the given key.
+     * Finds a LinkedAvlMapNode whose key is higher than the given key.
      *
      * @param key the key
-     * @return the LinkedAvlMapNode<K,V> whose key is greater than the given key ,<br>
+     * @return the LinkedAvlMapNode whose key is greater than the given key ,<br>
      *         null if there is no node with a higher key than the given key.
      */
     LinkedAvlMapNode<K, V> findGreaterOrEqual( K key );
 
 
     /**
-     * Finds a LinkedAvlMapNode<K,V> whose key is lower than the given key.
+     * Finds a LinkedAvlMapNode whose key is lower than the given key.
      *
      * @param key the key
-     * @return the LinkedAvlMapNode<K,V> whose key is lower than the given key ,<br>
+     * @return the LinkedAvlMapNode whose key is lower than the given key ,<br>
      *         null if there is no node with a lower key than the given key.
      */
     LinkedAvlMapNode<K, V> findLess( K key );
 
 
     /**
-     * Finds a LinkedAvlMapNode<K,V> whose key is lower than the given key.
+     * Finds a LinkedAvlMapNode whose key is lower than the given key.
      *
      * @param key the key
-     * @return the LinkedAvlMapNode<K,V> whose key is lower than the given key ,<br>
+     * @return the LinkedAvlMapNode whose key is lower than the given key ,<br>
      *         null if there is no node with a lower key than the given key.
      */
     LinkedAvlMapNode<K, V> findLessOrEqual( K key );
diff --git a/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java b/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java
index 7242853..da32041 100644
--- a/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java
+++ b/core-avl/src/main/java/org/apache/directory/server/core/avltree/AvlTreeMarshaller.java
@@ -187,9 +187,9 @@ public class AvlTreeMarshaller<E> implements Marshaller<AvlTree<E>>
         int size = din.readInt();
 
         LinkedAvlNode[] nodes = new LinkedAvlNode[size];
-        LinkedAvlNode<E> root = readTree( din, null, nodes );
+        LinkedAvlNode<E> root = readTree( din, nodes );
 
-        AvlTreeImpl<E> tree = new AvlTreeImpl<E>( comparator );
+        AvlTreeImpl<E> tree = new AvlTreeImpl<>( comparator );
 
         tree.setRoot( root );
 
@@ -219,11 +219,11 @@ public class AvlTreeMarshaller<E> implements Marshaller<AvlTree<E>>
      * [node] [child-marker] [node].
      *
      * @param in the input stream to deserialize from
-     * @param node the node to deserialize
+     * @param nodes the deserialized nodes
      * @return the deserialized AvlTree node
      * @throws IOException on failures to deserialize or read from the stream
      */
-    public LinkedAvlNode<E> readTree( DataInputStream in, LinkedAvlNode<E> node, LinkedAvlNode[] nodes )
+    public LinkedAvlNode<E> readTree( DataInputStream in, LinkedAvlNode[] nodes )
         throws IOException
     {
         int dLen = in.readInt();
@@ -234,7 +234,7 @@ public class AvlTreeMarshaller<E> implements Marshaller<AvlTree<E>>
         in.readFully( data );
 
         E key = keyMarshaller.deserialize( data );
-        node = new LinkedAvlNode( key );
+        LinkedAvlNode<E> node = new LinkedAvlNode<>( key );
 
         int index = in.readInt();
         nodes[index] = node;
@@ -243,14 +243,14 @@ public class AvlTreeMarshaller<E> implements Marshaller<AvlTree<E>>
 
         if ( childMarker == 2 )
         {
-            node.setLeft( readTree( in, node.getLeft(), nodes ) );
+            node.setLeft( readTree( in, nodes ) );
         }
 
         childMarker = in.readInt();
 
         if ( childMarker == 4 )
         {
-            node.setRight( readTree( in, node.getRight(), nodes ) );
+            node.setRight( readTree( in, nodes ) );
         }
 
         return node;
diff --git a/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java b/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java
index 0aa421d..b3097b3 100644
--- a/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java
+++ b/core-avl/src/main/java/org/apache/directory/server/core/avltree/KeyTupleAvlCursor.java
@@ -130,9 +130,10 @@ public class KeyTupleAvlCursor<K, V> extends AbstractCursor<Tuple<K, V>>
      * considered at all.
      *
      * @param element the valueTuple who's value is used to position this Cursor
-     * @throws Exception if there are failures to position the Cursor
+     * @throws CursorException if there are failures to position the Cursor
+     * @throws LdapException if there are failures to position the Cursor
      */
-    public void before( Tuple<K, V> element ) throws LdapException, CursorException
+    public void before( Tuple<K, V> element ) throws CursorException, LdapException
     {
         checkNotClosed();
         wrapped.before( element.getValue() );
diff --git a/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlMapNode.java b/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlMapNode.java
index e1f7220..b3dc9a4 100644
--- a/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlMapNode.java
+++ b/core-avl/src/main/java/org/apache/directory/server/core/avltree/LinkedAvlMapNode.java
@@ -55,12 +55,13 @@ public class LinkedAvlMapNode<K, V>
     /**
      * Creates a new instance of LinkedAvlNode, containing a given value.
      *
-     * @param theKey the stored value on the topmost node
+     * @param theKey the stored key on the topmost node
+     * @param theValue The stored value on the topmost node
      */
     public LinkedAvlMapNode( K theKey, V theValue )
     {
         key = theKey;
-        value = new SingletonOrOrderedSet<V>( theValue );
+        value = new SingletonOrOrderedSet<>( theValue );
         left = null;
         right = null;
     }
diff --git a/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java b/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
index 042b9a7..a8388b9 100644
--- a/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
+++ b/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
@@ -166,7 +166,7 @@ public class IntegrationUtils
 
 
     public static CoreSession getCoreSession( String principalDn, DirectoryService service, String dn )
-        throws Exception
+        throws LdapException
     {
         if ( principalDn == null )
         {
@@ -176,12 +176,8 @@ public class IntegrationUtils
         Dn userDn = new Dn( service.getSchemaManager(), principalDn );
         LdapPrincipal principal = new LdapPrincipal( service.getSchemaManager(), userDn, AuthenticationLevel.SIMPLE );
 
-        if ( dn == null )
-        {
-            dn = "";
-        }
-
         CoreSession session = service.getSession( principal );
+        
         return session;
     }
 
@@ -204,7 +200,7 @@ public class IntegrationUtils
     }
 
 
-    public static void apply( DirectoryService service, LdifEntry entry ) throws Exception
+    public static void apply( DirectoryService service, LdifEntry entry ) throws LdapException
     {
         Dn dn = entry.getDn();
         CoreSession session = service.getAdminSession();
@@ -302,7 +298,7 @@ public class IntegrationUtils
     // Enable/Disable Schema Tests
     // -----------------------------------------------------------------------
 
-    public static void enableSchema( DirectoryService service, String schemaName ) throws Exception
+    public static void enableSchema( DirectoryService service, String schemaName ) throws LdapException
     {
         LdapConnection connection = getAdminConnection( service );
 
@@ -313,7 +309,7 @@ public class IntegrationUtils
     }
 
 
-    public static void disableSchema( DirectoryService service, String schemaName ) throws Exception
+    public static void disableSchema( DirectoryService service, String schemaName ) throws LdapException
     {
         LdapConnection connection = getAdminConnection( service );
 
@@ -327,6 +323,10 @@ public class IntegrationUtils
 
     /**
      * A helper method which tells if a schema is disabled.
+     * 
+     * @param service The Directory Service 
+     * @param schemaName The name of the Schema to check
+     * @return <tt>true</tt> if the schema is enabled
      */
     public static boolean isDisabled( DirectoryService service, String schemaName )
     {
@@ -338,6 +338,10 @@ public class IntegrationUtils
 
     /**
      * A helper method which tells if a schema is loaded.
+     * 
+     * @param service The Directory Service 
+     * @param schemaName The schema to check
+     * @return <tt>true</tt> if the schema is loaded
      */
     public static boolean isLoaded( DirectoryService service, String schemaName )
     {
@@ -350,6 +354,10 @@ public class IntegrationUtils
     /**
      * A helper method which tells if a schema is enabled. A shema must be
      * loaded and enabled.
+     * 
+     * @param service The Directory Service 
+     * @param schemaName The name of the Schema to check
+     * @return <tt>true</tt> if the schema is enabled
      */
     public static boolean isEnabled( DirectoryService service, String schemaName )
     {
@@ -364,9 +372,9 @@ public class IntegrationUtils
      * 
      * @param dirService The Directory Service to be connected to
      * @return A LdapCoreSessionConnection instance
-     * @exception If the connection could not be established.
+     * @exception LdapException If the connection could not be established.
      */
-    public static LdapConnection getAdminConnection( DirectoryService dirService ) throws Exception
+    public static LdapConnection getAdminConnection( DirectoryService dirService ) throws LdapException
     {
         return getConnectionAs( dirService, ServerDNConstants.ADMIN_SYSTEM_DN, "secret" );
     }
@@ -380,10 +388,10 @@ public class IntegrationUtils
      * @param dn The User's DN as a String
      * @param password The User's password as a String
      * @return A LdapCoreSessionConnection instance
-     * @exception If the connection could not be established.
+     * @exception LdapException If the connection could not be established.
      */
     public static LdapConnection getConnectionAs( DirectoryService dirService, String dn, String password )
-        throws Exception
+        throws LdapException
     {
         return getConnectionAs( dirService, new Dn( dn ), password );
     }
@@ -397,10 +405,10 @@ public class IntegrationUtils
      * @param dn The User's DN
      * @param password The User's password as a String
      * @return A LdapCoreSessionConnection instance
-     * @exception If the connection could not be established.
+     * @exception LdapException If the connection could not be established.
      */
     public static LdapConnection getConnectionAs( DirectoryService dirService, Dn dn, String password )
-        throws Exception
+        throws LdapException
     {
         LdapCoreSessionConnection connection = new LdapCoreSessionConnection();
 
@@ -416,14 +424,15 @@ public class IntegrationUtils
      * Gets a LdapNetworkConnection bound using a user's DN and a password. We will bind using those
      * credentials.
      * 
-     * @param dirService The Directory Service to be connected to
+     * @param host The server to connect to
+     * @param port The port to connect on
      * @param dn The User's DN as a String
      * @param password The User's password as a String
      * @return A LdapNetworkConnection instance
-     * @exception If the connection could not be established.
+     * @exception LdapException If the connection could not be established.
      */
     public static LdapConnection getNetworkConnectionAs( String host, int port, String dn, String password )
-        throws Exception
+        throws LdapException
     {
         LdapConnection connection = new LdapNetworkConnection( host, port );
 
@@ -436,11 +445,11 @@ public class IntegrationUtils
     /**
      * Gets an anonymous LdapNetworkConnection
      * 
-     * @param dirService The Directory Service to be connected to
+     * @param ldapServer The LdapServer to be connected to
      * @return A LdapNetworkConnection instance
-     * @exception If the connection could not be established.
+     * @exception LdapException If the connection could not be established.
      */
-    public static LdapConnection getAnonymousNetworkConnection( LdapServer ldapServer ) throws Exception
+    public static LdapConnection getAnonymousNetworkConnection( LdapServer ldapServer ) throws LdapException
     {
         LdapConnection connection = getAnonymousNetworkConnection( Network.LOOPBACK_HOSTNAME, ldapServer.getPort() );
 
@@ -451,11 +460,12 @@ public class IntegrationUtils
     /**
      * Gets an anonymous LdapNetworkConnection
      * 
-     * @param dirService The Directory Service to be connected to
+     * @param host The server to connect to
+     * @param port The port to connect on
      * @return A LdapNetworkConnection instance
-     * @exception If the connection could not be established.
+     * @exception LdapException If the connection could not be established.
      */
-    public static LdapConnection getAnonymousNetworkConnection( String host, int port ) throws Exception
+    public static LdapConnection getAnonymousNetworkConnection( String host, int port ) throws LdapException
     {
         LdapConnection connection = new LdapNetworkConnection( host, port );
         connection.bind();
@@ -469,11 +479,11 @@ public class IntegrationUtils
     /**
      * Gets a LdapNetworkConnection bound to the Admin user (uid=admin,ou=system).
      * 
-     * @param dirService The Directory Service to be connected to
+     * @param ldapServer The LdapServer to be connected to
      * @return A LdapNetworkConnection instance
-     * @exception If the connection could not be established.
+     * @exception LdapException If the connection could not be established.
      */
-    public static LdapConnection getAdminNetworkConnection( LdapServer ldapServer ) throws Exception
+    public static LdapConnection getAdminNetworkConnection( LdapServer ldapServer ) throws LdapException
     {
         LdapConnection connection = new LdapNetworkConnection( Network.LOOPBACK_HOSTNAME, ldapServer.getPort() );
 
@@ -491,13 +501,13 @@ public class IntegrationUtils
      * credentials. We specify a LdapServer instance too.
      * 
      * @param ldapServer The LdapServer to be connected to
-     * @param dn The User's DN as a String
+     * @param userDn The User's DN as a String
      * @param password The User's password as a String
      * @return A LdapNetworkConnection instance
-     * @exception If the connection could not be established.
+     * @exception LdapException If the connection could not be established.
      */
     public static LdapConnection getNetworkConnectionAs( LdapServer ldapServer, String userDn, String password )
-        throws Exception
+        throws LdapException
     {
         return getNetworkConnectionAs( Network.LOOPBACK_HOSTNAME, ldapServer.getPort(), userDn, password );
     }
diff --git a/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultDnFactory.java b/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultDnFactory.java
index dad71a2..606e409 100644
--- a/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultDnFactory.java
+++ b/core-shared/src/main/java/org/apache/directory/server/core/shared/DefaultDnFactory.java
@@ -58,7 +58,8 @@ public class DefaultDnFactory implements DnFactory
     /**
      * Instantiates a new default Dn factory.
      *
-     * @param directoryService the directory service
+     * @param schemaManager The SchemaManager instance
+     * @param dnCache The cache used to store DNs
      */
     public DefaultDnFactory( SchemaManager schemaManager, Cache dnCache )
     {
diff --git a/core-shared/src/main/java/org/apache/directory/server/core/shared/ReferralManagerImpl.java b/core-shared/src/main/java/org/apache/directory/server/core/shared/ReferralManagerImpl.java
index 8341799..126286b 100644
--- a/core-shared/src/main/java/org/apache/directory/server/core/shared/ReferralManagerImpl.java
+++ b/core-shared/src/main/java/org/apache/directory/server/core/shared/ReferralManagerImpl.java
@@ -73,7 +73,7 @@ public class ReferralManagerImpl implements ReferralManager
      * Creates a new instance of ReferralManagerImpl.
      *
      * @param directoryService The directory service
-     * @throws Exception If we can't initialize the manager
+     * @throws LdapException If we can't initialize the manager
      */
     public ReferralManagerImpl( DirectoryService directoryService ) throws LdapException
     {
diff --git a/core-shared/src/main/java/org/apache/directory/server/core/shared/SortedEntrySerializer.java b/core-shared/src/main/java/org/apache/directory/server/core/shared/SortedEntrySerializer.java
index 31bea2c..fb719d4 100644
--- a/core-shared/src/main/java/org/apache/directory/server/core/shared/SortedEntrySerializer.java
+++ b/core-shared/src/main/java/org/apache/directory/server/core/shared/SortedEntrySerializer.java
@@ -161,6 +161,9 @@ public class SortedEntrySerializer implements Serializer
      *     </ul>
      *   </li>
      * </ul>
+     * 
+     * @param entry The entry to serialize
+     * @return The byte[] containing the serialized entry
      */
     public byte[] serialize( Entry entry )
     {
diff --git a/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java b/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java
index 6b2db0f..8042409 100644
--- a/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java
+++ b/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java
@@ -1112,7 +1112,8 @@ public class DefaultPartitionNexus extends AbstractPartition implements Partitio
     /**
      * Return the number of children and subordinates for a given entry
      *
-     * @param dn The entry's DN
+     * @param partitionTxn The Partition transaction
+     * @param entry The entry for which we want to find the subordinates
      * @return The Subordinate instance that contains the values.
      * @throws LdapException If we had an issue while processing the request
      */
diff --git a/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java b/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
index 6388e9c..f5c6c6c 100644
--- a/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
+++ b/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
@@ -307,8 +307,10 @@ public class DefaultDirectoryService implements DirectoryService
 
     /**
      * Creates a new instance of the directory service.
+     * 
+     * @throws LdapException If the instance cannot be created
      */
-    public DefaultDirectoryService() throws Exception
+    public DefaultDirectoryService() throws LdapException
     {
         changeLog = new DefaultChangeLog();
         journal = new DefaultJournal();
@@ -711,8 +713,7 @@ public class DefaultDirectoryService implements DirectoryService
 
 
     /**
-     * Sets test directory entries({@link Attributes}) to be loaded while
-     * bootstrapping.
+     * Sets test directory entries to be loaded while bootstrapping.
      *
      * @param testEntries the test entries to load while bootstrapping
      */
@@ -1237,7 +1238,7 @@ public class DefaultDirectoryService implements DirectoryService
 
 
     /**
-     * @throws Exception if the LDAP server cannot be started
+     * @throws LdapException if the LDAP server cannot be started
      */
     public synchronized void startup() throws LdapException
     {
@@ -2249,22 +2250,12 @@ public class DefaultDirectoryService implements DirectoryService
      */
     public Interceptor getInterceptor( String interceptorName )
     {
-        //readLock.lock();
-
-        //try
-        //{
-            return interceptorNames.get( interceptorName );
-        //}
-        //finally
-        //{
-            //readLock.unlock();
-        //}
+        return interceptorNames.get( interceptorName );
     }
 
 
     /**
      * {@inheritDoc}
-     * @throws LdapException
      */
     public void addFirst( Interceptor interceptor ) throws LdapException
     {
@@ -2274,7 +2265,6 @@ public class DefaultDirectoryService implements DirectoryService
 
     /**
      * {@inheritDoc}
-     * @throws LdapException
      */
     public void addLast( Interceptor interceptor ) throws LdapException
     {
diff --git a/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java b/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
index 313b352..5ea95d0 100644
--- a/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
+++ b/core/src/main/java/org/apache/directory/server/core/security/CoreKeyStoreSpi.java
@@ -65,6 +65,7 @@ public class CoreKeyStoreSpi extends KeyStoreSpi
 
     /**
      * Creates a new instance of LocalKeyStore.
+     * @param directoryService The DirectorySevice instance
      */
     public CoreKeyStoreSpi( DirectoryService directoryService )
     {
diff --git a/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java b/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java
index 9de8a9e..8fabc2d 100644
--- a/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java
+++ b/core/src/main/java/org/apache/directory/server/core/security/TlsKeyGenerator.java
@@ -312,6 +312,13 @@ public final class TlsKeyGenerator
      * 
      * TODO the code is duplicate atm, will eliminate this redundancy after finding
      * a better thought (an instant one is to call this method from the aboveaddKeyPair(entry) and remove the impl there)
+     * 
+     * @param entry The Entry to update
+     * @param issuerDN The issuer
+     * @param subjectDN The subject
+     * @param keyAlgo The algorithm
+     * @param keySize The key size
+     * @throws LdapException If the addition failed 
      */
     public static void addKeyPair( Entry entry, String issuerDN, String subjectDN, String keyAlgo, int keySize )
         throws LdapException
diff --git a/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java b/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
index 7e1c018..65eb844 100644
--- a/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
+++ b/http-integration/src/main/java/org/apache/directory/server/integration/http/HttpServer.java
@@ -106,7 +106,8 @@ public class HttpServer
     /**
      * starts the jetty http server
      * 
-     * @throws Exception
+     * @param dirService The DirectoryService instance
+     * @throws Exception If Jetty can't be started
      */
     public void start( DirectoryService dirService ) throws Exception
     {
@@ -290,8 +291,8 @@ public class HttpServer
 
     /**
      * stops the jetty http server
-     * 
-     * @throws Exception
+     *  
+     * @throws Exception If Jetty can't be stopped
      */
     public void stop() throws Exception
     {
diff --git a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/AbstractMojoCommand.java b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/AbstractMojoCommand.java
index b05b7d3..4de2f65 100644
--- a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/AbstractMojoCommand.java
+++ b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/AbstractMojoCommand.java
@@ -130,8 +130,8 @@ public abstract class AbstractMojoCommand<T extends Target>
     /**
      * Executes the command.
      *
-     * @throws MojoExecutionException
-     * @throws MojoFailureException
+     * @throws MojoExecutionException If the execution failed
+     * @throws MojoFailureException If the execution failed
      */
     public abstract void execute() throws MojoExecutionException, MojoFailureException;
 
@@ -186,8 +186,8 @@ public abstract class AbstractMojoCommand<T extends Target>
     /**
      * Creates both installation and instance layouts.
      * 
-     * @throws MojoFailureException
-     * @throws IOException
+     * @throws MojoFailureException If the InstanceLayout cannot be created
+     * @throws IOException If the InstanceLayout cannot be created
      */
     public void createLayouts() throws MojoFailureException, IOException
     {
@@ -202,8 +202,8 @@ public abstract class AbstractMojoCommand<T extends Target>
      *      <code>true</code> if wrapper dependencies are included,
      *      <code>false</code> if wrapper dependencies are excluded
      *      
-     * @throws MojoFailureException
-     * @throws IOException
+     * @throws MojoFailureException If the InstanceLayout cannot be created
+     * @throws IOException If the InstanceLayout cannot be created
      */
     public void createLayouts( boolean includeWrapperDependencies ) throws MojoFailureException, IOException
     {
@@ -218,11 +218,10 @@ public abstract class AbstractMojoCommand<T extends Target>
     /**
      * Creates the installation layout.
      *      
-     * @throws MojoFailureException
-     * @throws IOException
+     * @throws MojoFailureException If the InstanceLayout cannot be created
+     * @throws IOException If the InstanceLayout cannot be created
      */
-    protected void createInstallationLayout() throws MojoFailureException,
-        IOException
+    protected void createInstallationLayout() throws MojoFailureException, IOException
     {
         createInstallationLayout( true );
     }
@@ -235,8 +234,8 @@ public abstract class AbstractMojoCommand<T extends Target>
      *      <code>true</code> if wrapper dependencies are included,
      *      <code>false</code> if wrapper dependencies are excluded
      *      
-     * @throws MojoFailureException
-     * @throws IOException
+     * @throws MojoFailureException If the creation failed
+     * @throws IOException If the layout cannot be created
      */
     protected void createInstallationLayout( boolean includeWrapperDependencies ) throws MojoFailureException,
         IOException
@@ -305,7 +304,7 @@ public abstract class AbstractMojoCommand<T extends Target>
     /**
      * Creates the instance layout.
      *
-     * @throws IOException
+     * @throws IOException If the InatsnaceLayout cannot be created
      */
     protected void createInstanceLayout() throws IOException
     {
diff --git a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/GenerateMojo.java b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/GenerateMojo.java
index 64b3626..3efa09c 100644
--- a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/GenerateMojo.java
+++ b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/GenerateMojo.java
@@ -52,6 +52,7 @@ import org.codehaus.plexus.util.FileUtils;
  * @description Creates platform specific installation layout images.
  * @phase package
  * @requiresDependencyResolution runtime
+ * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public class GenerateMojo extends AbstractMojo
diff --git a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/Target.java b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/Target.java
index 87701fb..b97f1d4 100644
--- a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/Target.java
+++ b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/Target.java
@@ -156,6 +156,8 @@ public abstract class Target
 
     /**
      * Indicates if the OS name is 'Linux'.
+     * 
+     * @return <tt>true</tt> if the OS architecture is Linux 
      */
     public boolean isOsNameLinux()
     {
@@ -165,6 +167,8 @@ public abstract class Target
 
     /**
      * Indicates if the OS name is 'Mac OS X'.
+     * 
+     * @return <tt>true</tt> if the OS architecture is MAC OS X 
      */
     public boolean isOsNameMacOSX()
     {
@@ -174,6 +178,8 @@ public abstract class Target
 
     /**
      * Indicates if the OS name is 'Solaris'.
+     * 
+     * @return <tt>true</tt> if the OS architecture is Solaris 
      */
     public boolean isOsNameSolaris()
     {
@@ -183,6 +189,8 @@ public abstract class Target
 
     /**
      * Indicates if the OS name is 'Windows'.
+     * 
+     * @return <tt>true</tt> if the OS architecture is Windows 
      */
     public boolean isOsNameWindows()
     {
@@ -192,6 +200,8 @@ public abstract class Target
 
     /**
      * Indicates if the OS architecture is 'amd64'.
+     * 
+     * @return <tt>true</tt> if the OS architecture is AMD64 
      */
     public boolean isOsArchAmd64()
     {
@@ -201,6 +211,8 @@ public abstract class Target
 
     /**
      * Indicates if the OS architecture is 'i386'.
+     * 
+     * @return <tt>true</tt> if the OS architecture is I386 
      */
     public boolean isOsArchI386()
     {
@@ -210,6 +222,8 @@ public abstract class Target
 
     /**
      * Indicates if the OS architecture is 'Sparc'.
+     * 
+     * @return <tt>true</tt> if the OS architecture is Sparc 
      */
     public boolean isOsArchSparc()
     {
@@ -219,6 +233,8 @@ public abstract class Target
 
     /**
      * Indicates if the OS architecture is 'x86'.
+     * 
+     * @return <tt>true</tt> if the OS architecture is X86 
      */
     public boolean isOsArchx86()
     {
@@ -228,6 +244,8 @@ public abstract class Target
 
     /**
      * Indicates if the OS architecture is 'x86_64'.
+     * 
+     * @return <tt>true</tt> if the OS architecture is X86_64 
      */
     public boolean isOsArchX86_64()
     {
diff --git a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveTarget.java b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveTarget.java
index 51ac6c3..0000347 100644
--- a/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveTarget.java
+++ b/installers-maven-plugin/src/main/java/org/apache/directory/server/installers/archive/ArchiveTarget.java
@@ -69,7 +69,7 @@ public class ArchiveTarget extends Target
     /**
      * Sets the archive type.
      *
-     * @param archiveType
+     * @param archiveType The Archive type
      */
     public void setArchiveType( String archiveType )
     {
diff --git a/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java b/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
index 45a5ec4..f2e274c 100644
--- a/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
+++ b/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
@@ -43,6 +43,7 @@ import org.apache.directory.api.util.Strings;
 import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.core.api.entry.ClonedServerEntry;
 import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
+import org.apache.directory.server.core.api.interceptor.Interceptor;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
diff --git a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DnSerializer.java b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DnSerializer.java
index 5875087..e7a755c 100644
--- a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DnSerializer.java
+++ b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DnSerializer.java
@@ -72,10 +72,11 @@ public class DnSerializer implements Serializer
 
 
     /**
-     * <p>
-     * 
      * This is the place where we serialize Dn
-     * <p>
+     * 
+     * @param object The element to serialize
+     * @return a byte[] containing the serialized element
+     * @throws IOException If teh serialization failed
      */
     public byte[] serialize( Object object ) throws IOException
     {
diff --git a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DnSerializerComparator.java b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DnSerializerComparator.java
index 7814a96..4545fe5 100644
--- a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DnSerializerComparator.java
+++ b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DnSerializerComparator.java
@@ -42,7 +42,7 @@ public class DnSerializerComparator extends SerializableComparator<Dn>
     /**
      * Creates a new instance of DnSerializer.
      * 
-     * @param schemaManager The reference to the global schemaManager
+     * @param oid The comparator OID
      */
     public DnSerializerComparator( String oid )
     {
diff --git a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
index 8178ebf..342cc4d 100644
--- a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
+++ b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/DupsContainerCursor.java
@@ -74,8 +74,6 @@ public class DupsContainerCursor<K, V> extends AbstractCursor<Tuple<K, DupsConta
      * Creates a Cursor over the tuples of a JDBM table.
      *
      * @param table the JDBM Table to build a Cursor over
-     * @throws java.io.IOException of there are problems accessing the BTree or if this table
-     * does not allow duplicate values
      */
     public DupsContainerCursor( JdbmTable<K, V> table )
     {
@@ -208,7 +206,8 @@ public class DupsContainerCursor<K, V> extends AbstractCursor<Tuple<K, DupsConta
      * Positions this Cursor before the key of the supplied tuple.
      *
      * @param element the tuple who's key is used to position this Cursor
-     * @throws IOException if there are failures to position the Cursor
+     * @throws LdapException if there are failures to position the Cursor
+     * @throws CursorException if there are failures to position the Cursor
      */
     public void before( Tuple<K, DupsContainer<V>> element ) throws LdapException, CursorException
     {
diff --git a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
index 5556006..4efef7b 100644
--- a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
+++ b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
@@ -118,6 +118,9 @@ public class JdbmIndex<K> extends AbstractIndex<K, String>
     // ----------------------------------------------------------------------
     /**
      * Creates a JdbmIndex instance for a give AttributeId
+     * 
+     * @param attributeId The Attribute ID
+     * @param withReverse If we have to create a reverse index
      */
     public JdbmIndex( String attributeId, boolean withReverse )
     {
@@ -130,11 +133,14 @@ public class JdbmIndex<K> extends AbstractIndex<K, String>
     /**
      * Initialize the index for an Attribute, with a specific working directory (may be null).
      * 
+     * @param recMan The RecordManager
      * @param schemaManager The schemaManager to use to get back the Attribute
      * @param attributeType The attributeType this index is created for
+     * @throws LdapException If the initialization failed
      * @throws IOException If the initialization failed
      */
-    public void init( RecordManager recMan, SchemaManager schemaManager, AttributeType attributeType ) throws LdapException, IOException
+    public void init( RecordManager recMan, SchemaManager schemaManager, AttributeType attributeType ) 
+            throws LdapException, IOException
     {
         LOG.debug( "Initializing an Index for attribute '{}'", attributeType.getName() );
 
@@ -320,7 +326,7 @@ public class JdbmIndex<K> extends AbstractIndex<K, String>
 
 
     /**
-     * @see org.apache.directory.server.xdbm.Index#lessThanCount(java.lang.Object)
+     * {@inheritDoc}
      */
     @Override
     public long lessThanCount( PartitionTxn partitionTxn, K attrVal ) throws LdapException
@@ -334,7 +340,7 @@ public class JdbmIndex<K> extends AbstractIndex<K, String>
     // ------------------------------------------------------------------------
 
     /**
-     * @see Index#forwardLookup(java.lang.Object)
+     * {@inheritDoc}
      */
     public String forwardLookup( PartitionTxn partitionTxn, K attrVal ) throws LdapException
     {
diff --git a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
index 04b47fe..2938885 100644
--- a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
+++ b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
@@ -44,7 +44,7 @@ public class JdbmMasterTable extends JdbmTable<String, Entry> implements MasterT
      *
      * @param recMan the JDBM record manager
      * @param schemaManager the schema manager
-     * @throws Exception if there is an error opening the Db file.
+     * @throws IOException if there is an error opening the Db file.
      */
     public JdbmMasterTable( RecordManager recMan, SchemaManager schemaManager ) throws IOException
     {
diff --git a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
index 354a2bd..2cd8562 100644
--- a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
+++ b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartition.java
@@ -114,6 +114,9 @@ public class JdbmPartition extends AbstractBTreePartition
 
     /**
      * Creates a store based on JDBM B+Trees.
+     * 
+     * @param schemaManager The SchemaManager instance
+     * @param dnFactory The DN factory instance
      */
     public JdbmPartition( SchemaManager schemaManager, DnFactory dnFactory )
     {
@@ -671,7 +674,7 @@ public class JdbmPartition extends AbstractBTreePartition
      * This method is called when the synch thread is waking up, to write
      * the modified data.
      * 
-     * @throws Exception on failures to sync database files to disk
+     * @throws LdapException on failures to sync database files to disk
      */
     @Override
     public synchronized void sync() throws LdapException
diff --git a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartitionWriteTxn.java b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartitionWriteTxn.java
index 43b4b01..aa6633a 100644
--- a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartitionWriteTxn.java
+++ b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmPartitionWriteTxn.java
@@ -17,9 +17,10 @@ public class JdbmPartitionWriteTxn extends PartitionWriteTxn
     private boolean syncOnWrite = false;
     
     /**
+     * Create an instance of JdbmPartitionWriteTxn
      * 
-     * @param recordManager
-     * @param syncOnWrite
+     * @param recordManager The RecordManager instance
+     * @param syncOnWrite If we want to data to be flushed on each write
      */
     public JdbmPartitionWriteTxn( RecordManager recordManager, boolean syncOnWrite )
     {
diff --git a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
index 2632b3d..c3d7f71 100644
--- a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
+++ b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
@@ -206,7 +206,7 @@ public class JdbmTable<K, V> extends AbstractTable<K, V>
     // Count Overloads
     // ------------------------------------------------------------------------
     /**
-     * @see org.apache.directory.server.xdbm.Table#count(java.lang.Object)
+     * {@inheritDoc}
      */
     @Override
     public long count( PartitionTxn transaction, K key ) throws LdapException
diff --git a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java
index ad08894..d79774e 100644
--- a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java
+++ b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyBTreeCursor.java
@@ -62,7 +62,6 @@ public class KeyBTreeCursor<E> extends AbstractCursor<E>
      *
      * @param btree the JDBM BTree to build a Cursor over
      * @param comparator the Comparator used to determine key ordering
-     * @throws Exception of there are problems accessing the BTree
      */
     public KeyBTreeCursor( BTree btree, Comparator<E> comparator )
     {
diff --git a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
index af3d2ae..dfde28d 100644
--- a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
+++ b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursor.java
@@ -67,7 +67,7 @@ public class KeyTupleBTreeCursor<K, V> extends AbstractCursor<Tuple<K, V>>
      * @param btree the JDBM BTree to build a Cursor over
      * @param key the constant key for which values are returned
      * @param comparator the Comparator used to determine <b>key</b> ordering
-     * @throws Exception of there are problems accessing the BTree
+     * @throws IOException of there are problems accessing the BTree
      */
     public KeyTupleBTreeCursor( BTree btree, K key, Comparator<V> comparator ) throws IOException
     {
@@ -195,7 +195,8 @@ public class KeyTupleBTreeCursor<K, V> extends AbstractCursor<Tuple<K, V>>
      * all.
      *
      * @param element the valueTuple who's value is used to position this Cursor
-     * @throws Exception if there are failures to position the Cursor
+     * @throws LdapException if there are failures to position the Cursor
+     * @throws CursorException if there are failures to position the Cursor
      */
     public void before( Tuple<K, V> element ) throws LdapException, CursorException
     {
diff --git a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java
index 01003e8..82106b2 100644
--- a/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java
+++ b/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java
@@ -73,10 +73,11 @@ public class ParentIdAndRdnSerializer implements Serializer
 
 
     /**
-     * <p>
-     * 
      * This is the place where we serialize ParentIdAndRdn
-     * <p>
+     * 
+     * @param object The element to serialize
+     * @return the byte] containing the serialized element
+     * @throws IOException If the serialization failed
      */
     public byte[] serialize( Object object ) throws IOException
     {
diff --git a/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConnection.java b/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConnection.java
index a051355..03e6e46 100644
--- a/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConnection.java
+++ b/kerberos-client/src/main/java/org/apache/directory/kerberos/client/KdcConnection.java
@@ -130,10 +130,10 @@ public class KdcConnection
      * 
      * @param principal the client's principal 
      * @param password password of the client
-     * @return
-     * @throws Exception
+     * @return A Ticket Granting Ticket instance
+     * @throws KerberosException If a Ticket Granting Ticket cannot be fetch
      */
-    public TgTicket getTgt( String principal, String password ) throws Exception
+    public TgTicket getTgt( String principal, String password ) throws KerberosException
     {
         TgtRequest clientTgtReq = new TgtRequest();
         
@@ -147,13 +147,14 @@ public class KdcConnection
     /**
      * Authenticates to the Kerberos server and gets a service ticket for the given server principal
      * 
-     * @param principal the client's principal 
+     * @param clientPrincipal the client's principal 
      * @param password password of the client
      * @param serverPrincipal the application server's principal
-     * @return
-     * @throws Exception
+     * @return A ServiceTicket instance
+     * @throws KerberosException If the ServiceTicket cannot be fetch
      */
-    public ServiceTicket getServiceTicket( String clientPrincipal, String password, String serverPrincipal ) throws KerberosException
+    public ServiceTicket getServiceTicket( String clientPrincipal, String password, String serverPrincipal ) 
+            throws KerberosException
     {
         TgtRequest clientTgtReq = new TgtRequest();
         clientTgtReq.setClientPrincipal( clientPrincipal );
diff --git a/kerberos-client/src/main/java/org/apache/directory/kerberos/client/Kinit.java b/kerberos-client/src/main/java/org/apache/directory/kerberos/client/Kinit.java
index 7a0d014..d3dfb38 100644
--- a/kerberos-client/src/main/java/org/apache/directory/kerberos/client/Kinit.java
+++ b/kerberos-client/src/main/java/org/apache/directory/kerberos/client/Kinit.java
@@ -34,52 +34,51 @@ import org.apache.directory.shared.kerberos.components.PrincipalName;
  */
 public class Kinit
 {
-	
-	private KdcConnection kdc;
-	private File credCacheFile;
-	
-	public Kinit( KdcConnection kdc )
-	{
-		this.kdc = kdc;
-	}
-	
-	public void setCredCacheFile( File credCacheFile )
-	{
-		this.credCacheFile = credCacheFile;
-	}
-	
-	public File getCredCacheFile()
-	{
-		return this.credCacheFile;
-	}
-	
+    private KdcConnection kdc;
+    private File credCacheFile;
+    
+    public Kinit( KdcConnection kdc )
+    {
+    	this.kdc = kdc;
+    }
+    
+    public void setCredCacheFile( File credCacheFile )
+    {
+    	this.credCacheFile = credCacheFile;
+    }
+    
+    public File getCredCacheFile()
+    {
+    	return this.credCacheFile;
+    }
+    
     /**
      * Authenticates to the Kerberos server and gets the initial Ticket Granting Ticket,
      * then cache the tgt in credentials cache, as MIT kinit does.
      * 
      * @param principal the client's principal 
      * @param password password of the client
-     * @return
-     * @throws Exception
+     * @throws Exception If we had an issue while getting the TGT, or creating the PrincipalName, or
+     * storing the credentials
      */
     public void kinit( String principal, String password ) throws Exception
     {
-    	if ( principal == null || password == null || credCacheFile == null )
-    	{
-    		throw new IllegalArgumentException( "Invalid principal, password, or credentials cache file" );
-    	}
-    	
-    	TgTicket tgt = kdc.getTgt( principal, password );
-    	
-    	CredentialsCache credCache = new CredentialsCache();
-    	
-    	PrincipalName princ = new PrincipalName( principal, PrincipalNameType.KRB_NT_PRINCIPAL );
-    	princ.setRealm( tgt.getRealm() );
-    	credCache.setPrimaryPrincipalName( princ );
-    	
-    	Credentials cred = new Credentials( tgt );
-    	credCache.addCredentials( cred );
-    	
-    	CredentialsCache.store( credCacheFile, credCache );
-    }    
+        if ( principal == null || password == null || credCacheFile == null )
+        {
+        	throw new IllegalArgumentException( "Invalid principal, password, or credentials cache file" );
+        }
+        
+        TgTicket tgt = kdc.getTgt( principal, password );
+        
+        CredentialsCache credCache = new CredentialsCache();
+        
+        PrincipalName princ = new PrincipalName( principal, PrincipalNameType.KRB_NT_PRINCIPAL );
+        princ.setRealm( tgt.getRealm() );
+        credCache.setPrimaryPrincipalName( princ );
+        
+        Credentials cred = new Credentials( tgt );
+        credCache.addCredentials( cred );
+        
+        CredentialsCache.store( credCacheFile, credCache );
+    }
 }
diff --git a/kerberos-client/src/main/java/org/apache/directory/kerberos/credentials/cache/CredentialsCache.java b/kerberos-client/src/main/java/org/apache/directory/kerberos/credentials/cache/CredentialsCache.java
index 38f7f37..802e975 100644
--- a/kerberos-client/src/main/java/org/apache/directory/kerberos/credentials/cache/CredentialsCache.java
+++ b/kerberos-client/src/main/java/org/apache/directory/kerberos/credentials/cache/CredentialsCache.java
@@ -87,7 +87,7 @@ public class CredentialsCache
     }
     
     /**
-     * Returns the primary principal
+     * @return the primary principal
      */
     public PrincipalName getPrimaryPrincipalName() 
     {
@@ -96,6 +96,8 @@ public class CredentialsCache
     
     /**
      * Set the primary principal
+     * 
+     * @param principal The PrincipalName to set
      */
     public void setPrimaryPrincipalName( PrincipalName principal ) 
     {
@@ -113,7 +115,7 @@ public class CredentialsCache
     }
     
     /**
-     * Returns the credentials entries
+     * @return the credentials entries
      */
     public List<Credentials> getCredsList() 
     {
@@ -123,36 +125,36 @@ public class CredentialsCache
     
     public static void main(String[] args) throws IOException
     {
-    	String dumpFile = File.createTempFile( "credCache-", ".cc" ).getAbsolutePath();
-    	System.out.println( "This tool tests CredentialsCache reading and writing, " + 
-				"and will load the built-in sample credentials cache by default, and dump to " + dumpFile );
-    	
-    	System.out.println( "To specify your own credentials cache file, run this as: CredentialsCache [cred-cache-file] " );
-    	
-    	System.out.println( "When dumped successfully, run 'klist -e -c' from MIT to check the dumped file" );
-    	
-    	CredentialsCache cc;
-    	String cacheFile = args.length > 0 ? args[0] : null;
-    	if (cacheFile == null)
-    	{    		
-    		byte[] sampleCache = SampleCredentialsCacheResource.getCacheContent();
-    		ByteArrayInputStream bais = new ByteArrayInputStream(sampleCache);
-    		cc = CredentialsCache.load(bais);
-    	} 
-    	else
-    	{
-    		cc = CredentialsCache.load( new File( cacheFile ) );
-    	}
-    	
-    	if ( cc != null )
-    	{
-    		System.out.println( "Reading credentials cache is successful" );
-    		
-    		File tmpCacheFile = new File(dumpFile);
-    		tmpCacheFile.delete();
-    		CredentialsCache.store(tmpCacheFile, cc);
-
-    		System.out.println( "Writing credentials cache successfully to: " + dumpFile );
-    	}
+        String dumpFile = File.createTempFile( "credCache-", ".cc" ).getAbsolutePath();
+        System.out.println( "This tool tests CredentialsCache reading and writing, " + 
+                "and will load the built-in sample credentials cache by default, and dump to " + dumpFile );
+        
+        System.out.println( "To specify your own credentials cache file, run this as: CredentialsCache [cred-cache-file] " );
+        
+        System.out.println( "When dumped successfully, run 'klist -e -c' from MIT to check the dumped file" );
+        
+        CredentialsCache cc;
+        String cacheFile = args.length > 0 ? args[0] : null;
+        if (cacheFile == null)
+        {
+            byte[] sampleCache = SampleCredentialsCacheResource.getCacheContent();
+            ByteArrayInputStream bais = new ByteArrayInputStream(sampleCache);
+            cc = CredentialsCache.load(bais);
+        }
+        else
+        {
+            cc = CredentialsCache.load( new File( cacheFile ) );
+        }
+        
+        if ( cc != null )
+        {
+            System.out.println( "Reading credentials cache is successful" );
+        
+        File tmpCacheFile = new File(dumpFile);
+        tmpCacheFile.delete();
+        CredentialsCache.store(tmpCacheFile, cc);
+        
+        System.out.println( "Writing credentials cache successfully to: " + dumpFile );
+        }
     }
 }
diff --git a/kerberos-client/src/main/java/org/apache/directory/kerberos/credentials/cache/SampleCredentialsCacheResource.java b/kerberos-client/src/main/java/org/apache/directory/kerberos/credentials/cache/SampleCredentialsCacheResource.java
index 2c19223..390d1f9 100644
--- a/kerberos-client/src/main/java/org/apache/directory/kerberos/credentials/cache/SampleCredentialsCacheResource.java
+++ b/kerberos-client/src/main/java/org/apache/directory/kerberos/credentials/cache/SampleCredentialsCacheResource.java
@@ -40,71 +40,79 @@ public class SampleCredentialsCacheResource
      *
      * Valid starting     Expires            Service principal
      * 09/06/13 01:54:10  09/06/13 11:54:10  krbtgt/SH.INTEL.COM@SH.INTEL.COM
-	 * renew until 09/07/13 01:54:07
+     * renew until 09/07/13 01:54:07
      * 09/06/13 01:54:11  09/06/13 11:54:10  host/hadoop-nn.sh.intel.com@SH.INTEL.COM
-	 * renew until 09/07/13 01:54:07
-	 */
-	private static final String SAMPLE_CACHE_CONTENT = 
-			        "BQQADAABAAgAAAAAAAAAAAAAAAEAAAABAAAADFNILklOVEVMLkNPTQAAAAhhcGFjaGVkcwAAAAEA" +
-					"AAABAAAADFNILklOVEVMLkNPTQAAAAhhcGFjaGVkcwAAAAIAAAACAAAADFNILklOVEVMLkNPTQAA" +
-					"AAZrcmJ0Z3QAAAAMU0guSU5URUwuQ09NAAEAAAAI3H/4OE/NpCpSKGeiUihnolIo9EJSKbkfAEDh" +
-					"AAAAAAAAAAAAAAAAAUFhggE9MIIBOaADAgEFoQ4bDFNILklOVEVMLkNPTaIhMB+gAwIBAqEYMBYb" +
-					"BmtyYnRndBsMU0guSU5URUwuQ09No4H+MIH7oAMCARehAwIBAaKB7gSB6/v51fFhnp/E2uto2e9I" +
-					"9+RUk2grlKW9pYQUc4lAV602hdP6I80s1KU1rNtezbmf8plmxdZ48yogt0KwzAoGoFWCiZk4S1dR" +
-					"zzvl/TmNtk9q1gFuVycoP1EvScPYWhdTPAR4/t1Si1DKrYY19eegYmv6PfKoisdAADatLOjqJsVc" +
-					"Ntl/cUU4qUJfm181X1b+mguIdAX4jKzWbEc52pYQr8UIDl3TNT8OIzmQC0Wjn93ocOpKwOGsclbN" +
-					"OoxSfqpxvARjg+uE5HSm5tX7nUsccjhKMJ76Uy78CEULXkg6ySPYiim5wKVvgwxI7/AAAAAAAAAA" +
-					"AQAAAAEAAAAMU0guSU5URUwuQ09NAAAACGFwYWNoZWRzAAAAAAAAAAMAAAAMWC1DQUNIRUNPTkY6" +
-					"AAAAFWtyYjVfY2NhY2hlX2NvbmZfZGF0YQAAAApmYXN0X2F2YWlsAAAAIGtyYnRndC9TSC5JTlRF" +
-					"TC5DT01AU0guSU5URUwuQ09NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD" +
-					"eWVzAAAAAAAAAAEAAAABAAAADFNILklOVEVMLkNPTQAAAAhhcGFjaGVkcwAAAAMAAAACAAAADFNI" +
-					"LklOVEVMLkNPTQAAAARob3N0AAAAFmhhZG9vcC1ubi5zaC5pbnRlbC5jb20AAQAAAAgsx5ub9wI0" +
-					"01IoZ6JSKGemUij0QlIpuR8AQKkAAAAAAAAAAAAAAAABX2GCAVswggFXoAMCAQWhDhsMU0guSU5U" +
-					"RUwuQ09NoikwJ6ADAgEDoSAwHhsEaG9zdBsWaGFkb29wLW5uLnNoLmludGVsLmNvbaOCARMwggEP" +
-					"oAMCARehAwIBB6KCAQEEgf7Z6Xz1bYJ9uE4e2Buyrp2aflcqgVoh9YUVAZyIiqpsrMa71wMuZFUl" +
-					"FD+S58Q3T39pZ9vIfXENNoKje1Y5kyImPHC1D/eHIeUN9v5kmDPJP9U31di8dOi3TbHUQWWLbB6k" +
-					"+uQE25GAP2hQg0vm5WtU3Fjo0ysXQTMpe+FSwe9ca9V3soPSbDhmlEt8WjAY05iXD8Fe6o/aY/PJ" +
-					"nElmCwQayRT87vENJI9LeMVEzhIjxBmg124G4nGnjUCaf++G03kJ04mLFZDB9kS8sA7V8AT1IF00" +
-					"ehpt7c9KbUM1Iz/S3Ni5hq8IfdOTSWMjGdNIsUMhJmivYFzQ0PRBzSBxbAAAAAA=";
-	
-	private static final String SAMPLE_PRINCIPAL = "apacheds";
-	private static final String SAMPLE_REALM = "SH.INTEL.COM";
-	private static final String[] SAMPLE_SERVERS = new String[] {"krbtgt/SH.INTEL.COM", "host/hadoop-nn.sh.intel.com"};
-	
-	public static byte[] getCacheContent()
-	{
-		byte[] content = Base64.decode(SampleCredentialsCacheResource.SAMPLE_CACHE_CONTENT.toCharArray());
-		return content;
-	}
-	
-	/**
-	 * Get the primary principal name contained in the sample cache
-	 */
-	public static String getSamplePrincipal()
-	{
-		return SAMPLE_PRINCIPAL;
-	}
-	
-	/**
-	 * Get the realm contained in the sample cache
-	 */
-	public static String getSampleRealm()
-	{
-		return SAMPLE_REALM;
-	}
-	
-	/**
-	 * Get the servers in the tickets contained in the sample cache
-	 */
-	public static String[] getSampleServers()
-	{
-		return SAMPLE_SERVERS;
-	}
-
-	/**
-	 * Get the tickets count in the sample cache
-	 */
-	public static int getSampleTicketsCount() {
-		return 2;
-	}
+     * renew until 09/07/13 01:54:07
+     */
+    private static final String SAMPLE_CACHE_CONTENT = 
+                    "BQQADAABAAgAAAAAAAAAAAAAAAEAAAABAAAADFNILklOVEVMLkNPTQAAAAhhcGFjaGVkcwAAAAEA" +
+                    "AAABAAAADFNILklOVEVMLkNPTQAAAAhhcGFjaGVkcwAAAAIAAAACAAAADFNILklOVEVMLkNPTQAA" +
+                    "AAZrcmJ0Z3QAAAAMU0guSU5URUwuQ09NAAEAAAAI3H/4OE/NpCpSKGeiUihnolIo9EJSKbkfAEDh" +
+                    "AAAAAAAAAAAAAAAAAUFhggE9MIIBOaADAgEFoQ4bDFNILklOVEVMLkNPTaIhMB+gAwIBAqEYMBYb" +
+                    "BmtyYnRndBsMU0guSU5URUwuQ09No4H+MIH7oAMCARehAwIBAaKB7gSB6/v51fFhnp/E2uto2e9I" +
+                    "9+RUk2grlKW9pYQUc4lAV602hdP6I80s1KU1rNtezbmf8plmxdZ48yogt0KwzAoGoFWCiZk4S1dR" +
+                    "zzvl/TmNtk9q1gFuVycoP1EvScPYWhdTPAR4/t1Si1DKrYY19eegYmv6PfKoisdAADatLOjqJsVc" +
+                    "Ntl/cUU4qUJfm181X1b+mguIdAX4jKzWbEc52pYQr8UIDl3TNT8OIzmQC0Wjn93ocOpKwOGsclbN" +
+                    "OoxSfqpxvARjg+uE5HSm5tX7nUsccjhKMJ76Uy78CEULXkg6ySPYiim5wKVvgwxI7/AAAAAAAAAA" +
+                    "AQAAAAEAAAAMU0guSU5URUwuQ09NAAAACGFwYWNoZWRzAAAAAAAAAAMAAAAMWC1DQUNIRUNPTkY6" +
+                    "AAAAFWtyYjVfY2NhY2hlX2NvbmZfZGF0YQAAAApmYXN0X2F2YWlsAAAAIGtyYnRndC9TSC5JTlRF" +
+                    "TC5DT01AU0guSU5URUwuQ09NAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD" +
+                    "eWVzAAAAAAAAAAEAAAABAAAADFNILklOVEVMLkNPTQAAAAhhcGFjaGVkcwAAAAMAAAACAAAADFNI" +
+                    "LklOVEVMLkNPTQAAAARob3N0AAAAFmhhZG9vcC1ubi5zaC5pbnRlbC5jb20AAQAAAAgsx5ub9wI0" +
+                    "01IoZ6JSKGemUij0QlIpuR8AQKkAAAAAAAAAAAAAAAABX2GCAVswggFXoAMCAQWhDhsMU0guSU5U" +
+                    "RUwuQ09NoikwJ6ADAgEDoSAwHhsEaG9zdBsWaGFkb29wLW5uLnNoLmludGVsLmNvbaOCARMwggEP" +
+                    "oAMCARehAwIBB6KCAQEEgf7Z6Xz1bYJ9uE4e2Buyrp2aflcqgVoh9YUVAZyIiqpsrMa71wMuZFUl" +
+                    "FD+S58Q3T39pZ9vIfXENNoKje1Y5kyImPHC1D/eHIeUN9v5kmDPJP9U31di8dOi3TbHUQWWLbB6k" +
+                    "+uQE25GAP2hQg0vm5WtU3Fjo0ysXQTMpe+FSwe9ca9V3soPSbDhmlEt8WjAY05iXD8Fe6o/aY/PJ" +
+                    "nElmCwQayRT87vENJI9LeMVEzhIjxBmg124G4nGnjUCaf++G03kJ04mLFZDB9kS8sA7V8AT1IF00" +
+                    "ehpt7c9KbUM1Iz/S3Ni5hq8IfdOTSWMjGdNIsUMhJmivYFzQ0PRBzSBxbAAAAAA=";
+    
+    private static final String SAMPLE_PRINCIPAL = "apacheds";
+    private static final String SAMPLE_REALM = "SH.INTEL.COM";
+    private static final String[] SAMPLE_SERVERS = new String[] {"krbtgt/SH.INTEL.COM", "host/hadoop-nn.sh.intel.com"};
+    
+    public static byte[] getCacheContent()
+    {
+        return Base64.decode(SampleCredentialsCacheResource.SAMPLE_CACHE_CONTENT.toCharArray());
+    }
+    
+    
+    /**
+     * @return the primary principal name contained in the sample cache
+     */
+    public static String getSamplePrincipal()
+    {
+        return SAMPLE_PRINCIPAL;
+    }
+    
+    
+    /**
+     * @return the realm contained in the sample cache
+     */
+    public static String getSampleRealm()
+    {
+        return SAMPLE_REALM;
+    }
+    
+    
+    /**
+     * Get the servers in the tickets contained in the sample cache
+     * 
+     * @return The sample servers
+     */
+    public static String[] getSampleServers()
+    {
+        return SAMPLE_SERVERS;
+    }
+    
+    
+    /**
+     * Get the tickets count in the sample cache
+     * 
+     * @return Always 2
+     */
+    public static int getSampleTicketsCount() 
+    {
+        return 2;
+    }
 }
diff --git a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/changepwd/messages/ChangePasswordReply.java b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/changepwd/messages/ChangePasswordReply.java
index 62e62fc..c90ab31 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/changepwd/messages/ChangePasswordReply.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/changepwd/messages/ChangePasswordReply.java
@@ -67,9 +67,9 @@ public class ChangePasswordReply extends AbstractPasswordMessage
 
 
     /**
-     * Returns the {@link ApplicationReply}.
+     * Returns the {@link ApRep} instance.
      *
-     * @return The {@link ApplicationReply}.
+     * @return The {@link ApRep} instance.
      */
     public ApRep getApplicationReply()
     {
@@ -78,9 +78,9 @@ public class ChangePasswordReply extends AbstractPasswordMessage
 
 
     /**
-     * Returns the {@link PrivateMessage}.
+     * Returns the {@link KrbPriv} instance.
      *
-     * @return The {@link PrivateMessage}.
+     * @return The {@link KrbPriv} instance.
      */
     public KrbPriv getPrivateMessage()
     {
@@ -119,7 +119,7 @@ public class ChangePasswordReply extends AbstractPasswordMessage
      *
      * @param buf
      * @return The {@link ChangePasswordReply}.
-     * @throws KerberosException
+     * @throws ChangePasswordException If teh decoding failed
      */
     public static ChangePasswordReply decode( ByteBuffer buf ) throws ChangePasswordException
     {
diff --git a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/changepwd/messages/ChangePasswordRequest.java b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/changepwd/messages/ChangePasswordRequest.java
index 03de1ac..8449b84 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/changepwd/messages/ChangePasswordRequest.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/changepwd/messages/ChangePasswordRequest.java
@@ -79,9 +79,9 @@ public class ChangePasswordRequest extends AbstractPasswordMessage
 
 
     /**
-     * Returns the {@link PrivateMessage}.
+     * Returns the {@link KrbPriv}.
      *
-     * @return The {@link PrivateMessage}.
+     * @return The {@link KrbPriv}.
      */
     public KrbPriv getPrivateMessage()
     {
@@ -122,7 +122,7 @@ public class ChangePasswordRequest extends AbstractPasswordMessage
      *
      * @param buf
      * @return The {@link ChangePasswordRequest}.
-     * @throws IOException
+     * @throws ChangePasswordException If the decoding failed
      */
     public static ChangePasswordRequest decode( ByteBuffer buf ) throws ChangePasswordException
     {
diff --git a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
index 9daeb1b..0d4c9bc 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandler.java
@@ -71,7 +71,7 @@ public class CipherTextHandler
      * Performs an encode and an encrypt.
      *
      * @param key The key to use for encrypting.
-     * @param encodable The Kerberos object to encode.
+     * @param message The Kerberos object to encode.
      * @param usage The key usage.
      * @return The Kerberos EncryptedData.
      * @throws KerberosException
diff --git a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesStringToKey.java b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesStringToKey.java
index 0f6274a..95a9c92 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesStringToKey.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesStringToKey.java
@@ -75,7 +75,6 @@ public class DesStringToKey
      *
      * @param passPhrase The passphrase.
      * @return The DES key.
-     * @throws Exception
      */
     protected byte[] generateKey( String passPhrase )
     {
diff --git a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java
index 0564799..ed87e35 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/Keytab.java
@@ -53,7 +53,7 @@ import org.apache.directory.server.i18n.I18n;
  *     timestamp : int
  *     vno8 : byte
  *     key : keyBlock
- *     vno : int // only present if >= 4 bytes left in entry
+ *     vno : int // only present if &gt;= 4 bytes left in entry
  * };
  *
  * keyblock 
@@ -67,7 +67,7 @@ import org.apache.directory.server.i18n.I18n;
  *     length : short
  *     data[length] : bytes
  * }
- *
+ * </pre>
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
diff --git a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java
index e1ecdcc..8edb05d 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStore.java
@@ -35,11 +35,12 @@ public interface PrincipalStore
 
     /**
      * Change a principal's password.
+     * 
      * @param byPrincipal the principal which is changing the password for the forPrincipal
      * @param forPrincipal the principal whose password is being set or changed
      * @param newPassword the new password
      * @param isInitialTicket tells if the ticket is a freshly obtained ticket
-     * @throws Exception
+     * @throws ChangePasswordException If the password change failed
      */
     void changePassword( KerberosPrincipal byPrincipal, KerberosPrincipal forPrincipal, String newPassword,
         boolean isInitialTicket ) throws ChangePasswordException;
diff --git a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
index ea41504..2c6cdc0 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/store/PrincipalStoreEntryModifier.java
@@ -276,12 +276,12 @@ public class PrincipalStoreEntryModifier
      *
      * @param krb5key
      * @return The map of encryption types to encryption keys.
-     * @throws LdapException
-     * @throws IOException
+     * @throws KerberosException If the key cannot be converted to a map
      */
-    public Map<EncryptionType, EncryptionKey> reconstituteKeyMap( Attribute krb5key ) throws KerberosException, LdapException
+    public Map<EncryptionType, EncryptionKey> reconstituteKeyMap( Attribute krb5key ) 
+            throws KerberosException
     {
-        Map<EncryptionType, EncryptionKey> map = new HashMap<EncryptionType, EncryptionKey>();
+        Map<EncryptionType, EncryptionKey> map = new HashMap<>();
 
         for ( Value val : krb5key )
         {
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosDecoder.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosDecoder.java
index 1b26dc5..fbcc1f3 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosDecoder.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/KerberosDecoder.java
@@ -660,7 +660,7 @@ public class KerberosDecoder
      * 
      * @param data The byte array containing the data structure to decode
      * @return An instance of EncTgsRepPart
-     * @throws KerberosException If the decoding fails
+     * @throws ChangePasswordException If the decoding fails
      */
     public static EncTgsRepPart decodeEncTgsRepPart( byte[] data ) throws ChangePasswordException
     {
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/HostAddrType.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/HostAddrType.java
index 9df60d7..7246cf7 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/HostAddrType.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/HostAddrType.java
@@ -40,7 +40,7 @@ package org.apache.directory.shared.kerberos.codec.types;
  * The other address types are simply ignored. They are part of a Unix
  * include file. 
  * 
- * @todo find the original include where those ignored values come from 
+ * todo find the original include where those ignored values come from 
  * 
  * To be realistic, we may encounter IPv4, IPv6 and NetBios addresses in the real world...
  * 
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java
index a0502bd..e40cf4a 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdAndOr.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
  * <pre>
  * AD-AND-OR               ::= SEQUENCE {
  *         condition-count [0] Int32,
- *         elements        [1] <AuthorizationData>
+ *         elements        [1] &lt;AuthorizationData&gt;
  * }
  * </pre>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -116,13 +116,13 @@ public class AdAndOr implements Asn1Object
      * <pre>
      * 0x30 L1 AD-AND-OR sequence
      *  |
-     *  +--> 0xA1 L2 condition count tag
+     *  +--&gt; 0xA1 L2 condition count tag
      *  |     |
-     *  |     +--> 0x02 L2-1 condition count (int)
+     *  |     +--&gt; 0x02 L2-1 condition count (int)
      *  |
-     *  +--> 0xA2 L3 elements tag
+     *  +--&gt; 0xA2 L3 elements tag
      *        |
-     *        +--> 0x30 L3-1 elements (AuthorizationData)
+     *        +--&gt; 0x30 L3-1 elements (AuthorizationData)
      * </pre>
      */
     @Override
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java
index 7e8dcec..765e048 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AdKdcIssued.java
@@ -162,21 +162,21 @@ public class AdKdcIssued implements Asn1Object
      * <pre>
      * 0x30 L1 AD-KDCIssued sequence
      *  |
-     *  +--> 0xA1 L2 ad-checksum tag
+     *  +--&gt; 0xA1 L2 ad-checksum tag
      *  |     |
-     *  |     +--> 0x30 L2-1 ad-checksum value ( Checksum )
+     *  |     +--&gt; 0x30 L2-1 ad-checksum value ( Checksum )
      *  |
-     *  +--> 0xA2 L3 i-realm tag
+     *  +--&gt; 0xA2 L3 i-realm tag
      *  |     |
-     *  |     +--> 0x1B L3-1 i-realm value ( KerberosString )
+     *  |     +--&gt; 0x1B L3-1 i-realm value ( KerberosString )
      *  |
-     *  +--> 0xA3 L4 i-sname tag
+     *  +--&gt; 0xA3 L4 i-sname tag
      *  |     |
-     *  |     +--> 0x30 L4-1 i-sname value ( PrincipalName )
+     *  |     +--&gt; 0x30 L4-1 i-sname value ( PrincipalName )
      *  |
-     *  +--> 0xA4 L5 elements tag
+     *  +--&gt; 0xA4 L5 elements tag
      *        |
-     *        +--> 0x30 L5-1 elements (AuthorizationData)
+     *        +--&gt; 0x30 L5-1 elements (AuthorizationData)
      * </pre>
      */
     @Override
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java
index 8f4ee19..62dcf7c 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/AuthorizationData.java
@@ -86,13 +86,13 @@ public class AuthorizationData implements Asn1Object
      *  |
      *  +-- 0x30 L2 The AD sequence
      *       |
-     *       +--> 0xA0 L3 adType tag
+     *       +--&gt; 0xA0 L3 adType tag
      *       |     |
-     *       |     +--> 0x02 L3-1 adType (int)
+     *       |     +--&gt; 0x02 L3-1 adType (int)
      *       |
-     *       +--> 0xA1 L4 adData tag
+     *       +--&gt; 0xA1 L4 adData tag
      *             |
-     *             +--> 0x04 L<4-1 adData (OCTET STRING)
+     *             +--&gt; 0x04 L4-1 adData (OCTET STRING)
      * </pre>
      */
     @Override
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
index ce495f5..707dedb 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
@@ -177,13 +177,13 @@ public class Checksum implements Asn1Object
      * 
      * 0x30 L1 checksum sequence
      *  |
-     *  +--> 0xA0 L2 cksumtype tag
+     *  +--&gt; 0xA0 L2 cksumtype tag
      *  |     |
-     *  |     +--> 0x02 L2-1 cksumtype (int)
+     *  |     +--&gt; 0x02 L2-1 cksumtype (int)
      *  |
-     *  +--> 0xA1 L3 checksum tag
+     *  +--&gt; 0xA1 L3 checksum tag
      *        |
-     *        +--> 0x04 L3-1 checksum (OCTET STRING)
+     *        +--&gt; 0x04 L3-1 checksum (OCTET STRING)
      *        
      *  where L1 = L2 + lenght(0xA0) + length(L2) +
      *             L3 + lenght(0xA1) + length(L3) 
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java
index 6fdda7b..27cfc2e 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo.java
@@ -41,8 +41,8 @@ import org.slf4j.LoggerFactory;
  * 
  * The ASN.1 grammar is :
  * <pre>
- * ETYPE-INFO              ::= SEQUENCE OF <ETYPE-INFO-ENTRY>
- *</pre>
+ * ETYPE-INFO              ::= SEQUENCE OF &lt;ETYPE-INFO-ENTRY&gt;
+ * </pre>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public class ETypeInfo implements Asn1Object
@@ -100,7 +100,7 @@ public class ETypeInfo implements Asn1Object
     /**
      * Returns true if this {@link ETypeInfoEntry} contains a specified {@link ETypeInfoEntry}.
      *
-     * @param address The etypeInfoEntry we are looking for in the existing list
+     * @param etypeInfoEntry The etypeInfoEntry we are looking for in the existing list
      * @return true if this {@link ETypeInfoEntry} contains a specified {@link ETypeInfoEntry}.
      */
     public boolean contains( ETypeInfoEntry etypeInfoEntry )
@@ -185,13 +185,13 @@ public class ETypeInfo implements Asn1Object
      * 
      * 0x30 L1 ETypeInfo sequence of ETypeInfoEntry
      *  |
-     *  +--> 0x30 L2[1] ETypeInfoEntry[1]
+     *  +--&gt; 0x30 L2[1] ETypeInfoEntry[1]
      *  |
-     *  +--> 0x30 L2[2] ETypeInfoEntry[2]
+     *  +--&gt; 0x30 L2[2] ETypeInfoEntry[2]
      *  |
      *  ...
      *  |
-     *  +--> 0x30 L2[n] ETypeInfoEntry[n]
+     *  +--&gt; 0x30 L2[n] ETypeInfoEntry[n]
      *        
      *  where L1 = sum( L2[1], l2[2], ..., L2[n] )
      * </pre>
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java
index 993561a..ab8e876 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2.java
@@ -100,7 +100,7 @@ public class ETypeInfo2 implements Asn1Object
     /**
      * Returns true if this {@link ETypeInfo2Entry} contains a specified {@link ETypeInfo2Entry}.
      *
-     * @param address The etypeInfo2Entry we are looking for in the existing list
+     * @param etypeInfo2Entry The etypeInfo2Entry we are looking for in the existing list
      * @return true if this {@link ETypeInfo2Entry} contains a specified {@link ETypeInfo2Entry}.
      */
     public boolean contains( ETypeInfo2Entry etypeInfo2Entry )
@@ -185,13 +185,13 @@ public class ETypeInfo2 implements Asn1Object
      * 
      * 0x30 L1 ETypeInfo2 sequence of ETypeInfo2Entry
      *  |
-     *  +--> 0x30 L2[1] ETypeInfo2Entry[1]
+     *  +--&gt; 0x30 L2[1] ETypeInfo2Entry[1]
      *  |
-     *  +--> 0x30 L2[2] ETypeInfo2Entry[2]
+     *  +--&gt; 0x30 L2[2] ETypeInfo2Entry[2]
      *  |
      *  ...
      *  |
-     *  +--> 0x30 L2[n] ETypeInfo2Entry[n]
+     *  +--&gt; 0x30 L2[n] ETypeInfo2Entry[n]
      *        
      *  where L1 = sum( L2[1], l2[2], ..., L2[n] )
      * </pre>
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java
index f4cf79d..e1d3d3b 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfo2Entry.java
@@ -140,7 +140,7 @@ public class ETypeInfo2Entry implements Asn1Object
 
 
     /**
-     * @param encryptionType the encryptionType to set
+     * @param etype the encryptionType to set
      */
     public void setEType( EncryptionType etype )
     {
@@ -155,17 +155,17 @@ public class ETypeInfo2Entry implements Asn1Object
      * 
      * 0x30 L1 ETYPE-INFO2-ENTRY sequence
      *  |
-     *  +--> 0xA0 L2 etype tag
+     *  +--&gt; 0xA0 L2 etype tag
      *  |     |
-     *  |     +--> 0x02 L2-1etype (int)
+     *  |     +--&gt; 0x02 L2-1etype (int)
      *  |
-     *  +--> 0xA1 L3 salt tag
+     *  +--&gt; 0xA1 L3 salt tag
      *  |     |
-     *  |     +--> 0x1B L3-1 salt (KerberosString)
+     *  |     +--&gt; 0x1B L3-1 salt (KerberosString)
      *  |
-     *  +--> 0xA2 L4 s2kparams tag
+     *  +--&gt; 0xA2 L4 s2kparams tag
      *        |
-     *        +--> 0x04 L4-1 salt (OCTET STRING)
+     *        +--&gt; 0x04 L4-1 salt (OCTET STRING)
      *        
      *  where L1 = L2 + length(0xA0) + length(L2) +
      *             L3 + length(0xA1) + length(L3) +
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
index cdc06cb..e9d765b 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/ETypeInfoEntry.java
@@ -121,7 +121,7 @@ public class ETypeInfoEntry implements Asn1Object
 
 
     /**
-     * @param encryptionType the encryptionType to set
+     * @param etype the encryptionType to set
      */
     public void setEType( EncryptionType etype )
     {
@@ -136,13 +136,13 @@ public class ETypeInfoEntry implements Asn1Object
      * 
      * 0x30 L1 ETYPE-INFO-ENTRY sequence
      *  |
-     *  +--> 0xA0 L2 etype tag
+     *  +--&gt; 0xA0 L2 etype tag
      *  |     |
-     *  |     +--> 0x02 L2-1etype (int)
+     *  |     +--&gt; 0x02 L2-1etype (int)
      *  |
-     *  +--> 0xA1 L3 salt tag
+     *  +--&gt; 0xA1 L3 salt tag
      *        |
-     *        +--> 0x04 L3-1 salt (OCTET STRING)
+     *        +--&gt; 0x04 L3-1 salt (OCTET STRING)
      *        
      *  where L1 = L2 + lenght(0xA0) + length(L2) +
      *             L3 + lenght(0xA1) + length(L3) 
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java
index 47b3ec2..d5547cc 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKdcRepPart.java
@@ -160,7 +160,7 @@ public class EncKdcRepPart implements Asn1Object
     /**
      * Sets the client {@link HostAddresses}.
      *
-     * @param addresses
+     * @param caddr The client addresses
      */
     public void setClientAddresses( HostAddresses caddr )
     {
@@ -336,7 +336,7 @@ public class EncKdcRepPart implements Asn1Object
     /**
      * Sets the server {@link PrincipalName}.
      *
-     * @param principal The server PrincipalName
+     * @param sname The server PrincipalName
      */
     public void setSName( PrincipalName sname )
     {
@@ -395,53 +395,53 @@ public class EncKdcRepPart implements Asn1Object
      * 
      * 0x30 L1 EncKdcRepPart sequence
      *  |
-     *  +--> 0xA0 L2 key tag
+     *  +--&gt; 0xA0 L2 key tag
      *  |     |
-     *  |     +--> 0x30 L2-1 key ( EncryptionKey)
+     *  |     +--&gt; 0x30 L2-1 key ( EncryptionKey)
      *  |
-     *  +--> 0xA1 L3 last-req tag
+     *  +--&gt; 0xA1 L3 last-req tag
      *  |     |
-     *  |     +--> 0x30 L3-1 last-req ( LastReq )
+     *  |     +--&gt; 0x30 L3-1 last-req ( LastReq )
      *  |     
-     *  +--> 0xA2 L4 nonce tag
+     *  +--&gt; 0xA2 L4 nonce tag
      *  |     |
-     *  |     +--> 0x02 L4-1 nonce (Int)
+     *  |     +--&gt; 0x02 L4-1 nonce (Int)
      *  |     
-     * [+--> 0xA3 0x11 key-expiration tag]
+     * [+--&gt; 0xA3 0x11 key-expiration tag]
      *  |     |
-     *  |     +--> 0x18 0x0F key-expiration ( KerberosTime )
+     *  |     +--&gt; 0x18 0x0F key-expiration ( KerberosTime )
      *  |     
-     *  +--> 0xA4 0x07 flags tag 
+     *  +--&gt; 0xA4 0x07 flags tag 
      *  |     |
-     *  |     +--> 0x03 0x05 flags ( TicketFlags )
+     *  |     +--&gt; 0x03 0x05 flags ( TicketFlags )
      *  |     
-     *  +--> 0xA5 0x11 authtime tag
+     *  +--&gt; 0xA5 0x11 authtime tag
      *  |     |
-     *  |     +--> 0x18 0x0F authtime ( KerberosTime )
+     *  |     +--&gt; 0x18 0x0F authtime ( KerberosTime )
      *  |     
-     * [+--> 0xA6 0x11 starttime tag]
+     * [+--&gt; 0xA6 0x11 starttime tag]
      *  |     |
-     *  |     +--> 0x18 0x0F starttime ( KerberosTime )
+     *  |     +--&gt; 0x18 0x0F starttime ( KerberosTime )
      *  |     
-     *  +--> 0xA7 0x11 endtime tag
+     *  +--&gt; 0xA7 0x11 endtime tag
      *  |     |
-     *  |     +--> 0x18 0x0F endtime ( KerberosTime )
+     *  |     +--&gt; 0x18 0x0F endtime ( KerberosTime )
      *  |     
-     * [+--> 0xA8 0x11 renew-till tag]
+     * [+--&gt; 0xA8 0x11 renew-till tag]
      *  |     |
-     *  |     +--> 0x18 0x0F renew-till ( KerberosTime )
+     *  |     +--&gt; 0x18 0x0F renew-till ( KerberosTime )
      *  |     
-     *  +--> 0xA9 L5 srealm tag
+     *  +--&gt; 0xA9 L5 srealm tag
      *  |     |
-     *  |     +--> 0x1B L5-1 srealm ( KerberosString )
+     *  |     +--&gt; 0x1B L5-1 srealm ( KerberosString )
      *  |     
-     *  +--> 0xAA L6 sname tag
+     *  +--&gt; 0xAA L6 sname tag
      *  |     |
-     *  |     +--> 0x30 L6-1 sname ( PrincipalName )
+     *  |     +--&gt; 0x30 L6-1 sname ( PrincipalName )
      *  |     
-     * [+--> 0xAB L7 caddr tag]
+     * [+--&gt; 0xAB L7 caddr tag]
      *        |
-     *        +--> 0x30 L7-1 caddr ( HostAddresses )
+     *        +--&gt; 0x30 L7-1 caddr ( HostAddresses )
      *  </pre>
      */
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java
index 547a99f..aa8b103 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbCredPart.java
@@ -95,35 +95,35 @@ public class EncKrbCredPart implements Asn1Object
      * <pre>
      *  0x7D L1
      *   |
-     *   +--> 0x30 L1-2 EncKrbCredPart seq tag
+     *   +--&gt; 0x30 L1-2 EncKrbCredPart seq tag
      *         |
-     *         +--> 0xA0 L2 seq of KrbCredInfo tag
+     *         +--&gt; 0xA0 L2 seq of KrbCredInfo tag
      *         |     |
-     *         |     +--> 0x30 L2-2 seq tag
+     *         |     +--&gt; 0x30 L2-2 seq tag
      *         |     |
-     *         |     +--> 0x30 LL1 KrbCredInfo
+     *         |     +--&gt; 0x30 LL1 KrbCredInfo
      *         |     .      ....
-     *         |     +--> 0x30 LLn KrbCredInfo
+     *         |     +--&gt; 0x30 LLn KrbCredInfo
      *         |
-     *         +--> 0xA1 L3 nonce tag
+     *         +--&gt; 0xA1 L3 nonce tag
      *         |     |
-     *         |     +--> 0x02 L3-2 nonce (UInt32)
+     *         |     +--&gt; 0x02 L3-2 nonce (UInt32)
      *         |
-     *         +--> 0xA2 11 timestamp tag
+     *         +--&gt; 0xA2 11 timestamp tag
      *         |     |
-     *         |     +--> 0x18 0x0F timestamp (KerberosTime)
+     *         |     +--&gt; 0x18 0x0F timestamp (KerberosTime)
      *         |
-     *         +--> 0xA3 L4 usec tag
+     *         +--&gt; 0xA3 L4 usec tag
      *         |     |
-     *         |     +--> 0x02 L4-2 usec (Microseconds)
+     *         |     +--&gt; 0x02 L4-2 usec (Microseconds)
      *         |
-     *         +--> 0xA4 L5 s-address tag
+     *         +--&gt; 0xA4 L5 s-address tag
      *         |     |
-     *         |     +--> 0x30 L5-2 s-address (HostAddress)
+     *         |     +--&gt; 0x30 L5-2 s-address (HostAddress)
      *         |
-     *         +--> 0xA5 L6 r-address tag
+     *         +--&gt; 0xA5 L6 r-address tag
      *               |
-     *               +--> 0x30 L6-2 s-address (HostAddress) 
+     *               +--&gt; 0x30 L6-2 s-address (HostAddress) 
      *   
      * </pre> 
      */
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java
index b954163..a2f9257 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncKrbPrivPart.java
@@ -218,29 +218,29 @@ public class EncKrbPrivPart implements Asn1Object
      *  |
      * 0x30 L1 EncKrbPrivPart SEQ
      *  |
-     *  +--> 0xA0 L2 user-data tag
+     *  +--&gt; 0xA0 L2 user-data tag
      *  |     |
-     *  |     +--> 0x04 L2-1 user-data (Octet String)
+     *  |     +--&gt; 0x04 L2-1 user-data (Octet String)
      *  |
-     *  +--> 0xA1 0x11 timestamp tag
+     *  +--&gt; 0xA1 0x11 timestamp tag
      *  |     |
-     *  |     +--> 0x18 0x0F timestamp (KerberosTime)
+     *  |     +--&gt; 0x18 0x0F timestamp (KerberosTime)
      *  |
-     *  +--> 0xA2 L3 usec tag
+     *  +--&gt; 0xA2 L3 usec tag
      *  |     |
-     *  |     +--> 0x02 L3-1 usec (Microseconds)
+     *  |     +--&gt; 0x02 L3-1 usec (Microseconds)
      *  |
-     *  +--> 0xA3 L4 seq-number tag
+     *  +--&gt; 0xA3 L4 seq-number tag
      *  |     |
-     *  |     +--> 0x02 L4-1 seqnumber (UInt32)
+     *  |     +--&gt; 0x02 L4-1 seqnumber (UInt32)
      *  |
-     *  +--> 0xA4 L5 s-address tag
+     *  +--&gt; 0xA4 L5 s-address tag
      *  |     |
-     *  |     +--> 0x30 L5-1 s-address (HostAddress)
+     *  |     +--&gt; 0x30 L5-1 s-address (HostAddress)
      *  |
-     *  +--> 0xA5 L6 r-address tag
+     *  +--&gt; 0xA5 L6 r-address tag
      *        |
-     *        +--> 0x30 L6-1 r-address (HostAddress)
+     *        +--&gt; 0x30 L6-1 r-address (HostAddress)
      * </pre>       
      */
     @Override
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
index 7902c33..c46c686 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncTicketPart.java
@@ -122,51 +122,51 @@ public class EncTicketPart implements Asn1Object
      * <pre>
      * 0x63 L1 EncTicketPart tag
      *  |
-     *  +--> 0x30 L1-2 EncTicketPart seq
+     *  +--&gt; 0x30 L1-2 EncTicketPart seq
      *        |
-     *        +--> 0xA0 L2 flags tag
+     *        +--&gt; 0xA0 L2 flags tag
      *        |     |
-     *        |     +--> 0x03 L2-2 flags (BitString)
+     *        |     +--&gt; 0x03 L2-2 flags (BitString)
      *        |
-     *        +--> 0xA1 L3 key tag
+     *        +--&gt; 0xA1 L3 key tag
      *        |     |
-     *        |     +--> 0x30 L3-2 key (EncryptionKey)
+     *        |     +--&gt; 0x30 L3-2 key (EncryptionKey)
      *        |
-     *        +--> 0xA2 L4 crealm tag
+     *        +--&gt; 0xA2 L4 crealm tag
      *        |     |
-     *        |     +--> 0x1B L4-2 crealm (Realm)
+     *        |     +--&gt; 0x1B L4-2 crealm (Realm)
      *        |
-     *        +--> 0xA3 L5 cname tag
+     *        +--&gt; 0xA3 L5 cname tag
      *        |     |
-     *        |     +--> 0x30 L5-2 cname (PrincipalName)
+     *        |     +--&gt; 0x30 L5-2 cname (PrincipalName)
      *        |
-     *        +--> 0xA4 L6 transited tag
+     *        +--&gt; 0xA4 L6 transited tag
      *        |     |
-     *        |     +--> 0x30 L6-2 transited (TransitedEncoding)
+     *        |     +--&gt; 0x30 L6-2 transited (TransitedEncoding)
      *        |
-     *        +--> 0xA5 0x11 authtime tag
+     *        +--&gt; 0xA5 0x11 authtime tag
      *        |     |
-     *        |     +--> 0x18 0x0F authtime (KerberosTime)
+     *        |     +--&gt; 0x18 0x0F authtime (KerberosTime)
      *        |
-     *        +--> [0xA6 0x11 starttime tag
+     *        +--&gt; [0xA6 0x11 starttime tag
      *        |     |
-     *        |     +--> 0x18 0x0F starttime (KerberosTime)]
+     *        |     +--&gt; 0x18 0x0F starttime (KerberosTime)]
      *        |
-     *        +--> 0xA7 0x11 endtime tag
+     *        +--&gt; 0xA7 0x11 endtime tag
      *        |     |
-     *        |     +--> 0x18 0x0F endtime (KerberosTime)
+     *        |     +--&gt; 0x18 0x0F endtime (KerberosTime)
      *        |
-     *        +--> [0xA8 0x11 renewtill tag
+     *        +--&gt; [0xA8 0x11 renewtill tag
      *        |     |
-     *        |     +--> 0x18 0x0F renewtill (KerberosTime)]
+     *        |     +--&gt; 0x18 0x0F renewtill (KerberosTime)]
      *        |
-     *        +--> [0xA9 L7 caddr tag
+     *        +--&gt; [0xA9 L7 caddr tag
      *        |     |
-     *        |     +--> 0x30 L7-2 caddre (HostAddresses)]
+     *        |     +--&gt; 0x30 L7-2 caddre (HostAddresses)]
      *        |
-     *        +--> [0xAA L8 authorization-data tag
+     *        +--&gt; [0xAA L8 authorization-data tag
      *              |
-     *              +--> 0x30 L8-2 authorization-data (AuthorizationData)]
+     *              +--&gt; 0x30 L8-2 authorization-data (AuthorizationData)]
      * </pre>
      * 
      */
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java
index f5dbcbb..c600c7d 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptedData.java
@@ -199,17 +199,17 @@ public class EncryptedData implements Asn1Object
      * 
      * 0x30 L1 EncryptedData sequence
      *  |
-     *  +--> 0xA1 L2 etype tag
+     *  +--&gt; 0xA1 L2 etype tag
      *  |     |
-     *  |     +--> 0x02 L2-1 etype (int)
+     *  |     +--&gt; 0x02 L2-1 etype (int)
      *  |
-     *  +--> [0xA2 L3 kvno tag
+     *  +--&gt; [0xA2 L3 kvno tag
      *  |     |
-     *  |     +--> 0x30 L3-1 kvno (int)] (optional)
+     *  |     +--&gt; 0x30 L3-1 kvno (int)] (optional)
      *  |
-     *  +--> 0xA2 L4 cipher tag
+     *  +--&gt; 0xA2 L4 cipher tag
      *        |
-     *        +--> 0x04 L4-1 cipher (OCTET STRING)
+     *        +--&gt; 0x04 L4-1 cipher (OCTET STRING)
      * </pre>
      */
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
index d2ae486..7fe8e14 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
@@ -226,13 +226,13 @@ public class EncryptionKey implements Asn1Object
      * 
      * 0x30 L1 EncryptionKey
      *  |
-     *  +--> 0xA0 L2 keyType tag
+     *  +--&gt; 0xA0 L2 keyType tag
      *  |     |
-     *  |     +--> 0x02 L2-1 keyType (int)
+     *  |     +--&gt; 0x02 L2-1 keyType (int)
      *  |
-     *  +--> 0xA1 L3 keyValue tag
+     *  +--&gt; 0xA1 L3 keyValue tag
      *        |
-     *        +--> 0x04 L3-1 keyValue (OCTET STRING)
+     *        +--&gt; 0x04 L3-1 keyValue (OCTET STRING)
      *        
      *  where L1 = L2 + lenght(0xA0) + length(L2) +
      *             L3 + lenght(0xA1) + length(L3) 
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java
index 535ff97..633a5c4 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddress.java
@@ -213,13 +213,13 @@ public class HostAddress implements Asn1Object
      * 
      * 0x30 L1 hostAddress sequence
      *  |
-     *  +--> 0xA0 L2 addrType tag
+     *  +--&gt; 0xA0 L2 addrType tag
      *  |     |
-     *  |     +--> 0x02 L2-1 addrType (int)
+     *  |     +--&gt; 0x02 L2-1 addrType (int)
      *  |
-     *  +--> 0xA1 L3 address tag
+     *  +--&gt; 0xA1 L3 address tag
      *        |
-     *        +--> 0x04 L3-1 address (OCTET STRING)
+     *        +--&gt; 0x04 L3-1 address (OCTET STRING)
      *        
      *  where L1 = L2 + length(0xA0) + length(L2) +
      *             L3 + length(0xA1) + length(L3) 
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java
index 9f503b8..4da9ccc 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/HostAddresses.java
@@ -139,7 +139,7 @@ public class HostAddresses implements Asn1Object
     /**
      * Returns true if two {@link HostAddresses} are equal.
      *
-     * @param that Th {@link HostAddresses} we want to compare with the current one
+     * @param obj The {@link HostAddresses} we want to compare with the current one
      * @return true if two {@link HostAddresses} are equal.
      */
     @Override
@@ -188,13 +188,13 @@ public class HostAddresses implements Asn1Object
      * 
      * 0x30 L1 hostAddresses sequence of HostAddresses
      *  |
-     *  +--> 0x30 L2[1] Hostaddress[1]
+     *  +--&gt; 0x30 L2[1] Hostaddress[1]
      *  |
-     *  +--> 0x30 L2[2] Hostaddress[2]
+     *  +--&gt; 0x30 L2[2] Hostaddress[2]
      *  |
      *  ...
      *  |
-     *  +--> 0x30 L2[n] Hostaddress[n]
+     *  +--&gt; 0x30 L2[n] Hostaddress[n]
      *        
      *  where L1 = sum( L2[1], l2[2], ..., L2[n] )
      * </pre>
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java
index 1dfe381..8edc187 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcRep.java
@@ -45,9 +45,9 @@ import org.apache.directory.shared.kerberos.messages.Ticket;
  *         padata          [2] SEQUENCE OF PA-DATA OPTIONAL
  *                                 -- NOTE: not empty --,
  *         crealm          [3] Realm,
- *         cname           [4] <PrincipalName>,
- *         ticket          [5] <Ticket>,
- *         enc-part        [6] <EncryptedData>
+ *         cname           [4] &lt;PrincipalName&gt;,
+ *         ticket          [5] &lt;Ticket@gt;,
+ *         enc-part        [6] &lt;EncryptedData&gt;
  *                                 -- EncASRepPart or EncTGSRepPart,
  *                                 -- as appropriate
  * }
@@ -245,38 +245,38 @@ public class KdcRep extends KerberosMessage
      * 
      * 0x30 L1 KDC-REP sequence
      *  |
-     *  +--> 0xA0 0x03 pvno tag
+     *  +--&gt; 0xA0 0x03 pvno tag
      *  |     |
-     *  |     +--> 0x02 0x01 0x05 pvno (5)
+     *  |     +--&gt; 0x02 0x01 0x05 pvno (5)
      *  |
-     *  +--> 0xA1 0x03 msg-type tag
+     *  +--&gt; 0xA1 0x03 msg-type tag
      *  |     |
-     *  |     +--> 0x02 0x01 0x0B/0x0D msg-type : either AS-REP (0x0B) or TGS-REP (0x0D)
+     *  |     +--&gt; 0x02 0x01 0x0B/0x0D msg-type : either AS-REP (0x0B) or TGS-REP (0x0D)
      *  |     
-     *  +--> 0xA2 L2 pa-data tag
+     *  +--&gt; 0xA2 L2 pa-data tag
      *  |     |
-     *  |     +--> 0x30 L2-1 pa-data SEQ
+     *  |     +--&gt; 0x30 L2-1 pa-data SEQ
      *  |           |
-     *  |           +--> 0x30 L2-1-1 pa-data
+     *  |           +--&gt; 0x30 L2-1-1 pa-data
      *  |           |
-     *  |           +--> 0x30 L2-1-2 pa-data
+     *  |           +--&gt; 0x30 L2-1-2 pa-data
      *  |           :
      *  |     
-     *  +--> 0xA3 L3 crealm tag
+     *  +--&gt; 0xA3 L3 crealm tag
      *  |     |
-     *  |     +--> 0x1B L3-1 crealm
+     *  |     +--&gt; 0x1B L3-1 crealm
      *  |
-     *  +--> 0xA4 L4 cname tag
+     *  +--&gt; 0xA4 L4 cname tag
      *  |     |
-     *  |     +--> 0x30 L4-1 cname
+     *  |     +--&gt; 0x30 L4-1 cname
      *  |
-     *  +--> 0xA5 L5 ticket tag
+     *  +--&gt; 0xA5 L5 ticket tag
      *  |     |
-     *  |     +--> 0x61 L5-1 ticket
+     *  |     +--&gt; 0x61 L5-1 ticket
      *  |
-     *  +--> 0xA6 L6 enc-part tag
+     *  +--&gt; 0xA6 L6 enc-part tag
      *        |
-     *        +--> 0x30 L6-1 enc-part
+     *        +--&gt; 0x30 L6-1 enc-part
      *  
      * </pre>       
      */
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java
index 444376b..db434e8 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReq.java
@@ -41,9 +41,9 @@ import org.apache.directory.shared.kerberos.messages.KerberosMessage;
  *      -- NOTE: first tag is [1], not [0]
  *      pvno            [1] INTEGER (5) ,
  *      msg-type        [2] INTEGER (10 -- AS -- | 12 -- TGS --),
- *      padata          [3] SEQUENCE OF <PA-DATA> OPTIONAL
+ *      padata          [3] SEQUENCE OF &lt;PA-DATA&gt; OPTIONAL
                             -- NOTE: not empty --,
- *      req-body        [4] <KDC-REQ-BODY>
+ *      req-body        [4] &lt;KDC-REQ-BODY&gt;
  * }
  * </pre>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -138,26 +138,26 @@ public abstract class KdcReq extends KerberosMessage
      * 
      * 0x30 L1 KDC-REQ sequence
      *  |
-     *  +--> 0xA1 0x03 pvno tag
+     *  +--&gt; 0xA1 0x03 pvno tag
      *  |     |
-     *  |     +--> 0x02 0x01 0x05 pvno (5)
+     *  |     +--&gt; 0x02 0x01 0x05 pvno (5)
      *  |
-     *  +--> 0xA2 0x03 msg-type tag
+     *  +--&gt; 0xA2 0x03 msg-type tag
      *  |     |
-     *  |     +--> 0x02 0x01 0x0A/0x0C msg-type : either AS-REQ (0x0A) or TGS-REQ (0x0C)
+     *  |     +--&gt; 0x02 0x01 0x0A/0x0C msg-type : either AS-REQ (0x0A) or TGS-REQ (0x0C)
      *  |     
-     *  +--> 0xA3 L2 pa-data tag
+     *  +--&gt; 0xA3 L2 pa-data tag
      *  |     |
-     *  |     +--> 0x30 L2-1 pa-data SEQ
+     *  |     +--&gt; 0x30 L2-1 pa-data SEQ
      *  |           |
-     *  |           +--> 0x30 L2-1-1 pa-data
+     *  |           +--&gt; 0x30 L2-1-1 pa-data
      *  |           |
-     *  |           +--> 0x30 L2-1-2 pa-data
+     *  |           +--&gt; 0x30 L2-1-2 pa-data
      *  |           :
      *  |     
-     *  +--> 0xA4 L3 req-body tag
+     *  +--&gt; 0xA4 L3 req-body tag
      *  |     |
-     *  |     +--> 0x30 L3-1 req-body (KDC-REQ-BODY)
+     *  |     +--&gt; 0x30 L3-1 req-body (KDC-REQ-BODY)
      * </pre>       
      */
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
index 1ea7f98..a277c4f 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
@@ -160,7 +160,7 @@ public class KdcReqBody implements Asn1Object
 
     /**
      * Add a new Ticket to the list of additional tickets
-     * @param additionalTickets the additionalTickets to set
+     * @param additionalTicket the additionalTicket to set
      */
     public void addAdditionalTicket( Ticket additionalTicket )
     {
@@ -400,63 +400,63 @@ public class KdcReqBody implements Asn1Object
      *
      * 0x30 L1 KdcReqBody sequence
      *  |
-     *  +--> 0xA0 L2 kdc-options tag
+     *  +--&gt; 0xA0 L2 kdc-options tag
      *  |     |
-     *  |     +--> 0x03 L2-1 kdc-options (BitString)
+     *  |     +--&gt; 0x03 L2-1 kdc-options (BitString)
      *  |
-     *  +--> 0xA1 L3 cname tag
+     *  +--&gt; 0xA1 L3 cname tag
      *  |     |
-     *  |     +--> 0x30 L3-1 cname (PrincipalName)
+     *  |     +--&gt; 0x30 L3-1 cname (PrincipalName)
      *  |
-     *  +--> 0xA2 L4 realm tag
+     *  +--&gt; 0xA2 L4 realm tag
      *  |     |
-     *  |     +--> 0x1B L4-1 realm (Realm, KerberosString)
+     *  |     +--&gt; 0x1B L4-1 realm (Realm, KerberosString)
      *  |
-     *  +--> 0xA3 L5 sname tag
+     *  +--&gt; 0xA3 L5 sname tag
      *  |     |
-     *  |     +--> 0x30 L5-1 sname (PrincipalName)
+     *  |     +--&gt; 0x30 L5-1 sname (PrincipalName)
      *  |
-     *  +--> 0xA4 L6 from tag
+     *  +--&gt; 0xA4 L6 from tag
      *  |     |
-     *  |     +--> 0x18 L6-1 from (KerberosTime)
+     *  |     +--&gt; 0x18 L6-1 from (KerberosTime)
      *  |
-     *  +--> 0xA5 L7 till tag
+     *  +--&gt; 0xA5 L7 till tag
      *  |     |
-     *  |     +--> 0x18 L7-1 till (KerberosTime)
+     *  |     +--&gt; 0x18 L7-1 till (KerberosTime)
      *  |
-     *  +--> 0xA6 L8 rtime tag
+     *  +--&gt; 0xA6 L8 rtime tag
      *  |     |
-     *  |     +--> 0x18 L8-1 rtime (KerberosTime)
+     *  |     +--&gt; 0x18 L8-1 rtime (KerberosTime)
      *  |
-     *  +--> 0xA7 L9 nonce tag
+     *  +--&gt; 0xA7 L9 nonce tag
      *  |     |
-     *  |     +--> 0x02 L9-1 nonce (Int)
+     *  |     +--&gt; 0x02 L9-1 nonce (Int)
      *  |
-     *  +--> 0xA8 L10 etype tag
+     *  +--&gt; 0xA8 L10 etype tag
      *  |     |
-     *  |     +--> 0x30 L10-1 SEQ
+     *  |     +--&gt; 0x30 L10-1 SEQ
      *  |           |
-     *  |           +--> 0x02 L10-1-1 etype
+     *  |           +--&gt; 0x02 L10-1-1 etype
      *  |           |
-     *  |           +--> 0x02 L10-1-2 etype
+     *  |           +--&gt; 0x02 L10-1-2 etype
      *  |           |
      *  |           :
      *  |
-     *  +--> 0xA9 L11 addresses tag
+     *  +--&gt; 0xA9 L11 addresses tag
      *  |     |
-     *  |     +--> 0x30 L11-1 addresses (HostAddresses)
+     *  |     +--&gt; 0x30 L11-1 addresses (HostAddresses)
      *  |
-     *  +--> 0xAA L12 enc-authorization-data tag
+     *  +--&gt; 0xAA L12 enc-authorization-data tag
      *  |     |
-     *  |     +--> 0x30 L12-1 enc-authorization-data
+     *  |     +--&gt; 0x30 L12-1 enc-authorization-data
      *  |
-     *  +--> 0xAB L13 additional-tickets tag
+     *  +--&gt; 0xAB L13 additional-tickets tag
      *        |
-     *        +--> 0x30 L13-1 additional-tickets
+     *        +--&gt; 0x30 L13-1 additional-tickets
      *              |
-     *              +--> 0x61 L13-1-1 Ticket
+     *              +--&gt; 0x61 L13-1-1 Ticket
      *              |
-     *              +--> 0x61 L13-1-2 Ticket
+     *              +--&gt; 0x61 L13-1-2 Ticket
      *              |
      *              :
      * </pre>
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java
index bea08b5..cf5cff7 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbCredInfo.java
@@ -123,49 +123,49 @@ public class KrbCredInfo implements Asn1Object
      * 0x30 L1 KrbCredInfo SEQ tag
      *  |
      *  |
-     *  +--> 0xA0 L2 key tag
+     *  +--&gt; 0xA0 L2 key tag
      *  |     |
-     *  |     +--> 0x30 L2-2 key
+     *  |     +--&gt; 0x30 L2-2 key
      *  |
-     *  +--> [0xA1 L3 prealm tag
+     *  +--&gt; [0xA1 L3 prealm tag
      *  |      |
-     *  |      +--> 0x1B L3-2 prealm]
+     *  |      +--&gt; 0x1B L3-2 prealm]
      *  |
-     *  +--> [0xA2 L4 pname tag
+     *  +--&gt; [0xA2 L4 pname tag
      *  |      |
-     *  |      +--> 0x30 L4-2 pname]
+     *  |      +--&gt; 0x30 L4-2 pname]
      *  |
-     *  +--> [0xA3 L5 flags tag
+     *  +--&gt; [0xA3 L5 flags tag
      *  |      |
-     *  |      +--> 0x02 L5-2 flags]
+     *  |      +--&gt; 0x02 L5-2 flags]
      *  |
-     *  +--> [0xA4 0x11 authtime tag
+     *  +--&gt; [0xA4 0x11 authtime tag
      *  |      |
-     *  |      +--> 0x18 0x1F authtime]
+     *  |      +--&gt; 0x18 0x1F authtime]
      *  |
-     *  +--> [0xA5 0x11 starttime tag
+     *  +--&gt; [0xA5 0x11 starttime tag
      *  |      |
-     *  |      +--> 0x18 0x1F starttime]
+     *  |      +--&gt; 0x18 0x1F starttime]
      *  |
-     *  +--> [0xA6 0x11 endtime tag
+     *  +--&gt; [0xA6 0x11 endtime tag
      *  |      |
-     *  |      +--> 0x18 0x1F endtime]
+     *  |      +--&gt; 0x18 0x1F endtime]
      *  |
-     *  +--> [0xA7 0x11 renew-till tag
+     *  +--&gt; [0xA7 0x11 renew-till tag
      *  |      |
-     *  |      +--> 0x18 0x1F renew-till]
+     *  |      +--&gt; 0x18 0x1F renew-till]
      *  |
-     *  +--> [0xA8 L6 srealm tag
+     *  +--&gt; [0xA8 L6 srealm tag
      *  |      |
-     *  |      +--> 0x1B L6-2 srealm]
+     *  |      +--&gt; 0x1B L6-2 srealm]
      *  |
-     *  +--> [0xA9 L7 sname tag
+     *  +--&gt; [0xA9 L7 sname tag
      *  |      |
-     *  |      +--> 0x30 L7-2 sname]
+     *  |      +--&gt; 0x30 L7-2 sname]
      *  |
-     *  +--> [0xAA L8 caddr tag
+     *  +--&gt; [0xAA L8 caddr tag
      *         |
-     *         +--> 0x30 L8-2 caddr 
+     *         +--&gt; 0x30 L8-2 caddr 
      * </pre>
      */
     @Override
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java
index f4aebcd..917abbd 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbSafeBody.java
@@ -220,29 +220,29 @@ public class KrbSafeBody implements Asn1Object
      * <pre>
      * 0x30 L1 KRB-SAFE-BODY SEQ
      *  |
-     *  +--> 0xA0 L2 user-data tag
+     *  +--&gt; 0xA0 L2 user-data tag
      *  |     |
-     *  |     +--> 0x04 L2-1 user-data (Octet String)
+     *  |     +--&gt; 0x04 L2-1 user-data (Octet String)
      *  |
-     *  +--> 0xA1 0x11 timestamp tag
+     *  +--&gt; 0xA1 0x11 timestamp tag
      *  |     |
-     *  |     +--> 0x18 0x0F timestamp (KerberosTime)
+     *  |     +--&gt; 0x18 0x0F timestamp (KerberosTime)
      *  |
-     *  +--> 0xA2 L3 usec tag
+     *  +--&gt; 0xA2 L3 usec tag
      *  |     |
-     *  |     +--> 0x02 L3-1 usec (Microseconds)
+     *  |     +--&gt; 0x02 L3-1 usec (Microseconds)
      *  |
-     *  +--> 0xA3 L4 seq-number tag
+     *  +--&gt; 0xA3 L4 seq-number tag
      *  |     |
-     *  |     +--> 0x02 L4-1 seqnumber (UInt32)
+     *  |     +--&gt; 0x02 L4-1 seqnumber (UInt32)
      *  |
-     *  +--> 0xA4 L5 s-address tag
+     *  +--&gt; 0xA4 L5 s-address tag
      *  |     |
-     *  |     +--> 0x30 L5-1 s-address (HostAddress)
+     *  |     +--&gt; 0x30 L5-1 s-address (HostAddress)
      *  |
-     *  +--> 0xA5 L6 r-address tag
+     *  +--&gt; 0xA5 L6 r-address tag
      *        |
-     *        +--> 0x30 L6-1 r-address (HostAddress)
+     *        +--&gt; 0x30 L6-1 r-address (HostAddress)
      * </pre>       
      */
     @Override
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java
index 5c42faf..c6dc885 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/LastReq.java
@@ -162,15 +162,15 @@ public class LastReq implements Asn1Object
      * 
      * 0x30 L1 LastReq
      *  |
-     *  +--> 0x30 L2 
+     *  +--&gt; 0x30 L2 
      *        |
-     *        +--> 0xA0 L3 lr-type tag
+     *        +--&gt; 0xA0 L3 lr-type tag
      *        |     |
-     *        |     +--> 0x02 L3-1 lrType (int)
+     *        |     +--&gt; 0x02 L3-1 lrType (int)
      *        |
-     *        +--> 0xA1 0x11 lr-value tag
+     *        +--&gt; 0xA1 0x11 lr-value tag
      *              |
-     *              +--> 0x18 0x0F ttt (KerberosString)
+     *              +--&gt; 0x18 0x0F ttt (KerberosString)
      *  </pre>
      */
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java
index 8b4a59e..8df9823 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/MethodData.java
@@ -40,8 +40,8 @@ import org.slf4j.LoggerFactory;
  * 
  * The ASN.1 grammar is :
  * <pre>
- * METHOD-DATA     ::= SEQUENCE OF <PA-DATA>
- *</pre>
+ * METHOD-DATA     ::= SEQUENCE OF &lt;PA-DATA&gt;
+ * </pre>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public class MethodData implements Asn1Object
@@ -81,7 +81,7 @@ public class MethodData implements Asn1Object
     /**
      * Returns true if this {@link PaData} contains a specified {@link PaData}.
      *
-     * @param address The paData we are looking for in the existing list
+     * @param paData The paData we are looking for in the existing list
      * @return true if this {@link PaData} contains a specified {@link PaData}.
      */
     public boolean contains( PaData paData )
@@ -166,13 +166,13 @@ public class MethodData implements Asn1Object
      * 
      * 0x30 L1 METHOD-DATA sequence of PA-DATA
      *  |
-     *  +--> 0x30 L2[1] PA-DATA[1]
+     *  +--&gt; 0x30 L2[1] PA-DATA[1]
      *  |
-     *  +--> 0x30 L2[2] PA-DATA[2]
+     *  +--&gt; 0x30 L2[2] PA-DATA[2]
      *  |
      *  ...
      *  |
-     *  +--> 0x30 L2[n] PA-DATA[n]
+     *  +--&gt; 0x30 L2[n] PA-DATA[n]
      *        
      *  where L1 = sum( L2[1], l2[2], ..., L2[n] )
      * </pre>
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
index 7baec80..f62bf03 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
@@ -150,13 +150,13 @@ public class PaData implements Asn1Object
      * 
      * 0x30 L1 PreAuthenticationData sequence
      *  |
-     *  +--> 0xA0 L2 padata-type tag
+     *  +--&gt; 0xA0 L2 padata-type tag
      *  |     |
-     *  |     +--> 0x02 L2-1 padata-type (int)
+     *  |     +--&gt; 0x02 L2-1 padata-type (int)
      *  |
-     *  +--> 0xA1 L3 padata-value tag
+     *  +--&gt; 0xA1 L3 padata-value tag
      *        |
-     *        +--> 0x04 L3-1 padata-value (OCTET STRING)
+     *        +--&gt; 0x04 L3-1 padata-value (OCTET STRING)
      *        
      *  where L1 = L2 + lenght(0xA0) + length(L2) +
      *             L3 + lenght(0xA1) + length(L3) 
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
index 7aa8122..e173247 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaEncTsEnc.java
@@ -138,13 +138,13 @@ public class PaEncTsEnc implements Asn1Object
      * 
      * 0x30 L1 PA-ENC-TS-ENC sequence
      *  |
-     *  +--> 0xA0 0x11 patimestamp tag
+     *  +--&gt; 0xA0 0x11 patimestamp tag
      *  |     |
-     *  |     +--> 0x18 0x0F patimestamp value (KerberosTime)
+     *  |     +--&gt; 0x18 0x0F patimestamp value (KerberosTime)
      *  |
-     *  +--> 0xA1 L2 pausec tag
+     *  +--&gt; 0xA1 L2 pausec tag
      *        |
-     *        +--> 0x02 L2-1 pausec (INTEGER)
+     *        +--&gt; 0x02 L2-1 pausec (INTEGER)
      *        
      *  </pre>
      */
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
index 8c45fb4..4b793a4 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PrincipalName.java
@@ -353,21 +353,21 @@ public class PrincipalName implements Asn1Object
      * 
      * 0x30 L1 PrincipalName sequence
      *  |
-     *  +--> 0xA1 L2 name-type tag
+     *  +--&gt; 0xA1 L2 name-type tag
      *  |     |
-     *  |     +--> 0x02 L2-1 addressType (int)
+     *  |     +--&gt; 0x02 L2-1 addressType (int)
      *  |
-     *  +--> 0xA2 L3 name-string tag
+     *  +--&gt; 0xA2 L3 name-string tag
      *        |
-     *        +--> 0x30 L3-1 name-string (SEQUENCE OF KerberosString)
+     *        +--&gt; 0x30 L3-1 name-string (SEQUENCE OF KerberosString)
      *              |
-     *              +--> 0x1B L4[1] value (KerberosString)
+     *              +--&gt; 0x1B L4[1] value (KerberosString)
      *              |
-     *              +--> 0x1B L4[2] value (KerberosString)
+     *              +--&gt; 0x1B L4[2] value (KerberosString)
      *              |
      *              ...
      *              |
-     *              +--> 0x1B L4[n] value (KerberosString)
+     *              +--&gt; 0x1B L4[n] value (KerberosString)
      * </pre>
      */
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java
index e2244fe..df69a6b 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TransitedEncoding.java
@@ -134,13 +134,13 @@ public class TransitedEncoding implements Asn1Object
      * 
      * 0x30 L1 TransitedEncoding
      *  |
-     *  +--> 0xA0 L2 trType tag
+     *  +--&gt; 0xA0 L2 trType tag
      *  |     |
-     *  |     +--> 0x02 L2-1 trType (int)
+     *  |     +--&gt; 0x02 L2-1 trType (int)
      *  |
-     *  +--> 0xA1 L3 contents tag
+     *  +--&gt; 0xA1 L3 contents tag
      *        |
-     *        +--> 0x04 L3-1 contents (OCTET STRING)
+     *        +--&gt; 0x04 L3-1 contents (OCTET STRING)
      *        
      *  where L1 = L2 + lenght(0xA0) + length(L2) +
      *             L3 + lenght(0xA1) + length(L3) 
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java
index bd0cb74..c178519 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/TypedData.java
@@ -167,13 +167,13 @@ public class TypedData implements Asn1Object
      *  |
      *  +-- 0x30 L2 The TD sequence
      *       |
-     *       +--> 0xA0 L3 tdType tag
+     *       +--&gt; 0xA0 L3 tdType tag
      *       |     |
-     *       |     +--> 0x02 L3-2 tdType (int)
+     *       |     +--&gt; 0x02 L3-2 tdType (int)
      *       |
-     *       +--> [0xA1 L4 tdData tag
+     *       +--&gt; [0xA1 L4 tdData tag
      *             |
-     *             +--> 0x04 L4-2 tdData (OCTET STRING)]
+     *             +--&gt; 0x04 L4-2 tdData (OCTET STRING)]
      * </pre>
      */
     @Override
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/exceptions/ErrorType.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/exceptions/ErrorType.java
index 56055af..2d125c3 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/exceptions/ErrorType.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/exceptions/ErrorType.java
@@ -512,7 +512,7 @@ public final class ErrorType implements Comparable<ErrorType>
     /**
      * Gets the value by its value value.
      *
-     * @param value the value value of the value
+     * @param ordinal the value value of the value
      * @return the type corresponding to the value value
      */
     public static ErrorType getTypeByValue( int ordinal )
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java
index 97bfe85..94d842e 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApRep.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
  * AP-REP          ::= [APPLICATION 15] SEQUENCE {
  *         pvno            [0] INTEGER (5),
  *         msg-type        [1] INTEGER (15),
- *         enc-part        [2] <EncryptedData> -- EncAPRepPart
+ *         enc-part        [2] &lt;EncryptedData&gt; -- EncAPRepPart
  * }
  * </pre>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -105,19 +105,19 @@ public class ApRep extends KerberosMessage
      * 
      * 0x6F L1 AP-REP message
      *  |
-     *  +--> 0x30 L2 
+     *  +--&gt; 0x30 L2 
      *        |
-     *        +--> 0xA0 0x03 
+     *        +--&gt; 0xA0 0x03 
      *        |     |
-     *        |     +--> 0x02 0x01 0x05 pvno
+     *        |     +--&gt; 0x02 0x01 0x05 pvno
      *        |
-     *        +--> 0xA1 0x03
+     *        +--&gt; 0xA1 0x03
      *        |     |
-     *        |     +--> 0x02 0x01 0x0E msg-type
+     *        |     +--&gt; 0x02 0x01 0x0E msg-type
      *        |
-     *        +--> 0xA2 L3
+     *        +--&gt; 0xA2 L3
      *              |
-     *              +--> 0x30 L3-1 enc-part
+     *              +--&gt; 0x30 L3-1 enc-part
      *         
      * </pre>
      */
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
index ada9871..7f91a95 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
@@ -121,9 +121,9 @@ public class ApReq extends KerberosMessage
 
 
     /**
-     * Sets the option at a specified index.
+     * Sets the options
      *
-     * @param option
+     * @param apOptions The options to set
      */
     public void setOption( ApOptions apOptions )
     {
@@ -193,27 +193,27 @@ public class ApReq extends KerberosMessage
      * 
      * 0x6E L1 AP-REQ [APPLICATION 14]
      *  |
-     *  +--> 0x30 L2
+     *  +--&gt; 0x30 L2
      *        |
-     *        +--> 0xA0 0x03 pvno tag
+     *        +--&gt; 0xA0 0x03 pvno tag
      *        |     |
-     *        |     +--> 0x02 0x01 0x05 pvno (5)
+     *        |     +--&gt; 0x02 0x01 0x05 pvno (5)
      *        |
-     *        +--> 0xA1 0x03 msg-type tag
+     *        +--&gt; 0xA1 0x03 msg-type tag
      *        |     |
-     *        |     +--> 0x02 0x01 0x0E msg-type (14)
+     *        |     +--&gt; 0x02 0x01 0x0E msg-type (14)
      *        |
-     *        +--> 0xA2 0x03 APOptions tag
+     *        +--&gt; 0xA2 0x03 APOptions tag
      *        |     |
-     *        |     +--> 0x03 0x05 0x00 b1 b2 b3 b4 APOtions
+     *        |     +--&gt; 0x03 0x05 0x00 b1 b2 b3 b4 APOtions
      *        |
-     *        +--> 0xA3 L3 ticket tag
+     *        +--&gt; 0xA3 L3 ticket tag
      *        |     |
-     *        |     +--> 0x61 L3-1 ticket
+     *        |     +--&gt; 0x61 L3-1 ticket
      *        |
-     *        +--> 0xA4 L4 authenticator tag
+     *        +--&gt; 0xA4 L4 authenticator tag
      *              |
-     *              +--> 0x30 L4-1 authenticator (encrypted)
+     *              +--&gt; 0x30 L4-1 authenticator (encrypted)
      * </pre>
      */
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java
index 5981aec..fd8c178 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsRep.java
@@ -36,7 +36,7 @@ import org.apache.directory.shared.kerberos.flags.TicketFlags;
  * AS-REQ message. It's just a KDC-REP message with a message type set to 11.
  *  It will store the object described by the ASN.1 grammar :
  * <pre>
- * AS-REP          ::= [APPLICATION 11] <KDC-REP>
+ * AS-REP          ::= [APPLICATION 11] &lt;KDC-RE&gt;P
  * </pre>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -129,7 +129,7 @@ public class AsRep extends KdcRep
      * 
      * 0x6B L1 AS-REP message
      *  |
-     *  +-->  0x30 L2 KDC-REP sequence
+     *  +--&gt;  0x30 L2 KDC-REP sequence
      * </pre>
      */
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsReq.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsReq.java
index df51b24..8d64033 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsReq.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/AsReq.java
@@ -33,7 +33,7 @@ import org.apache.directory.shared.kerberos.components.KdcReq;
  * AS-REQ message. It's just a KDC-REQ message with a message type set to 10.
  *  It will store the object described by the ASN.1 grammar :
  * <pre>
- * AS-REQ          ::= [APPLICATION 10] <KDC-REQ>
+ * AS-REQ          ::= [APPLICATION 10] &lt;KDC-REQ&gt;
  * </pre>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -59,7 +59,7 @@ public class AsReq extends KdcReq
      * 
      * 0x6A L1 AS-REQ message
      *  |
-     *  +-->  0x30 L2 KDC-REQ sequence
+     *  +--&gt;  0x30 L2 KDC-REQ sequence
      * </pre>
      */
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
index d1bd086..e08c28f 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
@@ -47,13 +47,13 @@ import org.slf4j.LoggerFactory;
  * Authenticator   ::= [APPLICATION 2] SEQUENCE  {
  *         authenticator-vno       [0] INTEGER (5),
  *         crealm                  [1] Realm,
- *         cname                   [2] <PrincipalName>,
- *         cksum                   [3] <Checksum> OPTIONAL,
+ *         cname                   [2] &lt;PrincipalName&gt;,
+ *         cksum                   [3] &lt;Checksum&gt; OPTIONAL,
  *         cusec                   [4] Microseconds,
  *         ctime                   [5] KerberosTime,
- *         subkey                  [6] <EncryptionKey> OPTIONAL,
+ *         subkey                  [6] &lt;EncryptionKey&gt; OPTIONAL,
  *         seq-number              [7] UInt32 OPTIONAL,
- *         authorization-data      [8] <AuthorizationData> OPTIONAL
+ *         authorization-data      [8] &lt;AuthorizationData&gt; OPTIONAL
  * }
  * </pre>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -291,35 +291,35 @@ public class Authenticator extends KerberosMessage
      * 
      * 0x62 L1 Authenticator [APPLICATION 2]
      *  |
-     *  +--> 0x30 L2 Authenticator SEQUENCE
+     *  +--&gt; 0x30 L2 Authenticator SEQUENCE
      *        |
-     *        +--> 0xA0 03 authenticator-vno tag
+     *        +--&gt; 0xA0 03 authenticator-vno tag
      *        |     |
-     *        |     +--> 0x02 0x01 0x05 authenticator-vno (int, 5)
+     *        |     +--&gt; 0x02 0x01 0x05 authenticator-vno (int, 5)
      *        |
-     *        +--> 0xA1 L3 crealm tag
+     *        +--&gt; 0xA1 L3 crealm tag
      *        |     |
-     *        |     +--> 0x1B L3-1 crealm (KerberosString)
+     *        |     +--&gt; 0x1B L3-1 crealm (KerberosString)
      *        |
-     *        +--> 0xA2 L4 cname (PrincipalName)
+     *        +--&gt; 0xA2 L4 cname (PrincipalName)
      *        |
-     *        +--> 0xA3 L5 cksum (CheckSum)
+     *        +--&gt; 0xA3 L5 cksum (CheckSum)
      *        |
-     *        +--> 0xA4 L6 cusec tag
+     *        +--&gt; 0xA4 L6 cusec tag
      *        |     |
-     *        |     +--> 0x02 L6-1 nnn cusec value (Integer)
+     *        |     +--&gt; 0x02 L6-1 nnn cusec value (Integer)
      *        |
-     *        +--> 0xA5 0x11 ctime tag
+     *        +--&gt; 0xA5 0x11 ctime tag
      *        |     |
-     *        |     +--> 0x18 0x0F ttt ctime (KerberosTime)
+     *        |     +--&gt; 0x18 0x0F ttt ctime (KerberosTime)
      *        |
-     *        +--> 0xA6 L7 subkey (EncryptionKey)
+     *        +--&gt; 0xA6 L7 subkey (EncryptionKey)
      *        |
-     *        +--> 0xA7 L8 seq-number tag
+     *        +--&gt; 0xA7 L8 seq-number tag
      *        |     |
-     *        |     +--> 0x02 L8-1 nnn seq-number (Integer)
+     *        |     +--&gt; 0x02 L8-1 nnn seq-number (Integer)
      *        |
-     *        +--> 0xA8 L9 authorization-data (AuthorizationData)
+     *        +--&gt; 0xA8 L9 authorization-data (AuthorizationData)
      * </pre>
      */
     @Override
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ChangePasswdData.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ChangePasswdData.java
index 85f7850..b307498 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ChangePasswdData.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ChangePasswdData.java
@@ -73,17 +73,18 @@ public class ChangePasswdData implements Asn1Object
      *
      * 0x30 L1 ChangePasswdData sequence
      *  |
-     *  +--> 0xA0 L2 newPasswd tag
+     *  +--&gt; 0xA0 L2 newPasswd tag
      *  |     |
-     *  |     +--> 0x04 L2-1 newPasswd (Octet string)
+     *  |     +--&gt; 0x04 L2-1 newPasswd (Octet string)
      *  |
-     *  +--> 0xA1 L3 targName tag
+     *  +--&gt; 0xA1 L3 targName tag
      *  |     |
-     *  |     +--> 0x30 L3-1 targName (PrincipalName)
+     *  |     +--&gt; 0x30 L3-1 targName (PrincipalName)
      *  |
-     *  +--> 0xA2 L4 targRealm tag
+     *  +--&gt; 0xA2 L4 targRealm tag
      *        |
-     *        +--> 0x1B L4-1 targRealm (KerberosString)
+     *        +--&gt; 0x1B L4-1 targRealm (KerberosString)
+     * </pre>
      */
     @Override
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java
index c49698d..fd1260d 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncApRepPart.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
  * EncAPRepPart    ::= [APPLICATION 27] SEQUENCE {
  *         ctime           [0] KerberosTime,
  *         cusec           [1] Microseconds,
- *         subkey          [2] <EncryptionKey> OPTIONAL,
+ *         subkey          [2] &lt;EncryptionKey&gt; OPTIONAL,
  *         seq-number      [3] UInt32 OPTIONAL
  * }
  * </pre>
@@ -169,21 +169,21 @@ public class EncApRepPart extends KerberosMessage
      * 
      * 0x7B L1 EncApRepPart [APPLICATION 27]
      *  |
-     *  +--> 0x30 L2 SEQ
+     *  +--&gt; 0x30 L2 SEQ
      *        |
-     *        +--> 0xA0 11 ctime tag
+     *        +--&gt; 0xA0 11 ctime tag
      *        |     |
-     *        |     +--> 0x18 0x0F ttt ctime (KerberosTime)
+     *        |     +--&gt; 0x18 0x0F ttt ctime (KerberosTime)
      *        |
-     *        +--> 0xA1 L3 cusec tag
+     *        +--&gt; 0xA1 L3 cusec tag
      *        |     |
-     *        |     +--> 0x02 L3-1 cusec (INTEGER)
+     *        |     +--&gt; 0x02 L3-1 cusec (INTEGER)
      *        |
-     *        +--> 0xA2 L4 subkey (EncryptionKey)
+     *        +--&gt; 0xA2 L4 subkey (EncryptionKey)
      *        |
-     *        +--> 0xA3 L5 seq-number tag
+     *        +--&gt; 0xA3 L5 seq-number tag
      *              |
-     *              +--> 0x02 L5-1 NN seq-number (INTEGER)
+     *              +--&gt; 0x02 L5-1 NN seq-number (INTEGER)
      * </pre>
      */
     @Override
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncAsRepPart.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncAsRepPart.java
index 623ce9e..f654b93 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncAsRepPart.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncAsRepPart.java
@@ -80,7 +80,7 @@ public class EncAsRepPart extends KerberosMessage
      * 
      * 0x79 L1 EncAsRepPart message
      *  |
-     *  +-->  0x30 L2 EncKdcRepPart sequence
+     *  +--&gt;  0x30 L2 EncKdcRepPart sequence
      * </pre>
      */
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncTgsRepPart.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncTgsRepPart.java
index dd9a5f4..85e9b02 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncTgsRepPart.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/EncTgsRepPart.java
@@ -80,7 +80,7 @@ public class EncTgsRepPart extends KerberosMessage
      * 
      * 0x7A L1 EncTgsRepPart message
      *  |
-     *  +-->  0x30 L2 EncKdcRepPart sequence
+     *  +--&gt;  0x30 L2 EncKdcRepPart sequence
      * </pre>
      */
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KerberosMessage.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KerberosMessage.java
index c7edbda..bc97503 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KerberosMessage.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KerberosMessage.java
@@ -62,9 +62,9 @@ public abstract class KerberosMessage implements Asn1Object
 
 
     /**
-     * Returns the {@link org.apache.directory.server.kerberos.shared.KerberosMessageType}.
+     * Returns the {@link KerberosMessageType}.
      *
-     * @return The {@link org.apache.directory.server.kerberos.shared.KerberosMessageType}.
+     * @return The {@link KerberosMessageType}.
      */
     public KerberosMessageType getMessageType()
     {
@@ -73,7 +73,7 @@ public abstract class KerberosMessage implements Asn1Object
 
 
     /**
-     * Sets the {@link org.apache.directory.server.kerberos.shared.KerberosMessageType}.
+     * Sets the {@link KerberosMessageType}.
      *
      * @param type
      */
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java
index 71f0cae..7ad7385 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbCred.java
@@ -88,27 +88,28 @@ public class KrbCred extends KerberosMessage
      * 
      * 0x76 L1 KRB-CRED APPLICATION[22]
      *  |
-     *  +--> 0x30 L2 KRB-CRED sequence
+     *  +--&gt; 0x30 L2 KRB-CRED sequence
      *        |
-     *        +--> 0xA0 0x03 pvno tag
+     *        +--&gt; 0xA0 0x03 pvno tag
      *        |     |
-     *        |     +--> 0x02 0x01 0x05 pvno (5)
+     *        |     +--&gt; 0x02 0x01 0x05 pvno (5)
      *        |
-     *        +--> 0xA1 0x03 msg-type tag
+     *        +--&gt; 0xA1 0x03 msg-type tag
      *        |     |
-     *        |     +--> 0x02 0x01 0x16 msg-type (22)
+     *        |     +--&gt; 0x02 0x01 0x16 msg-type (22)
      *        |     
-     *        +--> 0xA2 L3 tickets tag
+     *        +--&gt; 0xA2 L3 tickets tag
      *        |     |
-     *        |     +--> 0x30 LL tickets seq tag
+     *        |     +--&gt; 0x30 LL tickets seq tag
      *        |           |
-     *        |           +--> 0x30 LL1 ticket (Ticket)
+     *        |           +--&gt; 0x30 LL1 ticket (Ticket)
      *        |           .         ...
-     *        |           +--> 0x30 LLn ticket (Ticket)
+     *        |           +--&gt; 0x30 LLn ticket (Ticket)
      *        |
-     *        +--> 0xA3 L4 enc-part tag
+     *        +--&gt; 0xA3 L4 enc-part tag
      *              |
-     *              +--> 0x30 L4-2 enc-part (EncryptedData)
+     *              +--&gt; 0x30 L4-2 enc-part (EncryptedData)
+     * </pre>
      */
     @Override
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
index 59eca58..d3831a3 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
@@ -342,59 +342,59 @@ public class KrbError extends KerberosMessage
      * 
      * 0x7E L1 KRB-ERROR APPLICATION[30]
      *  |
-     *  +--> 0x30 L2 KRB-ERROR sequence
+     *  +--&gt; 0x30 L2 KRB-ERROR sequence
      *        |
-     *        +--> 0xA0 0x03 pvno tag
+     *        +--&gt; 0xA0 0x03 pvno tag
      *        |     |
-     *        |     +--> 0x02 0x01 0x05 pvno (5)
+     *        |     +--&gt; 0x02 0x01 0x05 pvno (5)
      *        |
-     *        +--> 0xA1 0x03 msg-type tag
+     *        +--&gt; 0xA1 0x03 msg-type tag
      *        |     |
-     *        |     +--> 0x02 0x01 0x1E msg-type (30)
+     *        |     +--&gt; 0x02 0x01 0x1E msg-type (30)
      *        |     
-     *        +--> 0xA2 0x11 ctime tag
+     *        +--&gt; 0xA2 0x11 ctime tag
      *        |     |
-     *        |     +--> 0x18 0x0F ttt ctime (KerberosTime)
+     *        |     +--&gt; 0x18 0x0F ttt ctime (KerberosTime)
      *        |     
-     *        +--> 0xA3 L3 cusec tag
+     *        +--&gt; 0xA3 L3 cusec tag
      *        |     |
-     *        |     +--> 0x02 L3-1 cusec
+     *        |     +--&gt; 0x02 L3-1 cusec
      *        |     
-     *        +--> 0xA4 0x11 stime tag
+     *        +--&gt; 0xA4 0x11 stime tag
      *        |     |
-     *        |     +--> 0x18 0x0F ttt stime (KerberosTime)
+     *        |     +--&gt; 0x18 0x0F ttt stime (KerberosTime)
      *        |     
-     *        +--> 0xA5 L4 susec tag
+     *        +--&gt; 0xA5 L4 susec tag
      *        |     |
-     *        |     +--> 0x02 L4-1 susec (KerberosTime)
+     *        |     +--&gt; 0x02 L4-1 susec (KerberosTime)
      *        |     
-     *        +--> 0xA6 L5 error-code tag
+     *        +--&gt; 0xA6 L5 error-code tag
      *        |     |
-     *        |     +--> 0x02 L5-1 nnn error-code
+     *        |     +--&gt; 0x02 L5-1 nnn error-code
      *        |     
-     *        +--> 0xA7 L6 crealm tag
+     *        +--&gt; 0xA7 L6 crealm tag
      *        |     |
-     *        |     +--> 0x1B L6-1 crealm (KerberosString)
+     *        |     +--&gt; 0x1B L6-1 crealm (KerberosString)
      *        |     
-     *        +--> 0xA8 L7 cname tag
+     *        +--&gt; 0xA8 L7 cname tag
      *        |     |
-     *        |     +--> 0x30 L7-1 cname (PrincipalName)
+     *        |     +--&gt; 0x30 L7-1 cname (PrincipalName)
      *        |
-     *        +--> 0xA9 L8 realm tag
+     *        +--&gt; 0xA9 L8 realm tag
      *        |     |
-     *        |     +--> 0x1B L8-1 realm (KerberosString)
+     *        |     +--&gt; 0x1B L8-1 realm (KerberosString)
      *        |     
-     *        +--> 0xAA L9 sname tag
+     *        +--&gt; 0xAA L9 sname tag
      *        |     |
-     *        |     +--> 0x30 L9-1 sname (PrincipalName)
+     *        |     +--&gt; 0x30 L9-1 sname (PrincipalName)
      *        |     
-     *        +--> 0xAB L10 e-text tag
+     *        +--&gt; 0xAB L10 e-text tag
      *        |     |
-     *        |     +--> 0x1B L10-1 e-text (KerberosString)
+     *        |     +--&gt; 0x1B L10-1 e-text (KerberosString)
      *        |
-     *        +--> 0xAC L11 e-data
+     *        +--&gt; 0xAC L11 e-data
      *              |
-     *              +--> 0x04 L11-1 e-data (Octet String)
+     *              +--&gt; 0x04 L11-1 e-data (Octet String)
      * </pre>       
      */
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java
index 50311be..465c332 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbPriv.java
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
  *                      -- NOTE: there is no [2] tag
  *      enc-part        [3] EncryptedData -- EncKrbPrivPart
  * }
- * </pre
+ * </pre>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public class KrbPriv extends KerberosMessage
@@ -103,17 +103,18 @@ public class KrbPriv extends KerberosMessage
      * 
      * 0x75 L1 KRB-PRIV APPLICATION[21]
      *  |
-     *  +--> 0x30 L2 KRB-PRIV sequence
+     *  +--&gt; 0x30 L2 KRB-PRIV sequence
      *        |
-     *        +--> 0xA0 0x03 pvno tag
+     *        +--&gt; 0xA0 0x03 pvno tag
      *        |     |
-     *        |     +--> 0x02 0x01 0x05 pvno (5)
+     *        |     +--&gt; 0x02 0x01 0x05 pvno (5)
      *        |
-     *        +--> 0xA1 0x03 msg-type tag
+     *        +--&gt; 0xA1 0x03 msg-type tag
      *        |     |
-     *        |     +--> 0x02 0x01 0x15 msg-type (21)
+     *        |     +--&gt; 0x02 0x01 0x15 msg-type (21)
      *        |     
-     *        +--> 0xA3 L3 enc-part (EncryptedData -- EncKrbPrivPart)
+     *        +--&gt; 0xA3 L3 enc-part (EncryptedData -- EncKrbPrivPart)
+     * </pre>
      */
     @Override
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java
index 32cd661..b1e6b51 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbSafe.java
@@ -126,23 +126,23 @@ public class KrbSafe extends KerberosMessage
      * 
      * 0x74 L1 KRB-SAFE APPLICATION[20]
      *  |
-     *  +--> 0x30 L2 KRB-ERROR sequence
+     *  +--&gt; 0x30 L2 KRB-ERROR sequence
      *        |
-     *        +--> 0xA0 0x03 pvno tag
+     *        +--&gt; 0xA0 0x03 pvno tag
      *        |     |
-     *        |     +--> 0x02 0x01 0x05 pvno (5)
+     *        |     +--&gt; 0x02 0x01 0x05 pvno (5)
      *        |
-     *        +--> 0xA1 0x03 msg-type tag
+     *        +--&gt; 0xA1 0x03 msg-type tag
      *        |     |
-     *        |     +--> 0x02 0x01 0x14 msg-type (20)
+     *        |     +--&gt; 0x02 0x01 0x14 msg-type (20)
      *        |     
-     *        +--> 0xA2 L3 safe-body tag
+     *        +--&gt; 0xA2 L3 safe-body tag
      *        |     |
-     *        |     +--> 0x30 L3-1 safe-body (KRB-SAFE-BODY)
+     *        |     +--&gt; 0x30 L3-1 safe-body (KRB-SAFE-BODY)
      *        |
-     *        +--> 0xA3 L4 cksum tag
+     *        +--&gt; 0xA3 L4 cksum tag
      *              |
-     *              +--> 0x30 L4-1 cksum (CHECKSUM)
+     *              +--&gt; 0x30 L4-1 cksum (CHECKSUM)
      * </pre>
      */
     @Override
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java
index 869cbff..edcb208 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsRep.java
@@ -34,9 +34,9 @@ import org.apache.directory.shared.kerberos.flags.TicketFlags;
 
 /**
  * TGS-REP message. It's just a KDC-REP message with a message type set to 13.
- *  It will store the object described by the ASN.1 grammar :
+ * It will store the object described by the ASN.1 grammar :
  * <pre>
- * TGS-REP         ::= [APPLICATION 13] <KDC-REP>
+ * TGS-REP         ::= [APPLICATION 13] &lt;KDC-REP&gt;
  * </pre>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -128,7 +128,7 @@ public class TgsRep extends KdcRep
      * 
      * 0x6D L1 TGS-REP message
      *  |
-     *  +-->  0x30 L2 KDC-REP sequence
+     *  +--&gt;  0x30 L2 KDC-REP sequence
      * </pre>
      */
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
index 5ce37b9..b435366 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
@@ -33,7 +33,7 @@ import org.apache.directory.shared.kerberos.components.KdcReq;
  * TGS-REQ message. It's just a KDC-REQ message with a message type set to 12.
  *  It will store the object described by the ASN.1 grammar :
  * <pre>
- * TGS-REQ         ::= [APPLICATION 12] <KDC-REQ>
+ * TGS-REQ         ::= [APPLICATION 12] &lt;KDC-REQ&gt;
  * </pre>
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -60,7 +60,7 @@ public class TgsReq extends KdcReq
      * 
      * 0x6A L1 TGS-REQ message
      *  |
-     *  +-->  0x30 L2 KDC-REQ sequence
+     *  +--&gt;  0x30 L2 KDC-REQ sequence
      * </pre>
      */
     public int computeLength()
diff --git a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java
index 65519e5..ee9aacc 100644
--- a/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java
+++ b/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Ticket.java
@@ -46,8 +46,8 @@ import org.slf4j.LoggerFactory;
  * Ticket          ::= [APPLICATION 1] SEQUENCE {
  *         tkt-vno         [0] INTEGER (5),
  *         realm           [1] Realm,
- *         sname           [2] <PrincipalName>,
- *         enc-part        [3] <EncryptedData> -- EncTicketPart
+ *         sname           [2] &lt;PrincipalName&gt;,
+ *         enc-part        [3] &lt;EncryptedData&gt; -- EncTicketPart
  * }
  * </pre>
  * 
@@ -91,7 +91,7 @@ public class Ticket extends KerberosMessage
     /**
      * Creates a new instance of Ticket.
      *
-     * @param serverPrincipal The server principal
+     * @param sName The server principal
      * @param encPart The encoded part
      */
     public Ticket( PrincipalName sName, EncryptedData encPart ) throws InvalidTicketException
@@ -115,7 +115,7 @@ public class Ticket extends KerberosMessage
      * Creates a new instance of Ticket.
      *
      * @param tktvno The Kerberos version number
-     * @param serverPrincipal The server principal
+     * @param sName The server principal
      * @param encPart The encoded part
      */
     public Ticket( int tktvno, PrincipalName sName, EncryptedData encPart ) throws InvalidTicketException
@@ -234,19 +234,19 @@ public class Ticket extends KerberosMessage
      * 
      * 0x61 L1 Ticket [APPLICATION 1]
      *  |
-     *  +--> 0x30 L2 Ticket SEQUENCE
+     *  +--&gt; 0x30 L2 Ticket SEQUENCE
      *        |
-     *        +--> 0xA0 L3 tkt-vno tag
+     *        +--&gt; 0xA0 L3 tkt-vno tag
      *        |     |
-     *        |     +--> 0x02 L3-1 tkt-vno (int, 5)
+     *        |     +--&gt; 0x02 L3-1 tkt-vno (int, 5)
      *        |
-     *        +--> 0xA1 L4 realm tag
+     *        +--&gt; 0xA1 L4 realm tag
      *        |     |
-     *        |     +--> 0x1B L4-1 realm (KerberosString)
+     *        |     +--&gt; 0x1B L4-1 realm (KerberosString)
      *        |
-     *        +--> 0xA2 L5 sname (PrincipalName)
+     *        +--&gt; 0xA2 L5 sname (PrincipalName)
      *        |
-     *        +--> 0xA3 L6 enc-part (EncryptedData)
+     *        +--&gt; 0xA3 L6 enc-part (EncryptedData)
      * </pre>
      */
     public int computeLength()
diff --git a/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java b/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java
index 152bb94..14bdaef 100644
--- a/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java
+++ b/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java
@@ -50,7 +50,7 @@ public final class LdapApiIntegrationUtils
     private static final String DEFAULT_PASSWORD = "secret";
 
     /** The pools. */
-    private static final Map<Integer, LdapConnectionPool> POOLS = new HashMap<Integer, LdapConnectionPool>();
+    private static final Map<Integer, LdapConnectionPool> POOLS = new HashMap<>();
 
 
     private LdapApiIntegrationUtils()
@@ -65,13 +65,12 @@ public final class LdapApiIntegrationUtils
      * @param ldapServer the LDAP server instance, used to obtain the port used
      * @return the created connection
      * @throws LdapException the LDAP exception
-     * @throws IOException Signals that an I/O exception has occurred.
      */
-    public static LdapNetworkConnection createAdminConnection( LdapServer ldapServer ) throws LdapException,
-        IOException
+    public static LdapNetworkConnection createAdminConnection( LdapServer ldapServer ) throws LdapException
     {
         LdapNetworkConnection conn = new LdapNetworkConnection( Network.LOOPBACK_HOSTNAME, ldapServer.getPort() );
         conn.bind( DEFAULT_ADMIN, DEFAULT_PASSWORD );
+        
         return conn;
     }
 
@@ -99,9 +98,9 @@ public final class LdapApiIntegrationUtils
      *
      * @param ldapServer the LDAP server instance, used to obtain the port used
      * @return the pooled admin connection
-     * @throws Exception the exception
+     * @throws LdapException the exception
      */
-    public static LdapConnection getPooledAdminConnection( LdapServer ldapServer ) throws Exception
+    public static LdapConnection getPooledAdminConnection( LdapServer ldapServer ) throws LdapException
     {
         LdapConnection ldapConnection = getAdminPool( ldapServer ).getConnection();
 
@@ -118,10 +117,10 @@ public final class LdapApiIntegrationUtils
      *
      * @param conn the connection to release
      * @param ldapServer the LDAP server instance, used to obtain the port used
-     * @throws Exception the exception
+     * @throws LdapException the exception
      */
     public static void releasePooledAdminConnection( LdapConnection conn, LdapServer ldapServer )
-        throws Exception
+        throws LdapException
     {
         getAdminPool( ldapServer ).releaseConnection( conn );
     }
@@ -157,11 +156,12 @@ public final class LdapApiIntegrationUtils
     /**
      * Gets an anonymous LdapNetworkConnection
      * 
-     * @param dirService The Directory Service to be connected to
+     * @param host The server to connect to
+     * @param port The port to connect with
      * @return A LdapNetworkConnection instance
-     * @exception If the connection could not be established.
+     * @exception LdapException If the connection could not be established.
      */
-    public static LdapConnection getAnonymousNetworkConnection( String host, int port ) throws Exception
+    public static LdapConnection getAnonymousNetworkConnection( String host, int port ) throws LdapException
     {
         LdapConnection connection = new LdapNetworkConnection( host, port );
         connection.bind();
@@ -175,9 +175,9 @@ public final class LdapApiIntegrationUtils
      * 
      * @param ldapServer The LDAP server we want to connect to
      * @return A LdapNetworkConnection instance
-     * @exception If the connection could not be established.
+     * @exception LdapException If the connection could not be established.
      */
-    public static LdapConnection getAnonymousNetworkConnection( LdapServer ldapServer ) throws Exception
+    public static LdapConnection getAnonymousNetworkConnection( LdapServer ldapServer ) throws LdapException
     {
         LdapConnection connection = new LdapNetworkConnection( Network.LOOPBACK_HOSTNAME, ldapServer.getPort() );
         connection.setTimeOut( 0L );
diff --git a/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java b/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
index 349f7d2..f1c2d91 100644
--- a/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
+++ b/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
@@ -67,8 +67,10 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A LDIF based partition. Data are stored on disk as LDIF, following this organization :
- * <li> each entry is associated with a file, post-fixed with LDIF
- * <li> each entry having at least one child will have a directory created using its name.
+ * <ul>
+ *   <li> each entry is associated with a file, post-fixed with LDIF
+ *   <li> each entry having at least one child will have a directory created using its name.
+ * </ul>
  * The root is the partition's suffix.
  * <br>
  * So for instance, we may have on disk :
@@ -76,10 +78,10 @@ import org.slf4j.LoggerFactory;
  * /ou=example,ou=system.ldif
  * /ou=example,ou=system/
  *   |
- *   +--> cn=test.ldif
+ *   +--&gt; cn=test.ldif
  *        cn=test/
  *           |
- *           +--> cn=another test.ldif
+ *           +--&gt; cn=another test.ldif
  *                ...
  * </pre>
  * <br><br>
@@ -128,6 +130,9 @@ public class LdifPartition extends AbstractLdifPartition
 
     /**
      * Creates a new instance of LdifPartition.
+     * 
+     * @param schemaManager The SchemaManager instance
+     * @param dnFactory The DN factory
      */
     public LdifPartition( SchemaManager schemaManager, DnFactory dnFactory )
     {
diff --git a/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java b/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java
index 5d532c7..3048464 100644
--- a/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java
+++ b/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java
@@ -82,6 +82,9 @@ public class SingleFileLdifPartition extends AbstractLdifPartition
 
     /**
      * Creates a new instance of SingleFileLdifPartition.
+     * 
+     * @param schemaManager The SchemaManager instance
+     * @param dnFactory The DN factory
      */
     public SingleFileLdifPartition( SchemaManager schemaManager, DnFactory dnFactory )
     {
@@ -517,10 +520,11 @@ public class SingleFileLdifPartition extends AbstractLdifPartition
 
     /**
      * enable/disable the re-writing of partition data.
-     * This method internally calls the @see {@link #rewritePartitionData()} to save any dirty data if present
+     * This method internally calls the rewritePartitionData() method to save any dirty data if present
      * 
+     * @param partitionTxn The transaction to use
      * @param enableRewriting flag to enable/disable re-writing
-     * @throws LdapException
+     * @throws LdapException If we weren't able to save the dirty data
      */
     public void setEnableRewriting( PartitionTxn partitionTxn, boolean enableRewriting ) throws LdapException
     {
diff --git a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/DnSerializer.java b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/DnSerializer.java
index 3fa1e32..3455ca2 100644
--- a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/DnSerializer.java
+++ b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/DnSerializer.java
@@ -72,8 +72,6 @@ public class DnSerializer extends AbstractElementSerializer<Dn>
 
     /**
      * Creates a new instance of DnSerializer.
-     * 
-     * @param schemaManager The reference to the global schemaManager
      */
     public DnSerializer()
     {
@@ -82,10 +80,10 @@ public class DnSerializer extends AbstractElementSerializer<Dn>
 
 
     /**
-     * <p>
-     * 
      * This is the place where we serialize Dn
-     * <p>
+     * 
+     * @param dn The Dn to serialize
+     * @return The byte[] containing the serialized Dn
      */
     public byte[] serialize( Dn dn )
     {
@@ -117,7 +115,7 @@ public class DnSerializer extends AbstractElementSerializer<Dn>
     /**
      *  Deserialize a Dn.
      *  
-     *  @param bytes the byte array containing the serialized Dn
+     *  @param buffer the buffer containing the serialized Dn
      *  @return An instance of a Dn object 
      *  @throws IOException if we can't deserialize the Dn
      */
diff --git a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleValueCursor.java b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleValueCursor.java
index a06501c..d04d284 100644
--- a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleValueCursor.java
+++ b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/KeyTupleValueCursor.java
@@ -58,7 +58,7 @@ public class KeyTupleValueCursor<K, V> extends AbstractCursor<Tuple<K, V>>
     /**
      * Creates a Cursor over the tuples of an ArrayTree.
      *
-     * @param arrayTree the ArrayTree to build a Tuple returning Cursor over
+     * @param cursor The wrapped cursor 
      * @param key the constant key for which values are returned
      */
     public KeyTupleValueCursor( ValueCursor<V> cursor, K key )
@@ -118,7 +118,8 @@ public class KeyTupleValueCursor<K, V> extends AbstractCursor<Tuple<K, V>>
      * considered at all.
      *
      * @param element the valueTuple who's value is used to position this Cursor
-     * @throws Exception if there are failures to position the Cursor
+     * @throws LdapException if there are failures to position the Cursor
+     * @throws CursorException if there are failures to position the Cursor
      */
     public void before( Tuple<K, V> element ) throws LdapException, CursorException
     {
diff --git a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotEntrySerializer.java b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotEntrySerializer.java
index 5320a17..c44fe29 100644
--- a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotEntrySerializer.java
+++ b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotEntrySerializer.java
@@ -192,7 +192,7 @@ public class MavibotEntrySerializer extends AbstractElementSerializer<Entry>
     /**
      *  Deserialize a Entry.
      *  
-     *  @param bytes the byte array containing the serialized entry
+     *  @param buffer The buffer containing the serialized entry
      *  @return An instance of a Entry object 
      *  @throws IOException if we can't deserialize the Entry
      */
diff --git a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java
index ef8c851..4a6ab28 100644
--- a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java
+++ b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java
@@ -92,6 +92,9 @@ public class MavibotIndex<K> extends AbstractIndex<K, String>
     // ----------------------------------------------------------------------
     /**
      * Creates a JdbmIndex instance for a give AttributeId
+     * 
+     * @param attributeId The Attribute ID
+     * @param withReverse If we want a reverse index to be created
      */
     public MavibotIndex( String attributeId, boolean withReverse )
     {
@@ -107,6 +110,7 @@ public class MavibotIndex<K> extends AbstractIndex<K, String>
      * @param schemaManager The schemaManager to use to get back the Attribute
      * @param attributeType The attributeType this index is created for
      * @throws IOException If the initialization failed
+     * @throws LdapException If the initialization failed
      */
     public void init( SchemaManager schemaManager, AttributeType attributeType ) throws LdapException, IOException
     {
@@ -297,7 +301,12 @@ public class MavibotIndex<K> extends AbstractIndex<K, String>
     // ------------------------------------------------------------------------
 
     /**
-     * @see Index#forwardLookup(java.lang.Object)
+     * Do a lookup using the forward table
+     * 
+     * @param partitionTxn The Transaction to use
+     * @param attrVal The Key we are looking for
+     * @return The found value
+     * @throws LdapException If the lookup failed
      */
     public String forwardLookup( PartitionTxn partitionTxn, K attrVal ) throws LdapException
     {
@@ -550,11 +559,14 @@ public class MavibotIndex<K> extends AbstractIndex<K, String>
 
 
     /**
-     * @see Index#sync()
+     * Force the flush of this index
+     * 
+     * @throws IOException If the flush failed
      */
     public synchronized void sync() throws IOException
     {
         forward.getBTree().flush();
+        
         if ( reverse != null )
         {
             reverse.getBTree().flush();
diff --git a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotParentIdAndRdnSerializer.java b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotParentIdAndRdnSerializer.java
index e698432..535ed18 100644
--- a/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotParentIdAndRdnSerializer.java
+++ b/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotParentIdAndRdnSerializer.java
@@ -183,7 +183,7 @@ public class MavibotParentIdAndRdnSerializer extends AbstractElementSerializer<P
     /**
      *  Deserialize a ParentIdAndRdn.
      *  
-     *  @param bytes the byte array containing the serialized ParentIdAndRdn
+     *  @param bufferHandler The buffer containing the serialized ParentIdAndRdn
      *  @return An instance of a ParentIdAndRdn object 
      *  @throws IOException if we can't deserialize the ParentIdAndRdn
      */
diff --git a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java
index e6ab523..c3bfafc 100644
--- a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java
+++ b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/messages/HardwareAddress.java
@@ -203,7 +203,6 @@ public final class HardwareAddress
      * 
      * @param s
      * @return HardwareAddress
-     * @throws ParseException
      */
     public static HardwareAddress valueOf( String s )
     {
diff --git a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/DhcpStore.java b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/DhcpStore.java
index 2dc1c76..627c66e 100644
--- a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/DhcpStore.java
+++ b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/store/DhcpStore.java
@@ -50,7 +50,7 @@ public interface DhcpStore
      * and may be refined using the supplied options.
      * </ul>
      * <p>
-     * If the requestedLeaseTime is >= 0, the validity duration of the returned
+     * If the requestedLeaseTime is &gt;= 0, the validity duration of the returned
      * lease must be updated, so that the lease is valid for at least the
      * specified time. The duration may, however, be constrained by a configured
      * maximum lease time.
diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/package-info.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/package-info.java
index efcdaae..c3be51e 100644
--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/package-info.java
+++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/package-info.java
@@ -19,8 +19,7 @@
  */
 
 /**
- * Provides the entry point to an instance of the
- * {@link org.apache.directory.server.changepw.ChangePasswordServer},
+ * Provides the entry point to an instance of the {@link org.apache.directory.server.kerberos.changepwd.ChangePasswordServer},
  * as well as support for configuration.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java
index 8a5230e..4b14142 100644
--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java
+++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java
@@ -65,8 +65,8 @@ public class ChangePasswordProtocolHandler extends IoHandlerAdapter
     /**
      * Creates a new instance of ChangePasswordProtocolHandler.
      *
-     * @param config
-     * @param store
+     * @param config The ChangePassword server configuration
+     * @param store The Principal store
      */
     public ChangePasswordProtocolHandler( ChangePasswordServer config, PrincipalStore store )
     {
diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/MinaChangePasswordDecoder.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/MinaChangePasswordDecoder.java
index c400e8e..70a6f4c 100644
--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/MinaChangePasswordDecoder.java
+++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/MinaChangePasswordDecoder.java
@@ -54,7 +54,7 @@ public class MinaChangePasswordDecoder extends CumulativeProtocolDecoder
      * decoder will throw a {@link IllegalArgumentException}.  The default
      * value is <tt>16384</tt> (16KB).
      * 
-     * @param maxObjectSize 
+     * @param maxObjectSize The maximum size for a PDU
      */
     public void setMaxObjectSize( int maxObjectSize )
     {
diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/DirectoryPrincipalStore.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/DirectoryPrincipalStore.java
index 11f03a3..8597c4c 100644
--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/DirectoryPrincipalStore.java
+++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/DirectoryPrincipalStore.java
@@ -67,6 +67,7 @@ public class DirectoryPrincipalStore implements PrincipalStore
      * Creates a new instance of DirectoryPrincipalStore.
      *
      * @param directoryService backing store for this PrincipalStore
+     * @param searchBaseDn The Search Base DN
      */
     public DirectoryPrincipalStore( DirectoryService directoryService, Dn searchBaseDn )
     {
diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java
index 5923add..b748e44 100644
--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java
+++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java
@@ -214,7 +214,7 @@ public abstract class KdcContext
     /**
      * sets the replay cache
      *
-     * @param replayCache
+     * @param replayCache The Replay cache instance
      */
     public void setReplayCache( ReplayCache replayCache )
     {
diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/package-info.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/package-info.java
index 86bb879..bc9c314 100644
--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/package-info.java
+++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/package-info.java
@@ -22,7 +22,7 @@
  * Provides the entry point to an instance of the {@link org.apache.directory.server.kerberos.kdc.KdcServer}
  * (KDC), as well as classes common to the KDC's two services:  the
  * Authentication Service (AS) and the Ticket-Granting Service (TGS).
- * <p/>
+ * <p>
  * Classes common to all of the services provide configuration
  * support, the execution context, monitors for logging, and
  * "links" for selecting checksum and encryption types.
diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java
index a6fbe3a..8fea73d 100644
--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java
+++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java
@@ -1009,11 +1009,11 @@ public final class TicketGrantingService
      * Get a PrincipalStoreEntry given a principal.  The ErrorType is used to indicate
      * whether any resulting error pertains to a server or client.
      *
-     * @param principal
-     * @param store
-     * @param errorType
+     * @param principal The KerberosPrincipal instance
+     * @param store The Principal store
+     * @param errorType The type of error
      * @return The PrincipalStoreEntry
-     * @throws Exception
+     * @throws KerberosException If teh entry can't be retrieve
      */
     public static PrincipalStoreEntry getEntry( KerberosPrincipal principal, PrincipalStore store, ErrorType errorType )
         throws KerberosException
diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
index ec71944..d21ad59 100644
--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
+++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
@@ -71,8 +71,8 @@ public class KerberosProtocolHandler extends IoHandlerAdapter
     /**
      * Creates a new instance of KerberosProtocolHandler.
      *
-     * @param kdcServer
-     * @param store
+     * @param kdcServer The KdcServer instance
+     * @param store The Principal store
      */
     public KerberosProtocolHandler( KdcServer kdcServer, PrincipalStore store )
     {
@@ -308,7 +308,8 @@ public class KerberosProtocolHandler extends IoHandlerAdapter
     /**
      * Creates an explicit error message
      * The error we've get 
-     * @param error
+     * 
+     * @param error The Kerberos error to log
      */
     protected void logErrorMessage( KrbError error )
     {
diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamException.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamException.java
index 8e65a81..a19b5f3 100644
--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamException.java
+++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamException.java
@@ -26,7 +26,7 @@ import org.apache.directory.shared.kerberos.codec.types.SamType;
 /**
  * Base class for all SAM subsystem errors.
  *
- * @warning this should extend from KerberosException in o.a.k.exception.
+ * TODO this should extend from KerberosException in o.a.k.exception.
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public class SamException extends Exception
diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamVerifier.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamVerifier.java
index 9234650..d352802 100644
--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamVerifier.java
+++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamVerifier.java
@@ -50,7 +50,7 @@ public interface SamVerifier
     /**
      * Starts one of many pluggable SAM type subsystem.
      * 
-     * @throws SamException
+     * @throws SamException If the SamVerifier instance cannot be started
      */
     void startup() throws SamException;
 
@@ -80,7 +80,7 @@ public interface SamVerifier
      * @param principal The kerberos principal to use.
      * @param sad Single-use authentication data (encrypted generalized timestamp).
      * @return The {@link KerberosKey}.
-     * @throws SamException 
+     * @throws SamException If the verification failed
      */
     KerberosKey verify( KerberosPrincipal principal, byte[] sad ) throws SamException;
 
@@ -96,7 +96,7 @@ public interface SamVerifier
     /**
      * Sets the user context where users are stored for the primary realm.
      *  
-     * @param userContext
+     * @param userContext The User context
      */
     void setUserContext( DirContext userContext );
 }
diff --git a/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java b/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
index 9f60c06..7e1b458 100644
--- a/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
+++ b/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
@@ -22,11 +22,14 @@ package org.apache.directory.server.integ;
 import java.util.Hashtable;
 
 import javax.naming.Context;
+import javax.naming.NamingException;
 import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapContext;
 
 import netscape.ldap.LDAPConnection;
+import netscape.ldap.LDAPException;
 
+import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.message.Control;
 import org.apache.directory.api.ldap.util.JndiUtils;
 import org.apache.directory.api.util.Network;
@@ -57,9 +60,9 @@ public class ServerIntegrationUtils extends IntegrationUtils
      *
      * @param ldapServer the LDAP server to get the connection to
      * @return an LdapContext as the administrative user to the RootDSE
-     * @throws Exception if there are problems creating the context
+     * @throws NamingException if there are problems creating the context
      */
-    public static LdapContext getWiredContext( LdapServer ldapServer ) throws Exception
+    public static LdapContext getWiredContext( LdapServer ldapServer ) throws NamingException
     {
         return getWiredContext( ldapServer, null );
     }
@@ -71,11 +74,13 @@ public class ServerIntegrationUtils extends IntegrationUtils
      * user as the principalDN.  The context is to the rootDSE.
      *
      * @param ldapServer the LDAP server to get the connection to
+     * @param principalDn The user to use for authentication
+     * @param password The user's password
      * @return an LdapContext as the administrative user to the RootDSE
-     * @throws Exception if there are problems creating the context
+     * @throws NamingException if there are problems creating the context
      */
     public static LdapContext getWiredContext( LdapServer ldapServer, String principalDn, String password )
-        throws Exception
+        throws NamingException
     {
         LOG.debug( "Creating a wired context to local LDAP server on port {}", ldapServer.getPort() );
         Hashtable<String, String> env = new Hashtable<String, String>();
@@ -95,10 +100,11 @@ public class ServerIntegrationUtils extends IntegrationUtils
      * user as the principalDN.  The context is to the rootDSE.
      *
      * @param ldapServer the LDAP server to get the connection to
+     * @param controls The controls to use
      * @return an LdapContext as the administrative user to the RootDSE
-     * @throws Exception if there are problems creating the context
+     * @throws NamingException if there are problems creating the context
      */
-    public static LdapContext getWiredContext( LdapServer ldapServer, Control[] controls ) throws Exception
+    public static LdapContext getWiredContext( LdapServer ldapServer, Control[] controls ) throws NamingException
     {
         LOG.debug( "Creating a wired context to local LDAP server on port {}", ldapServer.getPort() );
         Hashtable<String, String> env = new Hashtable<String, String>();
@@ -107,8 +113,18 @@ public class ServerIntegrationUtils extends IntegrationUtils
         env.put( Context.SECURITY_PRINCIPAL, ServerDNConstants.ADMIN_SYSTEM_DN );
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
         env.put( Context.SECURITY_AUTHENTICATION, "simple" );
-        return new InitialLdapContext( env, JndiUtils.toJndiControls(
-            ldapServer.getDirectoryService().getLdapCodecService(), controls ) );
+        javax.naming.ldap.Control[] jndiControls;
+        
+        try
+        {
+            jndiControls = JndiUtils.toJndiControls( ldapServer.getDirectoryService().getLdapCodecService(), controls );
+        }
+        catch ( org.apache.directory.api.asn1.EncoderException ee )
+        {
+            throw new NamingException( ee.getMessage() );
+        }
+        
+        return new InitialLdapContext( env, jndiControls );
     }
 
 
@@ -119,9 +135,9 @@ public class ServerIntegrationUtils extends IntegrationUtils
      *
      * @param ldapServer the LDAP server to get the connection to
      * @return an LdapContext as the administrative user to the RootDSE
-     * @throws Exception if there are problems creating the context
+     * @throws NamingException if there are problems creating the context
      */
-    public static LdapContext getWiredContextThrowOnRefferal( LdapServer ldapServer ) throws Exception
+    public static LdapContext getWiredContextThrowOnRefferal( LdapServer ldapServer ) throws NamingException
     {
         LOG.debug( "Creating a wired context to local LDAP server on port {}", ldapServer.getPort() );
         Hashtable<String, String> env = new Hashtable<String, String>();
@@ -131,6 +147,7 @@ public class ServerIntegrationUtils extends IntegrationUtils
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
         env.put( Context.SECURITY_AUTHENTICATION, "simple" );
         env.put( Context.REFERRAL, "throw" );
+        
         return new InitialLdapContext( env, null );
     }
 
@@ -142,9 +159,9 @@ public class ServerIntegrationUtils extends IntegrationUtils
      *
      * @param ldapServer the LDAP server to get the connection to
      * @return an LdapContext as the administrative user to the RootDSE
-     * @throws Exception if there are problems creating the context
+     * @throws NamingException if there are problems creating the context
      */
-    public static LdapContext getWiredContextRefferalIgnore( LdapServer ldapServer ) throws Exception
+    public static LdapContext getWiredContextRefferalIgnore( LdapServer ldapServer ) throws NamingException
     {
         LOG.debug( "Creating a wired context to local LDAP server on port {}", ldapServer.getPort() );
         Hashtable<String, String> env = new Hashtable<String, String>();
@@ -154,6 +171,7 @@ public class ServerIntegrationUtils extends IntegrationUtils
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
         env.put( Context.SECURITY_AUTHENTICATION, "simple" );
         env.put( Context.REFERRAL, "ignore" );
+        
         return new InitialLdapContext( env, null );
     }
 
@@ -165,9 +183,9 @@ public class ServerIntegrationUtils extends IntegrationUtils
      *
      * @param ldapServer the LDAP server to get the connection to
      * @return an LdapContext as the administrative user to the RootDSE
-     * @throws Exception if there are problems creating the context
+     * @throws NamingException if there are problems creating the context
      */
-    public static LdapContext getWiredContextFollowOnRefferal( LdapServer ldapServer ) throws Exception
+    public static LdapContext getWiredContextFollowOnRefferal( LdapServer ldapServer ) throws NamingException
     {
         LOG.debug( "Creating a wired context to local LDAP server on port {}", ldapServer.getPort() );
         Hashtable<String, String> env = new Hashtable<String, String>();
@@ -177,11 +195,12 @@ public class ServerIntegrationUtils extends IntegrationUtils
         env.put( Context.SECURITY_CREDENTIALS, "secret" );
         env.put( Context.SECURITY_AUTHENTICATION, "simple" );
         env.put( Context.REFERRAL, "follow" );
+        
         return new InitialLdapContext( env, null );
     }
 
 
-    public static LdapConnection getWiredConnection( LdapServer ldapServer ) throws Exception
+    public static LdapConnection getWiredConnection( LdapServer ldapServer ) throws LdapException
     {
         String testServer = System.getProperty( "ldap.test.server", null );
 
@@ -211,7 +230,7 @@ public class ServerIntegrationUtils extends IntegrationUtils
     }
 
 
-    public static LDAPConnection getNsdkWiredConnection( LdapServer ldapServer ) throws Exception
+    public static LDAPConnection getNsdkWiredConnection( LdapServer ldapServer ) throws LDAPException
     {
         String testServer = System.getProperty( "ldap.test.server", null );
 
@@ -248,10 +267,10 @@ public class ServerIntegrationUtils extends IntegrationUtils
      * @param principalDn The user's DN
      * @param password The user's password
      * @return A LdapConnection instance if we got one
-     * @throws Exception If the connection cannot be created
+     * @throws LdapException If the connection cannot be created
      */
     public static LdapConnection getWiredConnection( LdapServer ldapServer, String principalDn, String password )
-        throws Exception
+        throws LdapException
     {
         LdapConnection connection = new LdapNetworkConnection( Network.LOOPBACK_HOSTNAME, ldapServer.getPort() );
         connection.bind( principalDn, password );
@@ -265,9 +284,9 @@ public class ServerIntegrationUtils extends IntegrationUtils
      * 
      * @param ldapServer The server we want to connect to
      * @return A LdapConnection instance if we got one
-     * @throws Exception If the connection cannot be created
+     * @throws LdapException If the connection cannot be created
      */
-    public static LdapConnection getLdapConnection( LdapServer ldapServer ) throws Exception
+    public static LdapConnection getLdapConnection( LdapServer ldapServer ) throws LdapException
     {
         LdapConnection connection = new LdapNetworkConnection( Network.LOOPBACK_HOSTNAME, ldapServer.getPort() );
 
@@ -282,10 +301,10 @@ public class ServerIntegrationUtils extends IntegrationUtils
      * @param principalDn The user's DN
      * @param password The user's password
      * @return A LdapConnection instance if we got one
-     * @throws Exception If the connection cannot be created
+     * @throws LDAPException If the connection cannot be created
      */
     public static LDAPConnection getNsdkWiredConnection( LdapServer ldapServer, String principalDn, String password )
-        throws Exception
+        throws LDAPException
     {
         LDAPConnection connection = new LDAPConnection();
         connection.connect( 3, Network.LOOPBACK_HOSTNAME, ldapServer.getPort(), principalDn, password );
@@ -299,9 +318,9 @@ public class ServerIntegrationUtils extends IntegrationUtils
      * 
      * @param ldapServer The server we want to connect to
      * @return A LdapConnection instance if we got one
-     * @throws Exception If the connection cannot be created
+     * @throws LdapException If the connection cannot be created
      */
-    public static LdapConnection getAdminConnection( LdapServer ldapServer ) throws Exception
+    public static LdapConnection getAdminConnection( LdapServer ldapServer ) throws LdapException
     {
         LdapConnection connection = new LdapNetworkConnection( Network.LOOPBACK_HOSTNAME, ldapServer.getPort() );
         connection.bind( ServerDNConstants.ADMIN_SYSTEM_DN, "secret" );
diff --git a/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java b/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
index 1d1f71a..5c83530 100644
--- a/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
+++ b/server-jndi/src/main/java/org/apache/directory/server/configuration/ApacheDS.java
@@ -32,6 +32,7 @@ import java.util.Set;
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.api.ldap.model.constants.SchemaConstants;
 import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.api.ldap.model.schema.registries.SchemaLoader;
@@ -89,8 +90,9 @@ public class ApacheDS
      * Creates a new instance of the ApacheDS server
      * 
      * @param ldapServer The ldap server protocol handler
+     * @throws LdapException If we can't create teh ApacheDS instance
      */
-    public ApacheDS( LdapServer ldapServer ) throws Exception
+    public ApacheDS( LdapServer ldapServer ) throws LdapException
     {
         LOG.info( "Starting the Apache Directory Server" );
 
@@ -107,12 +109,13 @@ public class ApacheDS
 
     /**
      * Start the server :
+     * <ul>
      *  <li>initialize the DirectoryService</li>
      *  <li>start the LDAP server</li>
      *  <li>start the LDAPS server</li>
+     * </ul>
      * 
-     * @throws NamingException If the server cannot be started
-     * @throws IOException If an IO error occurred while reading some file
+     * @throws Exception If the server cannot be started
      */
     public void startup() throws Exception
     {
@@ -257,7 +260,7 @@ public class ApacheDS
      * 
      * The files are stored in ou=loadedLdifFiles,ou=configuration,ou=system
      */
-    private void ensureLdifFileBase() throws Exception
+    private void ensureLdifFileBase() throws LdapException
     {
         Dn dn = new Dn( ServerDNConstants.LDIF_FILES_DN );
         Entry entry = null;
@@ -376,8 +379,10 @@ public class ApacheDS
 
     /**
      * Load the existing LDIF files in alphabetic order
+     * 
+     * @throws LdapException If we can't load the ldifs
      */
-    public void loadLdifs() throws Exception
+    public void loadLdifs() throws LdapException
     {
         // LOG and bail if property not set
         if ( ldifDirectory == null )
@@ -414,7 +419,7 @@ public class ApacheDS
                 // If the file can't be read, log the error, and stop
                 // loading LDIFs.
                 LOG.error( I18n.err( I18n.ERR_180, ldifDirectory.getAbsolutePath(), ne.getLocalizedMessage() ) );
-                throw ne;
+                throw new LdapException( ne.getMessage(), ne );
             }
         }
         else
@@ -459,7 +464,7 @@ public class ApacheDS
                     // If the file can't be read, log the error, and stop
                     // loading LDIFs.
                     LOG.error( I18n.err( I18n.ERR_180, ldifFile.getAbsolutePath(), ne.getLocalizedMessage() ) );
-                    throw ne;
+                    throw new LdapException( ne.getMessage(), ne );
                 }
             }
         }
diff --git a/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java b/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
index 7e5e112..48bed65 100644
--- a/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
+++ b/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
@@ -161,9 +161,9 @@ public final class ServiceBuilder
     /**
      * Creates the Interceptor instances from the configuration
      *
-     * @param dirServiceDN the Dn under which interceptors are configured
+     * @param interceptorBeans The Interceptors configuration used to create Interceptors
      * @return a list of instantiated Interceptor objects
-     * @throws Exception If the instanciation failed
+     * @throws LdapException If the instanciation failed
      */
     public static List<Interceptor> createInterceptors( List<InterceptorBean> interceptorBeans ) throws LdapException
     {
@@ -247,10 +247,10 @@ public final class ServiceBuilder
 
 
     /**
-     * creates the PassworddPolicyConfiguration object after reading the config entry containing pwdpolicy OC
+     * creates the PassworddPolicyConfiguration object after reading the config entry containing pwdPolicy OC
      *
-     * @param PasswordPolicyBean The Bean containing the PasswordPolicy configuration
-     * @return the {@link PasswordPolicyConfiguration} object, null if the pwdpolicy entry is not present or disabled
+     * @param passwordPolicyBean The Bean containing the PasswordPolicy configuration
+     * @return the {@link PasswordPolicyConfiguration} object, null if the pwdPolicy entry is not present or disabled
      */
     public static PasswordPolicyConfiguration createPwdPolicyConfig( PasswordPolicyBean passwordPolicyBean )
     {
@@ -315,7 +315,7 @@ public final class ServiceBuilder
     /**
      * Read the configuration for the ChangeLog system
      * 
-     * @param changelogBean The Bean containing the ChangeLog configuration
+     * @param changeLogBean The Bean containing the ChangeLog configuration
      * @return The instantiated ChangeLog element
      */
     public static ChangeLog createChangeLog( ChangeLogBean changeLogBean )
@@ -337,7 +337,7 @@ public final class ServiceBuilder
     /**
      * Instantiate the Journal object from the stored configuration
      * 
-     * @param changelogBean The Bean containing the ChangeLog configuration
+     * @param journalBean The Bean containing the Journal configuration
      * @return An instance of Journal
      */
     public static Journal createJournal( JournalBean journalBean )
@@ -441,7 +441,7 @@ public final class ServiceBuilder
     /**
      * Loads and instantiates a MechanismHandler from the configuration entry
      *
-     * @param saslMechHandlerEntry the entry of OC type {@link ConfigSchemaConstants#ADS_LDAP_SERVER_SASL_MECH_HANDLER_OC}
+     * @param saslMechHandlerBean The SaslMechHandler configuration used to create MechanismHandler instance
      * @return an instance of the MechanismHandler type
      * @throws ConfigurationException if the SASL mechanism handler cannot be created
      */
@@ -502,6 +502,7 @@ public final class ServiceBuilder
      * 
      * @param authenticatorBean The created instance of authenticator
      * @return An instance of authenticator if the given authenticatorBean is not disabled
+     * @throws ConfigurationException If the Authenticator cannot be created
      */
     public static Authenticator createAuthenticator( AuthenticatorBean authenticatorBean )
         throws ConfigurationException
@@ -614,14 +615,15 @@ public final class ServiceBuilder
 
 
     /**
-     * Creates the array of transports read from the DIT
+     * Creates the array of authenticators
      * 
-     * @param transportBeans The array of Transport configuration
-     * @return An arry of Transport instance
+     * @param list The array of AuthenticatorBean configuration
+     * @return An array of Authenticator instance
+     * @throws ConfigurationException If one of theAuthenticator cannot be created 
      */
     public static Authenticator[] createAuthenticators( List<AuthenticatorBean> list ) throws ConfigurationException
     {
-        Set<Authenticator> authenticators = new HashSet<Authenticator>( list.size() );
+        Set<Authenticator> authenticators = new HashSet<>( list.size() );
 
         for ( AuthenticatorBean authenticatorBean : list )
         {
@@ -691,8 +693,9 @@ public final class ServiceBuilder
      * Instantiates a NtpServer based on the configuration present in the partition
      *
      * @param ntpServerBean The NtpServerBean containing the NtpServer configuration
+     * @param directoryService The DirectoryService instance
      * @return Instance of NtpServer
-     * @throws org.apache.directory.api.ldap.model.exception.LdapException
+     * @throws LdapException If the NtpServer instance cannot be created
      */
     public static NtpServer createNtpServer( NtpServerBean ntpServerBean, DirectoryService directoryService )
         throws LdapException
@@ -716,7 +719,7 @@ public final class ServiceBuilder
     }
 
 
-    /**
+    /*
      * Instantiates a DhcpServer based on the configuration present in the partition
      *
      * @param dhcpServerBean The DhcpServerBean containing the DhcpServer configuration
@@ -747,9 +750,10 @@ public final class ServiceBuilder
     /**
      * Instantiates a KdcServer based on the configuration present in the partition
      *
-     * @param kdcServerBean The KdcServerBean containing the KdcServer configuration
+     * @param directoryServiceBean The DirectoryServiceBean containing the KdcServer configuration
+     * @param directoryService The DirectoryService instance
      * @return Instance of KdcServer
-     * @throws org.apache.directory.api.ldap.model.exception.LdapException
+     * @throws LdapException If the KdcServce cannot be created
      */
     public static KdcServer createKdcServer( DirectoryServiceBean directoryServiceBean,
         DirectoryService directoryService ) throws LdapException
@@ -844,8 +848,9 @@ public final class ServiceBuilder
      * Instantiates the HttpWebApps based on the configuration present in the partition
      *
      * @param httpWebAppBeans The list of HttpWebAppBeans containing the HttpWebAppBeans configuration
+     * @param directoryService The DirectoryService instance
      * @return Instances of HttpWebAppBean
-     * @throws LdapException
+     * @throws LdapException If the HttpWebApps instance cannot be created
      */
     public static Set<WebApp> createHttpWebApps( List<HttpWebAppBean> httpWebAppBeans, DirectoryService directoryService )
         throws LdapException
@@ -883,8 +888,9 @@ public final class ServiceBuilder
      * Instantiates a HttpServer based on the configuration present in the partition
      *
      * @param httpServerBean The HttpServerBean containing the HttpServer configuration
+     * @param directoryService The DirectoryService instance
      * @return Instance of LdapServer
-     * @throws LdapException
+     * @throws LdapException If the HttpServer cannot be created
      */
     public static HttpServer createHttpServer( HttpServerBean httpServerBean, DirectoryService directoryService )
         throws LdapException
@@ -1003,8 +1009,9 @@ public final class ServiceBuilder
      * Instantiates a LdapServer based on the configuration present in the partition
      *
      * @param ldapServerBean The LdapServerBean containing the LdapServer configuration
+     * @param directoryService The DirectoryService instance
      * @return Instance of LdapServer
-     * @throws LdapException
+     * @throws LdapException If the LdapServer cannot be created
      */
     public static LdapServer createLdapServer( LdapServerBean ldapServerBean, DirectoryService directoryService )
         throws LdapException
@@ -1134,7 +1141,7 @@ public final class ServiceBuilder
      * 
      * @param replConsumerBeans the list of consumers configured
      * @return a list of ReplicationConsumer instances
-     * @throws ConfigurationException
+     * @throws ConfigurationException If the replication consumer instance cannot be created
      */
     public static List<ReplicationConsumer> createReplConsumers( List<ReplConsumerBean> replConsumerBeans )
         throws ConfigurationException
@@ -1222,9 +1229,10 @@ public final class ServiceBuilder
     /**
      * Create a new instance of a JdbmIndex from an instance of JdbmIndexBean
      * 
-     * @param JdbmIndexBean The JdbmIndexBean to convert
+     * @param partition The JdbmPartition instance
+     * @param jdbmIndexBean The JdbmIndexBean to convert
+     * @param directoryService The DirectoryService instance
      * @return An JdbmIndex instance
-     * @throws Exception If the instance cannot be created
      */
     public static JdbmIndex<?> createJdbmIndex( JdbmPartition partition,
         JdbmIndexBean jdbmIndexBean, DirectoryService directoryService )
@@ -1297,10 +1305,10 @@ public final class ServiceBuilder
     /**
      * Create a new instance of a JdbmPartition
      * 
+     * @param directoryService The DirectoryService instance
      * @param jdbmPartitionBean the JdbmPartition bean
      * @return The instantiated JdbmPartition
-     * @throws LdapInvalidDnException
-     * @throws Exception If the instance cannot be created
+     * @throws ConfigurationException If the instance cannot be created
      */
     public static JdbmPartition createJdbmPartition( DirectoryService directoryService,
         JdbmPartitionBean jdbmPartitionBean ) throws ConfigurationException
@@ -1344,6 +1352,7 @@ public final class ServiceBuilder
     /**
      * Create the a Partition instantiated from the configuration
      * 
+     * @param directoryService The DirectoryService instance
      * @param partitionBean the Partition bean
      * @return The instantiated Partition
      * @throws ConfigurationException If we cannot process the Partition
@@ -1374,6 +1383,7 @@ public final class ServiceBuilder
     /**
      * Create the set of Partitions instantiated from the configuration
      * 
+     * @param directoryService The DirectoryService instance
      * @param partitionBeans the list of Partition beans
      * @return A Map of all the instantiated partitions
      * @throws ConfigurationException If we cannot process some Partition
@@ -1406,9 +1416,10 @@ public final class ServiceBuilder
      * Instantiates a DirectoryService based on the configuration present in the partition
      *
      * @param directoryServiceBean The bean containing the configuration
-     * @param baseDirectory The working path for this DirectoryService
+     * @param instanceLayout The InstanceLayout instance
+     * @param schemaManager The SchemaManager instance
      * @return An instance of DirectoryService
-     * @throws Exception
+     * @throws Exception If the DirectoryService cannot be created
      */
     public static DirectoryService createDirectoryService( DirectoryServiceBean directoryServiceBean,
         InstanceLayout instanceLayout, SchemaManager schemaManager ) throws Exception
@@ -1556,35 +1567,36 @@ public final class ServiceBuilder
     /**
      * Create a new instance of a MavibotIndex from an instance of MavibotIndexBean
      * 
-     * @param MavibotIndexBean The MavibotIndexBean to convert
+     * @param partition The Mavibot partition instance
+     * @param mavibotIndexBean The MavibotIndexBean to convert
+     * @param directoryService The DirectoryService instance
      * @return An MavibotIndex instance
-     * @throws Exception If the instance cannot be created
      */
     public static MavibotIndex<?> createMavibotIndex( MavibotPartition partition,
-        MavibotIndexBean mavobotIndexBean, DirectoryService directoryService )
+        MavibotIndexBean mavibotIndexBean, DirectoryService directoryService )
     {
-        if ( ( mavobotIndexBean == null ) || mavobotIndexBean.isDisabled() )
+        if ( ( mavibotIndexBean == null ) || mavibotIndexBean.isDisabled() )
         {
             return null;
         }
 
         MavibotIndex<?> index = null;
 
-        boolean hasReverse = mavobotIndexBean.getIndexHasReverse();
+        boolean hasReverse = mavibotIndexBean.getIndexHasReverse();
 
-        if ( mavobotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT )
-            || mavobotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT_OID ) )
+        if ( mavibotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT )
+            || mavibotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT_OID ) )
         {
             index = new MavibotRdnIndex();
         }
-        else if ( mavobotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_ALIAS_AT )
-            || mavobotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ) )
+        else if ( mavibotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_ALIAS_AT )
+            || mavibotIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ) )
         {
             index = new MavibotDnIndex( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
         }
         else
         {
-            index = new MavibotIndex<String>( mavobotIndexBean.getIndexAttributeId(), hasReverse );
+            index = new MavibotIndex<String>( mavibotIndexBean.getIndexAttributeId(), hasReverse );
         }
 
         index.setWkDirPath( partition.getPartitionPath() );
diff --git a/service-builder/src/main/java/org/apache/directory/server/config/listener/ConfigChangeListener.java b/service-builder/src/main/java/org/apache/directory/server/config/listener/ConfigChangeListener.java
index fad82db..3724d39 100644
--- a/service-builder/src/main/java/org/apache/directory/server/config/listener/ConfigChangeListener.java
+++ b/service-builder/src/main/java/org/apache/directory/server/config/listener/ConfigChangeListener.java
@@ -81,7 +81,7 @@ public class ConfigChangeListener extends DirectoryListenerAdapter
      *
      * @param cpReader the configuration reader
      * @param directoryService the DirectoryService instance
-     * @throws LdapException
+     * @throws LdapException If the instance cannot be created
      */
     public ConfigChangeListener( ConfigPartitionReader cpReader, DirectoryService directoryService )
         throws LdapException
diff --git a/service/src/main/java/org/apache/directory/server/ApacheDsService.java b/service/src/main/java/org/apache/directory/server/ApacheDsService.java
index c872bf7..270d4e5 100644
--- a/service/src/main/java/org/apache/directory/server/ApacheDsService.java
+++ b/service/src/main/java/org/apache/directory/server/ApacheDsService.java
@@ -682,6 +682,8 @@ public class ApacheDsService
 
     /**
      * Print the banner for a server
+     * 
+     * @param bannerConstant The banner to print
      */
     public static void printBanner( String bannerConstant )
     {
@@ -701,7 +703,7 @@ public class ApacheDsService
      * 
      * @param partition instance of the partition Note: should only be those which are loaded before starting the DirectoryService
      * @param dirService the DirectoryService instance
-     * @throws Exception
+     * @throws Exception  If the update failed
      */
     public void updateMandatoryOpAttributes( Partition partition, DirectoryService dirService ) throws Exception
     {
diff --git a/service/src/main/java/org/apache/directory/server/UberjarMain.java b/service/src/main/java/org/apache/directory/server/UberjarMain.java
index a35d024..a5973d4 100644
--- a/service/src/main/java/org/apache/directory/server/UberjarMain.java
+++ b/service/src/main/java/org/apache/directory/server/UberjarMain.java
@@ -54,8 +54,8 @@ public class UberjarMain
      * Takes a single argument, the path to the installation home, which
      * contains the configuration to load with server startup settings.
      *
-     * @param args
-     *            the arguments
+     * @param args the arguments
+     * @throws Exception If the startup failed
      */
     public static void main( String[] args ) throws Exception
     {
diff --git a/test-framework/src/main/java/org/apache/directory/server/core/integ/CreateLdapConnectionPoolRule.java b/test-framework/src/main/java/org/apache/directory/server/core/integ/CreateLdapConnectionPoolRule.java
index ed4bbe3..0439c89 100755
--- a/test-framework/src/main/java/org/apache/directory/server/core/integ/CreateLdapConnectionPoolRule.java
+++ b/test-framework/src/main/java/org/apache/directory/server/core/integ/CreateLdapConnectionPoolRule.java
@@ -34,6 +34,7 @@ import org.apache.directory.ldap.client.api.LdapConnectionValidator;
 import org.apache.directory.ldap.client.template.LdapConnectionTemplate;
 import org.apache.directory.server.annotations.CreateLdapConnectionPool;
 import org.apache.directory.server.ldap.LdapServer;
+import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.slf4j.Logger;
diff --git a/test-framework/src/main/java/org/apache/directory/server/core/integ/CreateLdapServerRule.java b/test-framework/src/main/java/org/apache/directory/server/core/integ/CreateLdapServerRule.java
index c4b5013..b78b075 100755
--- a/test-framework/src/main/java/org/apache/directory/server/core/integ/CreateLdapServerRule.java
+++ b/test-framework/src/main/java/org/apache/directory/server/core/integ/CreateLdapServerRule.java
@@ -23,6 +23,7 @@ import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.factory.ServerAnnotationProcessor;
 import org.apache.directory.server.ldap.LdapServer;
+import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.slf4j.Logger;
diff --git a/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java b/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java
index 78ab7f3..888579a 100644
--- a/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java
+++ b/test-framework/src/main/java/org/apache/directory/server/core/integ/DelayInducingInterceptor.java
@@ -26,6 +26,7 @@ import org.apache.directory.api.ldap.model.exception.LdapOperationErrorException
 import org.apache.directory.server.core.api.filtering.EntryFilter;
 import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
+import org.apache.directory.server.core.api.interceptor.Interceptor;
 import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
 
 
diff --git a/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java b/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
index 1ad0368..8e0e39c 100644
--- a/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
+++ b/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
@@ -87,6 +87,9 @@ public class FrameworkRunner extends BlockJUnit4ClassRunner
 
     /**
      * Creates a new instance of FrameworkRunner.
+     * 
+     * @param clazz The class to run
+     * @throws InitializationError If the initialization failed
      */
     public FrameworkRunner( Class<?> clazz ) throws InitializationError
     {
diff --git a/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java b/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java
index e67184d..b86b76d 100644
--- a/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java
+++ b/wrapper/src/main/java/org/apache/directory/server/wrapper/ExitCodes.java
@@ -22,7 +22,7 @@ package org.apache.directory.server.wrapper;
 
 /**
  * Exit codes for the bootstrappers.
- * Final reference -> class shouldn't be extended
+ * Final reference -&gt; class shouldn't be extended
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
diff --git a/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java b/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java
index 675f43f..21c3421 100644
--- a/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java
+++ b/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java
@@ -133,15 +133,47 @@ public interface Index<K, E>
     long count( PartitionTxn partitionTxn, K attrVal ) throws LdapException;
 
 
+    /**
+     * Find the number of element in a tree above a given key
+     * 
+     * @param partitionTxn The transaction to use
+     * @param attrVal The key
+     * @return The number of element above the key
+     * @throws LdapException If the operation failed
+     */
     long greaterThanCount( PartitionTxn partitionTxn, K attrVal ) throws LdapException;
 
 
+    /**
+     * Find the number of element in a tree below a given key
+     * 
+     * @param partitionTxn The transaction to use
+     * @param attrVal The key
+     * @return The number of element below the key
+     * @throws LdapException If the operation failed
+     */
     long lessThanCount( PartitionTxn partitionTxn, K attrVal ) throws LdapException;
 
 
+    /**
+     * Search for a value using the Forward table
+     * 
+     * @param partitionTxn The transaction to use
+     * @param attrVal The key to retrieve
+     * @return The found value
+     * @throws LdapException If the operation failed
+     */
     E forwardLookup( PartitionTxn partitionTxn, K attrVal ) throws LdapException;
 
 
+    /**
+     * Search for a value using the Reverse table
+     * 
+     * @param partitionTxn The transaction to use
+     * @param attrVal The key to retrieve
+     * @return The found value
+     * @throws LdapException If the operation failed
+     */
     K reverseLookup( PartitionTxn partitionTxn, E element ) throws LdapException;
 
 


Mime
View raw message