From 99aaa917a95d7ec19e14dad25f61f58ff84753b1 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 24 Mar 2015 10:49:57 +0000
Subject: [PATCH] Autorefactored javadocs

---
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeAddOperation.java                               |    6 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java                           |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java                               |   11 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/ParallelTextWriter.java                                        |   24 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java                                |   52 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java                                  |   20 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteMsg.java                                    |    2 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java                       |   11 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java                                           |   61 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java                            |   48 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPControl.java                                        |    8 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java                                       |   16 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/StackTraceMonitorProvider.java                                |    6 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java                             |    5 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java                                   |   71 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java                               |   20 
 opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java                             |   28 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java                         |    8 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java                                           |   32 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java                             |   10 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java                          |    2 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperationComparator.java                        |    6 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistAttrModificationKey.java                        |    4 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java                                       |   79 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java                  |    2 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/WindowProbeMsg.java                               |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java                            |   26 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java                           |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java                          |   47 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java     |   10 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java                         |   10 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPFilter.java                                         |   22 
 opendj-server-legacy/src/main/java/org/opends/server/core/LogRetentionPolicyConfigManager.java                              |   24 
 opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java                                          |    6 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPInputStream.java                        |   16 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java                               |   22 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java                              |   12 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java                              |    8 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java                                   |    4 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java                              |    6 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java                                  |   21 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java                             |    4 
 opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java                                       |   16 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java                            |   28 
 opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java                                         |   24 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java                                 |   11 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java                                |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java                               |   52 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java                                    |   20 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java                            |   53 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java                                  |   28 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java  |   10 
 opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java                                  |   64 
 opendj-server-legacy/src/main/java/org/opends/server/core/IdleTimeLimitThread.java                                          |   22 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java                            |   10 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerStatus.java                                   |    3 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java                                         |    6 
 opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java                                  |   20 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/AssuredMode.java                                    |   11 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java                                     |   56 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java                          |    8 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeDelOperation.java                               |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java                                 |   16 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModifyOperation.java                            |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java                      |   22 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java                     |    4 
 opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java                               |   32 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java                                      |    4 
 opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java                                          |   54 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java                          |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java                                |   44 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPMessage.java                                        |    8 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java                             |    8 
 opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java                                     |   12 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java                        |   12 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java                                          |   69 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java                                                |   48 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java                                  |   19 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java                                     |   17 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/StatusMachineEvent.java                             |    3 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java               |   24 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java                           |   24 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/HeartbeatMonitor.java                              |   11 
 opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableRequestControl.java                              |    6 
 opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesFilter.java                                      |   34 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java                               |    8 
 opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java                                            |   24 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java                                   |   26 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java                                   |    4 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java                                             |   42 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java                          |    4 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalWithOptions.java                      |    9 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplOutputStream.java                              |    6 
 opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java                        |    6 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/LightweightServerHandler.java                       |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java                      |   64 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerHandler.java                       |   14 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDB.java                     |    2 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java                             |   56 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java                              |   52 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java                          |   38 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java                           |   32 
 opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java                                  |   24 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java                                       |   36 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java                            |   90 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java |   12 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java                   |   26 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java                                           |   76 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java                                   |   20 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java                              |   52 
 opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java                            |   30 
 opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java                         |   24 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerListenThread.java                  |    6 
 opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java                                            |    8 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/OperationContext.java                             |   18 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java                                  |   60 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java                        |   36 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java                                     |   40 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java                              |    4 
 opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java                     |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java                              |   32 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java                                          |   26 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java                          |   31 
 opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java                                          |    8 
 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java          |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java                    |   22 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java                                     |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java                                 |   32 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/TraditionalWorkQueueMonitor.java                              |   18 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java                                               |   22 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java                      |   64 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java                        |   26 
 opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java                           |   10 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java                        |   60 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ServerStartMsg.java                               |    6 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/CSN.java                                            |   10 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ChangeStatusMsg.java                              |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java        |    6 
 opendj-server-legacy/src/main/java/org/opends/server/core/SubentryManager.java                                              |   62 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/VersionMonitorProvider.java                                   |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java                          |   34 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java                                            |   24 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java                           |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java                       |   22 
 opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerState.java                                    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModdnOperation.java                             |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java                      |   64 
 opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java                                        |   18 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java                                         |   46 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java                                  |    4 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java                |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java                               |   24 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java                      |   15 
 opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java                                     |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java              |   30 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyErrorType.java                                  |   16 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java                             |    4 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java                                 |   36 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPOutputStream.java                       |   35 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java                       |    4 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStackFrame.java                                |   20 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java                                |   93 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java                         |   10 
 opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java                                       |   44 
 opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java                                        |   20 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java                               |   24 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java                               |    4 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java                                  |   18 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java                             |   48 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java                      |   58 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java                     |    1 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java                                 |   30 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileViewer.java                                    |   18 
 opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationWrapper.java                                         |   94 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java                                      |    3 
 opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java                                              |    2 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java                         |   12 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java               |    4 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java                              |    8 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/SearchRequest.java                                  |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLByteChannel.java                                        |   49 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java                                     |   68 
 opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java                                    |   24 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java                                  |    6 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java                       |    6 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java                             |    8 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrValueHistorical.java                            |    4 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java                            |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/CertificateValidationPolicy.java                            |    3 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiAuthenticator.java                                    |   79 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java                               |   32 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ErrorMsg.java                                     |    4 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java                           |   46 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/SystemInfoMonitorProvider.java                                |    6 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java                       |    8 
 opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java                                      |   30 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java             |  172 -
 opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerThread.java                                   |   16 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java                                            |   24 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java       |   32 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java                                  |   48 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java                               |   24 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java                         |   54 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/AsynchronousTextWriter.java                                    |   24 
 opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java                               |   32 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplLDIFOutputStream.java                           |   15 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/ParallelWorkQueueMonitor.java                                 |   18 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/NotAssuredUpdateMsg.java                            |    2 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java                         |   54 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStack.java                                     |   10 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartDSMsg.java                         |    4 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartMsg.java                           |    4 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java           |   19 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java                                   |   18 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java                                    |   28 
 opendj-server-legacy/src/main/java/org/opends/server/replication/service/CTHeartbeatPublisherThread.java                    |    6 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java                                |   48 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java                         |    8 
 opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java                                          |   32 
 opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyWarningType.java                                |   16 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java                                        |  273 -
 opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java                               |   31 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java                         |   60 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java                               |    6 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/DBCursor.java                         |   12 
 opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java                                      |   12 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeStampNaming.java                                           |   18 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java                                       |   30 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java                                   |    8 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java                                |   22 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java                          |   54 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java                                     |   76 
 opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java                                        |    6 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java                    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java                                       |    8 
 opendj-server-legacy/src/main/java/org/opends/server/core/LogRotationPolicyConfigManager.java                               |   24 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java                                   |   12 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java                            |    2 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java                        |   16 
 opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java                |   24 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ExternalChangelogRequestControl.java                          |    4 
 opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/EntryMsg.java                                     |    5 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java                               |   54 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/TextNotificationMessageTemplateElement.java                 |    8 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java                                 |   20 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java                               |   78 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java                           |   30 
 opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerConnectThread.java                 |   10 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java                             |   48 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java                           |   40 
 opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java                         |   12 
 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java       |   16 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java                                 |   20 
 opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationWrapper.java                                      |   54 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java                                        |   40 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java                                      |   20 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/TraceSettings.java                                             |    8 
 opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java                                         |   30 
 opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java                                   |   26 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocket.java                             |   30 
 opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java                                     |    8 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java                    |   34 
 opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java                              |   20 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java                       |    6 
 opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java                              |    6 
 opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java                                 |   30 
 opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java                              |   30 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java                           |   26 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java                                       |   20 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java                           |    6 
 opendj-server-legacy/src/main/java/org/opends/server/monitors/ClientConnectionMonitorProvider.java                          |   12 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java                                        |   28 
 opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java                              |    8 
 273 files changed, 2,104 insertions(+), 4,542 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableRequestControl.java
index 4878a59..e5d5ba1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableRequestControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 import org.forgerock.i18n.LocalizableMessage;
@@ -55,9 +55,7 @@
   private static final class Decoder
       implements ControlDecoder<AccountUsableRequestControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public AccountUsableRequestControl decode(boolean isCritical,
                                               ByteString value)
            throws DirectoryException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java
index fede05e..5a56417 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/AccountUsableResponseControl.java
@@ -68,9 +68,7 @@
   private static final class Decoder
       implements ControlDecoder<AccountUsableResponseControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public AccountUsableResponseControl decode(boolean isCritical,
                                                ByteString value)
         throws DirectoryException
@@ -229,30 +227,34 @@
 
 
 
-  // Indicates whether the user's account is usable.
+  /** Indicates whether the user's account is usable. */
   private boolean isUsable;
 
-  // Indicates whether the user's password is expired.
+  /** Indicates whether the user's password is expired. */
   private boolean isExpired;
 
-  // Indicates whether the user's account is inactive.
+  /** Indicates whether the user's account is inactive. */
   private boolean isInactive;
 
-  // Indicates whether the user's account is currently locked.
+  /** Indicates whether the user's account is currently locked. */
   private boolean isLocked;
 
-  // Indicates whether the user's password has been reset and must be changed
-  // before anything else can be done.
+  /**
+   * Indicates whether the user's password has been reset and must be changed
+   * before anything else can be done.
+   */
   private boolean isReset;
 
-  // The number of remaining grace logins, if available.
+  /** The number of remaining grace logins, if available. */
   private int remainingGraceLogins;
 
-  // The length of time in seconds before the user's password expires, if
-  // available.
+  /**
+   * The length of time in seconds before the user's password expires, if
+   * available.
+   */
   private int secondsBeforeExpiration;
 
-  // The length of time before the user's account is unlocked, if available.
+  /** The length of time before the user's account is unlocked, if available. */
   private int secondsBeforeUnlock;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
index ed5938e..91b4bee 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/AuthorizationIdentityResponseControl.java
@@ -54,9 +54,7 @@
   private static final class Decoder
       implements ControlDecoder<AuthorizationIdentityResponseControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public AuthorizationIdentityResponseControl decode(boolean isCritical,
                                                        ByteString value)
         throws DirectoryException
@@ -94,7 +92,7 @@
       DECODER = new Decoder();
 
 
-  // The authorization ID for this control.
+  /** The authorization ID for this control. */
   private String authorizationID;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
index 96eb261..03d3df0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangeNotificationControl.java
@@ -55,9 +55,7 @@
   private static final class Decoder
       implements ControlDecoder<EntryChangeNotificationControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public EntryChangeNotificationControl decode(
         boolean isCritical, ByteString value) throws DirectoryException
     {
@@ -131,13 +129,13 @@
 
 
 
-  // The previous DN for this change notification control.
+  /** The previous DN for this change notification control. */
   private DN previousDN;
 
-  // The change number for this change notification control.
+  /** The change number for this change notification control. */
   private long changeNumber;
 
-  // The change type for this change notification control.
+  /** The change type for this change notification control. */
   private PersistentSearchChangeType changeType;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
index 5e2bbf2..a22a0d0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/EntryChangelogNotificationControl.java
@@ -54,7 +54,7 @@
        {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The cookie value - payload of this control.
+  /** The cookie value - payload of this control. */
   private String cookie;
 
   /**
@@ -63,9 +63,7 @@
   private static final class Decoder
   implements ControlDecoder<EntryChangelogNotificationControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public EntryChangelogNotificationControl decode(
         boolean isCritical, ByteString value)
     throws DirectoryException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ExternalChangelogRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ExternalChangelogRequestControl.java
index d25322d..ea0314c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ExternalChangelogRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ExternalChangelogRequestControl.java
@@ -56,9 +56,7 @@
   private static final class Decoder
       implements ControlDecoder<ExternalChangelogRequestControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public ExternalChangelogRequestControl decode(boolean isCritical,
         ByteString value)
     throws DirectoryException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
index f37a325..cf122ea 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
@@ -79,9 +79,7 @@
   private static final class Decoder
       implements ControlDecoder<GetEffectiveRightsRequestControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public GetEffectiveRightsRequestControl decode(boolean isCritical,
         ByteString value) throws DirectoryException
     {
@@ -153,16 +151,16 @@
     new Decoder();
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  //The DN representing the authzId. May be null.
+  /** The DN representing the authzId. May be null. */
   private DN authzDN;
 
-  //The raw DN representing the authzId. May be null.
+  /** The raw DN representing the authzId. May be null. */
   private String rawAuthzDN;
 
-  //The list of additional attribute types to return rights for. May be null.
+  /** The list of additional attribute types to return rights for. May be null. */
   private List<AttributeType> attrs;
 
-  //The raw DN representing the authzId. May be null.
+  /** The raw DN representing the authzId. May be null. */
   private List<String> rawAttrs;
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java
index 4f25be0..d735a06 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPAssertionRequestControl.java
@@ -55,9 +55,7 @@
   private static final class Decoder
       implements ControlDecoder<LDAPAssertionRequestControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LDAPAssertionRequestControl decode(boolean isCritical,
                                               ByteString value)
         throws DirectoryException
@@ -98,10 +96,10 @@
 
 
 
-  // The unparsed LDAP search filter contained in the request from the client.
+  /** The unparsed LDAP search filter contained in the request from the client. */
   private LDAPFilter rawFilter;
 
-  // The processed search filter
+  /** The processed search filter. */
   private SearchFilter filter;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
index 395ce0d..67fcead 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadRequestControl.java
@@ -62,9 +62,7 @@
   private static final class Decoder implements
       ControlDecoder<LDAPPostReadRequestControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LDAPPostReadRequestControl decode(boolean isCritical,
         ByteString value) throws DirectoryException
     {
@@ -115,10 +113,10 @@
       new Decoder();
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The set of raw attributes to return in the entry.
+  /** The set of raw attributes to return in the entry. */
   private Set<String> rawAttributes;
 
-  // The set of processed attributes to return in the entry.
+  /** The set of processed attributes to return in the entry. */
   private Set<String> requestedAttributes;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java
index 041d846..1a1f76f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPostReadResponseControl.java
@@ -55,9 +55,7 @@
   private static final class Decoder
       implements ControlDecoder<LDAPPostReadResponseControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LDAPPostReadResponseControl decode(boolean isCritical,
                                               ByteString value)
         throws DirectoryException
@@ -107,7 +105,7 @@
 
 
 
-  // The search result entry to include in the response control.
+  /** The search result entry to include in the response control. */
   private SearchResultEntry searchEntry;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
index 2960e81..957cb8a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadRequestControl.java
@@ -62,9 +62,7 @@
   private static final class Decoder implements
       ControlDecoder<LDAPPreReadRequestControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LDAPPreReadRequestControl decode(boolean isCritical,
         ByteString value) throws DirectoryException
     {
@@ -115,10 +113,10 @@
       new Decoder();
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The set of raw attributes to return in the entry.
+  /** The set of raw attributes to return in the entry. */
   private Set<String> rawAttributes;
 
-  // The set of processed attributes to return in the entry.
+  /** The set of processed attributes to return in the entry. */
   private Set<String> requestedAttributes;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java
index 2596c5f..4b438af 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/LDAPPreReadResponseControl.java
@@ -55,9 +55,7 @@
   private static final class Decoder
       implements ControlDecoder<LDAPPreReadResponseControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public LDAPPreReadResponseControl decode(boolean isCritical,
                                              ByteString value)
         throws DirectoryException
@@ -107,7 +105,7 @@
 
 
 
-  // The search result entry to include in the response control.
+  /** The search result entry to include in the response control. */
   private SearchResultEntry searchEntry;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
index 39820b2..17936de 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesControl.java
@@ -58,9 +58,7 @@
   private static final class Decoder
       implements ControlDecoder<MatchedValuesControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public MatchedValuesControl decode(boolean isCritical, ByteString value)
         throws DirectoryException
     {
@@ -122,7 +120,7 @@
 
 
 
-  // The set of matched values filters for this control.
+  /** The set of matched values filters for this control. */
   private final ArrayList<MatchedValuesFilter> filters;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesFilter.java
index 99a2b07..89bf599 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/MatchedValuesFilter.java
@@ -112,50 +112,52 @@
 
 
 
-  // The approximate matching rule for this matched values filter.
+  /** The approximate matching rule for this matched values filter. */
   private MatchingRule approximateMatchingRule;
 
-  // The raw, unprocessed assertion value for this matched values filter.
+  /** The raw, unprocessed assertion value for this matched values filter. */
   private final ByteString rawAssertionValue;
 
-  // The subFinal value for this matched values filter.
+  /** The subFinal value for this matched values filter. */
   private final ByteString subFinal;
 
-  // The subInitial value for this matched values filter.
+  /** The subInitial value for this matched values filter. */
   private final ByteString subInitial;
 
-  // The processed attribute type for this matched values filter.
+  /** The processed attribute type for this matched values filter. */
   private AttributeType attributeType;
 
-  // The processed assertion value for this matched values filter.
+  /** The processed assertion value for this matched values filter. */
   private ByteString assertionValue;
 
-  // Indicates whether the elements of this matched values filter have been
-  // fully decoded.
+  /**
+   * Indicates whether the elements of this matched values filter have been
+   * fully decoded.
+   */
   private boolean decoded;
 
-  // The match type for this matched values filter.
+  /** The match type for this matched values filter. */
   private final byte matchType;
 
-  // The equality matching rule for this matched values filter.
+  /** The equality matching rule for this matched values filter. */
   private MatchingRule equalityMatchingRule;
 
-  // The set of subAny values for this matched values filter.
+  /** The set of subAny values for this matched values filter. */
   private final List<ByteString> subAny;
 
-  // The matching rule for this matched values filter.
+  /** The matching rule for this matched values filter. */
   private MatchingRule matchingRule;
 
-  // The ordering matching rule for this matched values filter.
+  /** The ordering matching rule for this matched values filter. */
   private MatchingRule orderingMatchingRule;
 
-  // The matching rule ID for this matched values filter.
+  /** The matching rule ID for this matched values filter. */
   private final String matchingRuleID;
 
-  // The raw, unprocessed attribute type for this matched values filter.
+  /** The raw, unprocessed attribute type for this matched values filter. */
   private final String rawAttributeType;
 
-  // The substring matching rule for this matched values filter.
+  /** The substring matching rule for this matched values filter. */
   private MatchingRule substringMatchingRule;
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java
index d89cf3a..79292a2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PagedResultsControl.java
@@ -62,9 +62,7 @@
   private static final class Decoder
       implements ControlDecoder<PagedResultsControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public PagedResultsControl decode(boolean isCritical, ByteString value)
         throws DirectoryException
     {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java
index 7bf2680..4e2a920 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiredControl.java
@@ -55,9 +55,7 @@
   private static final class Decoder
       implements ControlDecoder<PasswordExpiredControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public PasswordExpiredControl decode(boolean isCritical, ByteString value)
         throws DirectoryException
     {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java
index 3654c81..f526601 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordExpiringControl.java
@@ -56,9 +56,7 @@
   private static final class Decoder
       implements ControlDecoder<PasswordExpiringControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public PasswordExpiringControl decode(boolean isCritical, ByteString value)
         throws DirectoryException
     {
@@ -105,7 +103,7 @@
 
 
 
-  // The length of time in seconds until the password actually expires.
+  /** The length of time in seconds until the password actually expires. */
   private int secondsUntilExpiration;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyErrorType.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyErrorType.java
index 086d3de..5259120 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyErrorType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyErrorType.java
@@ -22,12 +22,10 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 
-
-
 import static org.opends.messages.ProtocolMessages.*;
 
 import java.util.HashMap;
@@ -35,8 +33,6 @@
 
 import org.forgerock.i18n.LocalizableMessage;
 
-
-
 /**
  * This enumeration defines the set of password policy errors that may be
  * included in the password policy response control defined in
@@ -129,7 +125,7 @@
 
 
 
-  // A lookup table for resolving an error type from its integer value.
+  /** A lookup table for resolving an error type from its integer value. */
   private static final Map<Integer, PasswordPolicyErrorType> TABLE;
   static
   {
@@ -145,11 +141,13 @@
 
 
 
-  // The integer value associated with the error type to use in the associated
-  // enumerated element in the password policy response control.
+  /**
+   * The integer value associated with the error type to use in the associated
+   * enumerated element in the password policy response control.
+   */
   private int value;
 
-  // The message ID for the description of this password policy error type.
+  /** The message ID for the description of this password policy error type. */
   private LocalizableMessage description;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java
index bc403cf..fbeca53 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyRequestControl.java
@@ -54,9 +54,7 @@
   private static final class Decoder
       implements ControlDecoder<PasswordPolicyRequestControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public PasswordPolicyRequestControl decode(boolean isCritical,
                                                ByteString value)
         throws DirectoryException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
index 04a8076..1e356e4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyResponseControl.java
@@ -56,9 +56,7 @@
   private static final class Decoder
       implements ControlDecoder<PasswordPolicyResponseControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public PasswordPolicyResponseControl decode(boolean isCritical,
                                                 ByteString value)
         throws DirectoryException
@@ -163,13 +161,13 @@
 
 
 
-  // The warning value for this password policy response control.
+  /** The warning value for this password policy response control. */
   private int warningValue;
 
-  // The error type for this password policy response control.
+  /** The error type for this password policy response control. */
   private PasswordPolicyErrorType errorType;
 
-  // The warning type for the password policy response control.
+  /** The warning type for the password policy response control. */
   private PasswordPolicyWarningType warningType;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyWarningType.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyWarningType.java
index 66a1fa4..497f648 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyWarningType.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PasswordPolicyWarningType.java
@@ -22,12 +22,10 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.controls;
 
-
-
 import static org.opends.messages.ProtocolMessages.*;
 
 import java.util.HashMap;
@@ -35,8 +33,6 @@
 
 import org.forgerock.i18n.LocalizableMessage;
 
-
-
 /**
  * This enumeration defines the set of password policy warnings that may be
  * included in the password policy response control defined in
@@ -64,7 +60,7 @@
 
 
 
-  // A lookup table for resolving a warning type from its BER type.
+  /** A lookup table for resolving a warning type from its BER type. */
   private static final Map<Byte, PasswordPolicyWarningType> TABLE;
   static
   {
@@ -80,11 +76,13 @@
 
 
 
-  // The BER type to use for the associated element in the password policy
-  // control.
+  /**
+   * The BER type to use for the associated element in the password policy
+   * control.
+   */
   private final byte type;
 
-  // The message ID for the description of this password policy error type.
+  /** The message ID for the description of this password policy error type. */
   private final LocalizableMessage description;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java
index 731ed31..4b7b30b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/PersistentSearchControl.java
@@ -56,9 +56,7 @@
   private static final class Decoder
       implements ControlDecoder<PersistentSearchControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public PersistentSearchControl decode(boolean isCritical, ByteString value)
         throws DirectoryException
     {
@@ -119,15 +117,19 @@
 
 
 
-  // Indicates whether to only return entries that have been updated since the
-  // beginning of the search.
+  /**
+   * Indicates whether to only return entries that have been updated since the
+   * beginning of the search.
+   */
   private boolean changesOnly;
 
-  // Indicates whether entries returned as a result of changes to directory data
-  // should include the entry change notification control.
+  /**
+   * Indicates whether entries returned as a result of changes to directory data
+   * should include the entry change notification control.
+   */
   private boolean returnECs;
 
-  // The set of change types associated with this control.
+  /** The set of change types associated with this control. */
   private Set<PersistentSearchChangeType> changeTypes;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java
index 93044d5..539e073 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV1Control.java
@@ -62,9 +62,7 @@
   private static final class Decoder
       implements ControlDecoder<ProxiedAuthV1Control>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public ProxiedAuthV1Control decode(boolean isCritical, ByteString value)
         throws DirectoryException
@@ -119,10 +117,10 @@
 
 
 
-  // The raw, unprocessed authorization DN from the control value.
+  /** The raw, unprocessed authorization DN from the control value. */
   private ByteString rawAuthorizationDN;
 
-  // The processed authorization DN from the control value.
+  /** The processed authorization DN from the control value. */
   private DN authorizationDN;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
index 47bff50..a0505f5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ProxiedAuthV2Control.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS.
+ *      Portions Copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.controls;
 
@@ -63,9 +63,7 @@
   private static final class Decoder
       implements ControlDecoder<ProxiedAuthV2Control>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public ProxiedAuthV2Control decode(boolean isCritical, ByteString value)
         throws DirectoryException
@@ -128,7 +126,7 @@
 
 
 
-  // The authorization ID from the control value.
+  /** The authorization ID from the control value. */
   private ByteString authorizationID;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
index 4f51126..e3153fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
@@ -79,9 +79,7 @@
   private static final class Decoder
       implements ControlDecoder<ServerSideSortRequestControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public ServerSideSortRequestControl decode(boolean isCritical,
                                                ByteString value)
         throws DirectoryException
@@ -185,10 +183,10 @@
   public static final ControlDecoder<ServerSideSortRequestControl> DECODER =
       new Decoder();
 
-  // The sort order associated with this control represented by strings.
+  /** The sort order associated with this control represented by strings. */
   private ArrayList<String[]> decodedKeyList;
 
-  // The sort order associated with this control.
+  /** The sort order associated with this control. */
   private SortOrder sortOrder;
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java
index 9bf4e54..5fcae19 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortResponseControl.java
@@ -81,9 +81,7 @@
   private static final class Decoder
       implements ControlDecoder<ServerSideSortResponseControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public ServerSideSortResponseControl decode(boolean isCritical,
                                                 ByteString value)
         throws DirectoryException
@@ -139,10 +137,10 @@
 
 
 
-  // The result code for the sort result.
+  /** The result code for the sort result. */
   private int resultCode;
 
-  // The attribute type for the sort result.
+  /** The attribute type for the sort result. */
   private String attributeType;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java
index 48c723f..9e3ce23 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubentriesControl.java
@@ -52,9 +52,7 @@
   private static final class Decoder
       implements ControlDecoder<SubentriesControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public SubentriesControl decode(boolean isCritical, ByteString value)
         throws DirectoryException
     {
@@ -96,7 +94,7 @@
     new Decoder();
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The visibility from the control value.
+  /** The visibility from the control value. */
   private boolean visibility;
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java
index 9a0c055..ea44351 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/SubtreeDeleteControl.java
@@ -56,9 +56,7 @@
   private static final class Decoder implements
       ControlDecoder<SubtreeDeleteControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public SubtreeDeleteControl decode(boolean isCritical,
         ByteString value) throws DirectoryException
     {
@@ -105,9 +103,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected void writeValue(ASN1Writer writer) throws IOException
   {
@@ -116,9 +112,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void toString(StringBuilder buffer)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
index f16d0a1..fbe2a88 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
@@ -68,9 +68,7 @@
   private static final class Decoder
       implements ControlDecoder<VLVRequestControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public VLVRequestControl decode(boolean isCritical, ByteString value)
         throws DirectoryException
     {
@@ -165,25 +163,25 @@
 
 
 
-  // The target type for this VLV request control.
+  /** The target type for this VLV request control. */
   private byte targetType;
 
-  // The context ID for this VLV request control.
+  /** The context ID for this VLV request control. */
   private ByteString contextID;
 
-  // The greaterThanOrEqual target assertion value for this VLV request control.
+  /** The greaterThanOrEqual target assertion value for this VLV request control. */
   private ByteString greaterThanOrEqual;
 
-  // The after count for this VLV request control.
+  /** The after count for this VLV request control. */
   private int afterCount;
 
-  // The before count for this VLV request control.
+  /** The before count for this VLV request control. */
   private int beforeCount;
 
-  // The content count for the byOffset target of this VLV request control.
+  /** The content count for the byOffset target of this VLV request control. */
   private int contentCount;
 
-  // The offset for the byOffset target of this VLV request control.
+  /** The offset for the byOffset target of this VLV request control. */
   private int offset;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java
index 75fa727..90b29b6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVResponseControl.java
@@ -74,9 +74,7 @@
   private static final class Decoder
       implements ControlDecoder<VLVResponseControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public VLVResponseControl decode(boolean isCritical, ByteString value)
         throws DirectoryException
     {
@@ -112,9 +110,7 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public String getOID()
     {
       return OID_VLV_RESPONSE_CONTROL;
@@ -127,16 +123,16 @@
   public static final ControlDecoder<VLVResponseControl> DECODER =
     new Decoder();
 
-  // The context ID for this VLV response control.
+  /** The context ID for this VLV response control. */
   private ByteString contextID;
 
-  // The content count estimating the total number of entries in the result set.
+  /** The content count estimating the total number of entries in the result set. */
   private int contentCount;
 
-  // The offset of the target entry in the result set.
+  /** The offset of the target entry in the result set. */
   private int targetPosition;
 
-  // The result code for the VLV operation.
+  /** The result code for the VLV operation. */
   private int vlvResultCode;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java
index acf956f..d8b4b81 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AbandonOperationBasis.java
@@ -95,9 +95,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final OperationType getOperationType()
   {
@@ -109,9 +107,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final List<Control> getResponseControls()
   {
@@ -122,9 +118,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void addResponseControl(Control control)
   {
@@ -133,9 +127,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void removeResponseControl(Control control)
   {
@@ -227,9 +219,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void toString(StringBuilder buffer)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
index a07059a..903b598 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AccessControlConfigManager.java
@@ -68,13 +68,13 @@
   private static final String CLASS_NAME =
     "org.opends.server.core.AccessControlConfigManager";
 
-  // The single application-wide instance.
+  /** The single application-wide instance. */
   private static AccessControlConfigManager instance;
 
-  // The active access control implementation.
+  /** The active access control implementation. */
   private AtomicReference<AccessControlHandler> accessControlHandler;
 
-  // The current configuration.
+  /** The current configuration. */
   private AccessControlHandlerCfg currentConfiguration;
 
   private ServerContext serverContext;
@@ -308,9 +308,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       AccessControlHandlerCfg configuration,
@@ -337,9 +335,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  AccessControlHandlerCfg configuration)
@@ -367,9 +363,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public DN getComponentEntryDN()
   {
@@ -378,9 +372,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getClassName()
   {
@@ -389,9 +381,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public LinkedHashMap<String,String> getAlerts()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
index ae65ef6..3194eaf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AccountStatusNotificationHandlerConfigManager.java
@@ -139,9 +139,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       AccountStatusNotificationHandlerCfg configuration,
@@ -173,9 +171,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       AccountStatusNotificationHandlerCfg configuration
@@ -233,9 +229,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
       AccountStatusNotificationHandlerCfg configuration,
@@ -276,9 +270,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(
       AccountStatusNotificationHandlerCfg configuration
@@ -311,9 +303,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
       AccountStatusNotificationHandlerCfg configuration,
@@ -326,9 +316,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
       AccountStatusNotificationHandlerCfg configuration
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
index 6de4193..a76bf1d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AlertHandlerConfigManager.java
@@ -135,9 +135,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(AlertHandlerCfg configuration,
                                               List<LocalizableMessage> unacceptableReasons)
@@ -164,9 +162,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(AlertHandlerCfg configuration)
   {
@@ -205,9 +201,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
                       AlertHandlerCfg configuration,
@@ -220,9 +214,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
                                  AlertHandlerCfg configuration)
@@ -241,9 +233,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(AlertHandlerCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -270,9 +260,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  AlertHandlerCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
index d64637e..7800951 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/AttributeSyntaxConfigManager.java
@@ -67,8 +67,10 @@
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // A mapping between the DNs of the config entries and the associated
-  // attribute syntaxes.
+  /**
+   * A mapping between the DNs of the config entries and the associated
+   * attribute syntaxes.
+   */
   private ConcurrentHashMap<DN,AttributeSyntax> syntaxes;
 
   private final ServerContext serverContext;
@@ -152,9 +154,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
                       AttributeSyntaxCfg configuration,
@@ -182,9 +182,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(
                                  AttributeSyntaxCfg configuration)
@@ -230,9 +228,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
                       AttributeSyntaxCfg configuration,
@@ -264,9 +260,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
                                  AttributeSyntaxCfg configuration)
@@ -285,9 +279,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       AttributeSyntaxCfg configuration,
@@ -337,9 +329,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  AttributeSyntaxCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationWrapper.java
index 615356a..2b73418 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/BindOperationWrapper.java
@@ -22,16 +22,14 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.core;
-import org.forgerock.i18n.LocalizableMessage;
-
 
 import org.opends.server.types.*;
+import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.opendj.ldap.ByteString;
 
-
 /**
  * This abstract class wraps/decorates a given bind operation.
  * This class will be extended by sub-classes to enhance the
@@ -50,117 +48,91 @@
     super(bind);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public AuthenticationInfo getAuthenticationInfo()
   {
     return getOperation().getAuthenticationInfo();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public AuthenticationType getAuthenticationType()
   {
     return getOperation().getAuthenticationType();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public LocalizableMessage getAuthFailureReason()
   {
     return getOperation().getAuthFailureReason();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public DN getBindDN()
   {
     return getOperation().getBindDN();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getRawBindDN()
   {
     return getOperation().getRawBindDN();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Entry getSASLAuthUserEntry()
   {
     return getOperation().getSASLAuthUserEntry();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getSASLCredentials()
   {
     return getOperation().getSASLCredentials();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getSASLMechanism()
   {
     return getOperation().getSASLMechanism();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getServerSASLCredentials()
   {
     return getOperation().getServerSASLCredentials();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getSimplePassword()
   {
     return getOperation().getSimplePassword();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public DN getUserEntryDN()
   {
     return getOperation().getUserEntryDN();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setAuthenticationInfo(AuthenticationInfo authInfo)
   {
     getOperation().setAuthenticationInfo(authInfo);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setAuthFailureReason(LocalizableMessage reason)
   {
@@ -174,27 +146,21 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setRawBindDN(ByteString rawBindDN)
   {
     getOperation().setRawBindDN(rawBindDN);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setSASLAuthUserEntry(Entry saslAuthUserEntry)
   {
     getOperation().setSASLAuthUserEntry(saslAuthUserEntry);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setSASLCredentials(String saslMechanism,
       ByteString saslCredentials)
@@ -202,53 +168,41 @@
     getOperation().setSASLCredentials(saslMechanism, saslCredentials);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setServerSASLCredentials(ByteString serverSASLCredentials)
   {
     getOperation().setServerSASLCredentials(serverSASLCredentials);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setSimplePassword(ByteString simplePassword)
   {
     getOperation().setSimplePassword(simplePassword);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setUserEntryDN(DN userEntryDN){
     getOperation().setUserEntryDN(userEntryDN);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String toString()
   {
     return getOperation().toString();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setProtocolVersion(String protocolVersion)
   {
     getOperation().setProtocolVersion(protocolVersion);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getProtocolVersion()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationWrapper.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationWrapper.java
index 70efa1c..b9a877a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/CompareOperationWrapper.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -52,9 +52,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getRawEntryDN()
   {
@@ -62,9 +60,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setRawEntryDN(ByteString rawEntryDN)
   {
@@ -72,9 +68,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public DN getEntryDN()
   {
@@ -82,9 +76,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getRawAttributeType()
   {
@@ -92,9 +84,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setRawAttributeType(String rawAttributeType)
   {
@@ -102,9 +92,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public AttributeType getAttributeType()
   {
@@ -112,9 +100,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setAttributeType(AttributeType attributeType)
   {
@@ -122,9 +108,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Set<String> getAttributeOptions()
   {
@@ -132,9 +116,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setAttributeOptions(Set<String> attributeOptions)
   {
@@ -142,9 +124,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAssertionValue()
   {
@@ -152,9 +132,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setAssertionValue(ByteString assertionValue)
   {
@@ -162,9 +140,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public DN getProxiedAuthorizationDN()
   {
@@ -172,9 +148,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setProxiedAuthorizationDN(DN proxiedAuthorizationDN)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
index 68a98e7..1293520 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -86,9 +86,7 @@
     connectionHandlers = new ConcurrentHashMap<DN, ConnectionHandler<?>>();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(
       ConnectionHandlerCfg configuration) {
@@ -132,9 +130,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       ConnectionHandlerCfg configuration) {
@@ -202,9 +198,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
       ConnectionHandlerCfg configuration) {
@@ -313,9 +307,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
       ConnectionHandlerCfg configuration,
@@ -326,9 +318,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       ConnectionHandlerCfg configuration,
@@ -339,9 +329,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
       ConnectionHandlerCfg configuration,
@@ -352,7 +340,7 @@
 
 
 
-  // Load and initialize the connection handler named in the config.
+  /** Load and initialize the connection handler named in the config. */
   private <T extends ConnectionHandlerCfg> ConnectionHandler<T> getConnectionHandler(
       T config) throws ConfigException
   {
@@ -380,8 +368,10 @@
 
 
 
-  // Determines whether or not the new configuration's implementation
-  // class is acceptable.
+  /**
+   * Determines whether or not the new configuration's implementation
+   * class is acceptable.
+   */
   private boolean isJavaClassAcceptable(
       ConnectionHandlerCfg config,
       List<LocalizableMessage> unacceptableReasons) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java
index 0a40199..ec61016 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/CoreConfigManager.java
@@ -303,9 +303,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(GlobalCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -350,9 +348,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(GlobalCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
index 4d19a23..98985db 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultAccessControlHandler.java
@@ -55,9 +55,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeAccessControlHandler(AccessControlHandlerCfg
                                                   configuration)
@@ -68,9 +66,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeAccessControlHandler()
   {
@@ -79,9 +75,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isAllowed(LocalBackendAddOperation addOperation)
   {
@@ -89,9 +83,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isAllowed(BindOperation bindOperation)
   {
@@ -100,9 +92,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isAllowed(LocalBackendCompareOperation compareOperation)
   {
@@ -111,9 +101,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isAllowed(LocalBackendDeleteOperation deleteOperation)
   {
@@ -122,9 +110,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isAllowed(ExtendedOperation extendedOperation)
   {
@@ -133,9 +119,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isAllowed(LocalBackendModifyOperation modifyOperation)
   {
@@ -144,9 +128,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
    public  boolean isAllowed(DN dn, Operation  op, Control control)
    {
@@ -155,9 +137,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isAllowed(ModifyDNOperation modifyDNOperation)
   {
@@ -166,9 +146,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isAllowed(SearchOperation searchOperation)
   {
@@ -177,9 +155,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isAllowed(Operation operation, Entry entry,
     SearchFilter filter) throws DirectoryException
@@ -189,9 +165,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean maySend(Operation operation, SearchResultEntry unfilteredEntry)
   {
@@ -200,9 +174,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void filterEntry(Operation operation,
       SearchResultEntry unfilteredEntry, SearchResultEntry filteredEntry)
@@ -212,9 +184,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean maySend(DN dn, Operation operation,
                          SearchResultReference searchReference)
@@ -224,9 +194,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public  boolean mayProxy(Entry proxyUser, Entry proxiedUser,
                            Operation operation) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java
index 8d45a0b..4180eec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DefaultCompressedSchema.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.core;
 
@@ -56,7 +56,7 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // Synchronizes calls to save.
+  /** Synchronizes calls to save. */
   private final Object saveLock = new Object();
 
 
@@ -71,9 +71,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected void storeAttribute(final byte[] encodedAttribute,
       final String attributeName, final Collection<String> attributeOptions)
@@ -84,9 +82,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected void storeObjectClasses(final byte[] encodedObjectClasses,
       final Collection<String> objectClassNames) throws DirectoryException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
index 3e8e2ae..947d739 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
@@ -8409,7 +8409,7 @@
    * Print messages for start-ds "-F" option (full version information).
    */
   private static void printFullVersionInformation() {
-    /**
+    /*
      * This option is used by the upgrade to identify the server build and it
      * can eventually also be used to be sent to the support in case of an
      * issue.  Since this is not a public interface and since it is better
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
index 117f682..0b1ee20 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
@@ -69,10 +69,10 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The default entry cache.
+  /** The default entry cache. */
   private DefaultEntryCache _defaultEntryCache;
 
-  // The entry cache order map sorted by the cache level.
+  /** The entry cache order map sorted by the cache level. */
   @SuppressWarnings("rawtypes")
   private SortedMap<Integer, EntryCache> cacheOrderMap =
       new TreeMap<Integer, EntryCache>();
@@ -80,7 +80,7 @@
   /** The entry cache to level map. */
   private Map<DN,Integer> cacheNameToLevelMap = new HashMap<DN, Integer>();
 
-  // Global entry cache monitor provider name.
+  /** Global entry cache monitor provider name. */
   private static final String
     DEFAULT_ENTRY_CACHE_MONITOR_PROVIDER = "Entry Caches";
 
@@ -232,9 +232,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       EntryCacheCfg configuration,
@@ -276,9 +274,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       EntryCacheCfg configuration
@@ -363,9 +359,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
       EntryCacheCfg configuration,
@@ -403,9 +397,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(EntryCacheCfg configuration)
   {
@@ -435,9 +427,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
       EntryCacheCfg configuration,
@@ -451,9 +441,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
       EntryCacheCfg configuration
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
index 65b7fc0..369738d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationBasis.java
@@ -121,9 +121,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final String getRequestOID()
   {
@@ -147,9 +145,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final ByteString getRequestValue()
   {
@@ -173,9 +169,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final String getResponseOID()
   {
@@ -184,9 +178,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void setResponseOID(String responseOID)
   {
@@ -195,9 +187,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final ByteString getResponseValue()
   {
@@ -206,9 +196,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void setResponseValue(ByteString responseValue)
   {
@@ -216,9 +204,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final OperationType getOperationType()
   {
@@ -229,9 +215,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final List<Control> getResponseControls()
   {
@@ -240,9 +224,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void addResponseControl(Control control)
   {
@@ -251,9 +233,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void removeResponseControl(Control control)
   {
@@ -461,9 +441,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void toString(StringBuilder buffer)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
index 6d14e98..21383f0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
@@ -131,9 +131,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
        ExtendedOperationHandlerCfg configuration)
@@ -149,9 +147,7 @@
     return ccr;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
        ExtendedOperationHandlerCfg configuration,
@@ -161,9 +157,7 @@
         || isJavaClassAcceptable(configuration, unacceptableReasons);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
        ExtendedOperationHandlerCfg configuration)
@@ -222,9 +216,7 @@
     return ccr;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
        ExtendedOperationHandlerCfg configuration,
@@ -233,9 +225,7 @@
     return isConfigurationChangeAcceptable(configuration, unacceptableReasons);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(
        ExtendedOperationHandlerCfg configuration)
@@ -280,9 +270,7 @@
     return ccr;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
        ExtendedOperationHandlerCfg configuration,
@@ -292,7 +280,7 @@
     return true;
   }
 
-  // Load and initialize the handler named in the config.
+  /** Load and initialize the handler named in the config. */
   private ExtendedOperationHandler getHandler(
       ExtendedOperationHandlerCfg config) throws ConfigException
   {
@@ -320,8 +308,10 @@
 
 
 
-  // Determines whether or not the new configuration's implementation
-  // class is acceptable.
+  /**
+   * Determines whether or not the new configuration's implementation
+   * class is acceptable.
+   */
   private boolean isJavaClassAcceptable(ExtendedOperationHandlerCfg config,
                                         List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
index 7d1cf9d..1f60896 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/IdentityMapperConfigManager.java
@@ -155,9 +155,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
                       IdentityMapperCfg configuration,
@@ -185,9 +183,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(
                                  IdentityMapperCfg configuration)
@@ -227,9 +223,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
                       IdentityMapperCfg configuration,
@@ -242,9 +236,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
                                  IdentityMapperCfg configuration)
@@ -264,9 +256,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       IdentityMapperCfg configuration,
@@ -294,9 +284,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  IdentityMapperCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/IdleTimeLimitThread.java b/opendj-server-legacy/src/main/java/org/opends/server/core/IdleTimeLimitThread.java
index 8ba8213..ee5b6bf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/IdleTimeLimitThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/IdleTimeLimitThread.java
@@ -22,13 +22,12 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS.
+ *      Portions Copyright 2012-2015 ForgeRock AS.
  */
 package org.opends.server.core;
+
 import org.forgerock.i18n.LocalizableMessage;
 
-
-
 import org.opends.server.api.ClientConnection;
 import org.opends.server.api.ConnectionHandler;
 import org.opends.server.api.DirectoryThread;
@@ -37,11 +36,8 @@
 import org.opends.server.types.DisconnectReason;
 
 import static org.opends.messages.CoreMessages.*;
-
 import static org.opends.server.util.StaticUtils.*;
 
-
-
 /**
  * This class defines a thread that will be used to terminate client
  * connections if they have been idle for too long.
@@ -50,14 +46,12 @@
        extends DirectoryThread
        implements ServerShutdownListener
 {
-  /**
-   * The debug log tracer for this object.
-   */
+  /** The debug log tracer for this object. */
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
 
 
-  // Shutdown monitor state.
+  /** Shutdown monitor state. */
   private volatile boolean shutdownRequested;
   private final Object shutdownLock = new Object();
 
@@ -167,9 +161,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String getShutdownListenerName()
   {
     return "Idle Time Limit Thread";
@@ -177,9 +169,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void processServerShutdown(LocalizableMessage reason)
   {
     synchronized (shutdownLock)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
index 4d46125..f6be0f0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/KeyManagerProviderConfigManager.java
@@ -68,8 +68,10 @@
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // A mapping between the DNs of the config entries and the associated key
-  // manager providers.
+  /**
+   * A mapping between the DNs of the config entries and the associated key
+   * manager providers.
+   */
   private final ConcurrentHashMap<DN,KeyManagerProvider> providers;
 
   private final ServerContext serverContext;
@@ -143,9 +145,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationAddAcceptable(
           KeyManagerProviderCfg configuration,
           List<LocalizableMessage> unacceptableReasons)
@@ -172,9 +172,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationAdd(
           KeyManagerProviderCfg configuration)
   {
@@ -213,9 +211,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationDeleteAcceptable(
                       KeyManagerProviderCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -227,9 +223,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationDelete(
                                  KeyManagerProviderCfg configuration)
   {
@@ -248,9 +242,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       KeyManagerProviderCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -277,9 +269,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                                  KeyManagerProviderCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/LogRetentionPolicyConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/LogRetentionPolicyConfigManager.java
index 757d7e5..8524652 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/LogRetentionPolicyConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/LogRetentionPolicyConfigManager.java
@@ -100,9 +100,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
       LogRetentionPolicyCfg configuration,
@@ -111,9 +109,7 @@
     return isJavaClassAcceptable(configuration, unacceptableReasons);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
       LogRetentionPolicyCfg configuration,
@@ -123,9 +119,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(LogRetentionPolicyCfg config)
   {
@@ -152,9 +146,7 @@
     return ccr;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
       LogRetentionPolicyCfg config)
@@ -175,9 +167,7 @@
     return ccr;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       LogRetentionPolicyCfg configuration,
@@ -186,9 +176,7 @@
     return isJavaClassAcceptable(configuration, unacceptableReasons);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       LogRetentionPolicyCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/LogRotationPolicyConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/LogRotationPolicyConfigManager.java
index 0ce85a1..62ad71e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/LogRotationPolicyConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/LogRotationPolicyConfigManager.java
@@ -99,9 +99,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
       LogRotationPolicyCfg configuration,
@@ -110,9 +108,7 @@
     return isJavaClassAcceptable(configuration, unacceptableReasons);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
       LogRotationPolicyCfg configuration,
@@ -122,9 +118,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(LogRotationPolicyCfg config)
   {
@@ -151,9 +145,7 @@
     return ccr;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
       LogRotationPolicyCfg config)
@@ -174,9 +166,7 @@
     return ccr;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       LogRotationPolicyCfg configuration,
@@ -185,9 +175,7 @@
     return isJavaClassAcceptable(configuration, unacceptableReasons);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       LogRotationPolicyCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
index 6b2df31..0172520 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/MonitorConfigManager.java
@@ -139,9 +139,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
                       MonitorProviderCfg configuration,
@@ -169,9 +167,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(
                                  MonitorProviderCfg configuration)
@@ -211,9 +207,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
                       MonitorProviderCfg configuration,
@@ -225,9 +219,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
                                  MonitorProviderCfg configuration)
@@ -246,9 +238,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       MonitorProviderCfg configuration,
@@ -276,9 +266,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  MonitorProviderCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
index fe9383e..2c9ee5c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordGeneratorConfigManager.java
@@ -141,9 +141,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       PasswordGeneratorCfg configuration,
@@ -170,9 +168,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  PasswordGeneratorCfg configuration)
@@ -242,9 +238,7 @@
 
     return ccr;
   }
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
                       PasswordGeneratorCfg configuration,
@@ -271,9 +265,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(
                                  PasswordGeneratorCfg configuration)
@@ -313,9 +305,7 @@
     return ccr;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
       PasswordGeneratorCfg configuration, List<LocalizableMessage> unacceptableReasons)
@@ -325,9 +315,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
       PasswordGeneratorCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java
index 21abe9c..d708713 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicy.java
@@ -22,12 +22,10 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions copyright 2011 ForgeRock AS.
+ *      Portions copyright 2011-2015 ForgeRock AS.
  */
 package org.opends.server.core;
 
-
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -40,8 +38,6 @@
 import org.opends.server.types.DirectoryException;
 import org.opends.server.types.Entry;
 
-
-
 /**
  * This class defines a data structure that holds information about a Directory
  * Server password policy.
@@ -49,9 +45,7 @@
 public abstract class PasswordPolicy extends AuthenticationPolicy
 {
 
-  /**
-   * Creates a new password policy.
-   */
+  /** Creates a new password policy. */
   protected PasswordPolicy()
   {
     // Nothing to do.
@@ -59,9 +53,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public abstract DN getDN();
 
 
@@ -618,9 +610,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isPasswordPolicy()
   {
     return true;
@@ -628,9 +618,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public PasswordPolicyState createAuthenticationPolicyState(Entry userEntry,
       long time) throws DirectoryException
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java
index e2db5c7..76da105 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java
@@ -186,9 +186,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
       AuthenticationPolicyCfg configuration, List<LocalizableMessage> unacceptableReason)
@@ -201,9 +199,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(AuthenticationPolicyCfg configuration)
   {
@@ -235,9 +231,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
       AuthenticationPolicyCfg configuration, List<LocalizableMessage> unacceptableReason)
@@ -257,9 +251,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(AuthenticationPolicyCfg configuration)
   {
@@ -283,9 +275,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void checkSubentryAddAcceptable(Entry entry) throws DirectoryException
   {
@@ -297,9 +287,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void checkSubentryDeleteAcceptable(Entry entry)
       throws DirectoryException
@@ -311,9 +299,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void checkSubentryModifyAcceptable(Entry oldEntry, Entry newEntry)
       throws DirectoryException
@@ -326,9 +312,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void checkSubentryModifyDNAcceptable(Entry oldEntry, Entry newEntry)
       throws DirectoryException
@@ -340,9 +324,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void handleSubentryAdd(Entry entry)
   {
@@ -363,9 +345,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void handleSubentryDelete(Entry entry)
   {
@@ -377,9 +357,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void handleSubentryModify(Entry oldEntry, Entry newEntry)
   {
@@ -407,9 +385,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void handleSubentryModifyDN(Entry oldEntry, Entry newEntry)
   {
@@ -437,8 +413,10 @@
 
 
 
-  // Creates and registers the provided authentication policy
-  // configuration.
+  /**
+   * Creates and registers the provided authentication policy
+   * configuration.
+   */
   private <T extends AuthenticationPolicyCfg> void createAuthenticationPolicy(
       T policyConfiguration) throws ConfigException, InitializationException
   {
@@ -492,8 +470,10 @@
 
 
 
-  // Determines whether or not the new authentication policy configuration's
-  // implementation class is acceptable.
+  /**
+   * Determines whether or not the new authentication policy configuration's
+   * implementation class is acceptable.
+   */
   private <T extends AuthenticationPolicyCfg> boolean isAuthenticationPolicyConfigurationAcceptable(
       T policyConfiguration,
       List<LocalizableMessage> unacceptableReasons)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
index be071ca..50b9484 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyFactory.java
@@ -71,39 +71,44 @@
   {
     private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-    // Current configuration.
+    /** Current configuration. */
     private PasswordPolicyCfg configuration;
 
-    // Indicates whether the attribute type uses the authPassword syntax.
+    /** Indicates whether the attribute type uses the authPassword syntax. */
     private boolean authPasswordSyntax;
 
-    // The set of account status notification handlers for this password policy.
+    /** The set of account status notification handlers for this password policy. */
     private Map<DN, AccountStatusNotificationHandler<?>> notificationHandlers;
 
-    // The set of password validators that will be used with this
-    // password policy.
+    /**
+     * The set of password validators that will be used with this
+     * password policy.
+     */
     private Map<DN, PasswordValidator<?>> passwordValidators;
 
-    // The set of default password storage schemes for this password
-    // policy.
+    /**
+     * The set of default password storage schemes for this password policy.
+     */
     private List<PasswordStorageScheme<?>> defaultStorageSchemes;
 
-    // The names of the deprecated password storage schemes for this password
-    // policy.
+    /**
+     * The names of the deprecated password storage schemes for this password
+     * policy.
+     */
     private Set<String> deprecatedStorageSchemes;
 
-    // The password generator for use with this password policy.
+    /** The password generator for use with this password policy. */
     private PasswordGenerator<?> passwordGenerator;
 
-    // The the time by which all users will be required to change their
-    // passwords.
+    /**
+     * The the time by which all users will be required to change their
+     * passwords.
+     */
     private long requireChangeByTime;
 
     private final ServerContext serverContext;
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void finalizeAuthenticationPolicy()
     {
@@ -139,11 +144,7 @@
       return ccr;
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isConfigurationChangeAcceptable(
         PasswordPolicyCfg configuration, List<LocalizableMessage> unacceptableReasons)
@@ -420,55 +421,35 @@
       }
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isAuthPasswordSyntax()
     {
       return authPasswordSyntax;
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public List<PasswordStorageScheme<?>> getDefaultPasswordStorageSchemes()
     {
       return defaultStorageSchemes;
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public Set<String> getDeprecatedPasswordStorageSchemes()
     {
       return deprecatedStorageSchemes;
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public DN getDN()
     {
       return configuration.dn();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isDefaultPasswordStorageScheme(String name)
     {
@@ -493,33 +474,21 @@
       return false;
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isDeprecatedPasswordStorageScheme(String name)
     {
       return deprecatedStorageSchemes.contains(toLowerCase(name));
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public Collection<PasswordValidator<?>> getPasswordValidators()
     {
       return passwordValidators.values();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public Collection<AccountStatusNotificationHandler<?>>
       getAccountStatusNotificationHandlers()
@@ -527,22 +496,14 @@
       return notificationHandlers.values();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public PasswordGenerator<?> getPasswordGenerator()
     {
       return passwordGenerator;
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public long getRequireChangeByTime()
     {
@@ -831,297 +792,189 @@
       buffer.append(EOL);
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isAllowExpiredPasswordChanges()
     {
       return configuration.isAllowExpiredPasswordChanges();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isAllowMultiplePasswordValues()
     {
       return configuration.isAllowMultiplePasswordValues();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isAllowPreEncodedPasswords()
     {
       return configuration.isAllowPreEncodedPasswords();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isAllowUserPasswordChanges()
     {
       return configuration.isAllowUserPasswordChanges();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isExpirePasswordsWithoutWarning()
     {
       return configuration.isExpirePasswordsWithoutWarning();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isForceChangeOnAdd()
     {
       return configuration.isForceChangeOnAdd();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isForceChangeOnReset()
     {
       return configuration.isForceChangeOnReset();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int getGraceLoginCount()
     {
       return configuration.getGraceLoginCount();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public long getIdleLockoutInterval()
     {
       return configuration.getIdleLockoutInterval();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public AttributeType getLastLoginTimeAttribute()
     {
       return configuration.getLastLoginTimeAttribute();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public String getLastLoginTimeFormat()
     {
       return configuration.getLastLoginTimeFormat();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public long getLockoutDuration()
     {
       return configuration.getLockoutDuration();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int getLockoutFailureCount()
     {
       return configuration.getLockoutFailureCount();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public long getLockoutFailureExpirationInterval()
     {
       return configuration.getLockoutFailureExpirationInterval();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public long getMaxPasswordAge()
     {
       return configuration.getMaxPasswordAge();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public long getMaxPasswordResetAge()
     {
       return configuration.getMaxPasswordResetAge();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public long getMinPasswordAge()
     {
       return configuration.getMinPasswordAge();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public AttributeType getPasswordAttribute()
     {
       return configuration.getPasswordAttribute();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isPasswordChangeRequiresCurrentPassword()
     {
       return configuration.isPasswordChangeRequiresCurrentPassword();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public long getPasswordExpirationWarningInterval()
     {
       return configuration.getPasswordExpirationWarningInterval();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int getPasswordHistoryCount()
     {
       return configuration.getPasswordHistoryCount();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public long getPasswordHistoryDuration()
     {
       return configuration.getPasswordHistoryDuration();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public SortedSet<String> getPreviousLastLoginTimeFormats()
     {
       return configuration.getPreviousLastLoginTimeFormat();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isRequireSecureAuthentication()
     {
       return configuration.isRequireSecureAuthentication();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isRequireSecurePasswordChanges()
     {
       return configuration.isRequireSecurePasswordChanges();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isSkipValidationForAdministrators()
     {
       return configuration.isSkipValidationForAdministrators();
     }
 
-
-
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public StateUpdateFailurePolicy getStateUpdateFailurePolicy()
     {
@@ -1151,9 +1004,7 @@
     this.serverContext = serverContext;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PasswordPolicy createAuthenticationPolicy(
       final PasswordPolicyCfg configuration) throws ConfigException,
@@ -1164,11 +1015,7 @@
     return policy;
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
       final PasswordPolicyCfg configuration,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
index 5e052a3..b830a9c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyState.java
@@ -88,72 +88,77 @@
 
 
 
-  // The string representation of the user's DN.
+  /** The string representation of the user's DN. */
   private final String userDNString;
 
-  // The password policy with which the account is associated.
+  /** The password policy with which the account is associated. */
   private final PasswordPolicy passwordPolicy;
 
-  // The current time for use in all password policy calculations.
+  /** The current time for use in all password policy calculations. */
   private final long currentTime;
 
-  // The time that the user's password was last changed.
+  /** The time that the user's password was last changed. */
   private long passwordChangedTime = Long.MIN_VALUE;
 
-  // Indicates whether the user's account is expired.
+  /** Indicates whether the user's account is expired. */
   private ConditionResult isAccountExpired = ConditionResult.UNDEFINED;
 
-  // Indicates whether the user's password is expired.
+  /** Indicates whether the user's password is expired. */
   private ConditionResult isPasswordExpired = ConditionResult.UNDEFINED;
 
-  // Indicates whether the warning to send to the client would be the first
-  // warning for the user.
+  /**
+   * Indicates whether the warning to send to the client would be the first
+   * warning for the user.
+   */
   private ConditionResult isFirstWarning = ConditionResult.UNDEFINED;
 
-  // Indicates whether the user's account is locked by the idle lockout.
+  /** Indicates whether the user's account is locked by the idle lockout. */
   private ConditionResult isIdleLocked = ConditionResult.UNDEFINED;
 
-  // Indicates whether the user may use a grace login if the password is expired
-  // and there are one or more grace logins remaining.
+  /**
+   * Indicates whether the user may use a grace login if the password is expired
+   * and there are one or more grace logins remaining.
+   */
   private ConditionResult mayUseGraceLogin = ConditionResult.UNDEFINED;
 
-  // Indicates whether the user's password must be changed.
+  /** Indicates whether the user's password must be changed. */
   private ConditionResult mustChangePassword = ConditionResult.UNDEFINED;
 
-  // Indicates whether the user should be warned of an upcoming expiration.
+  /** Indicates whether the user should be warned of an upcoming expiration. */
   private ConditionResult shouldWarn = ConditionResult.UNDEFINED;
 
-  // The number of seconds until the user's account is automatically unlocked.
+  /** The number of seconds until the user's account is automatically unlocked. */
   private int secondsUntilUnlock = Integer.MIN_VALUE;
 
-  // The set of authentication failure times for this user.
+  /** The set of authentication failure times for this user. */
   private List<Long> authFailureTimes;
 
-  // The set of grace login times for this user.
+  /** The set of grace login times for this user. */
   private List<Long> graceLoginTimes;
 
-  // The time that the user's account should expire (or did expire).
+  /** The time that the user's account should expire (or did expire). */
   private long accountExpirationTime = Long.MIN_VALUE;
 
-  // The time that the user's entry was locked due to too many authentication
-  // failures.
+  /**
+   * The time that the user's entry was locked due to too many authentication
+   * failures.
+   */
   private long failureLockedTime = Long.MIN_VALUE;
 
-  // The time that the user last authenticated to the Directory Server.
+  /** The time that the user last authenticated to the Directory Server. */
   private long lastLoginTime = Long.MIN_VALUE;
 
-  // The time that the user's password should expire (or did expire).
+  /** The time that the user's password should expire (or did expire). */
   private long passwordExpirationTime = Long.MIN_VALUE;
 
-  // The last required change time with which the user complied.
+  /** The last required change time with which the user complied. */
   private long requiredChangeTime = Long.MIN_VALUE;
 
-  // The time that the user was first warned about an upcoming expiration.
+  /** The time that the user was first warned about an upcoming expiration. */
   private long warnedTime = Long.MIN_VALUE;
 
-  // The set of modifications that should be applied to the user's entry.
-  private LinkedList<Modification> modifications
-       = new LinkedList<Modification>();
+  /** The set of modifications that should be applied to the user's entry. */
+  private LinkedList<Modification> modifications = new LinkedList<Modification>();
 
 
 
@@ -306,9 +311,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PasswordPolicy getAuthenticationPolicy()
   {
@@ -2496,9 +2499,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteString password)
   {
@@ -3528,9 +3529,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeStateAfterBind()
          throws DirectoryException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
index fd08c1e..ff31a85 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordStorageSchemeConfigManager.java
@@ -133,9 +133,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       PasswordStorageSchemeCfg configuration,
@@ -167,9 +165,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       PasswordStorageSchemeCfg configuration
@@ -228,9 +224,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
       PasswordStorageSchemeCfg configuration,
@@ -271,9 +265,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(
       PasswordStorageSchemeCfg configuration
@@ -307,9 +299,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
       PasswordStorageSchemeCfg configuration,
@@ -322,9 +312,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
       PasswordStorageSchemeCfg configuration
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
index 8d085dc..5ecff6b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordValidatorConfigManager.java
@@ -145,9 +145,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
                       PasswordValidatorCfg configuration,
@@ -175,9 +173,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(
                                  PasswordValidatorCfg configuration)
@@ -218,9 +214,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
                       PasswordValidatorCfg configuration,
@@ -233,9 +227,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
                                  PasswordValidatorCfg configuration)
@@ -256,9 +248,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       PasswordValidatorCfg configuration,
@@ -286,9 +276,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  PasswordValidatorCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
index 9fab4c3..53ed225 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PluginConfigManager.java
@@ -127,27 +127,33 @@
   private DirectoryServerPlugin[] intermediateResponsePlugins;
 
 
-  // The mapping between the DN of a plugin entry and the plugin instance loaded
-  // from that entry.
+  /**
+   * The mapping between the DN of a plugin entry and the plugin instance loaded
+   * from that entry.
+   */
   private ConcurrentHashMap<DN,
                DirectoryServerPlugin<? extends PluginCfg>>
                     registeredPlugins;
 
-  // The mapping between an operation and a set of post operation plugins
-  // it should skip. This pairs up pre and post operation plugin processing
-  // such that only plugins that successfully execute its pre op plugin will
-  // have its post op plugin executed on a per operation basis. If an
-  // operation is not registered on this list then all all pre op plugins
-  // executed successfully for this operation so all post op plugins should
-  // execute.
+  /**
+   * The mapping between an operation and a set of post operation plugins
+   * it should skip. This pairs up pre and post operation plugin processing
+   * such that only plugins that successfully execute its pre op plugin will
+   * have its post op plugin executed on a per operation basis. If an
+   * operation is not registered on this list then all all pre op plugins
+   * executed successfully for this operation so all post op plugins should
+   * execute.
+   */
   private ConcurrentHashMap<PluginOperation, ArrayList<DirectoryServerPlugin>>
       skippedPreOperationPlugins;
 
-  // The plugin root configuration read at server startup.
+  /** The plugin root configuration read at server startup. */
   private PluginRootCfg pluginRootConfig;
 
-  // The lock that will provide threadsafe access to the sets of registered
-  // plugins.
+  /**
+   * The lock that will provide threadsafe access to the sets of registered
+   * plugins.
+   */
   private ReentrantLock pluginLock;
 
   private final ServerContext serverContext;
@@ -4708,9 +4714,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(PluginCfg configuration,
                                               List<LocalizableMessage> unacceptableReasons)
@@ -4745,9 +4749,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(
                                  PluginCfg configuration)
@@ -4793,9 +4795,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
                       PluginCfg configuration,
@@ -4807,9 +4807,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
                                  PluginCfg configuration)
@@ -4823,9 +4821,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       PluginCfg configuration,
@@ -4861,9 +4857,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  PluginCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
index 1ae4db9..db69b9b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/RootDNConfigManager.java
@@ -60,11 +60,13 @@
                   ConfigurationDeleteListener<RootDNUserCfg>
 
 {
-  // A mapping between the actual root DNs and their alternate bind DNs.
+  /** A mapping between the actual root DNs and their alternate bind DNs. */
   private ConcurrentHashMap<DN,HashSet<DN>> alternateBindDNs;
 
-  // The root privilege change listener that will handle changes to the
-  // "cn=Root DNs,cn=config" entry itself.
+  /**
+   * The root privilege change listener that will handle changes to the
+   * "cn=Root DNs,cn=config" entry itself.
+   */
   private RootPrivilegeChangeListener rootPrivilegeChangeListener;
 
   private final ServerContext serverContext;
@@ -160,9 +162,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(RootDNUserCfg configuration,
                                               List<LocalizableMessage> unacceptableReasons)
@@ -186,9 +186,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(RootDNUserCfg configuration)
   {
@@ -230,9 +228,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(RootDNUserCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -242,9 +238,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
                                  RootDNUserCfg configuration)
@@ -268,9 +262,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(RootDNUserCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -296,9 +288,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  RootDNUserCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
index 66a6453..74d1357 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/RootPrivilegeChangeListener.java
@@ -44,24 +44,16 @@
 public class RootPrivilegeChangeListener
        implements ConfigurationChangeListener<RootDNCfg>
 {
-  // The set of privileges that will be given to root users by default.
+  /** The set of privileges that will be given to root users by default. */
   private Set<Privilege> defaultRootPrivileges;
 
-
-
-  /**
-   * Creates a new instance of this root privilege change listener.
-   */
+  /** Creates a new instance of this root privilege change listener. */
   public RootPrivilegeChangeListener()
   {
     defaultRootPrivileges = Privilege.getDefaultRootPrivileges();
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(RootDNCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -70,11 +62,7 @@
     return true;
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(RootDNCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
index 912a1d5..ca7b045 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SASLConfigManager.java
@@ -145,9 +145,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
                       SASLMechanismHandlerCfg configuration,
@@ -175,9 +173,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(
               SASLMechanismHandlerCfg configuration)
@@ -216,9 +212,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
                       SASLMechanismHandlerCfg configuration,
@@ -231,9 +225,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
               SASLMechanismHandlerCfg configuration)
@@ -251,9 +243,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       SASLMechanismHandlerCfg configuration,
@@ -281,9 +271,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
               SASLMechanismHandlerCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
index 48a650c..58f2652 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.core;
 
@@ -165,9 +165,7 @@
    */
   public static class SchemaFileFilter implements FilenameFilter
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean accept(File directory, String filename)
     {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryManager.java
index f6d9682..e0841ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SubentryManager.java
@@ -83,26 +83,26 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // A mapping between the DNs and applicable subentries.
+  /** A mapping between the DNs and applicable subentries. */
   private HashMap<DN,List<SubEntry>> dn2SubEntry;
 
-  // A mapping between the DNs and applicable collective subentries.
+  /** A mapping between the DNs and applicable collective subentries. */
   private HashMap<DN,List<SubEntry>> dn2CollectiveSubEntry;
 
-  // A mapping between subentry DNs and subentry objects.
+  /** A mapping between subentry DNs and subentry objects. */
   private DITCacheMap<SubEntry> dit2SubEntry;
 
-  // Internal search all operational attributes.
+  /** Internal search all operational attributes. */
   private LinkedHashSet<String> requestAttrs;
 
-  // Lock to protect internal data structures.
+  /** Lock to protect internal data structures. */
   private final ReentrantReadWriteLock lock;
 
-  // The set of change notification listeners.
+  /** The set of change notification listeners. */
   private CopyOnWriteArrayList<SubentryChangeListener>
                changeListeners;
 
-  // Dummy configuration DN for Subentry Manager.
+  /** Dummy configuration DN for Subentry Manager. */
   private static final String CONFIG_DN = "cn=Subentry Manager,cn=config";
 
   /**
@@ -865,9 +865,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PreOperation doPreOperation(
           PreOperationAddOperation addOperation)
@@ -905,9 +903,7 @@
     return PluginResult.PreOperation.continueOperationProcessing();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PreOperation doPreOperation(
           PreOperationDeleteOperation deleteOperation)
@@ -962,9 +958,7 @@
     return PluginResult.PreOperation.continueOperationProcessing();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PreOperation doPreOperation(
           PreOperationModifyOperation modifyOperation)
@@ -1005,9 +999,7 @@
     return PluginResult.PreOperation.continueOperationProcessing();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PreOperation doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
   {
@@ -1068,9 +1060,7 @@
     return PluginResult.PreOperation.continueOperationProcessing();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PostOperation doPostOperation(
           PostOperationAddOperation addOperation)
@@ -1086,9 +1076,7 @@
     return PluginResult.PostOperation.continueOperationProcessing();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PostOperation doPostOperation(
           PostOperationDeleteOperation deleteOperation)
@@ -1104,9 +1092,7 @@
     return PluginResult.PostOperation.continueOperationProcessing();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PostOperation doPostOperation(
           PostOperationModifyOperation modifyOperation)
@@ -1123,9 +1109,7 @@
     return PluginResult.PostOperation.continueOperationProcessing();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PostOperation doPostOperation(
           PostOperationModifyDNOperation modifyDNOperation)
@@ -1142,9 +1126,7 @@
     return PluginResult.PostOperation.continueOperationProcessing();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void doPostSynchronization(
       PostSynchronizationAddOperation addOperation)
@@ -1156,9 +1138,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void doPostSynchronization(
       PostSynchronizationDeleteOperation deleteOperation)
@@ -1170,9 +1150,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void doPostSynchronization(
       PostSynchronizationModifyOperation modifyOperation)
@@ -1185,9 +1163,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void doPostSynchronization(
       PostSynchronizationModifyDNOperation modifyDNOperation)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
index 626ae43..1ede4ec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/SynchronizationProviderConfigManager.java
@@ -141,9 +141,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       SynchronizationProviderCfg configuration)
@@ -226,9 +224,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       SynchronizationProviderCfg configuration,
@@ -240,9 +236,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(
     SynchronizationProviderCfg configuration)
@@ -294,9 +288,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(
       SynchronizationProviderCfg configuration,
@@ -410,9 +402,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(
       SynchronizationProviderCfg configuration)
@@ -433,9 +423,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(
       SynchronizationProviderCfg configuration,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
index 5e23c7d..c4c1bae 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/TrustManagerProviderConfigManager.java
@@ -68,8 +68,10 @@
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // A mapping between the DNs of the config entries and the associated trust
-  // manager providers.
+  /**
+   * A mapping between the DNs of the config entries and the associated trust
+   * manager providers.
+   */
   private final ConcurrentHashMap<DN,TrustManagerProvider> providers;
 
   private final ServerContext serverContext;
@@ -144,9 +146,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationAddAcceptable(
           TrustManagerProviderCfg configuration,
           List<LocalizableMessage> unacceptableReasons)
@@ -173,9 +173,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationAdd(
                                   TrustManagerProviderCfg configuration)
   {
@@ -215,9 +213,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationDeleteAcceptable(
                       TrustManagerProviderCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -229,9 +225,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationDelete(
                                  TrustManagerProviderCfg configuration)
   {
@@ -250,9 +244,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       TrustManagerProviderCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -279,9 +271,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                                  TrustManagerProviderCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java b/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java
index 9e10cec..a4d5d19 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/UnbindOperationBasis.java
@@ -70,11 +70,7 @@
         ERR_CANNOT_CANCEL_UNBIND.get());
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final OperationType getOperationType()
   {
@@ -82,11 +78,7 @@
     // candidate for being called by the logging subsystem.
     return OperationType.UNBIND;
   }
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final List<Control> getResponseControls()
   {
@@ -95,22 +87,14 @@
     return NO_RESPONSE_CONTROLS;
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void addResponseControl(Control control)
   {
     // An unbind operation can never have a response, so just ignore this.
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void removeResponseControl(Control control)
   {
@@ -158,11 +142,7 @@
     setProcessingStopTime();
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void toString(StringBuilder buffer)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java
index 9856cc3..c58ee6c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/WorkQueueConfigManager.java
@@ -120,9 +120,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(WorkQueueCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -134,9 +132,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(WorkQueueCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
index f3cc672..ae63376 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerImpl.java
@@ -1379,7 +1379,7 @@
       return fValue.hashCode();
     }
 
-    // state
+    /** State. */
     private final UUID fValue;
   }
 
@@ -1532,7 +1532,7 @@
       return fIsCompromised;
     }
 
-    // state
+    /** State. */
     private final KeyEntryID fKeyID;
     private final SecretKey fSecretKey;
     private final int fKeyLengthBits;
@@ -1982,7 +1982,7 @@
       return fIVLengthBits;
     }
 
-    // state
+    /** State. */
     private final String fType;
     private int fIVLengthBits = -1;
   }
@@ -2434,7 +2434,7 @@
       return fType;
     }
 
-    // state
+    /** State. */
     private final String fType;
   }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
index b814733..f808308 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java
@@ -61,8 +61,10 @@
 
 
 
-  // The reference to the Directory Server crypto manager that we will use to
-  // handle the encryption/decryption.
+  /**
+   * The reference to the Directory Server crypto manager that we will use to
+   * handle the encryption/decryption.
+   */
   private CryptoManager cryptoManager;
 
 
@@ -77,11 +79,7 @@
     super();
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    AESPasswordStorageSchemeCfg configuration)
@@ -90,22 +88,14 @@
     cryptoManager = DirectoryServer.getCryptoManager();
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
     return STORAGE_SCHEME_NAME_AES;
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -136,11 +126,7 @@
     }
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -177,11 +163,7 @@
     return ByteString.valueOf(buffer.toString());
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -201,22 +183,14 @@
     }
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
     return true;
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -238,11 +212,7 @@
     }
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -250,11 +220,7 @@
     return false;
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -264,11 +230,7 @@
     throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -277,11 +239,7 @@
     return false;
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -292,11 +250,7 @@
     throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
index 111983b..757fb8c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AnonymousSASLMechanismHandler.java
@@ -66,11 +66,7 @@
     super();
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeSASLMechanismHandler(AnonymousSASLMechanismHandlerCfg
                                                   configuration)
@@ -82,23 +78,14 @@
                                                  this);
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeSASLMechanismHandler()
   {
     DirectoryServer.deregisterSASLMechanismHandler(SASL_MECHANISM_ANONYMOUS);
   }
 
-
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processSASLBind(BindOperation bindOperation)
   {
@@ -126,11 +113,7 @@
     bindOperation.setResultCode(ResultCode.SUCCESS);
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isPasswordBased(String mechanism)
   {
@@ -138,11 +121,7 @@
     return false;
   }
 
-
-
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isSecure(String mechanism)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
index f4b5fcc..0d33540 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/AttributeValuePasswordValidator.java
@@ -51,7 +51,7 @@
        implements ConfigurationChangeListener<
                        AttributeValuePasswordValidatorCfg>
 {
-  // The current configuration for this password validator.
+  /** The current configuration for this password validator. */
   private AttributeValuePasswordValidatorCfg currentConfig;
 
 
@@ -69,9 +69,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordValidator(
                    AttributeValuePasswordValidatorCfg configuration)
@@ -82,9 +80,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizePasswordValidator()
   {
@@ -128,9 +124,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
@@ -195,9 +189,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PasswordValidatorCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -209,9 +201,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       AttributeValuePasswordValidatorCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -222,9 +212,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                       AttributeValuePasswordValidatorCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
index f5543e5..62a4b8a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/Base64PasswordStorageScheme.java
@@ -69,9 +69,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    Base64PasswordStorageSchemeCfg configuration)
@@ -82,9 +80,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
@@ -93,9 +89,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -105,9 +99,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -123,9 +115,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -137,9 +127,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
@@ -148,9 +136,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -171,9 +157,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -183,9 +167,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -197,9 +179,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -210,9 +190,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -225,9 +203,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
index 147df5d..ab8fc0a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlindTrustManagerProvider.java
@@ -64,9 +64,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeTrustManagerProvider(
                   BlindTrustManagerProviderCfg configuration)
@@ -89,9 +87,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public TrustManager[] getTrustManagers()
          throws DirectoryException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
index 6c13be0..df059bb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java
@@ -61,8 +61,10 @@
 
 
 
-  // The reference to the Directory Server crypto manager that we will use to
-  // handle the encryption/decryption.
+  /**
+   * The reference to the Directory Server crypto manager that we will use to
+   * handle the encryption/decryption.
+   */
   private CryptoManager cryptoManager;
 
 
@@ -79,9 +81,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    BlowfishPasswordStorageSchemeCfg configuration)
@@ -92,9 +92,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
@@ -103,9 +101,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -138,9 +134,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -180,9 +174,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -204,9 +196,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
@@ -215,9 +205,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -241,9 +229,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -253,9 +239,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -267,9 +251,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -280,9 +262,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -295,9 +275,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
index 3f01a15..81d1eac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CRAMMD5SASLMechanismHandler.java
@@ -71,27 +71,30 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // An array filled with the inner pad byte.
+  /** An array filled with the inner pad byte. */
   private byte[] iPad;
 
-  // An array filled with the outer pad byte.
+  /** An array filled with the outer pad byte. */
   private byte[] oPad;
 
-  // The current configuration for this SASL mechanism handler.
+  /** The current configuration for this SASL mechanism handler. */
   private CramMD5SASLMechanismHandlerCfg currentConfig;
 
-  // The identity mapper that will be used to map ID strings to user entries.
+  /** The identity mapper that will be used to map ID strings to user entries. */
   private IdentityMapper<?> identityMapper;
 
-  // The message digest engine that will be used to create the MD5 digests.
+  /** The message digest engine that will be used to create the MD5 digests. */
   private MessageDigest md5Digest;
 
-  // The lock that will be used to provide threadsafe access to the message
-  // digest.
+  /**
+   * The lock that will be used to provide threadsafe access to the message
+   * digest.
+   */
   private Object digestLock;
 
-  // The random number generator that we will use to create the server
-  // challenge.
+  /**
+   * The random number generator that we will use to create the server challenge.
+   */
   private SecureRandom randomGenerator;
 
 
@@ -108,9 +111,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeSASLMechanismHandler(
                    CramMD5SASLMechanismHandlerCfg configuration)
@@ -153,9 +154,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeSASLMechanismHandler()
   {
@@ -166,9 +165,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processSASLBind(BindOperation bindOperation)
   {
@@ -520,9 +517,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isPasswordBased(String mechanism)
   {
@@ -532,9 +527,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isSecure(String mechanism)
   {
@@ -544,9 +537,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
                       SASLMechanismHandlerCfg configuration,
@@ -559,9 +550,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       CramMD5SASLMechanismHandlerCfg configuration,
@@ -572,9 +561,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
               CramMD5SASLMechanismHandlerCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CertificateValidationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CertificateValidationPolicy.java
index 16d2b0f..41e440e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CertificateValidationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CertificateValidationPolicy.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -61,7 +62,7 @@
 
 
 
-  // The human-readable name for this policy.
+  /** The human-readable name for this policy. */
   private String policyName;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
index 00a9840..dc1e0a5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CharacterSetPasswordValidator.java
@@ -56,15 +56,19 @@
        extends PasswordValidator<CharacterSetPasswordValidatorCfg>
        implements ConfigurationChangeListener<CharacterSetPasswordValidatorCfg>
 {
-  // The current configuration for this password validator.
+  /** The current configuration for this password validator. */
   private CharacterSetPasswordValidatorCfg currentConfig;
 
-  // A mapping between the character sets and the minimum number of characters
-  // required for each.
+  /**
+   * A mapping between the character sets and the minimum number of characters
+   * required for each.
+   */
   private HashMap<String,Integer> characterSets;
 
-  // A mapping between the character ranges and the minimum number of characters
-  // required for each.
+  /**
+   * A mapping between the character ranges and the minimum number of characters
+   * required for each.
+   */
   private HashMap<String,Integer> characterRanges;
 
 
@@ -82,9 +86,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordValidator(
                    CharacterSetPasswordValidatorCfg configuration)
@@ -100,9 +102,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizePasswordValidator()
   {
@@ -111,9 +111,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
@@ -483,9 +481,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PasswordValidatorCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -497,9 +493,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       CharacterSetPasswordValidatorCfg configuration,
@@ -522,9 +516,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                       CharacterSetPasswordValidatorCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
index d7fb62b..c0ac257 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ClearPasswordStorageScheme.java
@@ -62,9 +62,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    ClearPasswordStorageSchemeCfg configuration)
@@ -75,9 +73,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
@@ -86,9 +82,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -98,9 +92,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -116,9 +108,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -128,9 +118,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
@@ -139,9 +127,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -151,9 +137,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -163,9 +147,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -177,9 +159,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -190,9 +170,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -205,9 +183,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
index ba168bd..f03638e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java
@@ -98,9 +98,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    CryptPasswordStorageSchemeCfg configuration)
@@ -111,9 +109,7 @@
     currentConfig = configuration;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
@@ -238,9 +234,7 @@
     return ByteString.valueOf(output);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -265,9 +259,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -376,9 +368,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -402,9 +392,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -414,9 +402,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -428,9 +414,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -441,9 +425,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
@@ -452,9 +434,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -466,9 +446,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -481,9 +459,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
@@ -503,9 +479,7 @@
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
           PasswordStorageSchemeCfg configuration,
@@ -518,9 +492,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       CryptPasswordStorageSchemeCfg configuration,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
index 3391e30..ebf8ec6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DictionaryPasswordValidator.java
@@ -59,10 +59,10 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The current configuration for this password validator.
+  /** The current configuration for this password validator. */
   private DictionaryPasswordValidatorCfg currentConfig;
 
-  // The current dictionary that we should use when performing the validation.
+  /** The current dictionary that we should use when performing the validation. */
   private HashSet<String> dictionary;
 
 
@@ -80,9 +80,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordValidator(
                    DictionaryPasswordValidatorCfg configuration)
@@ -96,9 +94,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizePasswordValidator()
   {
@@ -107,9 +103,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
@@ -226,9 +220,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PasswordValidatorCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -240,9 +232,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       DictionaryPasswordValidatorCfg configuration,
@@ -275,9 +265,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                       DictionaryPasswordValidatorCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
index ea22144..4cfbd75 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DigestMD5SASLMechanismHandler.java
@@ -65,24 +65,23 @@
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The current configuration for this SASL mechanism handler.
+  /** The current configuration for this SASL mechanism handler. */
   private DigestMD5SASLMechanismHandlerCfg configuration;
 
-  // The identity mapper that will be used to map ID strings to user entries.
+  /** The identity mapper that will be used to map ID strings to user entries. */
   private IdentityMapper<?> identityMapper;
 
-  //Properties to use when creating a SASL server to process the authentication.
+  /** Properties to use when creating a SASL server to process the authentication. */
   private HashMap<String,String> saslProps;
 
-//The fully qualified domain name used when creating the SASL server.
+  /** The fully qualified domain name used when creating the SASL server. */
   private String serverFQDN;
 
-  // The DN of the configuration entry for this SASL mechanism handler.
+  /** The DN of the configuration entry for this SASL mechanism handler. */
   private DN configEntryDN;
 
-  //Property used to set the realm in the environment.
-  private static final String REALM_PROPERTY =
-                                          "com.sun.security.sasl.digest.realm";
+  /** Property used to set the realm in the environment. */
+  private static final String REALM_PROPERTY = "com.sun.security.sasl.digest.realm";
 
 
   /**
@@ -96,9 +95,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeSASLMechanismHandler(
           DigestMD5SASLMechanismHandlerCfg configuration)
@@ -131,9 +128,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeSASLMechanismHandler() {
     configuration.removeDigestMD5ChangeListener(this);
@@ -141,9 +136,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processSASLBind(BindOperation bindOp) {
       ClientConnection clientConnection = bindOp.getClientConnection();
@@ -177,9 +170,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isPasswordBased(String mechanism)
   {
@@ -189,9 +180,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isSecure(String mechanism)
   {
@@ -200,9 +189,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
                       SASLMechanismHandlerCfg configuration,
@@ -214,9 +201,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       DigestMD5SASLMechanismHandlerCfg configuration,
@@ -226,9 +211,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
           DigestMD5SASLMechanismHandlerCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
index 5d38012..7e83174 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroup.java
@@ -73,10 +73,10 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The DN of the entry that holds the definition for this group.
+  /** The DN of the entry that holds the definition for this group. */
   private DN groupEntryDN;
 
-  // The set of the LDAP URLs that define the membership criteria.
+  /** The set of the LDAP URLs that define the membership criteria. */
   private LinkedHashSet<LDAPURL> memberURLs;
 
 
@@ -115,9 +115,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeGroupImplementation(
                    DynamicGroupImplementationCfg configuration)
@@ -129,9 +127,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public DynamicGroup newInstance(ServerContext serverContext, Entry groupEntry)
          throws DirectoryException
@@ -170,9 +166,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public SearchFilter getGroupDefinitionFilter()
          throws DirectoryException
@@ -185,9 +179,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isGroupDefinition(Entry entry)
   {
@@ -202,9 +194,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public DN getGroupDN()
   {
@@ -213,9 +203,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setGroupDN(DN groupDN)
   {
@@ -237,9 +225,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsNestedGroups()
   {
@@ -249,9 +235,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public List<DN> getNestedGroupDNs()
   {
@@ -261,9 +245,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void addNestedGroup(DN nestedGroupDN)
          throws UnsupportedOperationException, DirectoryException
@@ -275,9 +257,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void removeNestedGroup(DN nestedGroupDN)
          throws UnsupportedOperationException, DirectoryException
@@ -289,9 +269,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isMember(DN userDN, Set<DN> examinedGroups)
          throws DirectoryException
@@ -307,9 +285,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isMember(Entry userEntry, Set<DN> examinedGroups)
          throws DirectoryException
@@ -332,9 +308,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public MemberList getMembers()
          throws DirectoryException
@@ -344,9 +318,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public MemberList getMembers(DN baseDN, SearchScope scope,
                                SearchFilter filter)
@@ -365,9 +337,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean mayAlterMemberList()
   {
@@ -376,9 +346,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void addMember(Entry userEntry)
          throws UnsupportedOperationException, DirectoryException
@@ -390,9 +358,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void removeMember(DN userDN)
          throws UnsupportedOperationException, DirectoryException
@@ -404,9 +370,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void toString(StringBuilder buffer)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
index 51f77d9..489ab06 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupMemberList.java
@@ -51,27 +51,29 @@
 public class DynamicGroupMemberList
        extends MemberList
 {
-  // Indicates whether the search thread has completed its processing.
+  /** Indicates whether the search thread has completed its processing. */
   private boolean searchesCompleted;
 
-  // The base DN to use when filtering the set of group members.
+  /** The base DN to use when filtering the set of group members. */
   private final DN baseDN;
 
-  // The DN of the entry containing the group definition.
+  /** The DN of the entry containing the group definition. */
   private final DN groupDN;
 
-  // The queue into which results will be placed while they are waiting to be
-  // returned.  The types of objects that may be placed in this queue are Entry
-  // objects to return or MembershipException objects to throw.
+  /**
+   * The queue into which results will be placed while they are waiting to be
+   * returned.  The types of objects that may be placed in this queue are Entry
+   * objects to return or MembershipException objects to throw.
+   */
   private final LinkedBlockingQueue<Object> resultQueue;
 
-  // The search filter to use when filtering the set of group members.
+  /** The search filter to use when filtering the set of group members. */
   private final SearchFilter filter;
 
-  // The search scope to use when filtering the set of group members.
+  /** The search scope to use when filtering the set of group members. */
   private final SearchScope scope;
 
-  // The set of LDAP URLs that define the membership criteria.
+  /** The set of LDAP URLs that define the membership criteria. */
   private final Set<LDAPURL> memberURLs;
 
 
@@ -399,9 +401,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean hasMoreMembers()
   {
@@ -423,9 +423,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Entry nextMemberEntry()
          throws MembershipException
@@ -463,9 +461,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void close()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java
index c0b8d49..1fec868 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -62,19 +62,19 @@
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The set of base DNs for the search requests.
+  /** The set of base DNs for the search requests. */
   private final DN[] baseDNs;
 
-  // The member list with which this search thread is associated.
+  /** The member list with which this search thread is associated. */
   private final DynamicGroupMemberList memberList;
 
-  // A counter used to keep track of which search is currently in progress.
+  /** A counter used to keep track of which search is currently in progress. */
   private int searchCounter;
 
-  // The set of member URLs for determining whether entries match the criteria.
+  /** The set of member URLs for determining whether entries match the criteria. */
   private final LDAPURL[][] memberURLs;
 
-  // The set of search filters for the search requests.
+  /** The set of search filters for the search requests. */
   private final SearchFilter[] searchFilters;
 
 
@@ -158,9 +158,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void handleInternalSearchEntry(InternalSearchOperation searchOperation,
                                         SearchResultEntry searchEntry)
@@ -184,9 +182,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void handleInternalSearchReference(
                    InternalSearchOperation searchOperation,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
index ed5b3e7..3cb6b3f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntityTagVirtualAttributeProvider.java
@@ -64,9 +64,7 @@
   private static final Comparator<Attribute> ATTRIBUTE_COMPARATOR =
       new Comparator<Attribute>()
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int compare(final Attribute a1, final Attribute a2)
     {
@@ -74,7 +72,7 @@
     }
   };
 
-  // Current configuration.
+  /** Current configuration. */
   private volatile EntityTagVirtualAttributeCfg config;
 
 
@@ -89,9 +87,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       final EntityTagVirtualAttributeCfg configuration)
@@ -102,9 +98,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConditionResult approximatelyEqualTo(final Entry entry,
       final VirtualAttributeRule rule, final ByteString value)
@@ -115,9 +109,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeVirtualAttributeProvider()
   {
@@ -126,9 +118,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Attribute getValues(final Entry entry, final VirtualAttributeRule rule)
   {
@@ -153,9 +143,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConditionResult greaterThanOrEqualTo(final Entry entry,
       final VirtualAttributeRule rule, final ByteString value)
@@ -166,9 +154,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean hasValue(final Entry entry, final VirtualAttributeRule rule)
   {
@@ -178,9 +164,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeVirtualAttributeProvider(
       final EntityTagVirtualAttributeCfg configuration) throws ConfigException,
@@ -192,9 +176,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       final EntityTagVirtualAttributeCfg configuration,
@@ -206,9 +188,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isMultiValued()
   {
@@ -218,9 +198,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isSearchable(final VirtualAttributeRule rule,
                               final SearchOperation searchOperation,
@@ -233,9 +211,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConditionResult lessThanOrEqualTo(final Entry entry,
       final VirtualAttributeRule rule, final ByteString value)
@@ -246,9 +222,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConditionResult matchesSubstring(final Entry entry,
       final VirtualAttributeRule rule, final ByteString subInitial,
@@ -260,9 +234,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processSearch(final VirtualAttributeRule rule,
       final SearchOperation searchOperation)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java
index fe31f40..c121663 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/EntryCacheCommon.java
@@ -85,24 +85,28 @@
    */
   public class ConfigErrorHandler
   {
-    // Configuration phase.
+    /** Configuration phase. */
     private EntryCacheCommon.ConfigPhase _configPhase;
 
-    // Unacceptable reasons. Used when _configPhase is PHASE_ACCEPTABLE.
+    /** Unacceptable reasons. Used when _configPhase is PHASE_ACCEPTABLE. */
     private List<LocalizableMessage> _unacceptableReasons;
 
-    // Error messages. Used when _configPhase is PHASE_APPLY.
+    /** Error messages. Used when _configPhase is PHASE_APPLY. */
     private ArrayList<LocalizableMessage> _errorMessages;
 
-    // Result code. Used when _configPhase is PHASE_APPLY.
+    /** Result code. Used when _configPhase is PHASE_APPLY. */
     private ResultCode _resultCode;
 
-    // Acceptable Configuration ? Used when _configPhase is PHASE_ACCEPTABLE
-    // or PHASE_APPLY.
+    /**
+     * Acceptable Configuration ? Used when _configPhase is PHASE_ACCEPTABLE
+     * or PHASE_APPLY.
+     */
     private boolean _isAcceptable;
 
-    // Indicates whether administrative action is required or not. Used when
-    // _configPhase is PHASE_APPLY.
+    /**
+     * Indicates whether administrative action is required or not. Used when
+     * _configPhase is PHASE_APPLY.
+     */
     private boolean _isAdminActionRequired;
 
     /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
index 5aa5674..309a879 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java
@@ -81,17 +81,15 @@
   }
 
 
-  // The DN of the configuration entry for this notification handler.
+  /** The DN of the configuration entry for this notification handler. */
   private DN configEntryDN;
 
-  // The set of notification types that should generate log messages.
+  /** The set of notification types that should generate log messages. */
   private HashSet<AccountStatusNotificationType> notificationTypes;
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeStatusNotificationHandler(
       ErrorLogAccountStatusNotificationHandlerCfg configuration
       )
@@ -107,9 +105,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void handleStatusNotification(
                    AccountStatusNotification notification)
   {
@@ -122,9 +118,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
                       AccountStatusNotificationHandlerCfg configuration,
@@ -137,9 +131,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
       ErrorLogAccountStatusNotificationHandlerCfg configuration,
       List<LocalizableMessage> unacceptableReasons)
@@ -178,9 +170,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange (
       ErrorLogAccountStatusNotificationHandlerCfg configuration
       )
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
index 834c79f..56bde9e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExactMatchIdentityMapper.java
@@ -69,16 +69,16 @@
        implements ConfigurationChangeListener<
                        ExactMatchIdentityMapperCfg>
 {
-  // The set of attribute types to use when performing lookups.
+  /** The set of attribute types to use when performing lookups. */
   private AttributeType[] attributeTypes;
 
-  // The DN of the configuration entry for this identity mapper.
+  /** The DN of the configuration entry for this identity mapper. */
   private DN configEntryDN;
 
-  // The current configuration for this identity mapper.
+  /** The current configuration for this identity mapper. */
   private ExactMatchIdentityMapperCfg currentConfig;
 
-  // The set of attributes to return in search result entries.
+  /** The set of attributes to return in search result entries. */
   private LinkedHashSet<String> requestedAttributes;
 
 
@@ -97,9 +97,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeIdentityMapper(
                    ExactMatchIdentityMapperCfg configuration)
@@ -277,9 +275,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(IdentityMapperCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -291,9 +287,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       ExactMatchIdentityMapperCfg configuration,
@@ -328,9 +322,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
               ExactMatchIdentityMapperCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
index 2c61b78..afec40c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ExternalSASLMechanismHandler.java
@@ -65,15 +65,19 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The attribute type that should hold the certificates to use for the
-  // validation.
+  /**
+   * The attribute type that should hold the certificates to use for the
+   * validation.
+   */
   private AttributeType certificateAttributeType;
 
-  // Indicates whether to attempt to validate the certificate presented by the
-  // client with a certificate in the user's entry.
+  /**
+   * Indicates whether to attempt to validate the certificate presented by the
+   * client with a certificate in the user's entry.
+   */
   private CertificateValidationPolicy validationPolicy;
 
-  // The current configuration for this SASL mechanism handler.
+  /** The current configuration for this SASL mechanism handler. */
   private ExternalSASLMechanismHandlerCfg currentConfig;
 
 
@@ -90,9 +94,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeSASLMechanismHandler(
                    ExternalSASLMechanismHandlerCfg configuration)
@@ -133,9 +135,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeSASLMechanismHandler()
   {
@@ -146,9 +146,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processSASLBind(BindOperation bindOperation)
   {
@@ -319,9 +317,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isPasswordBased(String mechanism)
   {
@@ -331,9 +327,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isSecure(String mechanism)
   {
@@ -343,9 +337,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
                       SASLMechanismHandlerCfg configuration,
@@ -358,9 +350,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       ExternalSASLMechanismHandlerCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -370,9 +360,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
               ExternalSASLMechanismHandlerCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
index b1846e3..d4edb1b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java
@@ -70,19 +70,19 @@
 
 
 
-  // The DN of the configuration entry for this key manager provider.
+  /** The DN of the configuration entry for this key manager provider. */
   private DN configEntryDN;
 
-  // The PIN needed to access the keystore.
+  /** The PIN needed to access the keystore. */
   private char[] keyStorePIN;
 
-  // The configuration for this key manager provider.
+  /** The configuration for this key manager provider. */
   private FileBasedKeyManagerProviderCfg currentConfig;
 
-  // The path to the key store backing file.
+  /** The path to the key store backing file. */
   private String keyStoreFile;
 
-  // The key store type to use.
+  /** The key store type to use. */
   private String keyStoreType;
 
 
@@ -99,9 +99,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeKeyManagerProvider(
       FileBasedKeyManagerProviderCfg configuration)
@@ -282,9 +280,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
                         FileBasedKeyManagerProviderCfg configuration,
@@ -295,9 +291,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       FileBasedKeyManagerProviderCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -427,9 +421,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                                  FileBasedKeyManagerProviderCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
index 0b4bd9d..45de3a6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java
@@ -68,19 +68,19 @@
 
 
 
-  // The DN of the configuration entry for this trust manager provider.
+  /** The DN of the configuration entry for this trust manager provider. */
   private DN configEntryDN;
 
-  // The PIN needed to access the trust store.
+  /** The PIN needed to access the trust store. */
   private char[] trustStorePIN;
 
-  // The handle to the configuration for this trust manager.
+  /** The handle to the configuration for this trust manager. */
   private FileBasedTrustManagerProviderCfg currentConfig;
 
-  // The path to the trust store backing file.
+  /** The path to the trust store backing file. */
   private String trustStoreFile;
 
-  // The trust store type to use.
+  /** The trust store type to use. */
   private String trustStoreType;
 
 
@@ -97,9 +97,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeTrustManagerProvider(
                    FileBasedTrustManagerProviderCfg configuration)
@@ -245,9 +243,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeTrustManagerProvider()
   {
@@ -256,9 +252,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public TrustManager[] getTrustManagers()
          throws DirectoryException
@@ -312,9 +306,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
                          TrustManagerProviderCfg configuration,
@@ -327,9 +319,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       FileBasedTrustManagerProviderCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -442,9 +432,7 @@
     return configAcceptable;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                                  FileBasedTrustManagerProviderCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
index f848d70..bc0f795 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/FingerprintCertificateMapper.java
@@ -71,16 +71,16 @@
 
 
 
-  // The DN of the configuration entry for this certificate mapper.
+  /** The DN of the configuration entry for this certificate mapper. */
   private DN configEntryDN;
 
-  // The current configuration for this certificate mapper.
+  /** The current configuration for this certificate mapper. */
   private FingerprintCertificateMapperCfg currentConfig;
 
-  // The algorithm that will be used to generate the fingerprint.
+  /** The algorithm that will be used to generate the fingerprint. */
   private String fingerprintAlgorithm;
 
-  // The set of attributes to return in search result entries.
+  /** The set of attributes to return in search result entries. */
   private LinkedHashSet<String> requestedAttributes;
 
 
@@ -96,9 +96,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeCertificateMapper(
                    FingerprintCertificateMapperCfg configuration)
@@ -150,9 +148,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeCertificateMapper()
   {
@@ -161,9 +157,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Entry mapCertificateToUser(Certificate[] certificateChain)
          throws DirectoryException
@@ -301,9 +295,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(CertificateMapperCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -315,9 +307,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       FingerprintCertificateMapperCfg configuration,
@@ -328,9 +318,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
               FingerprintCertificateMapperCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
index 0eab842..2a00706 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -79,23 +79,25 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The DN of the configuration entry for this SASL mechanism handler.
+  /** The DN of the configuration entry for this SASL mechanism handler. */
   private DN configEntryDN;
 
-  // The current configuration for this SASL mechanism handler.
+  /** The current configuration for this SASL mechanism handler. */
   private GSSAPISASLMechanismHandlerCfg configuration;
 
-  // The identity mapper that will be used to map identities.
+  /** The identity mapper that will be used to map identities. */
   private IdentityMapper<?> identityMapper;
 
-  // The properties to use when creating a SASL server to process the
-  // GSSAPI authentication.
+  /**
+   * The properties to use when creating a SASL server to process the
+   * GSSAPI authentication.
+   */
   private HashMap<String, String> saslProps;
 
-  // The fully qualified domain name used when creating the SASL server.
+  /** The fully qualified domain name used when creating the SASL server. */
   private String serverFQDN;
 
-  // The login context used to perform server-side authentication.
+  /** The login context used to perform server-side authentication. */
   private volatile LoginContext loginContext;
   private final Object loginContextLock = new Object();
 
@@ -114,9 +116,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeSASLMechanismHandler(
       GSSAPISASLMechanismHandlerCfg configuration) throws ConfigException,
@@ -332,9 +332,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeSASLMechanismHandler() {
     logout();
@@ -355,9 +353,7 @@
   System.clearProperty(JAAS_PROPERTY_SUBJECT_CREDS_ONLY);
 }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processSASLBind(BindOperation bindOp)
   {
@@ -430,9 +426,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isPasswordBased(String mechanism)
   {
@@ -441,9 +435,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isSecure(String mechanism)
   {
@@ -453,9 +445,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
       SASLMechanismHandlerCfg configuration, List<LocalizableMessage> unacceptableReasons)
@@ -467,9 +457,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       GSSAPISASLMechanismHandlerCfg newConfiguration,
@@ -518,9 +506,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(GSSAPISASLMechanismHandlerCfg newConfiguration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
index 05d7cfe..1ff5526 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/GetConnectionIDExtendedOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -71,9 +71,7 @@
     super.initializeExtendedOperationHandler(config);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processExtendedOperation(ExtendedOperation operation)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java
index 12cc3ac..befed8f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/JMXAlertHandler.java
@@ -82,17 +82,19 @@
 
 
 
-  // The current configuration for this alert handler.
+  /** The current configuration for this alert handler. */
   private AlertHandlerCfg currentConfig;
 
-  // The sequence number generator used for this alert handler.
+  /** The sequence number generator used for this alert handler. */
   private AtomicLong sequenceNumber;
 
-  // The DN of the configuration entry with which this alert handler is
-  // associated.
+  /**
+   * The DN of the configuration entry with which this alert handler is
+   * associated.
+   */
   private DN configEntryDN;
 
-  // The JMX object name used for this JMX alert handler.
+  /** The JMX object name used for this JMX alert handler. */
   private ObjectName objectName;
 
 
@@ -109,9 +111,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeAlertHandler(JMXAlertHandlerCfg configuration)
        throws ConfigException, InitializationException
   {
@@ -158,9 +158,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public AlertHandlerCfg getAlertHandlerConfiguration()
   {
     return currentConfig;
@@ -168,9 +166,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationAcceptable(AlertHandlerCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
@@ -180,9 +176,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void finalizeAlertHandler()
   {
     // No action is required.
@@ -202,9 +196,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void sendAlertNotification(AlertGenerator generator, String alertType,
                                     LocalizableMessage alertMessage)
   {
@@ -379,9 +371,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       JMXAlertHandlerCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -391,9 +381,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                                         JMXAlertHandlerCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
index 2e7e980..77d5db5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java
@@ -153,9 +153,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public void close()
       {
@@ -164,9 +162,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public ByteString search(final DN baseDN, final SearchScope scope,
           final SearchFilter filter) throws DirectoryException
@@ -187,9 +183,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public void simpleBind(final ByteString username,
           final ByteString password) throws DirectoryException
@@ -274,7 +268,7 @@
     {
       private final ConnectionFactory factory;
 
-      // isAvailable acts as memory barrier for lastException.
+      /** IsAvailable acts as memory barrier for lastException. */
       private volatile boolean isAvailable = true;
       private DirectoryException lastException;
 
@@ -287,9 +281,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public void close()
       {
@@ -298,9 +290,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public Connection getConnection() throws DirectoryException
       {
@@ -369,9 +359,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public final Connection getConnection() throws DirectoryException
     {
@@ -453,9 +441,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void close()
     {
@@ -464,9 +450,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public Connection getConnection() throws DirectoryException
     {
@@ -604,9 +588,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public void close()
       {
@@ -631,9 +613,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public ByteString search(final DN baseDN, final SearchScope scope,
           final SearchFilter filter) throws DirectoryException
@@ -666,9 +646,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public void simpleBind(final ByteString username,
           final ByteString password) throws DirectoryException
@@ -743,7 +721,7 @@
 
 
 
-    // Guarded by PolicyImpl.lock.
+    /** Guarded by PolicyImpl.lock. */
     private boolean poolIsClosed;
 
     private final ConnectionFactory factory;
@@ -797,9 +775,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public Connection getConnection() throws DirectoryException
     {
@@ -861,9 +837,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     int getStartIndex()
     {
@@ -908,9 +882,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public void close()
       {
@@ -945,9 +917,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public ByteString search(final DN baseDN, final SearchScope scope,
           final SearchFilter filter) throws DirectoryException
@@ -1049,9 +1019,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public void simpleBind(final ByteString username,
           final ByteString password) throws DirectoryException
@@ -1096,9 +1064,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       protected void finalize()
       {
@@ -1151,7 +1117,7 @@
 
 
 
-      // Reads a response message and adapts errors to directory exceptions.
+      /** Reads a response message and adapts errors to directory exceptions. */
       private LDAPMessage readResponse() throws DirectoryException
       {
         final LDAPMessage responseMessage;
@@ -1205,7 +1171,7 @@
 
 
 
-      // Sends a request message and adapts errors to directory exceptions.
+      /** Sends a request message and adapts errors to directory exceptions. */
       private void sendRequest(final ProtocolOp request)
           throws DirectoryException
       {
@@ -1258,9 +1224,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void close()
     {
@@ -1269,9 +1233,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public Connection getConnection() throws DirectoryException
     {
@@ -1495,9 +1457,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     int getStartIndex()
     {
@@ -1565,9 +1525,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public void finalizeStateAfterBind() throws DirectoryException
       {
@@ -1621,9 +1579,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public AuthenticationPolicy getAuthenticationPolicy()
       {
@@ -1632,9 +1588,7 @@
 
 
 
-      /**
-       * {@inheritDoc}
-       */
+      /** {@inheritDoc} */
       @Override
       public boolean passwordMatches(final ByteString password)
           throws DirectoryException
@@ -1941,7 +1895,7 @@
     private final ReadLock sharedLock = lock.readLock();
     private final WriteLock exclusiveLock = lock.writeLock();
 
-    // Current configuration.
+    /** Current configuration. */
     private LDAPPassThroughAuthenticationPolicyCfg cfg;
 
     private ConnectionFactory searchFactory;
@@ -1959,9 +1913,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public ConfigChangeResult applyConfigurationChange(
         final LDAPPassThroughAuthenticationPolicyCfg cfg)
@@ -1981,9 +1933,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public AuthenticationPolicyState createAuthenticationPolicyState(
         final Entry userEntry, final long time) throws DirectoryException
@@ -1994,9 +1944,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void finalizeAuthenticationPolicy()
     {
@@ -2014,9 +1962,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public DN getDN()
     {
@@ -2025,9 +1971,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isConfigurationChangeAcceptable(
         final LDAPPassThroughAuthenticationPolicyCfg cfg,
@@ -2165,32 +2109,29 @@
 
 
 
-  // Debug tracer for this class.
+  /** Debug tracer for this class. */
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  /**
-   * Attribute list for searches requesting no attributes.
-   */
-  static final LinkedHashSet<String> NO_ATTRIBUTES = new LinkedHashSet<String>(
-      1);
+  /** Attribute list for searches requesting no attributes. */
+  static final LinkedHashSet<String> NO_ATTRIBUTES = new LinkedHashSet<String>(1);
   static
   {
     NO_ATTRIBUTES.add(SchemaConstants.NO_ATTRIBUTES);
   }
 
-  // The provider which should be used by policies to create LDAP connections.
+  /** The provider which should be used by policies to create LDAP connections. */
   private final Provider provider;
 
   private ServerContext serverContext;
 
-  /**
-   * The default LDAP connection factory provider.
-   */
+  /** The default LDAP connection factory provider. */
   private static final Provider DEFAULT_PROVIDER = new Provider()
   {
 
-    // Global scheduler used for periodically monitoring connection factories in
-    // order to detect when they are online.
+    /**
+     * Global scheduler used for periodically monitoring connection factories in
+     * order to detect when they are online.
+     */
     private final ScheduledExecutorService scheduler = Executors
         .newScheduledThreadPool(2, new ThreadFactory()
         {
@@ -2275,17 +2216,16 @@
 
 
 
-//Get the search bind password performing mapped searches.
-  //
-  // We will offer several places to look for the password, and we will
-  // do so in the following order:
-  //
-  // - In a specified Java property
-  // - In a specified environment variable
-  // - In a specified file on the server filesystem.
-  // - As the value of a configuration attribute.
-  //
-  // In any case, the password must be in the clear.
+  /**
+   * Get the search bind password performing mapped searches.
+   * We will offer several places to look for the password, and we will
+   * do so in the following order:
+   * - In a specified Java property
+   * - In a specified environment variable
+   * - In a specified file on the server filesystem.
+   * - As the value of a configuration attribute.
+   * In any case, the password must be in the clear.
+   */
   private static String getMappedSearchBindPassword(
       final LDAPPassThroughAuthenticationPolicyCfg cfg,
       final List<LocalizableMessage> unacceptableReasons)
@@ -2437,9 +2377,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public AuthenticationPolicy createAuthenticationPolicy(
       final LDAPPassThroughAuthenticationPolicyCfg configuration)
@@ -2452,9 +2390,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
       final LDAPPassThroughAuthenticationPolicyCfg cfg,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
index d80c39c..a9cb37a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/LengthBasedPasswordValidator.java
@@ -49,7 +49,7 @@
     PasswordValidator<LengthBasedPasswordValidatorCfg> implements
     ConfigurationChangeListener<LengthBasedPasswordValidatorCfg>
 {
-  // The current configuration for this password validator.
+  /** The current configuration for this password validator. */
   private LengthBasedPasswordValidatorCfg currentConfig;
 
 
@@ -67,9 +67,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordValidator(
                    LengthBasedPasswordValidatorCfg configuration)
@@ -93,9 +91,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizePasswordValidator()
   {
@@ -104,9 +100,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
@@ -136,9 +130,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PasswordValidatorCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -150,9 +142,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       LengthBasedPasswordValidatorCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -174,9 +164,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
               LengthBasedPasswordValidatorCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
index 58cf4ea..9203a2a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java
@@ -71,10 +71,10 @@
 
 
 
-  // The message digest that will actually be used to generate the MD5 hashes.
+  /** The message digest that will actually be used to generate the MD5 hashes. */
   private MessageDigest messageDigest;
 
-  // The lock used to provide threadsafe access to the message digest.
+  /** The lock used to provide threadsafe access to the message digest. */
   private Object digestLock;
 
 
@@ -92,9 +92,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    MD5PasswordStorageSchemeCfg configuration)
@@ -118,9 +116,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
@@ -129,9 +125,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -168,9 +162,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -215,9 +207,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -265,9 +255,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -277,9 +265,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -291,9 +277,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -304,9 +288,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
@@ -315,9 +297,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -328,9 +308,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -343,9 +321,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
index 1636537..0116994 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/MemberVirtualAttributeProvider.java
@@ -62,7 +62,7 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The current configuration for this member virtual attribute.
+  /** The current configuration for this member virtual attribute. */
   private MemberVirtualAttributeCfg currentConfig;
 
 
@@ -80,9 +80,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeVirtualAttributeProvider(
                             MemberVirtualAttributeCfg configuration)
@@ -94,9 +92,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isMultiValued()
   {
@@ -105,9 +101,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
@@ -156,9 +150,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule)
   {
@@ -202,9 +194,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean hasValue(Entry entry, VirtualAttributeRule rule, ByteString value)
   {
@@ -229,9 +219,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConditionResult matchesSubstring(Entry entry,
                                           VirtualAttributeRule rule,
@@ -245,9 +233,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConditionResult greaterThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
@@ -259,9 +245,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConditionResult lessThanOrEqualTo(Entry entry,
                               VirtualAttributeRule rule,
@@ -273,9 +257,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConditionResult approximatelyEqualTo(Entry entry,
                               VirtualAttributeRule rule,
@@ -287,9 +269,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
@@ -300,9 +280,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
@@ -313,9 +291,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       MemberVirtualAttributeCfg configuration,
@@ -327,9 +303,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  MemberVirtualAttributeCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java
index 41e699b..ab4afe0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationMessageNotificationMessageTemplateElement.java
@@ -22,17 +22,13 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
-
-
 import org.forgerock.i18n.LocalizableMessageBuilder;
 import org.opends.server.types.AccountStatusNotification;
 
-
-
 /**
  * This class implements a notification message template element that will
  * generate a value that is the message for the account status notification.
@@ -50,9 +46,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void generateValue(LocalizableMessageBuilder buffer,
                             AccountStatusNotification notification)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java
index 90f7750..8793078 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationPropertyNotificationMessageTemplateElement.java
@@ -22,20 +22,16 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
-
-
 import java.util.List;
 
 import org.forgerock.i18n.LocalizableMessageBuilder;
 import org.opends.server.types.AccountStatusNotification;
 import org.opends.server.types.AccountStatusNotificationProperty;
 
-
-
 /**
  * This class implements a notification message template element that will
  * generate a value that is the value of a specified notification property.
@@ -43,7 +39,7 @@
 public class NotificationPropertyNotificationMessageTemplateElement
        extends NotificationMessageTemplateElement
 {
-  // The account status notification property for which to obtain the value.
+  /** The account status notification property for which to obtain the value. */
   private AccountStatusNotificationProperty property;
 
 
@@ -61,9 +57,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void generateValue(LocalizableMessageBuilder buffer,
                             AccountStatusNotification notification)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java
index 583cfe8..1cf4a04 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NotificationTypeNotificationMessageTemplateElement.java
@@ -22,17 +22,13 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
-
-
 import org.forgerock.i18n.LocalizableMessageBuilder;
 import org.opends.server.types.AccountStatusNotification;
 
-
-
 /**
  * This class implements a notification message template element that will
  * generate a value that is the name of the account status notification type.
@@ -50,9 +46,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void generateValue(LocalizableMessageBuilder buffer,
                             AccountStatusNotification notification)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java
index 3db9c7c..ae541bb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullKeyManagerProvider.java
@@ -22,12 +22,10 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
-
-
 import javax.net.ssl.KeyManager;
 
 import org.opends.server.admin.std.server.KeyManagerProviderCfg;
@@ -36,9 +34,6 @@
 import org.opends.server.types.DirectoryException;
 import org.opends.server.types.InitializationException;
 
-
-
-
 /**
  * This class provides an implementation of a key manager provider that does not
  * actually have the ability to provide a key manager.  It will be used when no
@@ -61,9 +56,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeKeyManagerProvider(
       KeyManagerProviderCfg configuration) throws ConfigException,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java
index 5ba2a99..1ff5510 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/NullTrustManagerProvider.java
@@ -22,12 +22,10 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
-
-
 import javax.net.ssl.TrustManager;
 
 import org.opends.server.admin.std.server.TrustManagerProviderCfg;
@@ -36,9 +34,6 @@
 import org.opends.server.types.DirectoryException;
 import org.opends.server.types.InitializationException;
 
-
-
-
 /**
  * This class provides an implementation of a trust manager provider that does
  * not actually have the ability to provide a trust manager.  It will be used
@@ -60,9 +55,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeTrustManagerProvider(
                      TrustManagerProviderCfg configuration)
          throws ConfigException, InitializationException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
index 8ffa9c0..49ba85d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java
@@ -74,13 +74,13 @@
 
 
 
-  // The DN of the configuration entry for this key manager provider.
+  /** The DN of the configuration entry for this key manager provider. */
   private DN configEntryDN;
 
-  // The PIN needed to access the keystore.
+  /** The PIN needed to access the keystore. */
   private char[] keyStorePIN;
 
-  // The current configuration for this key manager provider.
+  /** The current configuration for this key manager provider. */
   private PKCS11KeyManagerProviderCfg currentConfig;
 
 
@@ -97,9 +97,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeKeyManagerProvider(
                     PKCS11KeyManagerProviderCfg configuration)
@@ -244,9 +242,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
                         PKCS11KeyManagerProviderCfg configuration,
@@ -257,9 +253,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       PKCS11KeyManagerProviderCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -357,9 +351,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                                  PKCS11KeyManagerProviderCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
index 84ce381..200c5a9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkQueue.java
@@ -120,9 +120,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeWorkQueue(ParallelWorkQueueCfg configuration)
          throws ConfigException, InitializationException
@@ -171,9 +169,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeWorkQueue(LocalizableMessage reason)
   {
@@ -465,9 +461,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       ParallelWorkQueueCfg configuration,
@@ -478,9 +472,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  ParallelWorkQueueCfg configuration)
@@ -527,9 +519,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isIdle()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
index e0c6e29..1c8f816 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/PlainSASLMechanismHandler.java
@@ -89,9 +89,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeSASLMechanismHandler(
                    PlainSASLMechanismHandlerCfg configuration)
@@ -111,9 +109,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeSASLMechanismHandler()
   {
@@ -124,9 +120,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processSASLBind(BindOperation bindOperation)
   {
@@ -499,9 +493,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isPasswordBased(String mechanism)
   {
@@ -511,9 +503,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isSecure(String mechanism)
   {
@@ -523,9 +513,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
                       SASLMechanismHandlerCfg configuration,
@@ -538,9 +526,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       PlainSASLMechanismHandlerCfg configuration,
@@ -551,9 +537,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
               PlainSASLMechanismHandlerCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
index 8026e7e..8f3ef2c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java
@@ -60,8 +60,10 @@
 
 
 
-  // The reference to the Directory Server crypto manager that we will use to
-  // handle the encryption/decryption.
+  /**
+   * The reference to the Directory Server crypto manager that we will use to
+   * handle the encryption/decryption.
+   */
   private CryptoManager cryptoManager;
 
 
@@ -78,9 +80,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    RC4PasswordStorageSchemeCfg configuration)
@@ -91,9 +91,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
@@ -102,9 +100,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -137,9 +133,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -179,9 +173,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -203,9 +195,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
@@ -214,9 +204,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -240,9 +228,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -252,9 +238,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -266,9 +250,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -279,9 +261,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -294,9 +274,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
index 092721f..aef6bb3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java
@@ -60,37 +60,39 @@
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
 
-  // The current configuration for this password validator.
+  /** The current configuration for this password validator. */
   private RandomPasswordGeneratorCfg currentConfig;
 
-  // The encoded list of character sets defined for this password generator.
+  /** The encoded list of character sets defined for this password generator. */
   private SortedSet<String> encodedCharacterSets;
 
-  // The DN of the configuration entry for this password generator.
+  /** The DN of the configuration entry for this password generator. */
   private DN configEntryDN;
 
-  // The total length of the password that will be generated.
+  /** The total length of the password that will be generated. */
   private int totalLength;
 
-  // The numbers of characters of each type that should be used to generate the
-  // passwords.
+  /**
+   * The numbers of characters of each type that should be used to generate the
+   * passwords.
+   */
   private int[] characterCounts;
 
-  // The character sets that should be used to generate the passwords.
+  /** The character sets that should be used to generate the passwords. */
   private NamedCharacterSet[] characterSets;
 
-  // The lock to use to ensure that the character sets and counts are not
-  // altered while a password is being generated.
+  /**
+   * The lock to use to ensure that the character sets and counts are not
+   * altered while a password is being generated.
+   */
   private Object generatorLock;
 
-  // The character set format string for this password generator.
+  /** The character set format string for this password generator. */
   private String formatString;
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordGenerator(
       RandomPasswordGeneratorCfg configuration)
@@ -216,9 +218,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizePasswordGenerator()
   {
@@ -258,9 +258,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PasswordGeneratorCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -272,9 +270,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       RandomPasswordGeneratorCfg configuration,
@@ -374,9 +370,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       RandomPasswordGeneratorCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java
index ebd93f7..80b3338 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RedirectingByteChannel.java
@@ -69,9 +69,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void close() throws IOException
   {
     final ByteChannel tmp = redirect;
@@ -97,9 +95,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isOpen()
   {
     final ByteChannel tmp = redirect;
@@ -115,9 +111,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int read(final ByteBuffer buffer) throws IOException
   {
     final ByteChannel tmp = redirect;
@@ -147,9 +141,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public int write(final ByteBuffer buffer) throws IOException
   {
     final ByteChannel tmp = redirect;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
index e364e8f..5b38097 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RegularExpressionIdentityMapper.java
@@ -73,22 +73,22 @@
        implements ConfigurationChangeListener<
                        RegularExpressionIdentityMapperCfg>
 {
-  // The set of attribute types to use when performing lookups.
+  /** The set of attribute types to use when performing lookups. */
   private AttributeType[] attributeTypes;
 
-  // The DN of the configuration entry for this identity mapper.
+  /** The DN of the configuration entry for this identity mapper. */
   private DN configEntryDN;
 
-  // The set of attributes to return in search result entries.
+  /** The set of attributes to return in search result entries. */
   private LinkedHashSet<String> requestedAttributes;
 
-  // The regular expression pattern matcher for the current configuration.
+  /** The regular expression pattern matcher for the current configuration. */
   private Pattern matchPattern;
 
-  // The current configuration for this identity mapper.
+  /** The current configuration for this identity mapper. */
   private RegularExpressionIdentityMapperCfg currentConfig;
 
-  // The replacement string to use for the pattern.
+  /** The replacement string to use for the pattern. */
   private String replacePattern;
 
 
@@ -107,9 +107,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeIdentityMapper(
                    RegularExpressionIdentityMapperCfg configuration)
@@ -172,9 +170,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeIdentityMapper()
   {
@@ -183,9 +179,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Entry getEntryForID(String id)
          throws DirectoryException
@@ -298,9 +292,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(IdentityMapperCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -312,9 +304,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       RegularExpressionIdentityMapperCfg configuration,
@@ -362,9 +352,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
               RegularExpressionIdentityMapperCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
index 6c191a6..3631c63 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/RepeatedCharactersPasswordValidator.java
@@ -52,7 +52,7 @@
        implements ConfigurationChangeListener<
                        RepeatedCharactersPasswordValidatorCfg>
 {
-  // The current configuration for this password validator.
+  /** The current configuration for this password validator. */
   private RepeatedCharactersPasswordValidatorCfg currentConfig;
 
 
@@ -70,9 +70,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordValidator(
                    RepeatedCharactersPasswordValidatorCfg configuration)
@@ -83,9 +81,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizePasswordValidator()
   {
@@ -94,9 +90,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
@@ -158,9 +152,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       RepeatedCharactersPasswordValidatorCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -172,9 +164,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                       RepeatedCharactersPasswordValidatorCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLByteChannel.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLByteChannel.java
index a170b66..673527a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLByteChannel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLByteChannel.java
@@ -22,13 +22,10 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2012 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
-
 package org.opends.server.extensions;
 
-
-
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ByteChannel;
@@ -36,8 +33,6 @@
 
 import org.opends.server.api.ClientConnection;
 
-
-
 /**
  * This class implements a SASL byte channel that can be used during
  * confidentiality and integrity.
@@ -45,15 +40,11 @@
 public final class SASLByteChannel implements ConnectionSecurityProvider
 {
 
-  /**
-   * Private implementation.
-   */
+  /** Private implementation. */
   private final class ByteChannelImpl implements ByteChannel
   {
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void close() throws IOException
     {
@@ -69,9 +60,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isOpen()
     {
@@ -80,9 +69,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int read(final ByteBuffer unwrappedData) throws IOException
     {
@@ -122,9 +109,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int write(final ByteBuffer unwrappedData) throws IOException
     {
@@ -181,7 +166,7 @@
 
 
 
-    // Attempt to read and unwrap the next SASL packet.
+    /** Attempt to read and unwrap the next SASL packet. */
     private int doRecvAndUnwrap() throws IOException
     {
       // Read SASL packets until some unwrapped data is produced or no more
@@ -335,9 +320,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteChannel getChannel()
   {
@@ -346,9 +329,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Certificate[] getClientCertificateChain()
   {
@@ -357,9 +338,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getName()
   {
@@ -368,9 +347,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public int getSSF()
   {
@@ -379,9 +356,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java
index 1888af0..b667f68 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java
@@ -96,40 +96,40 @@
 
 
 
-  // The SASL server to use in the authentication.
+  /** The SASL server to use in the authentication. */
   private SaslServer saslServer;
 
-  // The identity mapper to use when mapping identities.
+  /** The identity mapper to use when mapping identities. */
   private final IdentityMapper<?> identityMapper;
 
-  // The property set to use when creating the SASL server.
+  /** The property set to use when creating the SASL server. */
   private final HashMap<String, String> saslProps;
 
-  // The fully qualified domain name to use when creating the SASL server.
+  /** The fully qualified domain name to use when creating the SASL server. */
   private final String serverFQDN;
 
-  // The SASL mechanism name.
+  /** The SASL mechanism name. */
   private final String mechanism;
 
-  // The authorization entry used in the authentication.
+  /** The authorization entry used in the authentication. */
   private Entry authEntry;
 
-  // The authorization entry used in the authentication.
+  /** The authorization entry used in the authentication. */
   private Entry authzEntry;
 
-  // The user name used in the authentication taken from the name callback.
+  /** The user name used in the authentication taken from the name callback. */
   private String userName;
 
-  // Error message used by callbacks.
+  /** Error message used by callbacks. */
   private LocalizableMessage cbMsg;
 
-  // Error code used by callbacks.
+  /** Error code used by callbacks. */
   private ResultCode cbResultCode;
 
-  // The current bind operation used by the callbacks.
+  /** The current bind operation used by the callbacks. */
   private BindOperation bindOp;
 
-  // Used to check if negotiated QOP is confidentiality or integrity.
+  /** Used to check if negotiated QOP is confidentiality or integrity. */
   private static final String confidentiality = "auth-conf";
   private static final String integrity = "auth-int";
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
index 01e77a2..6832ec4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java
@@ -71,10 +71,10 @@
 
 
 
-  // The message digest that will actually be used to generate the SHA-1 hashes.
+  /** The message digest that will actually be used to generate the SHA-1 hashes. */
   private MessageDigest messageDigest;
 
-  // The lock used to provide threadsafe access to the message digest.
+  /** The lock used to provide threadsafe access to the message digest. */
   private Object digestLock;
 
 
@@ -91,9 +91,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    SHA1PasswordStorageSchemeCfg configuration)
@@ -117,9 +115,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
@@ -128,9 +124,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -167,9 +161,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -213,9 +205,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -263,9 +253,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -275,9 +263,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -289,9 +275,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -302,9 +286,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
@@ -313,9 +295,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -327,9 +307,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -342,9 +320,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
index bb5035d..b1bbcbf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java
@@ -98,14 +98,14 @@
 
 
 
-  // A mapping between the notification types and the message template.
+  /** A mapping between the notification types and the message template. */
   private HashMap<AccountStatusNotificationType,
                   List<NotificationMessageTemplateElement>> templateMap;
 
-  // A mapping between the notification types and the message subject.
+  /** A mapping between the notification types and the message subject. */
   private HashMap<AccountStatusNotificationType,String> subjectMap;
 
-  // The current configuration for this account status notification handler.
+  /** The current configuration for this account status notification handler. */
   private SMTPAccountStatusNotificationHandlerCfg currentConfig;
 
 
@@ -121,9 +121,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeStatusNotificationHandler(
                    SMTPAccountStatusNotificationHandlerCfg configuration)
@@ -477,9 +475,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
                       AccountStatusNotificationHandlerCfg
@@ -493,9 +489,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void handleStatusNotification(AccountStatusNotification notification)
   {
@@ -659,9 +653,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       SMTPAccountStatusNotificationHandlerCfg configuration,
@@ -720,9 +712,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
               SMTPAccountStatusNotificationHandlerCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java
index db6b721..2bb5b3a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java
@@ -60,7 +60,7 @@
 
 
 
-  // The current configuration for this alert handler.
+  /** The current configuration for this alert handler. */
   private SMTPAlertHandlerCfg currentConfig;
 
 
@@ -77,9 +77,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeAlertHandler(SMTPAlertHandlerCfg configuration)
        throws ConfigException, InitializationException
   {
@@ -98,9 +96,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public AlertHandlerCfg getAlertHandlerConfiguration()
   {
     return currentConfig;
@@ -108,9 +104,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationAcceptable(AlertHandlerCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
   {
@@ -119,9 +113,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void finalizeAlertHandler()
   {
     // No action is required.
@@ -129,9 +121,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void sendAlertNotification(AlertGenerator generator, String alertType,
                                     LocalizableMessage alertMessage)
   {
@@ -205,9 +195,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       SMTPAlertHandlerCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -217,9 +205,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                                  SMTPAlertHandlerCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
index e539210..0398cbc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java
@@ -80,17 +80,17 @@
    */
   private static final int NUM_SALT_BYTES = 8;
 
-  // The number of bytes MD5 algorithm produces
+  /** The number of bytes MD5 algorithm produces. */
   private static final int MD5_LENGTH = 16;
 
 
-  // The message digest that will actually be used to generate the MD5 hashes.
+  /** The message digest that will actually be used to generate the MD5 hashes. */
   private MessageDigest messageDigest;
 
-  // The lock used to provide threadsafe access to the message digest.
+  /** The lock used to provide threadsafe access to the message digest. */
   private Object digestLock;
 
-  // The secure random number generator to use to generate the salt values.
+  /** The secure random number generator to use to generate the salt values. */
   private Random random;
 
 
@@ -107,9 +107,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    SaltedMD5PasswordStorageSchemeCfg configuration)
@@ -134,9 +132,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
@@ -145,9 +141,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -199,9 +193,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -259,9 +251,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -325,9 +315,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -337,9 +325,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getAuthPasswordSchemeName()
   {
@@ -348,9 +334,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -404,9 +388,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -448,9 +430,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
@@ -459,9 +439,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -473,9 +451,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -488,9 +464,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
index 6f69e5f..8f6f4d5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java
@@ -80,17 +80,17 @@
    */
   private static final int NUM_SALT_BYTES = 8;
 
-  // The number of bytes SHA algorithm produces
+  /** The number of bytes SHA algorithm produces. */
   private static final int SHA1_LENGTH = 20;
 
 
-  // The message digest that will actually be used to generate the SHA-1 hashes.
+  /** The message digest that will actually be used to generate the SHA-1 hashes. */
   private MessageDigest messageDigest;
 
-  // The lock used to provide threadsafe access to the message digest.
+  /** The lock used to provide threadsafe access to the message digest. */
   private Object digestLock;
 
-  // The secure random number generator to use to generate the salt values.
+  /** The secure random number generator to use to generate the salt values. */
   private Random random;
 
 
@@ -107,9 +107,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    SaltedSHA1PasswordStorageSchemeCfg configuration)
@@ -133,9 +131,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
@@ -144,9 +140,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -198,9 +192,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -258,9 +250,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -324,9 +314,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -336,9 +324,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getAuthPasswordSchemeName()
   {
@@ -347,9 +333,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -403,9 +387,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -447,9 +429,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
@@ -458,9 +438,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -472,9 +450,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -487,9 +463,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
index c6aa9bf..af39d72 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java
@@ -80,17 +80,19 @@
    */
   private static final int NUM_SALT_BYTES = 8;
 
-  // Size of the dgiest in bytes.
+  /** Size of the dgiest in bytes. */
   private static final int SHA256_LENGTH = 256 / 8;
 
-  // The message digest that will actually be used to generate the 256-bit SHA-2
-  // hashes.
+  /**
+   * The message digest that will actually be used to generate the 256-bit SHA-2
+   * hashes.
+   */
   private MessageDigest messageDigest;
 
-  // The lock used to provide threadsafe access to the message digest.
+  /** The lock used to provide threadsafe access to the message digest. */
   private Object digestLock;
 
-  // The secure random number generator to use to generate the salt values.
+  /** The secure random number generator to use to generate the salt values. */
   private Random random;
 
 
@@ -107,9 +109,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    SaltedSHA256PasswordStorageSchemeCfg configuration)
@@ -136,9 +136,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
@@ -147,9 +145,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -201,9 +197,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -261,9 +255,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -329,9 +321,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -341,9 +331,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getAuthPasswordSchemeName()
   {
@@ -352,9 +340,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -408,9 +394,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -452,9 +436,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
@@ -463,9 +445,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -477,9 +457,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -492,9 +470,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
index 76a52f3..e3f4b78 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java
@@ -81,17 +81,19 @@
   private static final int NUM_SALT_BYTES = 8;
 
 
-  // The size of the digest in bytes.
+  /** The size of the digest in bytes. */
   private static final int SHA384_LENGTH = 384 / 8;
 
-  // The message digest that will actually be used to generate the 384-bit SHA-2
-  // hashes.
+  /**
+   * The message digest that will actually be used to generate the 384-bit SHA-2
+   * hashes.
+   */
   private MessageDigest messageDigest;
 
-  // The lock used to provide threadsafe access to the message digest.
+  /** The lock used to provide threadsafe access to the message digest. */
   private Object digestLock;
 
-  // The secure random number generator to use to generate the salt values.
+  /** The secure random number generator to use to generate the salt values. */
   private Random random;
 
 
@@ -108,9 +110,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    SaltedSHA384PasswordStorageSchemeCfg configuration)
@@ -137,9 +137,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
@@ -148,9 +146,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -202,9 +198,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -262,9 +256,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -330,9 +322,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -342,9 +332,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getAuthPasswordSchemeName()
   {
@@ -353,9 +341,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -409,9 +395,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -453,9 +437,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
@@ -464,9 +446,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -478,9 +458,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -493,9 +471,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
index dfa26c5..032f07e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java
@@ -81,17 +81,19 @@
   private static final int NUM_SALT_BYTES = 8;
 
 
-  // The size of the digest in bytes.
+  /** The size of the digest in bytes. */
   private static final int SHA512_LENGTH = 512 / 8;
 
-  // The message digest that will actually be used to generate the 512-bit SHA-2
-  // hashes.
+  /**
+   * The message digest that will actually be used to generate the 512-bit SHA-2
+   * hashes.
+   */
   private MessageDigest messageDigest;
 
-  // The lock used to provide threadsafe access to the message digest.
+  /** The lock used to provide threadsafe access to the message digest. */
   private Object digestLock;
 
-  // The secure random number generator to use to generate the salt values.
+  /** The secure random number generator to use to generate the salt values. */
   private Random random;
 
 
@@ -108,9 +110,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    SaltedSHA512PasswordStorageSchemeCfg configuration)
@@ -136,9 +136,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
@@ -147,9 +145,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -201,9 +197,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -261,9 +255,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -329,9 +321,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -341,9 +331,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getAuthPasswordSchemeName()
   {
@@ -352,9 +340,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -408,9 +394,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -452,9 +436,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
@@ -463,9 +445,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -477,9 +457,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -492,9 +470,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
index e8e2cbd..5dbfb9a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SimilarityBasedPasswordValidator.java
@@ -51,7 +51,7 @@
     ConfigurationChangeListener<SimilarityBasedPasswordValidatorCfg>
 {
 
-  // The current configuration for this password validator.
+  /** The current configuration for this password validator. */
   private SimilarityBasedPasswordValidatorCfg currentConfig;
 
 
@@ -67,9 +67,7 @@
     // method.
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordValidator(
                    SimilarityBasedPasswordValidatorCfg configuration)
@@ -80,9 +78,7 @@
     currentConfig = configuration;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizePasswordValidator()
   {
@@ -91,9 +87,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
@@ -131,9 +125,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       SimilarityBasedPasswordValidatorCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -141,9 +133,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
               SimilarityBasedPasswordValidatorCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
index 55f23a2..f6a68aa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapper.java
@@ -84,16 +84,16 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The DN of the configuration entry for this certificate mapper.
+  /** The DN of the configuration entry for this certificate mapper. */
   private DN configEntryDN;
 
-  // The mappings between certificate attribute names and user attribute types.
+  /** The mappings between certificate attribute names and user attribute types. */
   private LinkedHashMap<String,AttributeType> attributeMap;
 
-  // The current configuration for this certificate mapper.
+  /** The current configuration for this certificate mapper. */
   private SubjectAttributeToUserAttributeCertificateMapperCfg currentConfig;
 
-  // The set of attributes to return in search result entries.
+  /** The set of attributes to return in search result entries. */
   private LinkedHashSet<String> requestedAttributes;
 
 
@@ -109,9 +109,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeCertificateMapper(
                    SubjectAttributeToUserAttributeCertificateMapperCfg
@@ -203,9 +201,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeCertificateMapper()
   {
@@ -215,9 +211,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Entry mapCertificateToUser(Certificate[] certificateChain)
          throws DirectoryException
@@ -368,9 +362,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(CertificateMapperCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -382,9 +374,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
               SubjectAttributeToUserAttributeCertificateMapperCfg
@@ -455,9 +445,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
               SubjectAttributeToUserAttributeCertificateMapperCfg
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
index 533f7bb..664d7b9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapper.java
@@ -71,13 +71,13 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The DN of the configuration entry for this certificate mapper.
+  /** The DN of the configuration entry for this certificate mapper. */
   private DN configEntryDN;
 
-  // The current configuration for this certificate mapper.
+  /** The current configuration for this certificate mapper. */
   private SubjectDNToUserAttributeCertificateMapperCfg currentConfig;
 
-  // The set of attributes to return in search result entries.
+  /** The set of attributes to return in search result entries. */
   private LinkedHashSet<String> requestedAttributes;
 
 
@@ -93,9 +93,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeCertificateMapper(
                    SubjectDNToUserAttributeCertificateMapperCfg
@@ -136,9 +134,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeCertificateMapper()
   {
@@ -147,9 +143,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Entry mapCertificateToUser(Certificate[] certificateChain)
          throws DirectoryException
@@ -264,9 +258,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(CertificateMapperCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -278,9 +270,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       SubjectDNToUserAttributeCertificateMapperCfg
@@ -292,9 +282,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
               SubjectDNToUserAttributeCertificateMapperCfg
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
index 03ebd82..df6a1b1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SubjectEqualsDNCertificateMapper.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -67,9 +67,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeCertificateMapper(SubjectEqualsDNCertificateMapperCfg
                                                configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java
index 3f09a9f..65d78d4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TLSByteChannel.java
@@ -59,9 +59,7 @@
   private final class ByteChannelImpl implements ByteChannel
   {
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void close() throws IOException
     {
@@ -112,9 +110,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isOpen()
     {
@@ -123,9 +119,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int read(final ByteBuffer unwrappedData) throws IOException
     {
@@ -165,9 +159,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int write(final ByteBuffer unwrappedData) throws IOException
     {
@@ -196,8 +188,10 @@
 
 
 
-    // It seems that the SSL engine does not remember if an error has already
-    // occurred so we must cache it here and rethrow. See OPENDJ-652.
+    /**
+     * It seems that the SSL engine does not remember if an error has already
+     * occurred so we must cache it here and rethrow. See OPENDJ-652.
+     */
     private void abortOnSSLException() throws IOException
     {
       if (sslException != null)
@@ -252,7 +246,7 @@
 
 
 
-    // Attempt to read and unwrap the next SSL packet.
+    /** Attempt to read and unwrap the next SSL packet. */
     private int doRecvAndUnwrap() throws IOException
     {
       // Synchronize SSL unwrap with channel reads.
@@ -341,7 +335,7 @@
 
 
 
-    // Attempt to wrap and send the next SSL packet.
+    /** Attempt to wrap and send the next SSL packet. */
     private int doWrapAndSend(final ByteBuffer unwrappedData)
         throws IOException
     {
@@ -494,9 +488,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteChannel getChannel()
   {
@@ -505,9 +497,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Certificate[] getClientCertificateChain()
   {
@@ -524,9 +514,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getName()
   {
@@ -535,9 +523,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public int getSSF()
   {
@@ -572,9 +558,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TextNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TextNotificationMessageTemplateElement.java
index ea66855..4101f91 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TextNotificationMessageTemplateElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TextNotificationMessageTemplateElement.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.extensions;
 
@@ -40,7 +40,7 @@
 public class TextNotificationMessageTemplateElement
        extends NotificationMessageTemplateElement
 {
-  // The static text associated with this element.
+  /** The static text associated with this element. */
   private final String text;
 
 
@@ -58,9 +58,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void generateValue(LocalizableMessageBuilder buffer,
                             AccountStatusNotification notification)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
index ec91131..caa270a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkQueue.java
@@ -156,9 +156,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeWorkQueue(TraditionalWorkQueueCfg configuration)
       throws ConfigException, InitializationException
@@ -224,9 +222,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeWorkQueue(LocalizableMessage reason)
   {
@@ -642,9 +638,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       TraditionalWorkQueueCfg configuration, List<LocalizableMessage> unacceptableReasons)
@@ -654,9 +648,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       TraditionalWorkQueueCfg configuration)
@@ -778,9 +770,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isIdle()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
index 17c2966..22b30dd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java
@@ -61,8 +61,10 @@
 
 
 
-  // The reference to the Directory Server crypto manager that we will use to
-  // handle the encryption/decryption.
+  /**
+   * The reference to the Directory Server crypto manager that we will use to
+   * handle the encryption/decryption.
+   */
   private CryptoManager cryptoManager;
 
 
@@ -79,9 +81,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordStorageScheme(
                    TripleDESPasswordStorageSchemeCfg configuration)
@@ -92,9 +92,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getStorageSchemeName()
   {
@@ -103,9 +101,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePassword(ByteSequence plaintext)
          throws DirectoryException
@@ -138,9 +134,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodePasswordWithScheme(ByteSequence plaintext)
          throws DirectoryException
@@ -180,9 +174,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordMatches(ByteSequence plaintextPassword,
                                  ByteSequence storedPassword)
@@ -204,9 +196,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isReversible()
   {
@@ -215,9 +205,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getPlaintextValue(ByteSequence storedPassword)
          throws DirectoryException
@@ -241,9 +229,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsAuthPasswordSyntax()
   {
@@ -253,9 +239,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString encodeAuthPassword(ByteSequence plaintext)
          throws DirectoryException
@@ -267,9 +251,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean authPasswordMatches(ByteSequence plaintextPassword,
                                      String authInfo, String authValue)
@@ -280,9 +262,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ByteString getAuthPasswordPlaintextValue(String authInfo,
                                                   String authValue)
@@ -295,9 +275,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isStorageSchemeSecure()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
index 0d0d473..ff427e9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UniqueCharactersPasswordValidator.java
@@ -51,7 +51,7 @@
        implements ConfigurationChangeListener<
                        UniqueCharactersPasswordValidatorCfg>
 {
-  // The current configuration for this password validator.
+  /** The current configuration for this password validator. */
   private UniqueCharactersPasswordValidatorCfg currentConfig;
 
 
@@ -69,9 +69,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePasswordValidator(
                    UniqueCharactersPasswordValidatorCfg configuration)
@@ -82,9 +80,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizePasswordValidator()
   {
@@ -93,9 +89,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean passwordIsAcceptable(ByteString newPassword,
                                       Set<ByteString> currentPasswords,
@@ -147,9 +141,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       UniqueCharactersPasswordValidatorCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -161,9 +153,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                       UniqueCharactersPasswordValidatorCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java
index 8381728..aa2993d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserAttributeNotificationMessageTemplateElement.java
@@ -47,7 +47,7 @@
 public class UserAttributeNotificationMessageTemplateElement
        extends NotificationMessageTemplateElement
 {
-  // The attribute type for which to obtain the value.
+  /** The attribute type for which to obtain the value. */
   private AttributeType attributeType;
 
 
@@ -65,9 +65,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void generateValue(LocalizableMessageBuilder buffer,
                             AccountStatusNotification notification)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java
index 1dc674a..187a706 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDNNotificationMessageTemplateElement.java
@@ -50,9 +50,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void generateValue(LocalizableMessageBuilder buffer,
                             AccountStatusNotification notification)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
index 9659d10..ff90b66 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/UserDefinedVirtualAttributeProvider.java
@@ -50,7 +50,7 @@
        extends VirtualAttributeProvider<UserDefinedVirtualAttributeCfg>
        implements ConfigurationChangeListener<UserDefinedVirtualAttributeCfg>
 {
-  // The current configuration for this virtual attribute provider.
+  /** The current configuration for this virtual attribute provider. */
   private UserDefinedVirtualAttributeCfg currentConfig;
 
 
@@ -68,9 +68,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeVirtualAttributeProvider(
                             UserDefinedVirtualAttributeCfg configuration)
@@ -82,9 +80,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeVirtualAttributeProvider()
   {
@@ -93,9 +89,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isMultiValued()
   {
@@ -104,9 +98,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Attribute getValues(Entry entry, VirtualAttributeRule rule)
   {
@@ -130,9 +122,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isSearchable(VirtualAttributeRule rule,
                               SearchOperation searchOperation,
@@ -144,9 +134,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processSearch(VirtualAttributeRule rule,
                             SearchOperation searchOperation)
@@ -157,9 +145,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       UserDefinedVirtualAttributeCfg configuration,
@@ -171,9 +157,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  UserDefinedVirtualAttributeCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
index 47622ab..cfc8687 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java
@@ -68,10 +68,10 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The DN of the entry that holds the definition for this group.
+  /** The DN of the entry that holds the definition for this group. */
   private DN groupEntryDN;
 
-  // The DN of the target group that will provide membership information.
+  /** The DN of the target group that will provide membership information. */
   private DN targetGroupDN;
 
 
@@ -110,9 +110,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeGroupImplementation(
                    VirtualStaticGroupImplementationCfg configuration)
@@ -124,9 +122,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public VirtualStaticGroup newInstance(ServerContext serverContext, Entry groupEntry)
          throws DirectoryException
@@ -179,9 +175,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public SearchFilter getGroupDefinitionFilter()
          throws DirectoryException
@@ -194,9 +188,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isGroupDefinition(Entry entry)
   {
@@ -211,9 +203,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public DN getGroupDN()
   {
@@ -222,9 +212,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void setGroupDN(DN groupDN)
   {
@@ -245,9 +233,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean supportsNestedGroups()
   {
@@ -257,9 +243,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public List<DN> getNestedGroupDNs()
   {
@@ -269,9 +253,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void addNestedGroup(DN nestedGroupDN)
          throws UnsupportedOperationException, DirectoryException
@@ -283,9 +265,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void removeNestedGroup(DN nestedGroupDN)
          throws UnsupportedOperationException, DirectoryException
@@ -297,9 +277,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isMember(DN userDN, Set<DN> examinedGroups)
          throws DirectoryException
@@ -329,9 +307,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isMember(Entry userEntry, Set<DN> examinedGroups)
          throws DirectoryException
@@ -361,9 +337,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public MemberList getMembers()
          throws DirectoryException
@@ -388,9 +362,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public MemberList getMembers(DN baseDN, SearchScope scope,
                                SearchFilter filter)
@@ -416,9 +388,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean mayAlterMemberList()
   {
@@ -427,9 +397,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void addMember(Entry userEntry)
          throws UnsupportedOperationException, DirectoryException
@@ -441,9 +409,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void removeMember(DN userDN)
          throws UnsupportedOperationException, DirectoryException
@@ -455,9 +421,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void toString(StringBuilder buffer)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java
index 39ddaad..b16793e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java
@@ -233,9 +233,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(C config,
       List<LocalizableMessage> unacceptableReasons)
@@ -244,9 +242,7 @@
         isJavaClassAcceptable(config, unacceptableReasons);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(C config,
       List<LocalizableMessage> unacceptableReasons)
@@ -255,9 +251,7 @@
         isJavaClassAcceptable(config, unacceptableReasons);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(C config)
   {
@@ -300,9 +294,7 @@
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(C config)
   {
@@ -342,9 +334,7 @@
     return ccr;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(C config,
       List<LocalizableMessage> unacceptableReasons)
@@ -352,9 +342,7 @@
     return findLogPublisher(config.dn()) != null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(C config)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
index cfc1411..7f7380c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
@@ -216,9 +216,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isConnectLoggable(final ClientConnection connection)
     {
@@ -227,9 +225,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isDisconnectLoggable(final ClientConnection connection)
     {
@@ -240,9 +236,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isRequestLoggable(final Operation operation)
     {
@@ -260,9 +254,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isResponseLoggable(final Operation operation)
     {
@@ -702,9 +694,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isConnectLoggable(final ClientConnection connection)
     {
@@ -721,9 +711,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isDisconnectLoggable(final ClientConnection connection)
     {
@@ -740,9 +728,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isRequestLoggable(final Operation operation)
     {
@@ -759,9 +745,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isResponseLoggable(final Operation operation)
     {
@@ -817,9 +801,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isConnectLoggable(final ClientConnection connection)
     {
@@ -843,9 +825,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isDisconnectLoggable(final ClientConnection connection)
     {
@@ -869,9 +849,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isRequestLoggable(final Operation operation)
     {
@@ -895,9 +873,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isResponseLoggable(final Operation operation)
     {
@@ -950,9 +926,7 @@
   private final class ChangeListener implements
       ConfigurationChangeListener<AccessLogPublisherCfg>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public final ConfigChangeResult applyConfigurationChange(
         final AccessLogPublisherCfg configuration)
@@ -968,9 +942,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public final boolean isConfigurationChangeAcceptable(
         final AccessLogPublisherCfg configuration,
@@ -991,9 +963,7 @@
       ConfigurationDeleteListener<AccessLogFilteringCriteriaCfg>
   {
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public ConfigChangeResult applyConfigurationAdd(
         final AccessLogFilteringCriteriaCfg configuration)
@@ -1006,9 +976,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public ConfigChangeResult applyConfigurationChange(
         final AccessLogFilteringCriteriaCfg configuration)
@@ -1020,9 +988,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public ConfigChangeResult applyConfigurationDelete(
         final AccessLogFilteringCriteriaCfg configuration)
@@ -1034,9 +1000,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isConfigurationAddAcceptable(
         final AccessLogFilteringCriteriaCfg configuration,
@@ -1047,9 +1011,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isConfigurationChangeAcceptable(
         final AccessLogFilteringCriteriaCfg configuration,
@@ -1060,9 +1022,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public boolean isConfigurationDeleteAcceptable(
         final AccessLogFilteringCriteriaCfg configuration,
@@ -1104,9 +1064,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void close()
   {
@@ -1139,9 +1097,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final DN getDN()
   {
@@ -1303,7 +1259,7 @@
 
 
 
-  // Build an appropriate set of filters based on the configuration.
+  /** Build an appropriate set of filters based on the configuration. */
   private void buildFilters()
   {
     buildFilters(cfg.isSuppressInternalOperations(),
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AsynchronousTextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AsynchronousTextWriter.java
index 7ae4bb6..a34a1e0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AsynchronousTextWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AsynchronousTextWriter.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.loggers;
 
@@ -99,7 +99,7 @@
     }
 
     /**
-     * the run method of the writerThread. Run until queue is empty
+     * The run method of the writerThread. Run until queue is empty
      * AND we've been asked to terminate
      */
     @Override
@@ -179,18 +179,14 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void flush()
   {
     writer.flush();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public long getBytesWritten()
   {
@@ -207,18 +203,14 @@
     return writer;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getShutdownListenerName()
   {
     return "AsynchronousTextWriter Thread " + name;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processServerShutdown(LocalizableMessage reason)
   {
@@ -228,9 +220,7 @@
     shutdown(false);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void shutdown()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java
index 813e678..85ff6ab 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ConsoleDebugLogPublisher.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.loggers;
 
@@ -64,18 +64,14 @@
     this.err = err;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeLogPublisher(DebugLogPublisherCfg config, ServerContext serverContext)
       throws ConfigException, InitializationException {
     // This publisher is not configurable.
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void trace(TraceSettings settings,
                            String signature,
@@ -91,9 +87,7 @@
     publish(msg, stack);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void traceException(TraceSettings settings,
                           String signature,
@@ -114,9 +108,7 @@
     publish(message, stack);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void close()
   {
@@ -124,8 +116,10 @@
   }
 
 
-  // Publishes a record, optionally performing some "special" work:
-  // - injecting a stack trace into the message
+  /**
+   * Publishes a record, optionally performing some "special" work:
+   * - injecting a stack trace into the message
+   */
   private void publish(String msg, String stack)
   {
     StringBuilder buf = new StringBuilder();
@@ -150,9 +144,7 @@
     err.print(buf);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public DN getDN()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java
index 9b3e13c..45af3a9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/DebugLogPublisher.java
@@ -49,13 +49,13 @@
 public abstract class DebugLogPublisher<T extends DebugLogPublisherCfg>
     implements LogPublisher<T>
 {
-  //The default global settings key.
+  /** The default global settings key. */
   private static final String GLOBAL= "_global";
 
-  //The map of class names to their trace settings.
+  /** The map of class names to their trace settings. */
   private Map<String,TraceSettings> classTraceSettings;
 
-  //The map of class names to their method trace settings.
+  /** The map of class names to their method trace settings. */
   private Map<String,Map<String,TraceSettings>> methodTraceSettings;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
index 2b4e1e8..f65ec2c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java
@@ -52,9 +52,7 @@
   private int numFiles;
   private FileCountLogRetentionPolicyCfg config;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeLogRetentionPolicy(
       FileCountLogRetentionPolicyCfg config)
   {
@@ -64,9 +62,7 @@
     config.addFileCountChangeListener(this);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
       FileCountLogRetentionPolicyCfg config,
       List<LocalizableMessage> unacceptableReasons)
@@ -75,9 +71,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
       FileCountLogRetentionPolicyCfg config)
   {
@@ -86,9 +80,7 @@
     return new ConfigChangeResult();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public File[] deleteFiles(FileNamingPolicy fileNamingPolicy)
       throws DirectoryException
   {
@@ -115,9 +107,7 @@
     return filesToDelete.toArray(new File[0]);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String toString()
   {
     return "Free Number Retention Policy " + config.dn();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java
index 80539eb..6decc14 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FixedTimeRotationPolicy.java
@@ -45,12 +45,10 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The scheduled rotation times as ms offsets from the beginning of the day.
+  /** The scheduled rotation times as ms offsets from the beginning of the day. */
   private int[] rotationTimes;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeLogRotationPolicy(FixedTimeLogRotationPolicyCfg config)
   {
     rotationTimes = new int[config.getTimeOfDay().size()];
@@ -66,9 +64,7 @@
     config.addFixedTimeChangeListener(this);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
       FixedTimeLogRotationPolicyCfg config, List<LocalizableMessage> unacceptableReasons)
   {
@@ -76,9 +72,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
       FixedTimeLogRotationPolicyCfg config)
   {
@@ -97,9 +91,7 @@
     return ccr;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean rotateFile(RotatableLogFile writer)
   {
     Calendar lastRotationTime = writer.getLastRotationTime();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
index 6802a57..d554e9a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
@@ -55,9 +55,7 @@
   private long freeDiskSpace;
   private FreeDiskSpaceLogRetentionPolicyCfg config;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeLogRetentionPolicy(
       FreeDiskSpaceLogRetentionPolicyCfg config)
@@ -68,9 +66,7 @@
     config.addFreeDiskSpaceChangeListener(this);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       FreeDiskSpaceLogRetentionPolicyCfg config,
@@ -80,9 +76,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       FreeDiskSpaceLogRetentionPolicyCfg config)
@@ -93,9 +87,7 @@
     return new ConfigChangeResult();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public File[] deleteFiles(FileNamingPolicy fileNamingPolicy)
       throws DirectoryException
@@ -155,9 +147,7 @@
     return filesToDelete.toArray(new File[filesToDelete.size()]);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String toString()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
index 91bcb09..10ce3e2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/MultifileTextWriter.java
@@ -78,7 +78,7 @@
   private FileNamingPolicy namingPolicy;
   private FilePermission filePermissions;
   private LogPublisherErrorHandler errorHandler;
-  //TODO: Implement actions.
+  /** TODO: Implement actions. */
   private ArrayList<ActionType> actions;
 
   private String name;
@@ -349,9 +349,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       SizeLimitLogRotationPolicyCfg config, List<LocalizableMessage> unacceptableReasons)
@@ -360,9 +358,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       SizeLimitLogRotationPolicyCfg config)
@@ -415,7 +411,7 @@
     }
 
     /**
-     * the run method of the rotaterThread. It wakes up periodically and checks
+     * The run method of the rotaterThread. It wakes up periodically and checks
      * whether the file needs to be rotated based on the rotation policy.
      */
     @Override
@@ -603,9 +599,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void flush()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ParallelTextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ParallelTextWriter.java
index 68816f5..af6a4a0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ParallelTextWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ParallelTextWriter.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.loggers;
 
@@ -99,7 +99,7 @@
       super(name);
     }
     /**
-     * the run method of the writerThread. Run until queue is empty
+     * The run method of the writerThread. Run until queue is empty
      * AND we've been asked to terminate
      */
     @Override
@@ -157,17 +157,13 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void flush()
   {
     writer.flush();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public long getBytesWritten()
   {
     return writer.getBytesWritten();
@@ -183,17 +179,13 @@
     return writer;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String getShutdownListenerName()
   {
     return "ParallelTextWriter Thread " + name;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void processServerShutdown(LocalizableMessage reason)
   {
     // Don't shutdown the wrapped writer on server shutdown as it
@@ -202,9 +194,7 @@
     shutdown(false);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void shutdown()
   {
     shutdown(true);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
index 28f37dd..741d5a2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java
@@ -55,9 +55,7 @@
   private FileComparator comparator;
   private SizeLimitLogRetentionPolicyCfg config;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeLogRetentionPolicy(
       SizeLimitLogRetentionPolicyCfg config)
@@ -69,9 +67,7 @@
     config.addSizeLimitChangeListener(this);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       SizeLimitLogRetentionPolicyCfg config,
@@ -81,9 +77,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       SizeLimitLogRetentionPolicyCfg config)
@@ -94,9 +88,7 @@
     return new ConfigChangeResult();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public File[] deleteFiles(FileNamingPolicy fileNamingPolicy)
       throws DirectoryException
@@ -142,9 +134,7 @@
     return filesToDelete;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String toString()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java
index 1d9c9ee..d3ffa60 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRotationPolicy.java
@@ -47,9 +47,7 @@
 
   SizeLimitLogRotationPolicyCfg currentConfig;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeLogRotationPolicy(SizeLimitLogRotationPolicyCfg config)
       throws ConfigException, InitializationException
   {
@@ -59,9 +57,7 @@
     currentConfig = config;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
       SizeLimitLogRotationPolicyCfg config, List<LocalizableMessage> unacceptableReasons)
   {
@@ -69,9 +65,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
       SizeLimitLogRotationPolicyCfg config)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
index c16539c..1eb0695 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -104,9 +104,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       final FileBasedAccessLogPublisherCfg config)
@@ -226,9 +224,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeLogPublisher(final FileBasedAccessLogPublisherCfg cfg, ServerContext serverContext)
       throws ConfigException, InitializationException
@@ -306,9 +302,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
       final FileBasedAccessLogPublisherCfg configuration,
@@ -320,9 +314,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       final FileBasedAccessLogPublisherCfg config,
@@ -1054,9 +1046,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected void close0()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java
index 0aa8141..9922aa3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java
@@ -60,9 +60,7 @@
   private TextWriter writer;
   private FileBasedAuditLogPublisherCfg cfg;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       FileBasedAuditLogPublisherCfg config)
@@ -156,9 +154,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected void close0()
   {
@@ -168,9 +164,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeLogPublisher(FileBasedAuditLogPublisherCfg cfg, ServerContext serverContext)
       throws ConfigException, InitializationException
@@ -232,9 +226,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
       FileBasedAuditLogPublisherCfg configuration,
@@ -246,9 +238,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       FileBasedAuditLogPublisherCfg config, List<LocalizableMessage> unacceptableReasons)
@@ -277,9 +267,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void logAddResponse(AddOperation addOperation)
   {
@@ -327,9 +315,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void logDeleteResponse(DeleteOperation deleteOperation)
   {
@@ -353,9 +339,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void logModifyDNResponse(ModifyDNOperation modifyDNOperation)
   {
@@ -402,9 +386,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void logModifyResponse(ModifyOperation modifyOperation)
   {
@@ -479,7 +461,7 @@
 
 
 
-  // Appends the common log header information to the provided buffer.
+  /** Appends the common log header information to the provided buffer. */
   private void appendHeader(Operation operation, StringBuilder buffer)
   {
     buffer.append("# ");
@@ -543,7 +525,7 @@
 
 
 
-  // Determines whether the provided operation should be logged.
+  /** Determines whether the provided operation should be logged. */
   private boolean isLoggable(Operation operation)
   {
     return operation.getResultCode() == SUCCESS
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java
index 0172570..890eebd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java
@@ -105,9 +105,7 @@
     return startupPublisher;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(
       FileBasedDebugLogPublisherCfg config, List<LocalizableMessage> unacceptableReasons)
@@ -115,9 +113,7 @@
     return isConfigurationChangeAcceptable(config, unacceptableReasons);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeLogPublisher(FileBasedDebugLogPublisherCfg config, ServerContext serverContext)
       throws ConfigException, InitializationException
@@ -197,9 +193,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       FileBasedDebugLogPublisherCfg config, List<LocalizableMessage> unacceptableReasons)
@@ -226,9 +220,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       FileBasedDebugLogPublisherCfg config)
@@ -331,9 +323,7 @@
         config.isDefaultIncludeThrowableCause());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAddAcceptable(DebugTargetCfg config,
                                               List<LocalizableMessage> unacceptableReasons)
@@ -341,9 +331,7 @@
     return !hasTraceSettings(config.getDebugScope());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationDeleteAcceptable(DebugTargetCfg config,
                                               List<LocalizableMessage> unacceptableReasons)
@@ -352,9 +340,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationAdd(DebugTargetCfg config)
   {
@@ -365,9 +351,7 @@
     return new ConfigChangeResult();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationDelete(DebugTargetCfg config)
   {
@@ -378,9 +362,7 @@
     return new ConfigChangeResult();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void trace(TraceSettings settings, String signature,
       String sourceLocation, String msg, StackTraceElement[] stackTrace)
@@ -394,9 +376,7 @@
     publish(signature, sourceLocation, msg, stack);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void traceException(TraceSettings settings, String signature,
       String sourceLocation, String msg, Throwable ex,
@@ -413,9 +393,7 @@
     publish(signature, sourceLocation, message, stack);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void close()
   {
@@ -428,9 +406,11 @@
   }
 
 
-  // Publishes a record, optionally performing some "special" work:
-  // - injecting a stack trace into the message
-  // - format the message with argument values
+  /**
+   * Publishes a record, optionally performing some "special" work:
+   * - injecting a stack trace into the message
+   * - format the message with argument values
+   */
   private void publish(String signature, String sourceLocation, String msg,
                        String stack)
   {
@@ -490,9 +470,7 @@
     writer.writeRecord(buf.toString());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public DN getDN()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java
index 7286118..3ef2e85 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextWriter.java
@@ -67,33 +67,25 @@
     private MeteredStream stream = new MeteredStream(System.out, 0);
     private PrintWriter writer = new PrintWriter(stream, true);
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void writeRecord(String record)
     {
       writer.println(record);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void flush()
     {
       writer.flush();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void shutdown()
     {
       // Should never close the system out stream.
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public long getBytesWritten()
     {
       return stream.written;
@@ -108,33 +100,25 @@
     private MeteredStream stream = new MeteredStream(System.err, 0);
     private PrintWriter writer = new PrintWriter(stream, true);
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void writeRecord(String record)
     {
       writer.println(record);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void flush()
     {
       writer.flush();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void shutdown()
     {
       // Should never close the system error stream.
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public long getBytesWritten()
     {
       return stream.written;
@@ -160,33 +144,25 @@
       writer = new PrintWriter(stream, true);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void writeRecord(String record)
     {
       writer.println(record);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void flush()
     {
       writer.flush();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public void shutdown()
     {
       // Should never close the system error stream.
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public long getBytesWritten()
     {
       return stream.written;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
index 4a5ed6b..1aa8278 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS
+ *      Portions Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.loggers;
 
@@ -61,9 +61,7 @@
     this.writer = writer;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeLogPublisher(ErrorLogPublisherCfg config, ServerContext serverContext)
       throws ConfigException, InitializationException
@@ -72,9 +70,7 @@
     // configurable via the admin framework.
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void close()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java
index 3b3abc6..1a40d9c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeLimitRotationPolicy.java
@@ -43,9 +43,7 @@
 {
   private long timeInterval;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeLogRotationPolicy(TimeLimitLogRotationPolicyCfg config)
   {
     timeInterval = config.getRotationInterval();
@@ -53,9 +51,7 @@
     config.addTimeLimitChangeListener(this);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
       TimeLimitLogRotationPolicyCfg config, List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeStampNaming.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeStampNaming.java
index fa80022..8f14aa2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeStampNaming.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TimeStampNaming.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.loggers;
 
@@ -117,33 +117,25 @@
     this.filter = new TimeStampNamingFilter();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public File getInitialName()
   {
     return file;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public File getNextName()
   {
     return new File(file + "." + TimeThread.getGMTTime());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public FilenameFilter getFilenameFilter()
   {
     return filter;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public File[] listFiles()
   {
     File directory = file.getParentFile();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TraceSettings.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TraceSettings.java
index 0270752..779b8a6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TraceSettings.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TraceSettings.java
@@ -186,9 +186,7 @@
     config.addChangeListener(this);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(DebugTargetCfg config,
       List<LocalizableMessage> unacceptableReasons)
   {
@@ -197,9 +195,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(DebugTargetCfg config)
   {
     final ConfigChangeResult ccr = new ConfigChangeResult();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
index dcf9b29..aed7d94 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/BackendMonitor.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.monitors;
 
@@ -49,29 +49,31 @@
 public class BackendMonitor
        extends MonitorProvider<MonitorProviderCfg>
 {
-  // The attribute type that will be used to report the backend ID.
+  /** The attribute type that will be used to report the backend ID. */
   private AttributeType backendIDType;
 
-  // The attribute type that will be used to report the set of base DNs.
+  /** The attribute type that will be used to report the set of base DNs. */
   private AttributeType baseDNType;
 
-  // The attribute type that will be used to report the number of entries.
+  /** The attribute type that will be used to report the number of entries. */
   private AttributeType entryCountType;
 
-  // The attribute type that will be used to report the number of entries per
-  // base DN.
+  /**
+   * The attribute type that will be used to report the number of entries per
+   * base DN.
+   */
   private AttributeType baseDNEntryCountType;
 
-  // The attribute type that will be used to indicate if a backend is private.
+  /** The attribute type that will be used to indicate if a backend is private. */
   private AttributeType isPrivateType;
 
-  // The attribute type that will be used to report the writability mode.
+  /** The attribute type that will be used to report the writability mode. */
   private AttributeType writabilityModeType;
 
-  // The backend with which this monitor is associated.
-  private Backend backend;
+  /** The backend with which this monitor is associated. */
+  private Backend<?> backend;
 
-  // The name for this monitor.
+  /** The name for this monitor. */
   private String monitorName;
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
@@ -82,48 +84,33 @@
    *
    * @param  backend  The backend with which this monitor is associated.
    */
-  public BackendMonitor(Backend backend)
+  public BackendMonitor(Backend<?> backend)
   {
     this.backend = backend;
   }
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeMonitorProvider(MonitorProviderCfg configuration)
   {
     monitorName = backend.getBackendID() + " Backend";
 
-    backendIDType = DirectoryConfig.getAttributeType(ATTR_MONITOR_BACKEND_ID,
-                                                     true);
-
-    baseDNType = DirectoryConfig.getAttributeType(ATTR_MONITOR_BACKEND_BASE_DN,
-                                                  true);
-
+    backendIDType = DirectoryConfig.getAttributeType(ATTR_MONITOR_BACKEND_ID, true);
+    baseDNType = DirectoryConfig.getAttributeType(ATTR_MONITOR_BACKEND_BASE_DN, true);
     entryCountType =
-         DirectoryConfig.getAttributeType(ATTR_MONITOR_BACKEND_ENTRY_COUNT,
-                                          true);
-
+         DirectoryConfig.getAttributeType(ATTR_MONITOR_BACKEND_ENTRY_COUNT, true);
     baseDNEntryCountType =
-         DirectoryConfig.getAttributeType(ATTR_MONITOR_BASE_DN_ENTRY_COUNT,
-                                          true);
-
+         DirectoryConfig.getAttributeType(ATTR_MONITOR_BASE_DN_ENTRY_COUNT, true);
     isPrivateType =
-         DirectoryConfig.getAttributeType(ATTR_MONITOR_BACKEND_IS_PRIVATE,
-                                          true);
-
+         DirectoryConfig.getAttributeType(ATTR_MONITOR_BACKEND_IS_PRIVATE, true);
     writabilityModeType =
-         DirectoryConfig.getAttributeType(ATTR_MONITOR_BACKEND_WRITABILITY_MODE,
-                                          true);
+         DirectoryConfig.getAttributeType(ATTR_MONITOR_BACKEND_WRITABILITY_MODE, true);
   }
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String getMonitorInstanceName()
   {
     return monitorName;
@@ -144,9 +131,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public List<Attribute> getMonitorData()
   {
     LinkedList<Attribute> attrs = new LinkedList<Attribute>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ClientConnectionMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ClientConnectionMonitorProvider.java
index 6d1fd45..ea3d20f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ClientConnectionMonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ClientConnectionMonitorProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.monitors;
 
@@ -56,8 +56,10 @@
     MonitorProvider<ClientConnectionMonitorProviderCfg>
 {
 
-  // The connection handler associated with this monitor, or null if all
-  // connection handlers should be monitored.
+  /**
+   * The connection handler associated with this monitor, or null if all
+   * connection handlers should be monitored.
+   */
   private final ConnectionHandler<?> handler;
 
 
@@ -86,9 +88,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeMonitorProvider(
       ClientConnectionMonitorProviderCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java
index 1ac3b3b..0dcf941 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ConnectionHandlerMonitor.java
@@ -46,26 +46,28 @@
 public class ConnectionHandlerMonitor
        extends MonitorProvider<MonitorProviderCfg>
 {
-  // The attribute type that will be used to report the established connections.
+  /** The attribute type that will be used to report the established connections. */
   private AttributeType connectionsType;
 
-  // The attribute type that will be used to report the listeners.
+  /** The attribute type that will be used to report the listeners. */
   private AttributeType listenerType;
 
-  // The attribute type that will be used to report the number of established
-  // client connections.
+  /**
+   * The attribute type that will be used to report the number of established
+   * client connections.
+   */
   private AttributeType numConnectionsType;
 
-  // The attribute type that will be used to report the protocol.
+  /** The attribute type that will be used to report the protocol. */
   private AttributeType protocolType;
 
-  // The attribute type that will be used to report the config dn .
+  /** The attribute type that will be used to report the config dn . */
   private AttributeType configDnType;
 
-  // The connection handler with which this monitor is associated.
+  /** The connection handler with which this monitor is associated. */
   private ConnectionHandler<?> connectionHandler;
 
-  // The name for this monitor.
+  /** The name for this monitor. */
   private String monitorName;
 
 
@@ -86,9 +88,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeMonitorProvider(MonitorProviderCfg configuration)
   {
@@ -117,9 +117,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getMonitorInstanceName()
   {
@@ -143,9 +141,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public List<Attribute> getMonitorData()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
index b7d3c4c..b138a23 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/DatabaseEnvironmentMonitor.java
@@ -127,9 +127,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeMonitorProvider(MonitorProviderCfg configuration)
        throws ConfigException, InitializationException
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java
index cebd8ee..d4a4728 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/EntryCacheMonitorProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.monitors;
 
@@ -52,16 +52,16 @@
 
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The name for this monitor.
+  /** The name for this monitor. */
   private String monitorName;
 
-  // The entry cache common name.
+  /** The entry cache common name. */
   private String entryCacheName;
 
-  // The entry cache with which this monitor is associated.
+  /** The entry cache with which this monitor is associated. */
   private EntryCache<? extends EntryCacheCfg> entryCache;
 
-  // Entry cache monitor configuration.
+  /** Entry cache monitor configuration. */
   private EntryCacheMonitorProviderCfg monitorConfiguration;
 
   /**
@@ -88,9 +88,7 @@
     this.entryCache = entryCache;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeMonitorProvider(
     EntryCacheMonitorProviderCfg configuration)
@@ -117,18 +115,14 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getMonitorInstanceName()
   {
     return monitorName;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ArrayList<Attribute> getMonitorData()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java
index 8b47ec3..1c51616 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/MemoryUsageMonitorProvider.java
@@ -42,7 +42,6 @@
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.types.*;
 
-
 /**
  * This class defines a monitor provider that reports information about
  * Directory Server memory usage.
@@ -51,26 +50,24 @@
        extends MonitorProvider<MemoryUsageMonitorProviderCfg>
        implements Runnable
 {
-  // A map of the last GC counts seen by this monitor for calculating recent
-  // stats.
+  /** A map of the last GC counts seen by this monitor for calculating recent stats. */
   private HashMap<String,Long> lastGCCounts = new HashMap<String,Long>();
 
-  // A map of the last GC times seen by this monitor for calculating recent
-  // stats.
+  /** A map of the last GC times seen by this monitor for calculating recent stats. */
   private HashMap<String,Long> lastGCTimes = new HashMap<String,Long>();
 
-  // A map of the most recent GC durations seen by this monitor.
+  /** A map of the most recent GC durations seen by this monitor. */
   private HashMap<String,Long> recentGCDurations = new HashMap<String,Long>();
 
-  // A map of the memory manager names to names that are safe for use in
-  // attribute names.
+  /**
+   * A map of the memory manager names to names that are safe for use in
+   * attribute names.
+   */
   private HashMap<String,String> gcSafeNames = new HashMap<String,String>();
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeMonitorProvider(
                    MemoryUsageMonitorProviderCfg configuration)
          throws ConfigException, InitializationException
@@ -78,9 +75,7 @@
     scheduleUpdate(this, 0, 1, TimeUnit.SECONDS);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getMonitorInstanceName()
   {
@@ -88,9 +83,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void run()
   {
     for (GarbageCollectorMXBean gc :
@@ -125,9 +118,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ArrayList<Attribute> getMonitorData()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ParallelWorkQueueMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ParallelWorkQueueMonitor.java
index f870cf3..64a09ce 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/ParallelWorkQueueMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/ParallelWorkQueueMonitor.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.monitors;
 
@@ -85,16 +85,16 @@
 
 
 
-  // The maximum backlog observed by polling the queue.
+  /** The maximum backlog observed by polling the queue. */
   private int maxBacklog;
 
-  // The total number of times the backlog has been polled.
+  /** The total number of times the backlog has been polled. */
   private long numPolls;
 
-  // The total backlog observed from periodic polling.
+  /** The total backlog observed from periodic polling. */
   private long totalBacklog;
 
-  // The parallel work queue instance with which this monitor is associated.
+  /** The parallel work queue instance with which this monitor is associated. */
   private ParallelWorkQueue workQueue;
 
 
@@ -113,9 +113,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeMonitorProvider(MonitorProviderCfg configuration)
          throws ConfigException, InitializationException
   {
@@ -139,9 +137,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void run()
   {
     int backlog = workQueue.size();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/StackTraceMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/StackTraceMonitorProvider.java
index 568e2e2..d61081d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/StackTraceMonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/StackTraceMonitorProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.monitors;
 
@@ -47,9 +47,7 @@
 public class StackTraceMonitorProvider
        extends MonitorProvider<StackTraceMonitorProviderCfg>
 {
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeMonitorProvider(
                    StackTraceMonitorProviderCfg configuration)
          throws ConfigException, InitializationException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/SystemInfoMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/SystemInfoMonitorProvider.java
index 6341e66..093ece6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/SystemInfoMonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/SystemInfoMonitorProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS.
+ *      Portions Copyright 2012-2015 ForgeRock AS.
  */
 package org.opends.server.monitors;
 
@@ -62,9 +62,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeMonitorProvider(
                    SystemInfoMonitorProviderCfg configuration)
          throws ConfigException, InitializationException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/TraditionalWorkQueueMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
index d92df7a..7e171b5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/TraditionalWorkQueueMonitor.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.monitors;
 
@@ -94,16 +94,16 @@
 
 
 
-  // The maximum backlog observed by polling the queue.
+  /** The maximum backlog observed by polling the queue. */
   private int maxBacklog;
 
-  // The total number of times the backlog has been polled.
+  /** The total number of times the backlog has been polled. */
   private long numPolls;
 
-  // The total backlog observed from periodic polling.
+  /** The total backlog observed from periodic polling. */
   private long totalBacklog;
 
-  // The traditional work queue instance with which this monitor is associated.
+  /** The traditional work queue instance with which this monitor is associated. */
   private TraditionalWorkQueue workQueue;
 
 
@@ -122,9 +122,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeMonitorProvider(MonitorProviderCfg configuration)
          throws ConfigException, InitializationException
   {
@@ -148,9 +146,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void run()
   {
     int backlog = workQueue.size();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/monitors/VersionMonitorProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/monitors/VersionMonitorProvider.java
index 35f38df..e64f9ac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/monitors/VersionMonitorProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/monitors/VersionMonitorProvider.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.monitors;
 
@@ -134,9 +134,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void initializeMonitorProvider(VersionMonitorProviderCfg configuration)
          throws ConfigException, InitializationException
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
index 0abe197..3185133 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/AttributeCleanupPlugin.java
@@ -99,9 +99,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       final AttributeCleanupPluginCfg config)
@@ -138,9 +136,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PluginResult.PreParse doPreParse(
       final PreParseAddOperation addOperation)
@@ -164,9 +160,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PluginResult.PreParse doPreParse(
       final PreParseModifyOperation modifyOperation)
@@ -204,9 +198,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizePlugin()
   {
@@ -228,9 +220,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePlugin(final Set<PluginType> pluginTypes,
       final AttributeCleanupPluginCfg configuration) throws ConfigException,
@@ -269,9 +259,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(final PluginCfg configuration,
       final List<LocalizableMessage> unacceptableReasons)
@@ -283,9 +271,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       final AttributeCleanupPluginCfg config, final List<LocalizableMessage> messages)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
index c5faad8..3f65aa6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
@@ -119,9 +119,7 @@
     super();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      ChangeNumberControlPluginCfg configuration)
@@ -176,9 +174,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void finalizePlugin()
   {
@@ -186,9 +182,7 @@
   }
 
 
- /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationAddOperation addOperation)
@@ -199,9 +193,7 @@
     return PluginResult.PostOperation.continueOperationProcessing();
   }
 
-   /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationDeleteOperation deleteOperation)
@@ -212,9 +204,7 @@
     return PluginResult.PostOperation.continueOperationProcessing();
   }
 
-   /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationModifyOperation modifyOperation)
@@ -225,9 +215,7 @@
     return PluginResult.PostOperation.continueOperationProcessing();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationModifyDNOperation modifyDNOperation)
@@ -240,9 +228,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -254,9 +240,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
       ChangeNumberControlPluginCfg configuration,
       List<LocalizableMessage> unacceptableReasons)
@@ -286,9 +270,7 @@
     return configAcceptable;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                                  ChangeNumberControlPluginCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java
index 79e26c1..257b7d8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/EntryUUIDPlugin.java
@@ -69,10 +69,10 @@
 
 
 
-  // The attribute type for the "entryUUID" attribute.
+  /** The attribute type for the "entryUUID" attribute. */
   private final AttributeType entryUUIDType;
 
-  // The current configuration for this plugin.
+  /** The current configuration for this plugin. */
   private EntryUUIDPluginCfg currentConfig;
 
 
@@ -111,9 +111,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      EntryUUIDPluginCfg configuration)
@@ -140,9 +138,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void finalizePlugin()
   {
@@ -151,9 +147,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.ImportLDIF
                doLDIFImport(LDIFImportConfig importConfig, Entry entry)
@@ -185,9 +179,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreOperation
                doPreOperation(PreOperationAddOperation addOperation)
@@ -218,9 +210,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -231,9 +221,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       EntryUUIDPluginCfg configuration,
@@ -264,9 +252,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  EntryUUIDPluginCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
index d5803ac..48de6f7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LDAPADListPlugin.java
@@ -143,7 +143,7 @@
 
 
 
-  // The current configuration for this plugin.
+  /** The current configuration for this plugin. */
   private LDAPAttributeDescriptionListPluginCfg currentConfig;
 
 
@@ -161,9 +161,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                          LDAPAttributeDescriptionListPluginCfg configuration)
@@ -195,9 +193,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void finalizePlugin()
   {
@@ -206,9 +202,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreParse doPreParse(
       PreParseSearchOperation searchOperation)
@@ -220,9 +214,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -234,9 +226,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       LDAPAttributeDescriptionListPluginCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -264,9 +254,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                                  LDAPAttributeDescriptionListPluginCfg
                                       configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
index 32cc478..0e5087c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/LastModPlugin.java
@@ -64,19 +64,19 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The attribute type for the "createTimestamp" attribute.
+  /** The attribute type for the "createTimestamp" attribute. */
   private final AttributeType createTimestampType;
 
-  // The attribute type for the "creatorsName" attribute.
+  /** The attribute type for the "creatorsName" attribute. */
   private final AttributeType creatorsNameType;
 
-  // The attribute type for the "modifiersName" attribute.
+  /** The attribute type for the "modifiersName" attribute. */
   private final AttributeType modifiersNameType;
 
-  // The attribute type for the "modifyTimestamp" attribute.
+  /** The attribute type for the "modifyTimestamp" attribute. */
   private final AttributeType modifyTimestampType;
 
-  // The current configuration for this plugin.
+  /** The current configuration for this plugin. */
   private LastModPluginCfg currentConfig;
 
 
@@ -107,9 +107,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      LastModPluginCfg configuration)
@@ -137,9 +135,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void finalizePlugin()
   {
@@ -148,9 +144,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreOperation
                doPreOperation(PreOperationAddOperation addOperation)
@@ -189,9 +183,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreOperation
        doPreOperation(PreOperationModifyOperation modifyOperation)
@@ -250,9 +242,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreOperation
        doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
@@ -289,9 +279,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -302,9 +290,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(LastModPluginCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -335,9 +321,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  LastModPluginCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
index b09503a..77048f5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -75,25 +75,31 @@
 
 
 
-  // The attribute type used to specify the password policy for an entry.
+  /** The attribute type used to specify the password policy for an entry. */
   private AttributeType customPolicyAttribute;
 
-  // The set of attribute types defined in the schema with the auth password
-  // syntax.
+  /**
+   * The set of attribute types defined in the schema with the auth password
+   * syntax.
+   */
   private AttributeType[] authPasswordTypes;
 
-  // The set of attribute types defined in the schema with the user password
-  // syntax.
+  /**
+   * The set of attribute types defined in the schema with the user password
+   * syntax.
+   */
   private AttributeType[] userPasswordTypes;
 
-  // The set of password storage schemes to use for the various password
-  // policies defined in the server.
+  /**
+   * The set of password storage schemes to use for the various password
+   * policies defined in the server.
+   */
   private HashMap<DN,PasswordStorageScheme<?>[]> schemesByPolicy;
 
-  // The default password storage schemes for auth password attributes.
+  /** The default password storage schemes for auth password attributes. */
   private PasswordStorageScheme<?>[] defaultAuthPasswordSchemes;
 
-  // The default password storage schemes for user password attributes.
+  /** The default password storage schemes for user password attributes. */
   private PasswordStorageScheme<?>[] defaultUserPasswordSchemes;
 
 
@@ -111,9 +117,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                          PasswordPolicyImportPluginCfg configuration)
@@ -241,9 +245,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void processImportBegin(Backend backend, LDIFImportConfig config)
   {
     // Find the set of attribute types with the auth password and user password
@@ -295,9 +297,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void processImportEnd(Backend backend, LDIFImportConfig config,
                                boolean successful)
   {
@@ -306,9 +306,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.ImportLDIF
                doLDIFImport(LDIFImportConfig importConfig, Entry entry)
@@ -558,9 +556,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -572,9 +568,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       PasswordPolicyImportPluginCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -684,9 +678,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                                  PasswordPolicyImportPluginCfg configuration)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
index 522796a..3ccc1f1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -102,37 +102,43 @@
 
 
 
-  //Current plugin configuration.
+  /** Current plugin configuration. */
   private ReferentialIntegrityPluginCfg currentConfiguration;
 
-  //List of attribute types that will be checked during referential integrity
-  //processing.
+  /**
+   * List of attribute types that will be checked during referential integrity
+   * processing.
+   */
   private LinkedHashSet<AttributeType>
           attributeTypes = new LinkedHashSet<AttributeType>();
 
-  //List of base DNs that limit the scope of the referential integrity checking.
+  /** List of base DNs that limit the scope of the referential integrity checking. */
   private Set<DN> baseDNs = new LinkedHashSet<DN>();
 
-  //The update interval the background thread uses. If it is 0, then
-  //the changes are processed in foreground.
+  /**
+   * The update interval the background thread uses. If it is 0, then
+   * the changes are processed in foreground.
+   */
   private long interval;
 
-  //The flag used by the background thread to check if it should exit.
+  /** The flag used by the background thread to check if it should exit. */
   private boolean stopRequested;
 
-  //The thread name.
+  /** The thread name. */
   private static final String name =
       "Referential Integrity Background Update Thread";
 
-  //The name of the logfile that the update thread uses to process change
-  //records. Defaults to "logs/referint", but can be changed in the
-  //configuration.
+  /**
+   * The name of the logfile that the update thread uses to process change
+   * records. Defaults to "logs/referint", but can be changed in the
+   * configuration.
+   */
   private String logFileName;
 
-  //The File class that logfile corresponds to.
+  /** The File class that logfile corresponds to. */
   private File logFile;
 
-  //The Thread class that the background thread corresponds to.
+  /** The Thread class that the background thread corresponds to. */
   private Thread backGroundThread;
 
   /**
@@ -148,15 +154,20 @@
    */
   public static final String DELETE_DNS="deleteDNs";
 
-  //The buffered reader that is used to read the log file by the background
-  //thread.
+  /**
+   * The buffered reader that is used to read the log file by the background
+   * thread.
+   */
   private BufferedReader reader;
 
-  //The buffered writer that is used to write update records in the log
-  //when the plugin is in background processing mode.
+  /**
+   * The buffered writer that is used to write update records in the log
+   * when the plugin is in background processing mode.
+   */
   private BufferedWriter writer;
 
-  /* Specifies the mapping between the attribute type (specified in the
+  /**
+   * Specifies the mapping between the attribute type (specified in the
    * attributeTypes list) and the filter which the plugin should use
    * to verify the integrity of the value of the given attribute.
    */
@@ -164,9 +175,7 @@
     new LinkedHashMap<AttributeType, SearchFilter>();
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      ReferentialIntegrityPluginCfg pluginCfg)
@@ -196,9 +205,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
           ReferentialIntegrityPluginCfg newConfiguration)
@@ -270,9 +277,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -380,9 +385,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
           ReferentialIntegrityPluginCfg configuration,
@@ -392,9 +395,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @SuppressWarnings("unchecked")
   @Override
   public PluginResult.PostOperation
@@ -426,9 +427,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @SuppressWarnings("unchecked")
   @Override
   public PluginResult.PostOperation doPostOperation(
@@ -454,9 +453,7 @@
     return PluginResult.PostOperation.continueOperationProcessing();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @SuppressWarnings("unchecked")
   @Override
   public PluginResult.SubordinateModifyDN processSubordinateModifyDN(
@@ -478,9 +475,7 @@
     return PluginResult.SubordinateModifyDN.continueOperationProcessing();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @SuppressWarnings("unchecked")
   @Override
   public PluginResult.SubordinateDelete processSubordinateDelete(
@@ -966,9 +961,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void finalizePlugin() {
     currentConfiguration.removeReferentialIntegrityChangeListener(this);
@@ -1074,11 +1067,9 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
-    public PluginResult.PreOperation doPreOperation(
+  public PluginResult.PreOperation doPreOperation(
     PreOperationModifyOperation modifyOperation)
   {
     /* Skip the integrity checks if the enforcing is not enabled
@@ -1134,9 +1125,7 @@
     return PluginResult.PreOperation.continueOperationProcessing();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PluginResult.PreOperation doPreOperation(
     PreOperationAddOperation addOperation)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
index 4d6411f..88aa59c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SambaPasswordPlugin.java
@@ -105,35 +105,30 @@
    */
   static final class MD4MessageDigest extends MessageDigest
   {
-    // Class is package private for testing.
+    /** Class is package private for testing. */
     private final byte[] xBuf = new byte[4];
     private int xBufOff;
     private long byteCount;
 
     private static final int DIGEST_LENGTH = 16;
-    private int H1, H2, H3, H4; // IV's
+    /** IV's. */
+    private int H1, H2, H3, H4;
     private final int[] X = new int[16];
     private int xOff;
 
-    //
-    // round 1 left rotates
-    //
+    /** Round 1 left rotates. */
     private static final int S11 = 3;
     private static final int S12 = 7;
     private static final int S13 = 11;
     private static final int S14 = 19;
 
-    //
-    // round 2 left rotates
-    //
+    /** Round 2 left rotates. */
     private static final int S21 = 3;
     private static final int S22 = 5;
     private static final int S23 = 9;
     private static final int S24 = 13;
 
-    //
-    // round 3 left rotates
-    //
+    /** Round 3 left rotates. */
     private static final int S31 = 3;
     private static final int S32 = 9;
     private static final int S33 = 11;
@@ -152,9 +147,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public byte[] engineDigest()
     {
@@ -170,9 +163,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void engineReset()
     {
@@ -196,9 +187,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void engineUpdate(final byte input)
     {
@@ -213,9 +202,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void engineUpdate(final byte[] in, int inOff, int len)
     {
@@ -256,7 +243,7 @@
 
 
 
-    /*
+    /**
      * F, G, H and I are the basic MD4 functions.
      */
     private int F(final int u, final int v, final int w)
@@ -434,36 +421,30 @@
    */
   private SambaPasswordPluginCfg config;
 
-  // The name of the Samba LanMan password attribute.
+  /** The name of the Samba LanMan password attribute. */
   private static final String SAMBA_LM_PASSWORD_ATTRIBUTE_NAME =
     "sambaLMPassword";
 
-  // The name of the Samba NT password attribute.
+  /** The name of the Samba NT password attribute. */
   private static final String SAMBA_NT_PASSWORD_ATTRIBUTE_NAME =
     "sambaNTPassword";
 
-  // The name of the Samba account object class.
+  /** The name of the Samba account object class. */
   private static final String SAMBA_SAM_ACCOUNT_OC_NAME = "sambaSAMAccount";
 
-  // The name of the Samba last password change attribute.
+  /** The name of the Samba last password change attribute. */
   private static final String SAMBA_PWD_LAST_SET_NAME = "sambaPwdLastSet";
 
-  /**
-   * Debug tracer object to log debugging information.
-   */
+  /** Debug tracer object to log debugging information. */
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  /**
-   * Password Modify Extended Operation OID.
-   */
+  /** Password Modify Extended Operation OID. */
   private static final String PWMOD_EXTOP_OID = "1.3.6.1.4.1.4203.1.11.1";
 
-  /**
-   * Magic string to be used as salt.
-   */
+  /** Magic string to be used as salt. */
   private static final String MAGIC_STR = "KGS!@#$%";
 
-  // Default timestamp provider implementation.
+  /** Default timestamp provider implementation. */
   private static final TimeStampProvider DEFAULT_TIMESTAMP_PROVIDER =
   new TimeStampProvider()
   {
@@ -474,7 +455,7 @@
     }
   };
 
-  // Use the default implementation of the timestamp provider... by default.
+  /** Use the default implementation of the timestamp provider... by default. */
   private TimeStampProvider timeStampProvider = DEFAULT_TIMESTAMP_PROVIDER;
 
 
@@ -645,9 +626,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       final SambaPasswordPluginCfg newConfig)
@@ -661,9 +640,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PluginResult.PostOperation doPostOperation(
       final PostOperationExtendedOperation extendedOperation)
@@ -796,9 +773,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public PluginResult.PreOperation doPreOperation(
       final PreOperationModifyOperation modifyOperation)
@@ -875,9 +850,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializePlugin(final Set<PluginType> pluginTypes,
       final SambaPasswordPluginCfg configuration) throws ConfigException,
@@ -923,9 +896,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       final SambaPasswordPluginCfg newConfig, final List<LocalizableMessage> messages)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
index 689df34..5db99e9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/SevenBitCleanPlugin.java
@@ -79,9 +79,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      SevenBitCleanPluginCfg configuration)
@@ -110,9 +108,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void finalizePlugin()
   {
@@ -121,9 +117,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.ImportLDIF
                doLDIFImport(LDIFImportConfig importConfig, Entry entry)
@@ -186,9 +180,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreParse
                doPreParse(PreParseAddOperation addOperation)
@@ -252,9 +244,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreParse
                     doPreParse(PreParseModifyOperation modifyOperation)
@@ -330,9 +320,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreParse
                     doPreParse(PreParseModifyDNOperation modifyDNOperation)
@@ -451,9 +439,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -464,9 +450,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       SevenBitCleanPluginCfg configuration,
@@ -498,9 +482,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  SevenBitCleanPluginCfg configuration)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
index abae578..882dda7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -105,9 +105,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      UniqueAttributePluginCfg configuration)
@@ -162,9 +160,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void finalizePlugin()
   {
@@ -174,9 +170,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreOperation
                doPreOperation(PreOperationAddOperation addOperation)
@@ -218,9 +212,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreOperation
                doPreOperation(PreOperationModifyOperation modifyOperation)
@@ -351,9 +343,7 @@
     return null;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PreOperation doPreOperation(
                     PreOperationModifyDNOperation modifyDNOperation)
@@ -394,9 +384,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void doPostSynchronization(
                          PostSynchronizationAddOperation addOperation)
@@ -431,9 +419,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void doPostSynchronization(
                          PostSynchronizationModifyOperation modifyOperation)
@@ -503,9 +489,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void doPostSynchronization(
                          PostSynchronizationModifyDNOperation modifyDNOperation)
@@ -691,9 +675,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -704,9 +686,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       UniqueAttributePluginCfg configuration,
@@ -761,9 +741,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
                                  UniqueAttributePluginCfg newConfiguration)
@@ -774,9 +752,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public DN getComponentEntryDN()
   {
@@ -785,9 +761,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getClassName()
   {
@@ -796,9 +770,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Map<String,String> getAlerts()
   {
@@ -814,9 +786,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationAddOperation addOperation)
@@ -853,9 +823,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationModifyOperation modifyOperation)
@@ -925,9 +893,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.PostOperation
        doPostOperation(PostOperationModifyDNOperation modifyDNOperation)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStack.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStack.java
index 8f0648b..b74a581 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStack.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStack.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.plugins.profiler;
 
@@ -59,16 +59,16 @@
 
 
 
-  // The number of frames in this stack.
+  /** The number of frames in this stack. */
   private int numFrames;
 
-  // The source file line numbers for each of the frames in this stack.
+  /** The source file line numbers for each of the frames in this stack. */
   private int[] lineNumbers;
 
-  // The class names for each of the frames in this stack.
+  /** The class names for each of the frames in this stack. */
   private String[] classNames;
 
-  // The method names for each of the frames in this stack.
+  /** The method names for each of the frames in this stack. */
   private String[] methodNames;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStackFrame.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStackFrame.java
index e735645..e16b7fb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStackFrame.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileStackFrame.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.plugins.profiler;
 
@@ -49,19 +49,23 @@
 
 
 
-  // The mapping between the line numbers for this stack frame and the
-  // number of times that they were encountered.
+  /**
+   * The mapping between the line numbers for this stack frame and the
+   * number of times that they were encountered.
+   */
   private HashMap<Integer,Long> lineNumbers;
 
-  // The mapping for subordinate frames.  It is mapped to itself because we
-  // use a fuzzy equality comparison and sets do not have a get method that
-  // can be used to retrieve a specified object.
+  /**
+   * The mapping for subordinate frames.  It is mapped to itself because we
+   * use a fuzzy equality comparison and sets do not have a get method that
+   * can be used to retrieve a specified object.
+   */
   private HashMap<ProfileStackFrame,ProfileStackFrame> subordinateFrames;
 
-  // The class name for this stack frame.
+  /** The class name for this stack frame. */
   private String className;
 
-  // The method name for this stack frame.
+  /** The method name for this stack frame. */
   private String methodName;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileViewer.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileViewer.java
index e334a81..12278ff 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileViewer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfileViewer.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.plugins.profiler;
 
@@ -72,23 +72,25 @@
 public class ProfileViewer
        implements TreeSelectionListener
 {
-  // The root stack frames for the profile information that has been captured.
+  /** The root stack frames for the profile information that has been captured. */
   private HashMap<ProfileStackFrame,ProfileStackFrame> rootFrames;
 
-  // A set of stack traces indexed by class and method name.
+  /** A set of stack traces indexed by class and method name. */
   private HashMap<String,HashMap<ProfileStack,Long>> stacksByMethod;
 
-  // The editor pane that will provide detailed information about the selected
-  // stack frame.
+  /**
+   * The editor pane that will provide detailed information about the selected
+   * stack frame.
+   */
   private JEditorPane frameInfoPane;
 
-  // The GUI tree that will be used to hold stack frame information;
+  /** The GUI tree that will be used to hold stack frame information;. */
   private JTree profileTree;
 
-  // The total length of time in milliseconds for which data is available.
+  /** The total length of time in milliseconds for which data is available. */
   private long totalDuration;
 
-  // The total number of profile intervals for which data is available.
+  /** The total number of profile intervals for which data is available. */
   private long totalIntervals;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java
index e8134f4..322f62d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerPlugin.java
@@ -93,13 +93,13 @@
 
 
 
-  // The DN of the configuration entry for this plugin.
+  /** The DN of the configuration entry for this plugin. */
   private DN configEntryDN;
 
-  // The current configuration for this plugin.
+  /** The current configuration for this plugin. */
   private ProfilerPluginCfg currentConfig;
 
-  // The thread that is actually capturing the profile information.
+  /** The thread that is actually capturing the profile information. */
   private ProfilerThread profilerThread;
 
 
@@ -118,9 +118,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void initializePlugin(Set<PluginType> pluginTypes,
                                      ProfilerPluginCfg configuration)
@@ -161,9 +159,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final void finalizePlugin()
   {
@@ -196,9 +192,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public final PluginResult.Startup doStartup()
   {
@@ -216,9 +210,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(PluginCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -229,9 +221,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
                       ProfilerPluginCfg configuration,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerThread.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerThread.java
index 9902702..46566fc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/profiler/ProfilerThread.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.plugins.profiler;
 
@@ -51,25 +51,25 @@
 
 
 
-  // Indicates whether a request has been received to stop profiling.
+  /** Indicates whether a request has been received to stop profiling. */
   private boolean stopProfiling;
 
-  // The time at which the capture started.
+  /** The time at which the capture started. */
   private long captureStartTime;
 
-  // The time at which the capture stopped.
+  /** The time at which the capture stopped. */
   private long captureStopTime;
 
-  // The number of intervals for which we have captured data.
+  /** The number of intervals for which we have captured data. */
   private long numIntervals;
 
-  // The sampling interval that will be used by this thread.
+  /** The sampling interval that will be used by this thread. */
   private long sampleInterval;
 
-  // The set of thread stack traces captured by this profiler thread.
+  /** The set of thread stack traces captured by this profiler thread. */
   private HashMap<ProfileStack,Long> stackTraces;
 
-  // The thread that is actually performing the capture.
+  /** The thread that is actually performing the capture. */
   private Thread captureThread;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
index 0ef6051..ec3ce6d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/LDIFConnectionHandler.java
@@ -82,26 +82,25 @@
 
 
 
-  // Indicates whether this connection handler is currently stopped.
+  /** Indicates whether this connection handler is currently stopped. */
   private volatile boolean isStopped;
 
-  // Indicates whether we should stop this connection handler.
+  /** Indicates whether we should stop this connection handler. */
   private volatile boolean stopRequested;
 
-  // The path to the directory to watch for new LDIF files.
+  /** The path to the directory to watch for new LDIF files. */
   private File ldifDirectory;
 
-  // The internal client connection that will be used for all processing.
+  /** The internal client connection that will be used for all processing. */
   private InternalClientConnection conn;
 
-  // The current configuration for this LDIF connection handler.
+  /** The current configuration for this LDIF connection handler. */
   private LDIFConnectionHandlerCfg currentConfig;
 
-  // The thread used to run the connection handler.
+  /** The thread used to run the connection handler. */
   private Thread connectionHandlerThread;
 
-  // Help to not warn permanently and fullfill the log file
-  // in debug mode.
+  /** Help to not warn permanently and fullfill the log file in debug mode. */
   private boolean alreadyWarn;
 
 
@@ -121,9 +120,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeConnectionHandler(LDIFConnectionHandlerCfg
                                                configuration)
@@ -164,9 +161,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeConnectionHandler(LocalizableMessage finalizeReason)
   {
@@ -199,9 +194,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getConnectionHandlerName()
   {
@@ -210,9 +203,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getProtocol()
   {
@@ -221,9 +212,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Collection<HostPort> getListeners()
   {
@@ -233,9 +222,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Collection<ClientConnection> getClientConnections()
   {
@@ -245,9 +232,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void run()
   {
@@ -564,9 +549,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void toString(StringBuilder buffer)
   {
@@ -579,9 +562,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(ConnectionHandlerCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -592,9 +573,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public boolean isConfigurationChangeAcceptable(
                       LDIFConnectionHandlerCfg configuration,
                       List<LocalizableMessage> unacceptableReasons)
@@ -605,9 +584,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public ConfigChangeResult applyConfigurationChange(
                                  LDIFConnectionHandlerCfg configuration)
   {
@@ -621,9 +598,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public DN getComponentEntryDN()
   {
@@ -632,9 +607,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String getClassName()
   {
     return LDIFConnectionHandler.class.getName();
@@ -642,9 +615,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public LinkedHashMap<String,String> getAlerts()
   {
     LinkedHashMap<String,String> alerts = new LinkedHashMap<String,String>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
index 1c94209..dc033fc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalClientConnection.java
@@ -2356,9 +2356,7 @@
     return 0;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public int getSSF() {
       //Always return strongest value.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java
index 6184efc..a9f9392 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalConnectionHandler.java
@@ -54,21 +54,20 @@
 public final class InternalConnectionHandler
        extends ConnectionHandler
 {
-  // The singleton instance of this internal connection handler.
+  /** The singleton instance of this internal connection handler. */
   private static InternalConnectionHandler handlerInstance =
        new InternalConnectionHandler();
 
-  // The list of "connections" associated with this connection
-  // handler.
+  /** The list of "connections" associated with this connection handler. */
   private LinkedList<ClientConnection> connectionList;
 
-  // The list of listeners associated with this connection handler.
+  /** The list of listeners associated with this connection handler. */
   private LinkedList<HostPort> listeners;
 
-  // The name of the protocol for this connection handler.
+  /** The name of the protocol for this connection handler. */
   private String protocol;
 
-  // Configuration object of the connection hanlder
+  /** Configuration object of the connection handler. */
   private ConnectionHandlerCfg configuration;
 
 
@@ -133,9 +132,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeConnectionHandler(LocalizableMessage finalizeReason)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPInputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPInputStream.java
index 0531c20..f1aa21a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPInputStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPInputStream.java
@@ -54,23 +54,25 @@
 public final class InternalLDAPInputStream
        extends InputStream
 {
-  // The queue of LDAP messages providing the data to be made
-  // available to the client.
+  /**
+   * The queue of LDAP messages providing the data to be made
+   * available to the client.
+   */
   private final ArrayBlockingQueue<LDAPMessage> messageQueue;
 
-  // Indicates whether this stream has been closed.
+  /** Indicates whether this stream has been closed. */
   private boolean closed;
 
-  // The byte buffer with partial data to be written to the client.
+  /** The byte buffer with partial data to be written to the client. */
   private final ByteStringBuilder messageBuffer;
 
-  // The byte buffer reader.
+  /** The byte buffer reader. */
   private final ByteSequenceReader messageReader;
 
-  // The byte buffer writer.
+  /** The byte buffer writer. */
   private final ASN1Writer writer;
 
-  // The internal LDAP socket serviced by this input stream.
+  /** The internal LDAP socket serviced by this input stream. */
   private final InternalLDAPSocket socket;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPOutputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
index 1f1ee9c..633fe4e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPOutputStream.java
@@ -67,21 +67,22 @@
        extends OutputStream
        implements InternalSearchListener
 {
-  // Indicates whether this stream has been closed.
+  /** Indicates whether this stream has been closed. */
   private boolean closed;
 
   private final ASN1Reader reader;
 
-  // The internal LDAP socket with which this output stream is
-  // associated.
+  /** The internal LDAP socket with which this output stream is associated. */
   private final InternalLDAPSocket socket;
 
-  // The immediate data being written.
+  /** The immediate data being written. */
   private ByteSequenceReader byteBuffer;
 
-  // The save buffer used to store any unprocessed data waiting
-  // to be read as ASN.1 elements. (Usually due to writing incomplete
-  // ASN.1 elements.)
+  /**
+   * The save buffer used to store any unprocessed data waiting
+   * to be read as ASN.1 elements. (Usually due to writing incomplete
+   * ASN.1 elements.)
+   */
   private final ByteStringBuilder saveBuffer;
 
   private final ByteSequenceReader saveBufferReader;
@@ -98,9 +99,7 @@
    */
   private class CombinedBufferInputStream extends InputStream
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int available()
     {
@@ -109,9 +108,7 @@
       return saveBufferReader.remaining() + byteBuffer.remaining();
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int read()
     {
@@ -129,18 +126,14 @@
       return -1;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int read(byte[] bytes)
     {
       return read(bytes, 0, bytes.length);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public int read(byte[] value, int off, int length)
     {
@@ -164,9 +157,7 @@
       return bytesCopied;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public long skip(long length)
     {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocket.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocket.java
index 69295ce..2cde8a6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocket.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalLDAPSocket.java
@@ -66,44 +66,46 @@
 public final class InternalLDAPSocket
        extends Socket
 {
-  // Indicates whether this socket is closed.
+  /** Indicates whether this socket is closed. */
   private boolean closed;
 
-  // The value that the client has requested for SO_KEEPALIVE.
+  /** The value that the client has requested for SO_KEEPALIVE. */
   private boolean keepAlive;
 
-  // The value that the client has requested for OOBINLINE.
+  /** The value that the client has requested for OOBINLINE. */
   private boolean oobInline;
 
-  // The value that the client has requested for SO_REUSEADDR.
+  /** The value that the client has requested for SO_REUSEADDR. */
   private boolean reuseAddress;
 
-  // The value that the client has requested for TCP_NODELAY.
+  /** The value that the client has requested for TCP_NODELAY. */
   private boolean tcpNoDelay;
 
-  // The value that the client has requested for SO_LINGER.
+  /** The value that the client has requested for SO_LINGER. */
   private int lingerDuration;
 
-  // The value that the client has requested for SO_RCVBUF.
+  /** The value that the client has requested for SO_RCVBUF. */
   private int receiveBufferSize;
 
-  // The value that the client has requested for SO_SNDBUF.
+  /** The value that the client has requested for SO_SNDBUF. */
   private int sendBufferSize;
 
-  // The value that the client has requested for SO_TIMEOUT.
+  /** The value that the client has requested for SO_TIMEOUT. */
   private int timeout;
 
-  // The value that the client has requested for the traffic class.
+  /** The value that the client has requested for the traffic class. */
   private int trafficClass;
 
-  // The internal client connection used to perform the internal
-  // operations.  It will be null until it is first used.
+  /**
+   * The internal client connection used to perform the internal
+   * operations.  It will be null until it is first used.
+   */
   private InternalClientConnection conn;
 
-  // The input stream associated with this internal LDAP socket.
+  /** The input stream associated with this internal LDAP socket. */
   private InternalLDAPInputStream inputStream;
 
-  // The output stream associated with this internal LDAP socket.
+  /** The output stream associated with this internal LDAP socket. */
   private InternalLDAPOutputStream outputStream;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/SearchRequest.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/SearchRequest.java
index 55128b2..d74b1e2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/SearchRequest.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/SearchRequest.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions copyright 2012-2014 ForgeRock AS.
+ *      Portions copyright 2012-2015 ForgeRock AS.
  */
 package org.opends.server.protocols.internal;
 
@@ -45,7 +45,7 @@
  */
 public final class SearchRequest extends AbstractRequestImpl {
     /**
-     * Use a LinkedHashSet to return the attributes in the same order as requested by the user
+     * Use a LinkedHashSet to return the attributes in the same order as requested by the user.
      */
     private final Set<String> attributes = new LinkedHashSet<String>();
     private DereferenceAliasesPolicy dereferenceAliasesPolicy = DereferenceAliasesPolicy.NEVER;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
index 4f3a21e..f27eb4f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
@@ -78,7 +78,6 @@
   public DirectoryRMIServerSocketFactory(SSLSocketFactory sslSocketFactory,
       boolean needClientCertificate)
   {
-    //
     // Initialize the configuration parameters.
     this.needClientCertificate = needClientCertificate;
     this.sslSocketFactory = sslSocketFactory;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index 58d0bce..abdfc8f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -107,9 +107,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       JMXConnectionHandlerCfg config) {
@@ -182,9 +180,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeConnectionHandler(LocalizableMessage finalizeReason) {
     // Make sure that we don't get notified of any more changes.
@@ -279,9 +275,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getShutdownListenerName() {
     return connectionHandlerName;
@@ -302,9 +296,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeConnectionHandler(JMXConnectionHandlerCfg config)
          throws ConfigException, InitializationException
@@ -345,9 +337,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getConnectionHandlerName() {
     return connectionHandlerName;
@@ -355,9 +345,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getProtocol() {
     return protocol;
@@ -365,18 +353,14 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Collection<HostPort> getListeners() {
     return listeners;
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(ConnectionHandlerCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -426,9 +410,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       JMXConnectionHandlerCfg config,
@@ -452,9 +434,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processServerShutdown(LocalizableMessage reason) {
     // We should also close the RMI registry.
@@ -485,9 +465,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void run() {
     try
@@ -502,9 +480,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void toString(StringBuilder buffer) {
     buffer.append(connectionHandlerName);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java
index f984eb3..50b5dbe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java
@@ -40,34 +40,25 @@
 
 /**
  * Wrapper class for the JMX's RMI connector. This class has the exact same
- * functionnalities but maintain inner variables which are used during the
+ * functionalities but maintain inner variables which are used during the
  * connection phase.
  * <p>
  * Note that the javadoc has been copied from the
  * javax.management.remote.JMXConnector interface.
  */
 public class OpendsJmxConnector implements JMXConnector
-
 {
 
-  /**
-   * the wrapped JMX RMI connector.
-   */
+  /** The wrapped JMX RMI connector. */
   private JMXConnector jmxc;
 
-  /**
-   * the connection environment set at creation.
-   */
+  /** The connection environment set at creation. */
   private Map<String,Object> environment;
 
-  /**
-   * the JMX Service URL.
-   */
+  /** The JMX Service URL. */
   private JMXServiceURL serviceURL;
 
-  /**
-   * the host to connect to.
-   */
+  /** The host to connect to. */
   private String serverHostname;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
index 3ec6337..b2ae042 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxPrincipal.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.server.protocols.jmx;
 
@@ -32,9 +33,7 @@
  */
 public class OpendsJmxPrincipal implements Principal
 {
-  /**
-   * The authentication ID.
-   */
+  /** The authentication ID. */
   private String authID;
 
 
@@ -50,36 +49,28 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean equals(Object another)
   {
     return authID.equals(another);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public int hashCode()
   {
     return authID.hashCode() ;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String toString()
   {
     return authID;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public String getName()
   {
     return authID;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java
index 38803d1..01ed7e0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsRMIJRMPServerImpl.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.server.protocols.jmx;
 
@@ -68,9 +69,7 @@
     super(port, csf, ssf, env);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   protected RMIConnection makeClient(String connectionId, Subject subject)
       throws IOException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiAuthenticator.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiAuthenticator.java
index fbe9d97..97c5ece 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiAuthenticator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiAuthenticator.java
@@ -25,26 +25,30 @@
  *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.jmx;
-import org.forgerock.i18n.LocalizableMessage;
 
-import java.util.*;
+import static org.opends.messages.ProtocolMessages.*;
+
+import java.util.ArrayList;
 
 import javax.management.remote.JMXAuthenticator;
 import javax.security.auth.Subject;
 
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.ResultCode;
+import org.opends.messages.CoreMessages;
 import org.opends.server.api.plugin.PluginResult;
 import org.opends.server.core.BindOperationBasis;
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.core.PluginConfigManager;
-import org.opends.messages.CoreMessages;
 import org.opends.server.protocols.ldap.LDAPResultCode;
-
-import static org.opends.messages.ProtocolMessages.*;
-
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.opends.server.types.*;
-import org.forgerock.opendj.ldap.ResultCode;
-import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.types.AuthenticationInfo;
+import org.opends.server.types.Control;
+import org.opends.server.types.DN;
+import org.opends.server.types.DisconnectReason;
+import org.opends.server.types.LDAPException;
+import org.opends.server.types.Privilege;
 
 /**
  * A <code>RMIAuthenticator</code> manages authentication for the secure
@@ -102,49 +106,29 @@
    * @return a <code>Subject</code> holding the principal(s)
    *         authenticated
    */
+  @Override
   public Subject authenticate(Object credentials)
   {
-    //
-    // If we are in the finalized phase, we should not accept
-    // new connection
-    if (finalizedPhase)
+    // If we are in the finalized phase, we should not accept new connection
+    if (finalizedPhase
+        || credentials == null)
     {
-      SecurityException se = new SecurityException();
-      throw se;
-    }
-
-    //
-    // Credentials are null !!!
-    if (credentials == null)
-    {
-      SecurityException se = new SecurityException();
-      throw se;
+      throw new SecurityException();
     }
     Object c[] = (Object[]) credentials;
     String authcID = (String) c[0];
     String password = (String) c[1];
 
-    //
-    // The authcID is used at forwarder level to identify the calling
-    // client
+    // The authcID is used at forwarder level to identify the calling client
     if (authcID == null)
     {
-      if (logger.isTraceEnabled())
-      {
-        logger.trace("User name is Null");
-      }
-      SecurityException se = new SecurityException();
-      throw se;
+      logger.trace("User name is Null");
+      throw new SecurityException();
     }
     if (password == null)
     {
-      if (logger.isTraceEnabled())
-      {
-        logger.trace("User password is Null ");
-      }
-
-      SecurityException se = new SecurityException();
-      throw se;
+      logger.trace("User password is Null ");
+      throw new SecurityException();
     }
 
     if (logger.isTraceEnabled())
@@ -152,11 +136,9 @@
       logger.trace("UserName = %s", authcID);
     }
 
-    //
     // Declare the client connection
     JmxClientConnection jmxClientConnection;
 
-    //
     // Try to see if we have an Ldap Authentication
     // Which should be the case in the current implementation
     try
@@ -170,7 +152,6 @@
       throw se;
     }
 
-    //
     // If we've gotten here, then the authentication was
     // successful. We'll take the connection so
     // invoke the post-connect plugins.
@@ -191,16 +172,13 @@
             pluginResult.getErrorMessage());
       }
 
-      SecurityException se = new SecurityException();
-      throw se;
+      throw new SecurityException();
     }
 
     // initialize a subject
     Subject s = new Subject();
 
-    //
     // Add the Principal. The current implementation doesn't use it
-
     s.getPrincipals().add(new OpendsJmxPrincipal(authcID));
 
     // add the connection client object
@@ -209,7 +187,6 @@
     s.getPrivateCredentials().add(new Credential(jmxClientConnection));
 
     return s;
-
   }
 
   /**
@@ -224,12 +201,9 @@
   {
     ArrayList<Control> requestControls = new ArrayList<Control>();
 
-    //
-    // We have a new client connection
-    DN bindDN;
     try
     {
-      bindDN = DN.valueOf(authcID);
+      DN.valueOf(authcID);
     }
     catch (Exception e)
     {
@@ -285,7 +259,6 @@
     }
     else
     {
-      //
       // Set the initcause.
       LDAPException ldapEx = new LDAPException(
           LDAPResultCode.INVALID_CREDENTIALS,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java
index 7fdf006..6209a40 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/RmiConnector.java
@@ -155,19 +155,14 @@
   {
     try
     {
-      //
-      // start the common registry
       startCommonRegistry();
 
-      //
       // start the RMI connector (SSL + server authentication)
       startConnectorNoClientCertificate();
 
-      //
       // start the RMI connector (SSL + server authentication +
       // client authentication + identity given part SASL/PLAIN)
       // TODO startConnectorClientCertificate(clientConnection);
-
     }
     catch (Exception e)
     {
@@ -196,7 +191,6 @@
     final InetAddress listenAddress = jmxConnectionHandler.getListenAddress();
     int registryPort = jmxConnectionHandler.getListenPort();
 
-    //
     // create our local RMI registry if it does not exist already
     if (logger.isTraceEnabled())
     {
@@ -205,7 +199,6 @@
     }
     try
     {
-      //
       // TODO Not yet implemented: If the host has several interfaces
       if (registry == null)
       {
@@ -215,7 +208,6 @@
     }
     catch (RemoteException re)
     {
-      //
       // is the registry already created ?
       if (logger.isTraceEnabled())
       {
@@ -223,11 +215,9 @@
       }
       try
       {
-        //
         // get a 'remote' reference on the registry
         Registry reg = LocateRegistry.getRegistry(registryPort);
 
-        //
         // 'ping' the registry
         reg.list();
         registry = reg;
@@ -236,18 +226,15 @@
       {
         if (logger.isTraceEnabled())
         {
-          //
           // no 'valid' registry found on the specified port
           logger.trace("exception thrown while pinging the RMI registry");
 
-          //
           // throw the original exception
           logger.traceException(re);
         }
         throw re;
       }
 
-      //
       // here the registry is ok even though
       // it was not created by this call
       if (logger.isTraceEnabled())
@@ -273,7 +260,6 @@
   {
     try
     {
-      //
       // Environment map
       HashMap<String, Object> env = new HashMap<String, Object>();
 
@@ -292,7 +278,6 @@
         // ---------------------
         // SERVER SIDE
         // ---------------------
-        //
         // Get a Server socket factory
         KeyManager[] keyManagers;
         KeyManagerProvider provider = DirectoryServer
@@ -323,10 +308,8 @@
             null);
         SSLSocketFactory ssf = ctx.getSocketFactory();
 
-        //
         // set the Server socket factory in the JMX map
-        rmiServerSockeyFactory = new DirectoryRMIServerSocketFactory(ssf,
-            false);
+        rmiServerSockeyFactory = new DirectoryRMIServerSocketFactory(ssf, false);
         env.put(
             "jmx.remote.rmi.server.socket.factory",
             rmiServerSockeyFactory);
@@ -349,7 +332,6 @@
         }
       }
 
-      //
       // specify the rmi JMX authenticator to be used
       if (logger.isTraceEnabled())
       {
@@ -359,7 +341,6 @@
 
       env.put(JMXConnectorServer.AUTHENTICATOR, rmiAuthenticator);
 
-      //
       // Create the JMX Service URL
       String uri = "org.opends.server.protocols.jmx.client-unknown";
       String serviceUrl = "service:jmx:rmi:///jndi/rmi://"
@@ -367,7 +348,6 @@
           + "/" + uri;
       JMXServiceURL url = new JMXServiceURL(serviceUrl);
 
-      //
       // Create and start the connector
       if (logger.isTraceEnabled())
       {
@@ -380,7 +360,6 @@
           opendsRmiConnectorServer, mbs);
       jmxRmiConnectorNoClientCertificate.start();
 
-      //
       // Register the connector into the RMI registry
       // TODO Should we do that?
       ObjectName name = new ObjectName(jmxRmiConnectorNoClientCertificateName);
@@ -429,7 +408,6 @@
     jmxRmiConnectorNoClientCertificate = null;
     jmxRmiConnectorClientCertificate = null;
 
-    //
     // Unregister connectors and stop them.
     try
     {
@@ -459,12 +437,13 @@
 
     if (stopRegistry)
     {
-      //
       // Close the socket
       try
       {
         if (rmiSsf != null)
+        {
           rmiSsf.close();
+        }
       }
       catch (IOException e)
       {
@@ -473,7 +452,6 @@
       }
       registry = null;
     }
-
   }
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
index 8d958c6..bea4de4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AbandonRequestProtocolOp.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.ldap;
 
@@ -47,7 +47,7 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The message ID of the operation to abandon.
+  /** The message ID of the operation to abandon. */
   private int idToAbandon;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
index effb035..2217e18 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/AddResponseProtocolOp.java
@@ -51,16 +51,16 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The matched DN for this response.
+  /** The matched DN for this response. */
   private DN matchedDN;
 
-  // The result code for this response.
+  /** The result code for this response. */
   private int resultCode;
 
-  // The set of referral URLs for this response.
+  /** The set of referral URLs for this response. */
   private List<String> referralURLs;
 
-  // The error message for this response.
+  /** The error message for this response. */
   private LocalizableMessage errorMessage;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
index 72c3d7b..dc2910c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/BindResponseProtocolOp.java
@@ -52,19 +52,19 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The server SASL credentials for this response.
+  /** The server SASL credentials for this response. */
   private ByteString serverSASLCredentials;
 
-  // The matched DN for this response.
+  /** The matched DN for this response. */
   private DN matchedDN;
 
-  // The result code for this response.
+  /** The result code for this response. */
   private int resultCode;
 
-  // The set of referral URLs for this response.
+  /** The set of referral URLs for this response. */
   private List<String> referralURLs;
 
-  // The error message for this response.
+  /** The error message for this response. */
   private LocalizableMessage errorMessage;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
index 5ed8fd7..d785cb0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareRequestProtocolOp.java
@@ -47,13 +47,13 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The assertion value for this compare request.
+  /** The assertion value for this compare request. */
   private ByteString assertionValue;
 
-  // The DN for this compare request.
+  /** The DN for this compare request. */
   private ByteString dn;
 
-  // The attribute type for this compare request.
+  /** The attribute type for this compare request. */
   private String attributeType;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
index 7e83066..3f1a5d8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/CompareResponseProtocolOp.java
@@ -51,16 +51,16 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The matched DN for this response.
+  /** The matched DN for this response. */
   private DN matchedDN;
 
-  // The result code for this response.
+  /** The result code for this response. */
   private int resultCode;
 
-  // The set of referral URLs for this response.
+  /** The set of referral URLs for this response. */
   private List<String> referralURLs;
 
-  // The error message for this response.
+  /** The error message for this response. */
   private LocalizableMessage errorMessage;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
index 2c383c3..8e15c97 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteRequestProtocolOp.java
@@ -47,7 +47,7 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The DN for this delete request.
+  /** The DN for this delete request. */
   private ByteString dn;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
index a876eb4..989b8cc 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/DeleteResponseProtocolOp.java
@@ -54,16 +54,16 @@
 
 
 
-  // The matched DN for this response.
+  /** The matched DN for this response. */
   private DN matchedDN;
 
-  // The result code for this response.
+  /** The result code for this response. */
   private int resultCode;
 
-  // The set of referral URLs for this response.
+  /** The set of referral URLs for this response. */
   private List<String> referralURLs;
 
-  // The error message for this response.
+  /** The error message for this response. */
   private LocalizableMessage errorMessage;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
index c5f2304..e955627 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedRequestProtocolOp.java
@@ -47,10 +47,10 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The value for this extended request.
+  /** The value for this extended request. */
   private ByteString value;
 
-  // The OID for this extended request.
+  /** The OID for this extended request. */
   private String oid;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
index 80d11ea..e347d5f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ExtendedResponseProtocolOp.java
@@ -52,22 +52,22 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The value for this extended response.
+  /** The value for this extended response. */
   private ByteString value;
 
-  // The matched DN for this response.
+  /** The matched DN for this response. */
   private DN matchedDN;
 
-  // The result code for this response.
+  /** The result code for this response. */
   private int resultCode;
 
-  // The set of referral URLs for this response.
+  /** The set of referral URLs for this response. */
   private List<String> referralURLs;
 
-  // The error message for this response.
+  /** The error message for this response. */
   private LocalizableMessage errorMessage;
 
-  // The OID for this extended response.
+  /** The OID for this extended response. */
   private String oid;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
index 98b4efc..c9ea4aa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/IntermediateResponseProtocolOp.java
@@ -47,10 +47,10 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The value for this intermediate response.
+  /** The value for this intermediate response. */
   private ByteString value;
 
-  // The OID for this intermediate response.
+  /** The OID for this intermediate response. */
   private String oid;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
index 894b9eb..8156f8a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -103,9 +103,7 @@
 
 
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     public void run()
     {
@@ -334,9 +332,7 @@
   private static final ThreadLocal<ASN1WriterHolder> ASN1_WRITER_CACHE =
       new ThreadLocal<ASN1WriterHolder>()
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     @Override
     protected ASN1WriterHolder initialValue()
     {
@@ -1472,9 +1468,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Selector getWriteSelector()
   {
@@ -1501,9 +1495,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public long getMaxBlockedWriteTimeLimit()
   {
@@ -2353,9 +2345,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getMonitorSummary()
   {
@@ -2441,9 +2431,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean prepareTLS(LocalizableMessageBuilder unavailableReason)
   {
@@ -2607,9 +2595,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public int getSSF()
   {
@@ -2620,9 +2606,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finishBindOrStartTLS()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index 92cc9f5..33bdeaa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -300,9 +300,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       LDAPConnectionHandlerCfg config)
@@ -374,9 +372,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void finalizeConnectionHandler(LocalizableMessage finalizeReason)
   {
@@ -500,9 +496,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getConnectionHandlerName()
   {
@@ -511,9 +505,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Collection<String> getEnabledSSLCipherSuites()
   {
@@ -527,9 +519,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Collection<String> getEnabledSSLProtocols()
   {
@@ -543,9 +533,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Collection<HostPort> getListeners()
   {
@@ -610,9 +598,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getProtocol()
   {
@@ -621,9 +607,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getShutdownListenerName()
   {
@@ -656,9 +640,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeConnectionHandler(LDAPConnectionHandlerCfg config)
       throws ConfigException, InitializationException
@@ -782,9 +764,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(ConnectionHandlerCfg configuration,
       List<LocalizableMessage> unacceptableReasons)
@@ -865,9 +845,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       LDAPConnectionHandlerCfg config, List<LocalizableMessage> unacceptableReasons)
@@ -890,9 +868,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processServerShutdown(LocalizableMessage reason)
   {
@@ -918,9 +894,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void start()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPControl.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPControl.java
index a3bde1e..11d3e87 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPControl.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.ldap;
 
@@ -42,7 +42,7 @@
  */
 public class LDAPControl extends Control
 {
-  // The control value.
+  /** The control value. */
   private ByteString value;
 
 
@@ -114,9 +114,7 @@
     return (value != null);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void writeValue(ASN1Writer stream) throws IOException
   {
     if (value != null)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPFilter.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPFilter.java
index 4f4efcd..d744703 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPFilter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPFilter.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.ldap;
 
@@ -59,34 +59,34 @@
 
   private static LDAPFilter objectClassPresent;
 
-  // The set of subAny elements for substring filters.
+  /** The set of subAny elements for substring filters. */
   private ArrayList<ByteString> subAnyElements;
 
-  // The set of filter components for AND and OR filters.
+  /** The set of filter components for AND and OR filters. */
   private ArrayList<RawFilter> filterComponents;
 
-  // Indicates whether to match on DN attributes for extensible match filters.
+  /** Indicates whether to match on DN attributes for extensible match filters. */
   private boolean dnAttributes;
 
-  // The assertion value for several filter types.
+  /** The assertion value for several filter types. */
   private ByteString assertionValue;
 
-  // The subFinal element for substring filters.
+  /** The subFinal element for substring filters. */
   private ByteString subFinalElement;
 
-  // The subInitial element for substring filters.
+  /** The subInitial element for substring filters. */
   private ByteString subInitialElement;
 
-  // The filter type for this filter.
+  /** The filter type for this filter. */
   private FilterType filterType;
 
-  // The filter component for NOT filters.
+  /** The filter component for NOT filters. */
   private RawFilter notComponent;
 
-  // The attribute type for several filter types.
+  /** The attribute type for several filter types. */
   private String attributeType;
 
-  // The matching rule ID for extensible matching filters.
+  /** The matching rule ID for extensible matching filters. */
   private String matchingRuleID;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPMessage.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPMessage.java
index 8d95694..18b52b6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPMessage.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPMessage.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.ldap;
 
@@ -49,13 +49,13 @@
 public class LDAPMessage
        implements ProtocolElement
 {
-  // The set of controls for this LDAP message.
+  /** The set of controls for this LDAP message. */
   private List<Control> controls;
 
-  // The message ID for this LDAP message.
+  /** The message ID for this LDAP message. */
   private final int messageID;
 
-  // The protocol op for this LDAP message.
+  /** The protocol op for this LDAP message. */
   private final ProtocolOp protocolOp;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java
index 8e63596..ca9d367 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPModification.java
@@ -42,10 +42,10 @@
 public class LDAPModification
        extends RawModification
 {
-  // The modification type for this modification.
+  /** The modification type for this modification. */
   private ModificationType modificationType;
 
-  // The attribute for this modification.
+  /** The attribute for this modification. */
   private RawAttribute attribute;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
index 1831569..f5756dd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
@@ -65,29 +65,31 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // Indicates whether the Directory Server is in the process of shutting down.
+  /** Indicates whether the Directory Server is in the process of shutting down. */
   private volatile boolean shutdownRequested;
 
-  // The current set of selection keys.
+  /** The current set of selection keys. */
   private volatile SelectionKey[] keys = new SelectionKey[0];
 
-  // The queue that will be used to hold the set of pending connections that
-  // need to be registered with the selector.
-  // TODO: revisit, see Issue 4202.
+  /**
+   * The queue that will be used to hold the set of pending connections that
+   * need to be registered with the selector.
+   * TODO: revisit, see Issue 4202.
+   */
   private List<LDAPClientConnection> pendingConnections =
     new LinkedList<LDAPClientConnection>();
 
-  // Lock object for synchronizing access to the pending connections queue.
+  /** Lock object for synchronizing access to the pending connections queue. */
   private final Object pendingConnectionsLock = new Object();
 
-  // The list of connections ready for request processing.
+  /** The list of connections ready for request processing. */
   private LinkedList<LDAPClientConnection> readyConnections =
     new LinkedList<LDAPClientConnection>();
 
-  // The selector that will be used to monitor the client connections.
+  /** The selector that will be used to monitor the client connections. */
   private final Selector selector;
 
-  // The name to use for this request handler.
+  /** The name to use for this request handler. */
   private final String handlerName;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
index b29ad57..49568ac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPStatistics.java
@@ -22,13 +22,10 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
- *
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.protocols.ldap;
 
-
-
 import static org.opends.messages.ProtocolMessages.*;
 import static org.opends.server.protocols.ldap.LDAPConstants.*;
 import static org.opends.server.util.ServerConstants.*;
@@ -44,7 +41,6 @@
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.types.*;
 
-
 /**
  * This class defines a data structure that will be used to keep track
  * of various metrics related to LDAP communication that the server has
@@ -105,7 +101,7 @@
   private AtomicLong unbindRequests = new AtomicLong(0);
 
 
-  // The instance name for this monitor provider instance.
+  /** The instance name for this monitor provider instance. */
   private final String instanceName;
 
   // Monitor Objects : for Operations (count and time)
@@ -144,9 +140,7 @@
 
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeMonitorProvider(MonitorProviderCfg configuration)
       throws ConfigException
@@ -176,10 +170,7 @@
   }
 
 
-  /**
-   *
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ObjectClass getMonitorObjectClass()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
index ded704b..906ce5c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNRequestProtocolOp.java
@@ -47,16 +47,16 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The current entry DN for this modify DN request.
+  /** The current entry DN for this modify DN request. */
   private ByteString entryDN;
 
-  // The new RDN for this modify DN request.
+  /** The new RDN for this modify DN request. */
   private ByteString newRDN;
 
-  // The new superior DN for this modify DN request.
+  /** The new superior DN for this modify DN request. */
   private ByteString newSuperior;
 
-  // Indicates whether to delete the current RDN value(s).
+  /** Indicates whether to delete the current RDN value(s). */
   private boolean deleteOldRDN;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
index e64c1fc..308ca3b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyDNResponseProtocolOp.java
@@ -51,16 +51,16 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The matched DN for this response.
+  /** The matched DN for this response. */
   private DN matchedDN;
 
-  // The result code for this response.
+  /** The result code for this response. */
   private int resultCode;
 
-  // The set of referral URLs for this response.
+  /** The set of referral URLs for this response. */
   private List<String> referralURLs;
 
-  // The error message for this response.
+  /** The error message for this response. */
   private LocalizableMessage errorMessage;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
index 240b82e..9e4f0a3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/ModifyResponseProtocolOp.java
@@ -51,16 +51,16 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The matched DN for this response.
+  /** The matched DN for this response. */
   private DN matchedDN;
 
-  // The result code for this response.
+  /** The result code for this response. */
   private int resultCode;
 
-  // The set of referral URLs for this response.
+  /** The set of referral URLs for this response. */
   private List<String> referralURLs;
 
-  // The error message for this response.
+  /** The error message for this response. */
   private LocalizableMessage errorMessage;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
index 9489e65..4d31075 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultDoneProtocolOp.java
@@ -51,16 +51,16 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The matched DN for this response.
+  /** The matched DN for this response. */
   private DN matchedDN;
 
-  // The result code for this response.
+  /** The result code for this response. */
   private int resultCode;
 
-  // The set of referral URLs for this response.
+  /** The set of referral URLs for this response. */
   private List<String> referralURLs;
 
-  // The error message for this response.
+  /** The error message for this response. */
   private LocalizableMessage errorMessage;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
index f5a0e81..d4ef065 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
@@ -59,16 +59,16 @@
 public class SearchResultEntryProtocolOp
        extends ProtocolOp
 {
-  // The set of attributes for this search entry.
+  /** The set of attributes for this search entry. */
   private LinkedList<LDAPAttribute> attributes;
 
-  // The DN for this search entry.
+  /** The DN for this search entry. */
   private final DN dn;
 
-  // The underlying search result entry.
+  /** The underlying search result entry. */
   private SearchResultEntry entry;
 
-  // The LDAP version (determines how attribute options are handled).
+  /** The LDAP version (determines how attribute options are handled). */
   private final int ldapVersion;
 
 
@@ -131,7 +131,7 @@
 
 
 
-  // Generic constructor.
+  /** Generic constructor. */
   private SearchResultEntryProtocolOp(DN dn,
       LinkedList<LDAPAttribute> attributes, SearchResultEntry searchEntry,
       int ldapVersion)
@@ -624,7 +624,7 @@
 
 
 
-  // Write an attribute without converting to an LDAPAttribute.
+  /** Write an attribute without converting to an LDAPAttribute. */
   private void writeAttribute(ASN1Writer stream, Attribute a)
       throws IOException
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
index 5fd0c3e..8cf6fe9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/SearchResultReferenceProtocolOp.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
 package org.opends.server.protocols.ldap;
 
@@ -51,7 +51,7 @@
 {
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
-  // The set of referral URLs for this search result reference.
+  /** The set of referral URLs for this search result reference. */
   private List<String> referralURLs;
 
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/AssuredMode.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/AssuredMode.java
index 300ec6d..6c13993 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/AssuredMode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/AssuredMode.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.server.replication.common;
 
@@ -30,16 +31,12 @@
  */
 public enum AssuredMode
 {
-  /**
-   * Safe read assured mode.
-   */
+  /** Safe read assured mode. */
   SAFE_READ_MODE((byte) 1),
-  /**
-   * Safe data assured mode.
-   */
+  /** Safe data assured mode. */
   SAFE_DATA_MODE((byte) 2);
 
-  // The mode value
+  /** The mode value. */
   private byte value = -1;
 
   private AssuredMode(byte value)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/CSN.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/CSN.java
index 73f248b..f4ca451 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/CSN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/CSN.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.replication.common;
 
@@ -181,9 +181,7 @@
     return serverId;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean equals(Object obj)
   {
@@ -203,9 +201,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public int hashCode()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerState.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerState.java
index aa2789e..0d41166 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerState.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.replication.common;
 
@@ -181,7 +181,7 @@
   }
 
   /**
-   * return a Set of String usable as a textual representation of
+   * Return a Set of String usable as a textual representation of
    * a Server state.
    * format : time seqnum id
    *
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerStatus.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerStatus.java
index b7bba89..98f0b8a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerStatus.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/ServerStatus.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.server.replication.common;
 
@@ -85,7 +86,7 @@
    */
   BAD_GEN_ID_STATUS((byte) 4);
 
-  // The status value
+  /** The status value. */
   private byte value = -1;
 
   private ServerStatus(byte value)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/StatusMachineEvent.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/StatusMachineEvent.java
index c1ca3e8..07a5704 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/common/StatusMachineEvent.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/common/StatusMachineEvent.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.server.replication.common;
 
@@ -57,7 +58,7 @@
    * Event used when one wants the DS to enter the BAD_GEN_ID_STATUS.
    */
   TO_BAD_GEN_ID_STATUS_EVENT((byte) 4);
-  // The status value
+  /** The status value. */
   private byte value = -1;
 
   private StatusMachineEvent(byte value)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java
index 193f251..14164ad 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalMultiple.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -244,9 +244,7 @@
     return valuesHist;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean replayOperation(Iterator<Modification> modsIterator, CSN csn,
       Entry modifiedEntry, Modification m)
@@ -638,9 +636,7 @@
     return true;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void assign(HistAttrModificationKey histKey, ByteString value, CSN csn)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
index 51e8647..74ba9d9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalSingle.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -55,24 +55,20 @@
   /** Last added value. */
   private ByteString value;
 
-/**
- * last operation applied. This is only used for multiple mods on the same
- * single valued attribute in the same modification.
- */
+  /**
+   * Last operation applied. This is only used for multiple mods on the same
+   * single valued attribute in the same modification.
+   */
   private HistAttrModificationKey lastMod;
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public CSN getDeleteTime()
   {
     return this.deleteTime;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public Map<AttrValueHistorical,AttrValueHistorical> getValuesHistorical()
   {
@@ -87,9 +83,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void processLocalOrNonConflictModification(CSN csn, Modification mod)
   {
@@ -138,9 +132,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean replayOperation(Iterator<Modification> modsIterator, CSN csn,
       Entry modifiedEntry, Modification mod)
@@ -287,9 +279,7 @@
     return conflict;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void assign(HistAttrModificationKey histKey, ByteString value, CSN csn)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalWithOptions.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalWithOptions.java
index 05f4fec..7032757 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalWithOptions.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrHistoricalWithOptions.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.server.replication.plugin;
 
@@ -35,11 +36,9 @@
  */
 public class AttrHistoricalWithOptions
 {
-  private HashMap<Set<String> ,AttrHistorical> attributesInfo;
+  private HashMap<Set<String>, AttrHistorical> attributesInfo;
 
-  /**
-   * creates a new AttrInfoWithOptions.
-   */
+  /** Creates a new AttrInfoWithOptions. */
   public AttrHistoricalWithOptions()
   {
     attributesInfo = new HashMap<Set<String> ,AttrHistorical>();
@@ -69,7 +68,7 @@
   }
 
   /**
-   * get the Attributes information associated to this object.
+   * Get the Attributes information associated to this object.
    * @return the set of informations
    */
   public HashMap<Set<String>, AttrHistorical> getAttributesInfo()
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrValueHistorical.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrValueHistorical.java
index f8a65d3..6ff45f7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrValueHistorical.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/AttrValueHistorical.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.replication.plugin;
 
@@ -70,7 +70,7 @@
   }
 
   /**
-   * calculates the hasCode for this object.
+   * Calculates the hasCode for this object.
    * Only value is used when calculating the hashCode
    * @return the hashcode
    */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeAddOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeAddOperation.java
index 496014c..056ef3a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeAddOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeAddOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -54,9 +54,7 @@
     this.entry = entry;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public AddMsg generateMessage()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeDelOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeDelOperation.java
index 2e69fcf..254e068 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeDelOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeDelOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions copyright 2012-2013 ForgeRock AS
+ *      Portions copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -58,9 +58,7 @@
   }
 
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ReplicationMsg generateMessage()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModdnOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModdnOperation.java
index 1f54d08..a7e2752 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModdnOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModdnOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2012-2014 ForgeRock AS
+ *      Portions Copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -55,9 +55,7 @@
     this.entry = entry;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ReplicationMsg generateMessage()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModifyOperation.java
index 9746178..8ca1e73 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModifyOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeModifyOperation.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions copyright 2012-2013 ForgeRock AS
+ *      Portions copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -74,9 +74,7 @@
     mods.add(mod);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public ReplicationMsg generateMessage()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperationComparator.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperationComparator.java
index 5e0a05e..0efc229 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperationComparator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/FakeOperationComparator.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions copyright 2013 ForgeRock AS
+ *      Portions copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.replication.plugin;
 
@@ -34,9 +34,7 @@
  */
 public class FakeOperationComparator implements Comparator<FakeOperation>
 {
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public int compare(FakeOperation op1, FakeOperation op2)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java
index 8b445a3..7f6aa1e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/GenerationIdChecksum.java
@@ -39,20 +39,16 @@
  */
 public class GenerationIdChecksum implements Checksum
 {
-  // Checksum to be returned.
+  /** Checksum to be returned. */
   private long checksum;
 
-  /**
-   * This is the generation id for an empty backend.
-   */
+  /** This is the generation id for an empty backend. */
   public static final long EMPTY_BACKEND_GENERATION_ID = 48L;
 
-  /**
-   * Update the checksum with one added byte.
-   */
+  /** Update the checksum with one added byte. */
   private void updateWithOneByte(byte b)
   {
-    /**
+    /*
      * The "end of line" code is CRLF under windows but LF on UNIX. So to get
      * the same checksum value on every platforms, we always exclude the CR and
      * LF characters from the computation.
@@ -63,17 +59,13 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void update(int b)
   {
     updateWithOneByte((byte) b);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void update(byte[] b, int off, int len)
   {
     for (int i = off; i < (off + len); i++)
@@ -82,9 +74,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public long getValue()
   {
     if (checksum != 0L)
@@ -92,18 +82,18 @@
       return checksum;
     } else
     {
-      // Computing an empty backend writes the number of entries (0) only, which
-      // will not be added to the checksum as no entries will follow. To treat
-      // this special case, and to keep consistency with old versions, in that
-      // case we hardcode and return the generation id value for an empty
-      // backend.
+      /*
+       * Computing an empty backend writes the number of entries (0) only,
+       * will not be added to the checksum as no entries will follow. To treat
+       * this special case, and to keep consistency with old versions, in that
+       * case we hardcode and return the generation id value for an empty
+       * backend.
+       */
       return EMPTY_BACKEND_GENERATION_ID;
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void reset()
   {
     checksum = 0L;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistAttrModificationKey.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistAttrModificationKey.java
index 20c1fbd..9415761 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistAttrModificationKey.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistAttrModificationKey.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.server.replication.plugin;
 
@@ -34,7 +35,6 @@
  * ds-sync-hist: attrName1:changeNumber2:del:deletedValue
  * ds-sync-hist: attrName3:changeNumber3:add:newAddedvalue
  * ds-sync-hist: attrName3:changeNumber4:attrDel
- *
  */
 public enum HistAttrModificationKey
 {
@@ -58,7 +58,7 @@
    */
   ADD("add");
 
-  // The string representation of this key.
+  /** The string representation of this key. */
   private String key;
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java
index 9fd9cf0..af4d6c7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRuleFactory.java
@@ -22,10 +22,8 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS
+ *      Portions Copyright 2014-2015 ForgeRock AS
  */
-
-
 package org.opends.server.replication.plugin;
 
 import java.util.Collection;
@@ -47,12 +45,10 @@
         extends MatchingRuleFactory<MatchingRuleCfg>
 {
 
-  //Associated Matching Rule.
+  /** Associated Matching Rule. */
   private MatchingRule matchingRule;
 
- /**
-  * {@inheritDoc}
-  */
+ /** {@inheritDoc} */
  @Override
  public final void initializeMatchingRule(MatchingRuleCfg configuration)
          throws ConfigException, InitializationException
@@ -65,12 +61,10 @@
        .addToSchema().toSchema().getMatchingRule(oid);
  }
 
- /**
-  * {@inheritDoc}
-  */
+ /** {@inheritDoc} */
  @Override
  public final Collection<MatchingRule> getMatchingRules()
  {
     return Collections.singleton(matchingRule);
  }
-}
\ No newline at end of file
+}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index d19a911..b9dd1ba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -2550,7 +2550,7 @@
   }
 
   /**
-   * find the current DN of an entry from its entry UUID.
+   * Find the current DN of an entry from its entry UUID.
    *
    * @param uuid the Entry Unique ID.
    * @return The current DN of the entry or null if there is no entry with
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplLDIFOutputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplLDIFOutputStream.java
index 2715dd0..2e7d6be 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplLDIFOutputStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplLDIFOutputStream.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
+ *      Portions Copyright 2015 ForgeRock AS.
  */
 package org.opends.server.replication.plugin;
 
@@ -38,14 +39,14 @@
 public class ReplLDIFOutputStream
        extends OutputStream
 {
-  // The number of entries to be exported
+  /** The number of entries to be exported. */
   long numEntries;
 
-  // The current number of entries exported
+  /** The current number of entries exported. */
   private long numExportedEntries;
   String entryBuffer = "";
 
-  // The checksum for computing the generation id
+  /** The checksum for computing the generation id. */
   private GenerationIdChecksum checkSum = new GenerationIdChecksum();
 
   /**
@@ -59,9 +60,7 @@
     this.numEntries = numEntries;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void write(int i) throws IOException
   {
     throw new IOException("Invalid call");
@@ -76,9 +75,7 @@
     return checkSum.getValue();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   public void write(byte b[], int off, int len) throws IOException
   {
     int endOfEntryIndex;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
index c6f7494..5e92cb3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/ReplicationRepairRequestControl.java
@@ -52,9 +52,7 @@
   private static final class Decoder
       implements ControlDecoder<ReplicationRepairRequestControl>
   {
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public ReplicationRepairRequestControl decode(boolean isCritical,
                                                   ByteString value)
            throws DirectoryException
@@ -62,9 +60,7 @@
       return new ReplicationRepairRequestControl(isCritical);
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    /** {@inheritDoc} */
     public String getOID()
     {
       return OID_REPLICATION_REPAIR_CONTROL;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ChangeStatusMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ChangeStatusMsg.java
index 3e55c30..42982a1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ChangeStatusMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ChangeStatusMsg.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions copyright 2013-2014 ForgeRock AS.
+ *      Portions copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.replication.protocol;
 
@@ -37,9 +37,9 @@
  */
 public class ChangeStatusMsg extends ReplicationMsg
 {
-  /** The status we want the DS to enter (used when from RS to DS) */
+  /** The status we want the DS to enter (used when from RS to DS). */
   private final ServerStatus requestedStatus;
-  /** The new status the DS just entered (used when from DS to RS) */
+  /** The new status the DS just entered (used when from DS to RS). */
   private ServerStatus newStatus;
 
   /**
@@ -124,4 +124,4 @@
       "\nnewStatus: " + newStatus +
       "\nrequestedStatus: " + requestedStatus;
   }
-}
\ No newline at end of file
+}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteMsg.java
index 0918399..1ef98bb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/DeleteMsg.java
@@ -45,7 +45,7 @@
 {
   private String initiatorsName;
 
-  /** whether the DEL operation is a subtree DEL. */
+  /** Whether the DEL operation is a subtree DEL. */
   private boolean isSubtreeDelete;
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/EntryMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/EntryMsg.java
index ebac0db..17033fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/EntryMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/EntryMsg.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.replication.protocol;
 
@@ -38,7 +38,8 @@
 {
   /** The byte array containing the bytes of the entry transported. */
   private final byte[] entryByteArray;
-  private int msgId = -1; // from V4
+  /** From V4. */
+  private int msgId = -1;
 
   /**
    * Creates a new EntryMsg.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ErrorMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ErrorMsg.java
index 2b7e0c9..80f6e5e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ErrorMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ErrorMsg.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.replication.protocol;
 
@@ -40,7 +40,7 @@
  */
 public class ErrorMsg extends RoutableMsg
 {
-  /** The tracer object for the debug logger */
+  /** The tracer object for the debug logger. */
   private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
   /** Specifies the messageID built from the error that was detected. */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java
index a9fcdb8..554e3f2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/HeartbeatThread.java
@@ -83,9 +83,7 @@
     this.heartbeatInterval = heartbeatInterval;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void run()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java
index bc35fcb..3be70cb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ModifyDNMsg.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.replication.protocol;
 
@@ -51,7 +51,7 @@
   private String newSuperiorEntryUUID;
 
   /**
-   * construct a new Modify DN message.
+   * Construct a new Modify DN message.
    *
    * @param operation The operation to use for building the message
    */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java
index 408df8b..af848a7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/NotSupportedOldVersionPDUException.java
@@ -39,11 +39,14 @@
  */
 public class NotSupportedOldVersionPDUException extends Exception
 {
-  // Suppress compile warning
+  /** Suppress compile warning. */
   static final long serialVersionUID = 1739875L;
-  private String msg; // Explicit message
-  private short protocolVersion = -1; // protocol version of the pdu
-  private byte pduType = -1; // type of the pdu
+  /** Explicit message. */
+  private String msg;
+  /** Protocol version of the pdu. */
+  private short protocolVersion = -1;
+  /** Type of the pdu. */
+  private byte pduType = -1;
 
   /**
    * Exception constructor.
@@ -70,18 +73,14 @@
     return msg;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getLocalizedMessage()
   {
     return getMessage();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String toString()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/OperationContext.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/OperationContext.java
index 58b3907..a426821 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/OperationContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/OperationContext.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions copyright 2012-2013 ForgeRock AS
+ *      Portions copyright 2012-2015 ForgeRock AS
  */
 package org.opends.server.replication.protocol;
 
@@ -36,14 +36,10 @@
  */
 public abstract class OperationContext
 {
-  /**
-   * The identifier used to attach the context to operations.
-   */
+  /** The identifier used to attach the context to operations. */
   public static final String SYNCHROCONTEXT = "replicationContext";
 
-  /**
-   * The CSN of the Operation.
-   */
+  /** The CSN of the Operation. */
   private CSN csn;
 
   /**
@@ -119,9 +115,7 @@
     return ctx.csn;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean equals(Object obj)
   {
@@ -134,9 +128,7 @@
     return false;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public int hashCode()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartDSMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartDSMsg.java
index 3e13c4d..dec8a00 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartDSMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartDSMsg.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.replication.protocol;
 
@@ -195,7 +195,7 @@
   }
 
   /**
-   * get the window size for the server that created this message.
+   * Get the window size for the server that created this message.
    *
    * @return The window size for the server that created this message.
    */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartMsg.java
index a1403fe..ac498fd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ReplServerStartMsg.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.replication.protocol;
 
@@ -203,7 +203,7 @@
   }
 
   /**
-   * get the window size for the server that created this message.
+   * Get the window size for the server that created this message.
    *
    * @return The window size for the server that created this message.
    */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ServerStartMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ServerStartMsg.java
index 8b65188..e0b93ec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ServerStartMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/ServerStartMsg.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.replication.protocol;
 
@@ -38,7 +38,7 @@
  */
 public class ServerStartMsg extends StartMsg
 {
-  /** Id of the LDAP server that sent this message */
+  /** Id of the LDAP server that sent this message. */
   private final int serverId;
   private final String serverURL;
   private final DN baseDN;
@@ -135,7 +135,7 @@
   }
 
   /**
-   * get the Server URL from the message.
+   * Get the Server URL from the message.
    * @return the server URL
    */
   public String getServerURL()
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java
index 78eb777..718597c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java
@@ -91,7 +91,8 @@
    * initial single threaded handshake.
    */
   private short protocolVersion = ProtocolVersion.getCurrentVersion();
-  private boolean isEncrypted = true; // Initially encrypted.
+  /** Initially encrypted. */
+  private boolean isEncrypted = true;
 
   /**
    * Use a buffered input stream to avoid too many system calls.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/WindowProbeMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/WindowProbeMsg.java
index d15cc79..59af2ae 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/WindowProbeMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/WindowProbeMsg.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
 package org.opends.server.replication.protocol;
 
@@ -65,9 +65,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public byte[] getBytes(short protocolVersion)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java
index 78da8d7..dde5d99 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/DataServerHandler.java
@@ -273,9 +273,7 @@
     return attributes;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getMonitorInstanceName()
   {
@@ -293,9 +291,7 @@
     return status;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isDataServer()
   {
@@ -525,9 +521,7 @@
         refUrls, eclIncludes, eclIncludesForDeletes, getProtocolVersion());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String toString()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LightweightServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LightweightServerHandler.java
index 52b09e6..7ca0567 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LightweightServerHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/LightweightServerHandler.java
@@ -131,9 +131,7 @@
         + replServerHandler.getMonitorInstanceName() + " " + message);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeMonitorProvider(MonitorProviderCfg configuration)
                           throws ConfigException,InitializationException
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/NotAssuredUpdateMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/NotAssuredUpdateMsg.java
index 5573f45..d85e985 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/NotAssuredUpdateMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/NotAssuredUpdateMsg.java
@@ -47,7 +47,7 @@
  */
 class NotAssuredUpdateMsg extends UpdateMsg
 {
-  /** The real update message this message represents */
+  /** The real update message this message represents. */
   private final UpdateMsg realUpdateMsg;
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
index a66e08d..6e99523 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServer.java
@@ -114,7 +114,7 @@
   private static final Set<Integer> localPorts =
       new CopyOnWriteArraySet<Integer>();
 
-  // Monitors for synchronizing domain creation with the connect thread.
+  /** Monitors for synchronizing domain creation with the connect thread. */
   private final Object domainTicketLock = new Object();
   private final Object connectThreadLock = new Object();
   private long domainTicket;
@@ -412,9 +412,7 @@
     }
   }
 
-  /**
-   * initialization function for the replicationServer.
-   */
+  /** Initialization function for the replicationServer. */
   private void initialize()
   {
     shutdown.set(false);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerConnectThread.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerConnectThread.java
index 9f55053..a5548d0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerConnectThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerConnectThread.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.replication.server;
 
@@ -35,9 +35,7 @@
  */
 public class ReplicationServerConnectThread extends DirectoryThread
 {
-  /**
-   * The Replication Server that created this thread.
-   */
+  /** The Replication Server that created this thread. */
   private final ReplicationServer server;
 
   /**
@@ -54,9 +52,7 @@
     this.server = server;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void run()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
index bbf4a28..4a9e1d6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -1647,9 +1647,7 @@
     return domainDB.getDomainNewestCSNs(baseDN);
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String toString()
   {
@@ -2290,18 +2288,14 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void initializeMonitorProvider(MonitorProviderCfg configuraiton)
   {
     // Nothing to do for now
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getMonitorInstanceName()
   {
@@ -2311,9 +2305,7 @@
         + ",cn=Replication";
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public List<Attribute> getMonitorData()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerHandler.java
index 823b2cc..dfea203 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerHandler.java
@@ -57,7 +57,7 @@
   /** Properties filled only if remote server is a RS. */
   private String serverAddressURL;
   /**
-   * this collection will contain as many elements as there are
+   * This collection will contain as many elements as there are
    * LDAP servers connected to the remote replication server.
    */
   private final Map<Integer, LightweightServerHandler> remoteDirectoryServers =
@@ -516,9 +516,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean isDataServer()
   {
@@ -642,9 +640,7 @@
     return remoteDirectoryServers.keySet();
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String getMonitorInstanceName()
   {
@@ -684,9 +680,7 @@
     return attributes;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public String toString()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerListenThread.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerListenThread.java
index 17aa4ba..b7fc338 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerListenThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ReplicationServerListenThread.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
- *      Portions Copyright 2011 ForgeRock AS
+ *      Portions Copyright 2011-2015 ForgeRock AS
  */
 package org.opends.server.replication.server;
 
@@ -55,9 +55,7 @@
     this.server = server;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void run()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
index 1a9d34b..f50fc16 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeDataExpectedAcksInfo.java
@@ -22,9 +22,8 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2013-2014 ForgeRock AS.
+ *      Portions Copyright 2013-2015 ForgeRock AS.
  */
-
 package org.opends.server.replication.server;
 
 import java.util.ArrayList;
@@ -73,9 +72,7 @@
     this.safeDataLevel = safeDataLevel;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean processReceivedAck(ServerHandler ackingServer, AckMsg ackMsg)
   {
@@ -112,9 +109,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public AckMsg createAck(boolean timeout)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java
index 8ea7ee3..ece82f9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/SafeReadExpectedAcksInfo.java
@@ -150,9 +150,7 @@
     return hasReplayError;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public boolean processReceivedAck(ServerHandler ackingServer, AckMsg ackMsg)
   {
@@ -199,9 +197,7 @@
     return (numKnownAckStatus == expectedServersAckStatus.size());
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public AckMsg createAck(boolean timeout)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
index 65c9f87..21eb5fb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
@@ -128,41 +128,25 @@
    */
   private ServerReader reader;
 
-  // window
+  /** Window. */
   private int rcvWindow;
   private final int rcvWindowSizeHalf;
 
-  /**
-   * The size of the receiving window.
-   */
+  /** The size of the receiving window. */
   protected final int maxRcvWindow;
-  /**
-   * Semaphore that the writer uses to control the flow to the remote server.
-   */
+  /** Semaphore that the writer uses to control the flow to the remote server. */
   private Semaphore sendWindow;
-  /**
-   * The initial size of the sending window.
-   */
+  /** The initial size of the sending window. */
   private int sendWindowSize;
-  /**
-   * remote generation id.
-   */
+  /** Remote generation id. */
   protected long generationId = -1;
-  /**
-   * The generation id of the hosting RS.
-   */
+  /** The generation id of the hosting RS. */
   protected long localGenerationId = -1;
-  /**
-   * The generation id before processing a new start handshake.
-   */
+  /** The generation id before processing a new start handshake. */
   protected long oldGenerationId = -1;
-  /**
-   * Group id of this remote server.
-   */
+  /** Group id of this remote server. */
   protected byte groupId = -1;
-  /**
-   * The SSL encryption after the negotiation with the peer.
-   */
+  /** The SSL encryption after the negotiation with the peer. */
   protected boolean sslEncryption;
   /**
    * The time in milliseconds between heartbeats from the replication
@@ -170,19 +154,13 @@
    */
   protected long heartbeatInterval;
 
-  /**
-   * The thread that will send heartbeats.
-   */
+  /** The thread that will send heartbeats. */
   private HeartbeatThread heartbeatThread;
 
-  /**
-   * Set when ServerWriter is stopping.
-   */
+  /** Set when ServerWriter is stopping. */
   private volatile boolean shutdownWriter;
 
-  /**
-   * Weight of this remote server.
-   */
+  /** Weight of this remote server. */
   protected int weight = 1;
 
   /**
@@ -579,7 +557,7 @@
   }
 
   /**
-   * get the Server Id.
+   * Get the Server Id.
    *
    * @return the ID of the server to which this object is linked
    */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/DBCursor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/DBCursor.java
index 585a82f..443512b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/DBCursor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/api/DBCursor.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2013-2014 ForgeRock AS
+ *      Copyright 2013-2015 ForgeRock AS
  */
 package org.opends.server.replication.server.changelog.api;
 
@@ -96,11 +96,11 @@
    * the exact key must be found or if any key equal or lower/higher should match.
    */
   public enum KeyMatchingStrategy {
-    /** matches if the key or a lower key is found. */
+    /** Matches if the key or a lower key is found. */
     LESS_THAN_OR_EQUAL_TO_KEY,
-    /** matches only if the exact key is found. */
+    /** Matches only if the exact key is found. */
     EQUAL_TO_KEY,
-    /** matches if the key or a greater key is found. */
+    /** Matches if the key or a greater key is found. */
     GREATER_THAN_OR_EQUAL_TO_KEY
   }
 
@@ -110,9 +110,9 @@
    * key.
    */
   public enum PositionStrategy {
-    /** start point is on the matching key. */
+    /** Start point is on the matching key. */
     ON_MATCHING_KEY,
-    /** start point is after the matching key. */
+    /** Start point is after the matching key. */
     AFTER_MATCHING_KEY
   }
 
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDB.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDB.java
index 8e0298f..2f7cdf0 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDB.java
@@ -187,7 +187,7 @@
   }
 
   /**
-   * add one change to the underlying db.
+   * Add one change to the underlying db.
    *
    * @param change
    *          The change to add to the underlying db.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
index 825ce9f..f7c887b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java
@@ -69,7 +69,7 @@
    * @GuardedBy("stateLock")
    */
   private final ChangelogState changelogState;
-  /** Exclusive lock to synchronize updates to in-memory and on-disk changelogState */
+  /** Exclusive lock to synchronize updates to in-memory and on-disk changelogState. */
   private final Object stateLock = new Object();
   private final List<Database> allDbs = new CopyOnWriteArrayList<Database>();
   private ReplicationServer replicationServer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/CTHeartbeatPublisherThread.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
index a000d75..5e8152f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/CTHeartbeatPublisherThread.java
@@ -80,13 +80,10 @@
     this.serverId = serverId;
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void run()
   {
-    long lastHeartbeatTime = 0;
     try
     {
       if (logger.isTraceEnabled())
@@ -102,7 +99,6 @@
         {
           final CSN csn = new CSN(now, 0, serverId);
           session.publish(new ChangeTimeHeartbeatMsg(csn));
-          lastHeartbeatTime = csn.getTime();
         }
 
         long sleepTime = session.getLastPublishTime() + heartbeatInterval - now;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/HeartbeatMonitor.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/HeartbeatMonitor.java
index 1387ce8..22dd19f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/HeartbeatMonitor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/HeartbeatMonitor.java
@@ -55,15 +55,12 @@
    */
   private final long heartbeatInterval;
 
-  // Info required for logging.
+  /** Info required for logging. */
   private final int serverID;
   private final int replicationServerID;
   private final String baseDN;
 
-
-  /**
-   * Thread life-cycle state.
-   */
+  /** Thread life-cycle state. */
   private volatile boolean shutdown;
   private final Object shutdownLock = new Object();
 
@@ -110,9 +107,7 @@
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
+  /** {@inheritDoc} */
   @Override
   public void run()
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplOutputStream.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplOutputStream.java
index d94a8da..d97a393 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplOutputStream.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplOutputStream.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2008 Sun Microsystems, Inc.
- *      Portions Copyright 2014 ForgeRock AS.
+ *      Portions Copyright 2014-2015 ForgeRock AS.
  */
 package org.opends.server.replication.service;
 
@@ -35,10 +35,10 @@
  */
 class ReplOutputStream extends OutputStream
 {
-  /** The synchronization domain on which the export is done */
+  /** The synchronization domain on which the export is done. */
   private final ReplicationDomain domain;
 
-  /** The current number of entries exported */
+  /** The current number of entries exported. */
   private final long numExportedEntries = 0;
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
index 5d3c77d..d75f2ba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationBroker.java
@@ -511,7 +511,7 @@
     }
 
     /**
-     * get the group id.
+     * Get the group id.
      * @return The group id
      */
     public byte getGroupId()
@@ -2135,7 +2135,7 @@
   }
 
   /**
-   * restart the ReplicationBroker.
+   * Restart the ReplicationBroker.
    * @param infiniteTry the socket which failed
    */
   public void reStart(boolean infiniteTry)
@@ -2666,9 +2666,7 @@
     }
   }
 
-  /**
-   * stop the server.
-   */
+  /** Stop the server. */
   public void stop()
   {
     if (logger.isTraceEnabled())
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
index 405847d..3e23eba 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
@@ -694,7 +694,7 @@
   }
 
   /**
-   * get the number of updates replayed by the replication.
+   * Get the number of updates replayed by the replication.
    *
    * @return The number of updates replayed by the replication
    */
@@ -708,7 +708,7 @@
   }
 
   /**
-   * get the number of updates received by the replication plugin.
+   * Get the number of updates received by the replication plugin.
    *
    * @return the number of updates received
    */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
index 0d57434..f92d2ed 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
@@ -199,10 +199,10 @@
   /** The backend's baseDN mapped by this object. */
   private final DN baseDN;
 
-  /** the backend associated with the local workflow element. */
+  /** The backend associated with the local workflow element. */
   private final Backend<?> backend;
 
-  /** the set of local backend workflow elements registered with the server. */
+  /** The set of local backend workflow elements registered with the server. */
   private static TreeMap<DN, LocalBackendWorkflowElement> registeredLocalBackends =
       new TreeMap<DN, LocalBackendWorkflowElement>();
 

--
Gitblit v1.10.0