mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noel Rouvignac
31.30.2014 2f01ee4d569022fff64691323b9bbcedc4285d98
Removed now useless calls to .toString() on arguments of ArgN.get(...).
127 files modified
1060 ■■■■■ changed files
opendj3-server-dev/src/ads/org/opends/admin/ads/ADSContextException.java 19 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/DBEnvironmentMonitoringTableModel.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/AddToGroupTask.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java 6 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java 5 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java 5 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java 8 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java 5 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java 25 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java 4 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/BuildInformation.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java 5 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/JavaArguments.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java 7 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java 11 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/BindRule.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/TargAttrFilterList.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java 22 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java 47 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java 5 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/config/ConfigAttribute.java 5 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java 5 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupPlugin.java 4 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java 5 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java 9 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java 15 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java 8 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java 4 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java 11 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/LogPublisherErrorHandler.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java 19 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java 5 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java 5 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java 5 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java 5 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java 5 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReader.java 44 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java 10 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java 4 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java 13 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java 35 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java 9 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java 16 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java 6 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java 9 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java 18 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java 44 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java 73 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tasks/DisconnectClientTask.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/CreateRCScript.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java 4 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/LDAPToolUtils.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java 5 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskScheduleInteraction.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java 6 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java 29 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/DN.java 66 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/LDIFExportConfig.java 5 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/Base64.java 7 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/EMailMessage.java 6 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java 6 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/RuntimeInformation.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/args/SubCommandArgumentParser.java 5 ●●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/cli/ConsoleApplication.java 15 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java 3 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java 32 ●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java 12 ●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java 6 ●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java 14 ●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/ads/org/opends/admin/ads/ADSContextException.java
@@ -202,22 +202,17 @@
  private static LocalizableMessage getMessage(ErrorType error, Throwable x)
  {
    LocalizableMessage msg;
    if (x != null)
    if (x instanceof OpenDsException)
    {
      if (x instanceof OpenDsException)
      {
        msg = INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG.get(error.toString(),
            ((OpenDsException)x).getMessageObject());
      }
      else
      {
        msg = INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG.get(error.toString(),
            x.toString());
      }
      msg = INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG.get(error,
          ((OpenDsException)x).getMessageObject());
    } else if (x != null)
    {
      msg = INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG.get(error, x);
    }
    else
    {
      msg = INFO_ADS_CONTEXT_EXCEPTION_MSG.get(error.toString());
      msg = INFO_ADS_CONTEXT_EXCEPTION_MSG.get(error);
    }
    return msg;
  }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/DBEnvironmentMonitoringTableModel.java
@@ -354,8 +354,7 @@
    // Add the total: always at the end
    String[] line = new String[attributes.size() + 1];
    line[0] = "<html><b>"+INFO_CTRL_PANEL_TOTAL_LABEL.get().toString()+
    "</b>";
    line[0] = "<html><b>" + INFO_CTRL_PANEL_TOTAL_LABEL.get() + "</b>";
    for (int i=1; i<line.length; i++)
    {
      boolean valueSet = false;
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexTableModel.java
@@ -178,7 +178,7 @@
    }
    if (sb.length() == 0)
    {
      sb.append(INFO_NOT_APPLICABLE_LABEL.get().toString());
      sb.append(INFO_NOT_APPLICABLE_LABEL.get());
    }
    return sb.toString();
  }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java
@@ -267,8 +267,7 @@
    if (addTotalRow())
    {
      String[] line = new String[columnNames.length];
      line[0] = "<html><b>"+INFO_CTRL_PANEL_TOTAL_LABEL.get().toString()+
      "</b>";
      line[0] = "<html><b>" + INFO_CTRL_PANEL_TOTAL_LABEL.get() + "</b>";
      for (int i=1; i<line.length; i++)
      {
        boolean valueSet = false;
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexTableModel.java
@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008-2009 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.guitools.controlpanel.datamodel;
@@ -183,7 +184,7 @@
    }
    if (sb.length() == 0)
    {
      sb.append(INFO_NOT_APPLICABLE_LABEL.get().toString());
      sb.append(INFO_NOT_APPLICABLE_LABEL.get());
    }
    return sb.toString();
  }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/AddToGroupTask.java
@@ -204,7 +204,7 @@
              printEquivalentCommandToModify(groupDn, modifications, false);
              getProgressDialog().appendProgressHtml(
                  Utilities.getProgressWithPoints(
                      INFO_CTRL_PANEL_ADDING_TO_GROUP.get(groupDn.toString()),
                      INFO_CTRL_PANEL_ADDING_TO_GROUP.get(groupDn),
                      ColorAndFontConstants.progressFont));
            }
          });
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
@@ -532,6 +532,6 @@
    args.add(dn.toString());
    printEquivalentCommandLine(getCommandLinePath("ldapdelete"),
        args,
        INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_ENTRY.get(dn.toString()));
        INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_ENTRY.get(dn));
  }
}
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
@@ -291,7 +291,7 @@
        catch (NamingException ne)
        {
          throw new OnlineUpdateException(
              ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(ne.toString()), ne);
              ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(ne), ne);
        }
      }
      else
@@ -351,7 +351,7 @@
        catch (NamingException ne)
        {
          throw new OnlineUpdateException(
              ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(ne.toString()), ne);
              ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(ne), ne);
        }
      }
      else
@@ -426,7 +426,7 @@
    catch (IOException e)
    {
      throw new OfflineUpdateException(
          ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(e.toString()), e);
          ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(e), e);
    }
    finally
    {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -422,8 +422,7 @@
        printEquivalentRenameCommand(oldDN, newEntry.getName(), useAdminCtx);
        getProgressDialog().appendProgressHtml(
            Utilities.getProgressWithPoints(
                INFO_CTRL_PANEL_RENAMING_ENTRY.get(oldDN.toString(),
                    newEntry.getName().toString()),
                INFO_CTRL_PANEL_RENAMING_ENTRY.get(oldDN, newEntry.getName()),
                ColorAndFontConstants.progressFont));
      }
    });
@@ -461,7 +460,7 @@
          printEquivalentCommandToModify(dn, originalMods, useAdminCtx);
          getProgressDialog().appendProgressHtml(
              Utilities.getProgressWithPoints(
                  INFO_CTRL_PANEL_MODIFYING_ENTRY.get(dn.toString()),
                  INFO_CTRL_PANEL_MODIFYING_ENTRY.get(dn),
                  ColorAndFontConstants.progressFont));
        }
      });
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -126,7 +126,7 @@
   */
  public LocalizableMessage getTaskDescription()
  {
    return INFO_CTRL_PANEL_NEW_ENTRY_TASK_DESCRIPTION.get(dn.toString());
    return INFO_CTRL_PANEL_NEW_ENTRY_TASK_DESCRIPTION.get(dn);
  }
  /**
@@ -235,7 +235,7 @@
          printEquivalentCommand();
          getProgressDialog().appendProgressHtml(
              Utilities.getProgressWithPoints(
                  INFO_CTRL_PANEL_CREATING_ENTRY.get(dn.toString()),
                  INFO_CTRL_PANEL_CREATING_ENTRY.get(dn),
                  ColorAndFontConstants.progressFont));
        }
      });
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
@@ -359,7 +359,7 @@
    catch (NamingException ne)
    {
      throw new OnlineUpdateException(
          ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(ne.toString()), ne);
          ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(ne), ne);
    }
    notifyConfigurationElementCreated(attribute);
    SwingUtilities.invokeLater(new Runnable()
@@ -403,7 +403,7 @@
    catch (NamingException ne)
    {
      throw new OnlineUpdateException(
          ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(ne.toString()), ne);
          ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(ne), ne);
    }
    notifyConfigurationElementCreated(objectClass);
    SwingUtilities.invokeLater(new Runnable()
@@ -741,7 +741,7 @@
      catch (Throwable t)
      {
        throw new OfflineUpdateException(
            ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(t.toString()), t);
            ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(t), t);
      }
      finally
      {
@@ -777,7 +777,7 @@
      catch (Throwable t)
      {
        throw new OfflineUpdateException(
            ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(t.toString()), t);
            ERR_CTRL_PANEL_ERROR_UPDATING_SCHEMA.get(t), t);
      }
      finally
      {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java
@@ -700,7 +700,7 @@
        }
        catch (Throwable t)
        {
          errors.add(INFO_CTRL_PANEL_INVALID_DN_DETAILS.get(s, t.toString()));
          errors.add(INFO_CTRL_PANEL_INVALID_DN_DETAILS.get(s, t));
        }
      }
    }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractNewEntryPanel.java
@@ -135,7 +135,7 @@
        {
          if (t != null)
          {
            errors.add(ERR_CTRL_PANEL_UNEXPECTED_DETAILS.get(t.toString()));
            errors.add(ERR_CTRL_PANEL_UNEXPECTED_DETAILS.get(t));
          }
          displayMainPanel();
          setEnabledCancel(true);
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AddToGroupPanel.java
@@ -161,7 +161,7 @@
      {
        if (t != null)
        {
          errors.add(ERR_CTRL_PANEL_UNEXPECTED_DETAILS.get(t.toString()));
          errors.add(ERR_CTRL_PANEL_UNEXPECTED_DETAILS.get(t));
        }
        displayMainPanel();
        setEnabledCancel(true);
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BinaryAttributeEditorPanel.java
@@ -417,12 +417,11 @@
          {
            if (useFile.isSelected())
            {
              errors.add(ERR_CTRL_PANEL_ERROR_READING_FILE.get(t.toString()));
              errors.add(ERR_CTRL_PANEL_ERROR_READING_FILE.get(t));
            }
            else
            {
              errors.add(
                  ERR_CTRL_PANEL_ERROR_DECODING_BASE_64.get(t.toString()));
              errors.add(ERR_CTRL_PANEL_ERROR_DECODING_BASE_64.get(t));
            }
            displayErrorDialog(errors);
          }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -982,7 +982,7 @@
    {
      if (!StaticUtils.isValidSchemaElement(n, 0, n.length(), err))
      {
        errors.add(ERR_CTRL_PANEL_INVALID_ATTRIBUTE_NAME.get(err.toString()));
        errors.add(ERR_CTRL_PANEL_INVALID_ATTRIBUTE_NAME.get(err));
        setPrimaryInvalid(lName);
        err = new LocalizableMessageBuilder();
      }
@@ -1002,7 +1002,7 @@
    {
      if (!StaticUtils.isValidSchemaElement(n, 0, n.length(), err))
      {
        errors.add(ERR_CTRL_PANEL_OID_NOT_VALID.get(err.toString()));
        errors.add(ERR_CTRL_PANEL_OID_NOT_VALID.get(err));
        setPrimaryInvalid(lOID);
        err = new LocalizableMessageBuilder();
      }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
@@ -779,7 +779,7 @@
    {
      if (!StaticUtils.isValidSchemaElement(n, 0, n.length(), err))
      {
        errors.add(ERR_CTRL_PANEL_INVALID_OBJECTCLASS_NAME.get(err.toString()));
        errors.add(ERR_CTRL_PANEL_INVALID_OBJECTCLASS_NAME.get(err));
        setPrimaryInvalid(lName);
        err = new LocalizableMessageBuilder();
      }
@@ -799,7 +799,7 @@
    {
      if (!StaticUtils.isValidSchemaElement(n, 0, n.length(), err))
      {
        errors.add(ERR_CTRL_PANEL_OID_NOT_VALID.get(err.toString()));
        errors.add(ERR_CTRL_PANEL_OID_NOT_VALID.get(err));
        setPrimaryInvalid(lOID);
        err = new LocalizableMessageBuilder();
      }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/DuplicateEntryPanel.java
@@ -373,7 +373,7 @@
      }
      catch (IOException ioe)
      {
        errors.add(ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe.toString()));
        errors.add(ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe));
      }
      catch (LDIFException le)
      {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ErrorSearchingEntryPanel.java
@@ -215,8 +215,7 @@
      if (arg != null)
      {
        details.append("<br><br>"+
            ERR_CTRL_PANEL_RESOLVING_REFERRAL_DETAILS.get(arg.toString(),
                msg));
            ERR_CTRL_PANEL_RESOLVING_REFERRAL_DETAILS.get(arg, msg));
      }
      else
      {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/GenericMenuBar.java
@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.guitools.controlpanel.ui;
@@ -139,7 +140,7 @@
        } catch (Throwable t)
        {
          throw new WebBrowserException(url,
              ERR_CTRL_PANEL_UNEXPECTED_DETAILS.get(t.toString()), t);
              ERR_CTRL_PANEL_UNEXPECTED_DETAILS.get(t), t);
        }
        return null;
      }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
@@ -1015,13 +1015,13 @@
      String cmd = getCommandLineToInitializeAll();
      getProgressDialog().appendProgressHtml(Utilities.applyFont(
          INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_INITIALIZE_ALL.get().toString()+
          INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_INITIALIZE_ALL.get()+
          "<br><b>"+cmd+"</b><br><br>",
          ColorAndFontConstants.progressFont));
      for (DN baseDN : replicatedBaseDNs)
      {
        LocalizableMessage msg = INFO_PROGRESS_INITIALIZING_SUFFIX.get(baseDN.toString(),
        LocalizableMessage msg = INFO_PROGRESS_INITIALIZING_SUFFIX.get(baseDN,
            ConnectionUtils.getHostPort(getInfo().getDirContext()));
        getProgressDialog().appendProgressHtml(Utilities.applyFont(
            msg.toString()+"<br>", ColorAndFontConstants.progressFont));
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java
@@ -742,8 +742,7 @@
      catch (IOException ioe)
      {
        throw new OfflineUpdateException(
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe.toString()),
            ioe);
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe), ioe);
      }
      finally
      {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
@@ -227,7 +227,7 @@
    useOpenDSJavaHome = Utilities.createRadioButton(LocalizableMessage.EMPTY);
    useOpenDSJavaHome.setOpaque(false);
    useOpenDSJavaHome.getAccessibleContext().setAccessibleName(
        INFO_CTRL_PANEL_USE_OPENDS_JAVA_HOME.get().toString()+" "+
        INFO_CTRL_PANEL_USE_OPENDS_JAVA_HOME.get()+" "+
        INFO_CTRL_PANEL_USE_OPENDS_JAVA_HOME_HELP.get());
    lJavaHome.setLabelFor(useOpenDSJavaHome);
    gbc.gridx = 0;
@@ -256,7 +256,7 @@
    useSpecifiedJavaHome = Utilities.createRadioButton(LocalizableMessage.EMPTY);
    useSpecifiedJavaHome.setOpaque(false);
    useSpecifiedJavaHome.getAccessibleContext().setAccessibleName(
        INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_HOME.get().toString() +
        INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_HOME.get() +
        " "+INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_HOME_HELP.get());
    useOpenDSJavaHomeLabel.setLabelFor(useSpecifiedJavaHome);
    LabelWithHelpIcon useSpecifiedJavaHomeLabel = new LabelWithHelpIcon(
@@ -311,7 +311,7 @@
        INFO_CTRL_PANEL_JAVA_ARGUMENTS_LABEL.get());
    useSpecifiedJavaArgs = Utilities.createRadioButton(LocalizableMessage.EMPTY);
    useSpecifiedJavaArgs.getAccessibleContext().setAccessibleName(
        INFO_CTRL_PANEL_USE_OPENDS_JAVA_ARGS.get().toString() +
        INFO_CTRL_PANEL_USE_OPENDS_JAVA_ARGS.get() +
        " "+INFO_CTRL_PANEL_USE_OPENDS_JAVA_ARGS_HELP.get());
    useSpecifiedJavaArgs.setOpaque(false);
    useOpenDSJavaArgs = Utilities.createRadioButton(LocalizableMessage.EMPTY);
@@ -342,7 +342,7 @@
    p.add(useSpecifiedJavaArgs, gbc);
    useOpenDSJavaArgsLabel.setLabelFor(useSpecifiedJavaArgs);
    useSpecifiedJavaArgs.getAccessibleContext().setAccessibleName(
        INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_ARGS.get().toString() +
        INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_ARGS.get() +
        " "+INFO_CTRL_PANEL_USE_SPECIFIED_OPENDS_JAVA_ARGS_HELP.get());
    gbc.gridx ++;
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LDIFViewEntryPanel.java
@@ -335,7 +335,7 @@
    catch (IOException ioe)
    {
      throw new OfflineUpdateException(
          ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe.toString()), ioe);
          ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe), ioe);
    }
    finally
    {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/ManageTasksPanel.java
@@ -478,7 +478,7 @@
          gbc.insets.left = 10;
          gbc.insets.right = 0;
          detailsSubpanel.add(Utilities.createPrimaryLabel(
              INFO_CTRL_PANEL_OPERATION_NAME_AS_LABEL.get(label.toString())),
              INFO_CTRL_PANEL_OPERATION_NAME_AS_LABEL.get(label)),
              gbc);
          gbc.gridx = 1;
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -392,7 +392,7 @@
    }
    else if (!StaticUtils.isValidSchemaElement(n, 0, n.length(), err))
    {
      errors.add(ERR_CTRL_PANEL_INVALID_ATTRIBUTE_NAME.get(err.toString()));
      errors.add(ERR_CTRL_PANEL_INVALID_ATTRIBUTE_NAME.get(err));
      setPrimaryInvalid(lName);
      err = new LocalizableMessageBuilder();
    }
@@ -412,7 +412,7 @@
    {
      if (!StaticUtils.isValidSchemaElement(n, 0, n.length(), err))
      {
        errors.add(ERR_CTRL_PANEL_OID_NOT_VALID.get(err.toString()));
        errors.add(ERR_CTRL_PANEL_OID_NOT_VALID.get(err));
        setPrimaryInvalid(lOID);
        err = new LocalizableMessageBuilder();
      }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -1309,8 +1309,7 @@
      catch (IOException ioe)
      {
        throw new OfflineUpdateException(
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe.toString()),
            ioe);
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe), ioe);
      }
      finally
      {
@@ -1341,8 +1340,7 @@
      catch (IOException ioe)
      {
        throw new OfflineUpdateException(
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe.toString()),
            ioe);
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe), ioe);
      }
      finally
      {
@@ -1472,7 +1470,7 @@
      catch (Throwable t)
      {
        throw new OnlineUpdateException(
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(t.toString()), t);
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(t), t);
      }
      finally
      {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java
@@ -248,7 +248,7 @@
    }
    catch (IOException ioe)
    {
      errors.add(ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe.toString()));
      errors.add(ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe));
    }
    catch (LDIFException le)
    {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
@@ -597,8 +597,7 @@
      catch (IOException ioe)
      {
        throw new OfflineUpdateException(
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe.toString()),
            ioe);
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe), ioe);
      }
      finally
      {
@@ -659,7 +658,7 @@
      catch (Throwable t)
      {
        throw new OnlineUpdateException(
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(t.toString()), t);
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(t), t);
      }
      finally
      {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
@@ -258,7 +258,7 @@
    }
    else if (!StaticUtils.isValidSchemaElement(n, 0, n.length(), err))
    {
      errors.add(ERR_CTRL_PANEL_INVALID_OBJECTCLASS_NAME.get(err.toString()));
      errors.add(ERR_CTRL_PANEL_INVALID_OBJECTCLASS_NAME.get(err));
      err = new LocalizableMessageBuilder();
    }
    else
@@ -276,7 +276,7 @@
    {
      if (!StaticUtils.isValidSchemaElement(n, 0, n.length(), err))
      {
        errors.add(ERR_CTRL_PANEL_OID_NOT_VALID.get(err.toString()));
        errors.add(ERR_CTRL_PANEL_OID_NOT_VALID.get(err));
        err = new LocalizableMessageBuilder();
      }
      else
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
@@ -381,8 +381,7 @@
      catch (IOException ioe)
      {
         throw new OfflineUpdateException(
              ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe.toString()),
              ioe);
              ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe), ioe);
      }
      finally
      {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -1386,8 +1386,7 @@
    catch (IOException ioe)
    {
      throw new OnlineUpdateException(
          ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe.toString()),
          ioe);
          ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe), ioe);
    }
    finally
    {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
@@ -1817,8 +1817,7 @@
            {
              LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
              mb.append(errorDetail);
              mb.append(
                  "  "+INFO_CTRL_PANEL_DETAILS_THROWABLE.get(t.toString()));
              mb.append(INFO_CTRL_PANEL_DETAILS_THROWABLE.get(t));
              summaryMsg = Utilities.getFormattedError(errorSummary,
                  ColorAndFontConstants.errorTitleFont,
                  mb.toMessage(), ColorAndFontConstants.defaultFont);
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/TableViewEntryPanel.java
@@ -257,8 +257,7 @@
    catch (IOException ioe)
    {
      throw new OnlineUpdateException(
          ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe.toString()),
          ioe);
          ERR_CTRL_PANEL_ERROR_CHECKING_ENTRY.get(ioe), ioe);
    }
    finally
    {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
@@ -787,8 +787,7 @@
      catch (IOException ioe)
      {
        throw new OfflineUpdateException(
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe.toString()),
            ioe);
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe), ioe);
      }
      finally
      {
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
@@ -509,9 +509,7 @@
    }
    catch (final Throwable t)
    {
      OnlineUpdateException oupe = new OnlineUpdateException(
          ERR_READING_CONFIG_LDAP.get(t.toString()), t);
      ex.add(oupe);
      ex.add(new OnlineUpdateException(ERR_READING_CONFIG_LDAP.get(t), t));
    }
    for (OpenDsException oe : ex)
    {
@@ -527,9 +525,7 @@
    catch (Throwable t)
    {
      logger.warn(LocalizableMessage.raw("Error reading monitoring: "+t, t));
      OnlineUpdateException oupe = new OnlineUpdateException(
          ERR_READING_CONFIG_LDAP.get(t.toString()), t);
      ex.add(oupe);
      ex.add(new OnlineUpdateException(ERR_READING_CONFIG_LDAP.get(t), t));
    }
    try
    {
@@ -538,9 +534,7 @@
    catch (Throwable t)
    {
      logger.warn(LocalizableMessage.raw("Error reading task information: "+t, t));
      OnlineUpdateException oupe = new OnlineUpdateException(
          ERR_READING_CONFIG_LDAP.get(t.toString()), t);
      ex.add(oupe);
      ex.add(new OnlineUpdateException(ERR_READING_CONFIG_LDAP.get(t), t));
    }
    taskEntries = Collections.unmodifiableSet(ts);
    for (ConnectionHandlerDescriptor ch : getConnectionHandlers())
@@ -585,8 +579,7 @@
      }
      catch (NamingException ne)
      {
        throw new OnlineUpdateException(
            ERR_READING_SCHEMA_LDAP.get(ne.toString()), ne);
        throw new OnlineUpdateException(ERR_READING_SCHEMA_LDAP.get(ne), ne);
      }
      schema = loader.getSchema();
    }
@@ -837,9 +830,8 @@
    }
    catch (NamingException ne)
    {
      OnlineUpdateException oue = new OnlineUpdateException(
          ERR_READING_CONFIG_LDAP.get(ne.getMessage().toString()), ne);
      ex.add(oue);
      ex.add(new OnlineUpdateException(
          ERR_READING_CONFIG_LDAP.get(ne.getMessage()), ne));
    }
  }
@@ -884,9 +876,8 @@
    }
    catch (NamingException ne)
    {
      OnlineUpdateException oue = new OnlineUpdateException(
          ERR_READING_CONFIG_LDAP.get(ne.getMessage().toString()), ne);
      ex.add(oue);
      ex.add(new OnlineUpdateException(
          ERR_READING_CONFIG_LDAP.get(ne.getMessage()), ne));
    }
  }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java
@@ -370,9 +370,7 @@
    catch (final Throwable t)
    {
      logger.warn(LocalizableMessage.raw("Error reading configuration: "+t, t));
      OfflineUpdateException oue = new OfflineUpdateException(
          ERR_READING_CONFIG_LDAP.get(t.getMessage().toString()), t);
      ex.add(oue);
      ex.add(new OfflineUpdateException(ERR_READING_CONFIG_LDAP.get(t.getMessage()), t));
    }
    if (ex.size() > 0)
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java
@@ -105,7 +105,7 @@
    catch (Throwable t)
    {
      environmentSettingException = new OfflineUpdateException(
          ERR_CTRL_PANEL_SETTING_ENVIRONMENT.get(t.getMessage().toString()), t);
          ERR_CTRL_PANEL_SETTING_ENVIRONMENT.get(t.getMessage()), t);
    }
    logger.debug(LocalizableMessage.raw("Environment initialized."));
  }
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
@@ -205,10 +205,8 @@
              }
              else
              {
                LocalizableMessage message =
                  ERR_CONFIG_FILE_NO_PARENT.get(entryDN.toString(),
                    reader.getLastEntryLineNumber(),
                    f.getAbsolutePath(), parentDN.toString());
                LocalizableMessage message = ERR_CONFIG_FILE_NO_PARENT.get(entryDN,
                    reader.getLastEntryLineNumber(), f.getAbsolutePath(), parentDN);
                throw new InitializationException(message);
              }
            }
opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -1330,7 +1330,7 @@
    } else {
      // Just tell that the file/directory does not exist.
      notifyListeners(getFormattedWarning(
          INFO_PROGRESS_DELETING_FILE_DOES_NOT_EXIST.get(cfile.toString())));
          INFO_PROGRESS_DELETING_FILE_DOES_NOT_EXIST.get(cfile)));
    }
  }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/BuildInformation.java
@@ -156,7 +156,7 @@
            // We did not get the required information.
            throw new ApplicationException(
                ReturnCode.START_ERROR,
                INFO_ERROR_CREATING_BUILD_INFO_MSG.get(sb.toString()),
                INFO_ERROR_CREATING_BUILD_INFO_MSG.get(sb),
                null);
          }
        }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java
@@ -112,8 +112,7 @@
          String cmd = Utils.isWindows() ?
              Installation.WINDOWS_SETUP_FILE_NAME :
                Installation.UNIX_SETUP_FILE_NAME;
          installationMsg =
            INFO_INSTALLSTATUS_INSTALLED_CLI.get(cmd, buf.toString());
          installationMsg = INFO_INSTALLSTATUS_INSTALLED_CLI.get(cmd, buf);
        }
        else
        {
@@ -125,7 +124,7 @@
            buf.append("</li>");
          }
          buf.append("</ul>");
          installationMsg = INFO_INSTALLSTATUS_INSTALLED.get( buf.toString() );
          installationMsg = INFO_INSTALLSTATUS_INSTALLED.get(buf);
        }
      }
    }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/JavaArguments.java
@@ -236,7 +236,7 @@
          }
          sb.append(arg);
        }
        lines.add(INFO_ADDITIONAL_ARGUMENTS.get(sb.toString()));
        lines.add(INFO_ADDITIONAL_ARGUMENTS.get(sb));
      }
      if (lines.isEmpty())
      {
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -2720,10 +2720,9 @@
    {
      throw new ApplicationException(
              ReturnCode.CONFIGURATION_ERROR,
              ((isRemoteServer)
                      ? INFO_REMOTE_ADS_EXCEPTION.get(
                      getHostDisplay(auth), ace.getMessageObject())
                      : INFO_ADS_EXCEPTION.get(ace.toString())), ace);
              (isRemoteServer
                      ? INFO_REMOTE_ADS_EXCEPTION.get(getHostDisplay(auth), ace.getMessageObject())
                      : INFO_ADS_EXCEPTION.get(ace)), ace);
    }
    finally
    {
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
@@ -884,7 +884,7 @@
    {
      checkOptions(sb.toString(), errorMsgs,
          ls.toArray(new JLabel[ls.size()]),
          ERR_GENERIC_JAVA_ARGUMENT.get(sb.toString()));
          ERR_GENERIC_JAVA_ARGUMENT.get(sb));
    }
  }
@@ -910,7 +910,7 @@
    if (sb.length() > 0)
    {
      checkOptions(sb.toString(), errorMsgs, lOtherArguments,
          ERR_GENERIC_JAVA_ARGUMENT.get(sb.toString()));
          ERR_GENERIC_JAVA_ARGUMENT.get(sb));
    }
  }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java
@@ -1827,7 +1827,7 @@
        }
        buf.append(suffix.getDN());
      }
      msg = INFO_REVIEW_REPLICATE_SUFFIX.get(buf.toString());
      msg = INFO_REVIEW_REPLICATE_SUFFIX.get(buf);
    }
    return msg.toString();
  }
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/webstart/WebStartDownloader.java
@@ -148,16 +148,13 @@
            }
            buf.append(jars[i]);
          }
          ex =
              new ApplicationException(
          ex = new ApplicationException(
              ReturnCode.DOWNLOAD_ERROR,
              getThrowableMsg(
                      INFO_DOWNLOADING_ERROR.get(buf.toString()), ioe), ioe);
              getThrowableMsg(INFO_DOWNLOADING_ERROR.get(buf), ioe), ioe);
        } catch (Throwable t)
        {
          // This is a bug
          ex =
              new ApplicationException(ReturnCode.BUG,
          ex = new ApplicationException(ReturnCode.BUG,
                      getThrowableMsg(INFO_BUG_MSG.get(), t), t);
        }
      }
@@ -375,7 +372,7 @@
    ex =
        new ApplicationException(
        ReturnCode.DOWNLOAD_ERROR,
                INFO_DOWNLOADING_ERROR.get(url.toString()), null);
                INFO_DOWNLOADING_ERROR.get(url), null);
  }
  /**
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java
@@ -224,8 +224,7 @@
          }
          final LocalizableMessage message = ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME
              .get(v.getValue().toString(), attributeType.getNameOrOID(), entry
                  .getName().toString(), String.valueOf(e));
              .get(v.getValue(), attributeType.getNameOrOID(), entry.getName(), e);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
              message, e);
        }
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/BindRule.java
@@ -432,10 +432,8 @@
        case DAYOFWEEK:
            if ((op != EnumBindRuleType.EQUAL_BINDRULE_TYPE)
                    && (op != EnumBindRuleType.NOT_EQUAL_BINDRULE_TYPE)) {
                LocalizableMessage message =
                  WARN_ACI_SYNTAX_INVALID_BIND_RULE_KEYWORD_OPERATOR_COMBO
                          .get(keyword.toString(), op.toString());
                throw new AciException(message);
                throw new AciException(
                    WARN_ACI_SYNTAX_INVALID_BIND_RULE_KEYWORD_OPERATOR_COMBO.get(keyword, op));
            }
        }
    }
opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
@@ -183,10 +183,8 @@
            default: {
                AttributeType attrType=filter.getAttributeType();
                if(!attrType.equals(type)) {
                    LocalizableMessage message =
               WARN_ACI_SYNTAX_INVALID_TARGATTRFILTERS_FILTER_LISTS_ATTR_FILTER.
                          get(filter.toString());
                    throw new AciException(message);
                    throw new AciException(
                        WARN_ACI_SYNTAX_INVALID_TARGATTRFILTERS_FILTER_LISTS_ATTR_FILTER.get(filter));
                }
            }
        }
opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
@@ -525,7 +525,7 @@
      DN entryDN = entry.getName();
      if (entryMap.containsKey(entryDN))
      {
        LocalizableMessage m = ERR_LDIF_BACKEND_ADD_ALREADY_EXISTS.get(entryDN.toString());
        LocalizableMessage m = ERR_LDIF_BACKEND_ADD_ALREADY_EXISTS.get(entryDN);
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, m);
      }
@@ -573,10 +573,8 @@
            }
          }
          LocalizableMessage m =
               ERR_LDIF_BACKEND_ADD_MISSING_PARENT.get(entryDN.toString());
          throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m, matchedDN,
                                       null);
          LocalizableMessage m = ERR_LDIF_BACKEND_ADD_MISSING_PARENT.get(entryDN);
          throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m, matchedDN, null);
        }
      }
    }
@@ -617,10 +615,8 @@
          parentDN = parentDN.getParentDNInSuffix();
        }
        LocalizableMessage m =
             ERR_LDIF_BACKEND_DELETE_NO_SUCH_ENTRY.get(entryDN.toString());
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m, matchedDN,
                                     null);
        LocalizableMessage m = ERR_LDIF_BACKEND_DELETE_NO_SUCH_ENTRY.get(entryDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m, matchedDN, null);
      }
@@ -657,7 +653,7 @@
        if (! subtreeDelete)
        {
          LocalizableMessage m = ERR_LDIF_BACKEND_DELETE_NONLEAF.get(entryDN.toString());
          LocalizableMessage m = ERR_LDIF_BACKEND_DELETE_NONLEAF.get(entryDN);
          throw new DirectoryException(ResultCode.NOT_ALLOWED_ON_NONLEAF, m);
        }
@@ -743,10 +739,8 @@
          parentDN = parentDN.getParentDNInSuffix();
        }
        LocalizableMessage m =
             ERR_LDIF_BACKEND_MODIFY_NO_SUCH_ENTRY.get(entryDN.toString());
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m, matchedDN,
                                     null);
        LocalizableMessage m = ERR_LDIF_BACKEND_MODIFY_NO_SUCH_ENTRY.get(entryDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m, matchedDN, null);
      }
      entryMap.put(entryDN, newEntry.duplicate(false));
opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java
@@ -1178,7 +1178,7 @@
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_OBJECTCLASS.
                    get(v.getValue().toString(), de.getMessageObject());
                    get(v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
@@ -1360,7 +1360,7 @@
                logger.traceException(de);
                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_OBJECTCLASS.
                    get(v.getValue().toString(), de.getMessageObject());
                    get(v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -996,8 +996,7 @@
        EntryID baseID = dn2id.get(null, aBaseDN, LockMode.DEFAULT);
        if (baseID == null)
        {
          LocalizableMessage message =
            ERR_JEB_SEARCH_NO_SUCH_OBJECT.get(aBaseDN.toString());
          LocalizableMessage message = ERR_JEB_SEARCH_NO_SUCH_OBJECT.get(aBaseDN);
          DN matchedDN = getMatchedDN(aBaseDN);
          throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
              message, matchedDN, null);
@@ -1633,10 +1632,8 @@
      // Check whether the entry already exists.
      if (dn2id.get(txn, entry.getName(), LockMode.DEFAULT) != null)
      {
        LocalizableMessage message =
          ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName().toString());
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
            message);
            ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName()));
      }
      // Check that the parent entry exists.
@@ -1664,30 +1661,24 @@
      if (!dn2id.insert(txn, entry.getName(), entryID))
      {
        // Do not ever expect to come through here.
        LocalizableMessage message =
          ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName().toString());
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
            message);
            ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName()));
      }
      // Update the referral database for referral entries.
      if (!dn2uri.addEntry(txn, entry))
      {
        // Do not ever expect to come through here.
        LocalizableMessage message =
          ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName().toString());
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
            message);
            ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName()));
      }
      // Insert into id2entry.
      if (!id2entry.insert(txn, entryID, entry))
      {
        // Do not ever expect to come through here.
        LocalizableMessage message =
          ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName().toString());
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
            message);
            ERR_JEB_ADD_ENTRY_ALREADY_EXISTS.get(entry.getName()));
      }
      // Insert into the indexes, in index configuration order.
@@ -1860,10 +1851,8 @@
          {
            // The subtree delete control was not specified and
            // the target entry is not a leaf.
            LocalizableMessage message =
              ERR_JEB_DELETE_NOT_ALLOWED_ON_NONLEAF.get(entryDN.toString());
            throw new DirectoryException(ResultCode.NOT_ALLOWED_ON_NONLEAF,
                message);
                ERR_JEB_DELETE_NOT_ALLOWED_ON_NONLEAF.get(entryDN));
          }
          // This is a subtree delete so create a index buffer
@@ -2004,7 +1993,7 @@
      if (status != OperationStatus.SUCCESS)
      {
        LocalizableMessage message =
          ERR_JEB_DELETE_NO_SUCH_OBJECT.get(leafDNKey.toString());
          ERR_JEB_DELETE_NO_SUCH_OBJECT.get(leafDNKey);
        DN matchedDN = getMatchedDN(baseDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
            message, matchedDN, null);
@@ -2016,7 +2005,7 @@
    if (dn2id.delete(txn, leafDNKey) != OperationStatus.SUCCESS)
    {
      // Do not expect to ever come through here.
      LocalizableMessage message = ERR_JEB_DELETE_NO_SUCH_OBJECT.get(leafDNKey.toString());
      LocalizableMessage message = ERR_JEB_DELETE_NO_SUCH_OBJECT.get(leafDNKey);
      DN matchedDN = getMatchedDN(baseDN);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
          message, matchedDN, null);
@@ -2026,9 +2015,8 @@
    Entry entry = id2entry.get(txn, leafID, LockMode.RMW);
    if (entry == null)
    {
      LocalizableMessage msg = ERR_JEB_MISSING_ID2ENTRY_RECORD.get(leafID.toString());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
          msg);
          ERR_JEB_MISSING_ID2ENTRY_RECORD.get(leafID));
    }
    if (!manageDsaIT)
@@ -2042,9 +2030,8 @@
    // Remove from id2entry.
    if (!id2entry.remove(txn, leafID))
    {
      LocalizableMessage msg = ERR_JEB_MISSING_ID2ENTRY_RECORD.get(leafID.toString());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
          msg);
          ERR_JEB_MISSING_ID2ENTRY_RECORD.get(leafID));
    }
    // Remove from the indexes, in index config order.
@@ -2199,9 +2186,8 @@
      if (entry == null)
      {
        // The entryID does not exist.
        LocalizableMessage msg = ERR_JEB_MISSING_ID2ENTRY_RECORD.get(entryID.toString());
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
            msg);
            ERR_JEB_MISSING_ID2ENTRY_RECORD.get(entryID));
      }
      // Put the entry in the cache making sure not to overwrite
@@ -2243,7 +2229,7 @@
      {
        // The entry does not exist.
        LocalizableMessage message =
          ERR_JEB_MODIFY_NO_SUCH_OBJECT.get(newEntry.getName().toString());
          ERR_JEB_MODIFY_NO_SUCH_OBJECT.get(newEntry.getName());
        DN matchedDN = getMatchedDN(baseDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
            message, matchedDN, null);
@@ -2394,7 +2380,7 @@
        dn2uri.targetEntryReferrals(currentDN, null);
        LocalizableMessage message =
          ERR_JEB_MODIFYDN_NO_SUCH_OBJECT.get(currentDN.toString());
          ERR_JEB_MODIFYDN_NO_SUCH_OBJECT.get(currentDN);
        DN matchedDN = getMatchedDN(baseDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
            message, matchedDN, null);
@@ -2403,9 +2389,8 @@
      Entry oldApexEntry = id2entry.get(txn, oldApexID, LockMode.DEFAULT);
      if (oldApexEntry == null)
      {
        LocalizableMessage msg = ERR_JEB_MISSING_ID2ENTRY_RECORD.get(oldApexID.toString());
        throw new DirectoryException(
            DirectoryServer.getServerErrorResultCode(), msg);
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
            ERR_JEB_MISSING_ID2ENTRY_RECORD.get(oldApexID));
      }
      if (!isManageDsaITOperation(modifyDNOperation))
@@ -3901,7 +3886,7 @@
      // Check for referral entries above the base entry.
      dn2uri.targetEntryReferrals(baseDN, searchScope);
      LocalizableMessage message = ERR_JEB_SEARCH_NO_SUCH_OBJECT.get(baseDN.toString());
      LocalizableMessage message = ERR_JEB_SEARCH_NO_SUCH_OBJECT.get(baseDN);
      DN matchedDN = getMatchedDN(baseDN);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
            message, matchedDN, null);
opendj3-server-dev/src/server/org/opends/server/backends/jeb/ID2Entry.java
@@ -497,9 +497,8 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_JEB_ENTRY_DATABASE_CORRUPT.get(id.toString());
      throw new DirectoryException(
          DirectoryServer.getServerErrorResultCode(), message);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
          ERR_JEB_ENTRY_DATABASE_CORRUPT.get(id));
    }
  }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/RootContainer.java
@@ -170,9 +170,7 @@
    }
    catch(Exception e)
    {
      LocalizableMessage message =
          ERR_CONFIG_BACKEND_MODE_INVALID.get(config.dn().toString());
      throw new ConfigException(message);
      throw new ConfigException(ERR_CONFIG_BACKEND_MODE_INVALID.get(config.dn()));
    }
    //Make sure the mode will allow the server itself access to
@@ -721,9 +719,7 @@
    }
    catch(Exception e)
    {
      LocalizableMessage message =
              ERR_CONFIG_BACKEND_MODE_INVALID.get(cfg.dn().toString());
      unacceptableReasons.add(message);
      unacceptableReasons.add(ERR_CONFIG_BACKEND_MODE_INVALID.get(cfg.dn()));
      acceptable = false;
    }
opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -1637,9 +1637,7 @@
      {
        if (!suffix.isParentProcessed(parentDN, tmpEnv, clearedBackend))
        {
          LocalizableMessage message =
              ERR_JEB_IMPORT_PARENT_NOT_FOUND.get(parentDN.toString());
          reader.rejectEntry(entry, message);
          reader.rejectEntry(entry, ERR_JEB_IMPORT_PARENT_NOT_FOUND.get(parentDN));
          return false;
        }
      }
@@ -3219,7 +3217,7 @@
      default:
        if (!rebuildConfig.isClearDegradedState())
        {
          message = NOTE_JEB_REBUILD_START.get(sb.toString(), totalEntries);
          message = NOTE_JEB_REBUILD_START.get(sb, totalEntries);
        }
        break;
      }
opendj3-server-dev/src/server/org/opends/server/config/ConfigAttribute.java
@@ -656,9 +656,8 @@
    {
      if (! tempValues.remove(value))
      {
        LocalizableMessage message =
           ERR_CONFIG_ATTR_NO_SUCH_VALUE.get(name, value.getValue().toString());
        throw new ConfigException(message);
        throw new ConfigException(
            ERR_CONFIG_ATTR_NO_SUCH_VALUE.get(name, value.getValue()));
      }
    }
opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java
@@ -730,9 +730,8 @@
    catch(Exception e)
    {
      // TODO: Need a better message.
      LocalizableMessage message =
          ERR_MVFILTER_INVALID_ELEMENT_TYPE.get(e.toString());
      throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);
      throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR,
          ERR_MVFILTER_INVALID_ELEMENT_TYPE.get(e));
    }
    switch (type)
opendj3-server-dev/src/server/org/opends/server/core/AccessControlConfigManager.java
@@ -302,8 +302,7 @@
    } catch (Exception e) {
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_AUTHZ_UNABLE_TO_INSTANTIATE_HANDLER.
              get(handlerClassName, String.valueOf(config.dn().toString()),
                      stackTraceToSingleLineString(e));
              get(handlerClassName, config.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
    return newHandler;
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
@@ -7078,7 +7078,7 @@
          DN user = clientConnection.getAuthenticationInfo()
              .getAuthorizationDN();
          LocalizableMessage message = ERR_ENQUEUE_MUST_CHANGE_PASSWORD
              .get(user != null ? user.toString() : "anonymous");
              .get(user != null ? user : "anonymous");
          throw new DirectoryException(
                  ResultCode.CONSTRAINT_VIOLATION, message);
@@ -7105,7 +7105,7 @@
            user = clientConnection.getAuthenticationInfo()
                .getAuthorizationDN();
            message = ERR_ENQUEUE_MUST_CHANGE_PASSWORD
                .get(user != null ? user.toString() : "anonymous");
                .get(user != null ? user : "anonymous");
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                         message);
          }
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
@@ -244,8 +244,7 @@
            }
            LocalizableMessage message = ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME.
                get(v.getValue().toString(), attributeType.getNameOrOID(),
                    userDNString, String.valueOf(e));
                get(v.getValue(), attributeType.getNameOrOID(), userDNString, e);
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                         message, e);
          }
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupPlugin.java
@@ -112,9 +112,7 @@
          // These are acceptable
          break;
        default:
          LocalizableMessage message =
              ERR_PLUGIN_NETWORKGROUP_INVALID_PLUGIN_TYPE.get(t.toString());
          throw new ConfigException(message);
          throw new ConfigException(ERR_PLUGIN_NETWORKGROUP_INVALID_PLUGIN_TYPE.get(t));
      }
    }
  }
opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java
@@ -605,7 +605,7 @@
      {
        unacceptableReasons
            .add(ERR_CONFIG_NETWORKGROUPREQUESTFILTERINGPOLICY_INVALID_ATTRIBUTE
                .get(allowedAttr, configuration.dn().toString()));
                .get(allowedAttr, configuration.dn()));
        return false;
      }
    }
@@ -619,8 +619,7 @@
      {
        unacceptableReasons
            .add(ERR_CONFIG_NETWORKGROUPREQUESTFILTERINGPOLICY_INVALID_SUBTREE
                .get(allowedSubtree.toString(), configuration.dn()
                    .toString()));
                .get(allowedSubtree, configuration.dn()));
        return false;
      }
    }
opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
@@ -561,12 +561,11 @@
    }
    //The certificate can never be null. The LocalizableMessage digest code that will
    //use it later throws a NPE if the certificate is null.
    if(certificate == null) {
      LocalizableMessage msg =
        ERR_CRYPTOMGR_FAILED_INSTANCE_CERTIFICATE_NULL.get(entryDN.toString());
        throw new CryptoManagerException(msg);
    if (certificate == null) {
      throw new CryptoManagerException(
          ERR_CRYPTOMGR_FAILED_INSTANCE_CERTIFICATE_NULL.get(entryDN));
    }
    return(certificate);
    return certificate;
  }
opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java
@@ -482,10 +482,8 @@
      {
        close(reader);
        LocalizableMessage message = ERR_CONFIG_FILE_NO_PARENT.get(entryDN.toString(),
                               reader.getLastEntryLineNumber(),
                               f.getAbsolutePath(), parentDN.toString());
        throw new InitializationException(message);
        throw new InitializationException(ERR_CONFIG_FILE_NO_PARENT.get(
            entryDN, reader.getLastEntryLineNumber(), f.getAbsolutePath(), parentDN));
      }
opendj3-server-dev/src/server/org/opends/server/extensions/FIFOEntryCache.java
@@ -178,8 +178,7 @@
          buffer.append(iterator.next());
        }
      }
      LocalizableMessage message = ERR_FIFOCACHE_CANNOT_INITIALIZE.get(buffer.toString());
      throw new ConfigException(message);
      throw new ConfigException(ERR_FIFOCACHE_CANNOT_INITIALIZE.get(buffer));
    }
  }
@@ -1083,17 +1082,15 @@
      sb.append(ServerConstants.EOL);
    }
    // See if there is anything on idMap that isnt reflected on
    // See if there is anything on idMap that is not reflected on
    // dnMap in case maps went out of sync.
    for (Backend backend : idMapCopy.keySet()) {
      for (Long id : idMapCopy.get(backend).keySet()) {
        if ((idMapCopy.get(backend).get(id) == null) ||
            !dnMapCopy.containsKey(
              idMapCopy.get(backend).get(id).getDN())) {
          sb.append((idMapCopy.get(backend).get(id) != null ?
              idMapCopy.get(backend).get(id).getDN().toString() : null));
        final CacheEntry cacheEntry = idMapCopy.get(backend).get(id);
        if (cacheEntry == null || !dnMapCopy.containsKey(cacheEntry.getDN())) {
          sb.append(cacheEntry != null ? cacheEntry.getDN() : null);
          sb.append(":");
          sb.append(id.toString());
          sb.append(id);
          sb.append(":");
          sb.append(backend.getBackendID());
          sb.append(ServerConstants.EOL);
opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
@@ -230,8 +230,7 @@
          buffer.append(iterator.next());
        }
      }
      LocalizableMessage message = ERR_FSCACHE_CANNOT_INITIALIZE.get(buffer.toString());
      throw new ConfigException(message);
      throw new ConfigException(ERR_FSCACHE_CANNOT_INITIALIZE.get(buffer));
    }
    // Set the cache type.
@@ -1453,10 +1452,9 @@
    // Check dnMap first.
    for (String dn : dnMapCopy.keySet()) {
      sb.append(dn.toString());
      sb.append(dn);
      sb.append(":");
      sb.append((dnMapCopy.get(dn) != null ?
          dnMapCopy.get(dn).toString() : null));
      sb.append(dnMapCopy.get(dn) != null ? dnMapCopy.get(dn) : null);
      sb.append(":");
      String backendID = null;
      Iterator<String> backendIterator = backendMapCopy.keySet().iterator();
opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java
@@ -325,8 +325,7 @@
      principal.append("@").append(realm);
    }
    w.write(principal.toString());
    LocalizableMessage msg = INFO_GSSAPI_PRINCIPAL_NAME.get(principal.toString());
    logger.error(msg);
    logger.error(INFO_GSSAPI_PRINCIPAL_NAME.get(principal));
    w.write("\" isInitiator=false;");
    w.newLine();
    w.write("};");
opendj3-server-dev/src/server/org/opends/server/extensions/SoftReferenceEntryCache.java
@@ -704,9 +704,9 @@
    // date than idMap. Dont bother with copies either since this
    // is SoftReference based implementation.
    for(SoftReference<CacheEntry> ce : dnMap.values()) {
      sb.append(ce.get().getDN().toString());
      sb.append(ce.get().getDN());
      sb.append(":");
      sb.append(Long.toString(ce.get().getEntryID()));
      sb.append(ce.get().getEntryID());
      sb.append(":");
      sb.append(ce.get().getBackend().getBackendID());
      sb.append(ServerConstants.EOL);
opendj3-server-dev/src/server/org/opends/server/extensions/VirtualStaticGroup.java
@@ -161,9 +161,7 @@
            logger.traceException(de);
            LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_CANNOT_DECODE_TARGET.
                get(v.getValue().toString(),
                    String.valueOf(groupEntry.getName()),
                    de.getMessageObject());
                get(v.getValue(), groupEntry.getName(), de.getMessageObject());
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                         message, de);
          }
opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java
@@ -376,10 +376,7 @@
      // The class is valid as far as we can tell.
      return publisher.isConfigurationAcceptable(config, unacceptableReasons);
    } catch (Exception e) {
      LocalizableMessage message =
          invalidLoggerClassErrorMessage.get(className, config.dn().toString(),
              String.valueOf(e));
      unacceptableReasons.add(message);
      unacceptableReasons.add(invalidLoggerClassErrorMessage.get(className, config.dn(), e));
      return false;
    }
  }
@@ -397,10 +394,8 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message =
          invalidLoggerClassErrorMessage.get(className, config.dn().toString(),
              String.valueOf(e));
      throw new ConfigException(message, e);
      throw new ConfigException(
          invalidLoggerClassErrorMessage.get(className, config.dn(), e), e);
    }
  }
opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java
@@ -132,7 +132,7 @@
    {
      logger.traceException(e);
      LocalizableMessage message =
          ERR_LOGGER_ERROR_OBTAINING_FREE_SPACE.get(files[0].toString(),
          ERR_LOGGER_ERROR_OBTAINING_FREE_SPACE.get(files[0],
              stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
opendj3-server-dev/src/server/org/opends/server/loggers/LogPublisherErrorHandler.java
@@ -84,10 +84,8 @@
   */
  public void handleOpenError(File file, Throwable ex)
  {
    LocalizableMessage msg = ERR_LOGGER_ERROR_OPENING_FILE.get(file.toString(),
                            publisherConfigDN.toString(),
                            stackTraceToSingleLineString(ex));
    System.err.println(msg);
    System.err.println(ERR_LOGGER_ERROR_OPENING_FILE.get(
        file, publisherConfigDN, stackTraceToSingleLineString(ex)));
  }
  /**
opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java
@@ -274,7 +274,7 @@
    }
    if (fields.size() == unsupportedFields.size())
    { // all fields are unsupported
      return ERR_CONFIG_LOGGING_EMPTY_LOG_FORMAT.get(cfg.dn().toString());
      return ERR_CONFIG_LOGGING_EMPTY_LOG_FORMAT.get(cfg.dn());
    }
    return null;
  }
opendj3-server-dev/src/server/org/opends/server/plugins/ChangeNumberControlPlugin.java
@@ -146,20 +146,18 @@
          break;
        default:
          LocalizableMessage message =
              ERR_PLUGIN_CHANGE_NUMBER_INVALID_PLUGIN_TYPE.get(t.toString());
          throw new ConfigException(message);
          throw new ConfigException(ERR_PLUGIN_CHANGE_NUMBER_INVALID_PLUGIN_TYPE.get(t));
      }
    }
    if (types.size() != 4) {
      StringBuilder expected = new StringBuilder();
      expected.append(PluginType.POST_OPERATION_ADD.toString());
      expected.append(PluginType.POST_OPERATION_ADD);
      expected.append(", ");
      expected.append(PluginType.POST_OPERATION_DELETE.toString());
      expected.append(PluginType.POST_OPERATION_DELETE);
      expected.append(", ");
      expected.append(PluginType.POST_OPERATION_MODIFY.toString());
      expected.append(PluginType.POST_OPERATION_MODIFY);
      expected.append(", ");
      expected.append(PluginType.POST_OPERATION_MODIFY_DN.toString());
      expected.append(PluginType.POST_OPERATION_MODIFY_DN);
      StringBuilder found = new StringBuilder();
      boolean first = true;
@@ -169,12 +167,11 @@
        } else {
          found.append(", ");
        }
        found.append(t.toString());
        found.append(t);
      }
      LocalizableMessage message = ERR_PLUGIN_CHANGE_NUMBER_INVALID_PLUGIN_TYPE_LIST.get(
              found.toString(), expected.toString());
          throw new ConfigException(message);
      throw new ConfigException(ERR_PLUGIN_CHANGE_NUMBER_INVALID_PLUGIN_TYPE_LIST.get(
          found, expected));
    }
  }
opendj3-server-dev/src/server/org/opends/server/plugins/EntryUUIDPlugin.java
@@ -134,11 +134,8 @@
          // These are acceptable.
          break;
        default:
          LocalizableMessage message =
              ERR_PLUGIN_ENTRYUUID_INVALID_PLUGIN_TYPE.get(t.toString());
          throw new ConfigException(message);
          throw new ConfigException(ERR_PLUGIN_ENTRYUUID_INVALID_PLUGIN_TYPE.get(t));
      }
    }
  }
opendj3-server-dev/src/server/org/opends/server/plugins/LastModPlugin.java
@@ -130,11 +130,8 @@
          // These are acceptable.
          break;
        default:
          LocalizableMessage message =
              ERR_PLUGIN_LASTMOD_INVALID_PLUGIN_TYPE.get(t.toString());
          throw new ConfigException(message);
          throw new ConfigException(ERR_PLUGIN_LASTMOD_INVALID_PLUGIN_TYPE.get(t));
      }
    }
  }
opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -136,11 +136,8 @@
          // This is the only acceptable type.
          break;
        default:
          LocalizableMessage message =
              ERR_PLUGIN_PWPIMPORT_INVALID_PLUGIN_TYPE.get(t.toString());
          throw new ConfigException(message);
          throw new ConfigException(ERR_PLUGIN_PWPIMPORT_INVALID_PLUGIN_TYPE.get(t));
      }
    }
opendj3-server-dev/src/server/org/opends/server/plugins/SevenBitCleanPlugin.java
@@ -108,11 +108,8 @@
          // These are acceptable.
          break;
        default:
          LocalizableMessage message =
              ERR_PLUGIN_7BIT_INVALID_PLUGIN_TYPE.get(t.toString());
          throw new ConfigException(message);
          throw new ConfigException(ERR_PLUGIN_7BIT_INVALID_PLUGIN_TYPE.get(t));
      }
    }
  }
opendj3-server-dev/src/server/org/opends/server/plugins/UniqueAttributePlugin.java
@@ -126,10 +126,7 @@
          break;
        default:
          LocalizableMessage message =
                  ERR_PLUGIN_UNIQUEATTR_INVALID_PLUGIN_TYPE.get(t.toString());
          throw new ConfigException(message);
          throw new ConfigException(ERR_PLUGIN_UNIQUEATTR_INVALID_PLUGIN_TYPE.get(t));
      }
    }
opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java
@@ -475,7 +475,7 @@
          DN matchedDN = operation.getMatchedDN();
          if (matchedDN != null)
          {
            m = INFO_LDIF_CONNHANDLER_MATCHED_DN.get(matchedDN.toString());
            m = INFO_LDIF_CONNHANDLER_MATCHED_DN.get(matchedDN);
            writer.writeComment(m, 78);
          }
opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReader.java
@@ -105,9 +105,7 @@
    }
    catch(IOException ioe)
    {
      LocalizableMessage message =
          ERR_ASN1_READ_ERROR.get(ioe.toString());
      throw new ASN1Exception(message, ioe);
      throw new ASN1Exception(ERR_ASN1_READ_ERROR.get(ioe), ioe);
    }
  }
@@ -138,9 +136,7 @@
    }
    catch(IOException ioe)
    {
      LocalizableMessage message =
          ERR_ASN1_READ_ERROR.get(ioe.toString());
      throw new ASN1Exception(message, ioe);
      throw new ASN1Exception(ERR_ASN1_READ_ERROR.get(ioe), ioe);
    }
  }
@@ -340,9 +336,7 @@
    }
    catch(IOException ioe)
    {
      LocalizableMessage message =
          ERR_ASN1_READ_ERROR.get(ioe.toString());
      throw new ASN1Exception(message, ioe);
      throw new ASN1Exception(ERR_ASN1_READ_ERROR.get(ioe), ioe);
    }
  }
@@ -369,9 +363,7 @@
    }
    catch(IOException ioe)
    {
      LocalizableMessage message =
          ERR_ASN1_READ_ERROR.get(ioe.toString());
      throw new ASN1Exception(message, ioe);
      throw new ASN1Exception(ERR_ASN1_READ_ERROR.get(ioe), ioe);
    }
  }
@@ -411,9 +403,7 @@
    }
    catch(IOException ioe)
    {
      LocalizableMessage message =
          ERR_ASN1_READ_ERROR.get(ioe.toString());
      throw new ASN1Exception(message, ioe);
      throw new ASN1Exception(ERR_ASN1_READ_ERROR.get(ioe), ioe);
    }
  }
@@ -507,9 +497,7 @@
    }
    catch(IOException ioe)
    {
      LocalizableMessage message =
          ERR_ASN1_READ_ERROR.get(ioe.toString());
      throw new ASN1Exception(message, ioe);
      throw new ASN1Exception(ERR_ASN1_READ_ERROR.get(ioe), ioe);
    }
  }
@@ -583,9 +571,7 @@
    }
    catch(IOException ioe)
    {
      LocalizableMessage message =
          ERR_ASN1_READ_ERROR.get(ioe.toString());
      throw new ASN1Exception(message, ioe);
      throw new ASN1Exception(ERR_ASN1_READ_ERROR.get(ioe), ioe);
    }
  }
@@ -639,9 +625,7 @@
    }
    catch(IOException ioe)
    {
      LocalizableMessage message =
          ERR_ASN1_READ_ERROR.get(ioe.toString());
      throw new ASN1Exception(message, ioe);
      throw new ASN1Exception(ERR_ASN1_READ_ERROR.get(ioe), ioe);
    }
    String str;
@@ -708,9 +692,7 @@
    }
    catch(IOException ioe)
    {
      LocalizableMessage message =
          ERR_ASN1_READ_ERROR.get(ioe.toString());
      throw new ASN1Exception(message, ioe);
      throw new ASN1Exception(ERR_ASN1_READ_ERROR.get(ioe), ioe);
    }
  }
@@ -786,9 +768,7 @@
      }
      catch(IOException ioe)
      {
        LocalizableMessage message =
            ERR_ASN1_READ_ERROR.get(ioe.toString());
        throw new ASN1Exception(message, ioe);
        throw new ASN1Exception(ERR_ASN1_READ_ERROR.get(ioe), ioe);
      }
    }
@@ -839,9 +819,7 @@
    }
    catch(IOException ioe)
    {
      LocalizableMessage message =
          ERR_ASN1_READ_ERROR.get(ioe.toString());
      throw new ASN1Exception(message, ioe);
      throw new ASN1Exception(ERR_ASN1_READ_ERROR.get(ioe), ioe);
    }
  }
opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java
@@ -363,9 +363,8 @@
            return PluginResult.ImportLDIF.stopEntryProcessing(null);
          }
          LocalizableMessage message = NOTE_ERR_LDIF_IMPORT_FRACTIONAL_BAD_DATA_SET
              .get(replicatedDomainBaseDn.toString());
          return PluginResult.ImportLDIF.stopEntryProcessing(message);
          return PluginResult.ImportLDIF.stopEntryProcessing(
              NOTE_ERR_LDIF_IMPORT_FRACTIONAL_BAD_DATA_SET.get(replicatedDomainBaseDn));
        }
        // Local domain is fractional but remote domain has no config :
@@ -385,9 +384,8 @@
          return PluginResult.ImportLDIF.stopEntryProcessing(null);
        }
        LocalizableMessage message = NOTE_ERR_LDIF_IMPORT_FRACTIONAL_DATA_SET_IS_FRACTIONAL
            .get(replicatedDomainBaseDn.toString());
        return PluginResult.ImportLDIF.stopEntryProcessing(message);
        return PluginResult.ImportLDIF.stopEntryProcessing(
            NOTE_ERR_LDIF_IMPORT_FRACTIONAL_DATA_SET_IS_FRACTIONAL.get(replicatedDomainBaseDn));
      }
    }
opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -38,8 +38,10 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.*;
import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.IsolationPolicy;
import org.opends.server.admin.std.server.ExternalChangelogDomainCfg;
import org.opends.server.admin.std.server.ReplicationDomainCfg;
import org.opends.server.api.AlertGenerator;
@@ -49,7 +51,6 @@
import org.opends.server.backends.task.Task;
import org.opends.server.config.ConfigException;
import org.opends.server.core.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchListener;
@@ -65,12 +66,11 @@
import org.opends.server.tasks.PurgeConflictsHistoricalTask;
import org.opends.server.tasks.TaskUtils;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.operation.*;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.TimeThread;
import org.opends.server.workflowelement.externalchangelog.ECLWorkflowElement;
import org.opends.server.workflowelement.localbackend.*;
import org.opends.server.workflowelement.localbackend.LocalBackendModifyOperation;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.messages.ToolMessages.*;
@@ -2441,8 +2441,8 @@
          // Continue with the next change but the servers could now become
          // inconsistent.
          // Let the repair tool know about this.
          LocalizableMessage message = ERR_LOOP_REPLAYING_OPERATION.get(op.toString(),
            op.getErrorMessage().toString());
          final LocalizableMessage message = ERR_LOOP_REPLAYING_OPERATION.get(
              op, op.getErrorMessage());
          logger.error(message);
          numUnresolvedNamingConflicts.incrementAndGet();
          replayErrorMsg = message.toString();
@@ -3081,7 +3081,7 @@
  private void renameConflictEntry(Operation conflictOp, DN dn,
      String entryUUID)
  {
    LocalizableMessage alertMessage = NOTE_UNRESOLVED_CONFLICT.get(dn.toString());
    LocalizableMessage alertMessage = NOTE_UNRESOLVED_CONFLICT.get(dn);
    DirectoryServer.sendAlertNotification(this,
        ALERT_TYPE_REPLICATION_UNRESOLVED_CONFLICT, alertMessage);
@@ -3140,7 +3140,7 @@
    // Generate an alert to let the administration know that some
    // conflict could not be solved.
    LocalizableMessage alertMessage = NOTE_UNRESOLVED_CONFLICT.get(conflictDN.toString());
    LocalizableMessage alertMessage = NOTE_UNRESOLVED_CONFLICT.get(conflictDN);
    DirectoryServer.sendAlertNotification(this,
        ALERT_TYPE_REPLICATION_UNRESOLVED_CONFLICT, alertMessage);
  }
@@ -3926,7 +3926,7 @@
    // Check that the base DN is configured as a base-dn of the directory server
    if (DirectoryServer.getBackend(dn) == null)
    {
      unacceptableReasons.add(ERR_UNKNOWN_DN.get(dn.toString()));
      unacceptableReasons.add(ERR_UNKNOWN_DN.get(dn));
      return false;
    }
opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java
@@ -320,9 +320,7 @@
    StatusMachineEvent event = StatusMachineEvent.statusToEvent(reqStatus);
    if (event == StatusMachineEvent.INVALID_EVENT)
    {
      LocalizableMessage msg = ERR_RS_INVALID_NEW_STATUS.get(reqStatus.toString(),
          getBaseDNString(), Integer.toString(serverId));
      logger.error(msg);
      logger.error(ERR_RS_INVALID_NEW_STATUS.get(reqStatus, getBaseDN(), serverId));
      return ServerStatus.INVALID_STATUS;
    }
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -34,7 +34,6 @@
import java.util.concurrent.atomic.AtomicReference;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.*;
import org.opends.server.admin.std.server.ReplicationServerCfg;
@@ -511,7 +510,7 @@
    catch (Exception e)
    {
      LocalizableMessage message =
        NOTE_ERR_UNABLE_TO_ENABLE_ECL_VIRTUAL_ATTR.get(attrName, e.toString());
        NOTE_ERR_UNABLE_TO_ENABLE_ECL_VIRTUAL_ATTR.get(attrName, e);
      throw new DirectoryException(ResultCode.OPERATIONS_ERROR, message, e);
    }
  }
@@ -987,10 +986,7 @@
    }
    catch(Exception e)
    {
      LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
      mb.append(e.getLocalizedMessage());
      LocalizableMessage msg = ERR_CHECK_CREATE_REPL_BACKEND_FAILED.get(mb.toString());
      throw new ConfigException(msg, e);
      throw new ConfigException(ERR_CHECK_CREATE_REPL_BACKEND_FAILED.get(e.getLocalizedMessage()), e);
    }
  }
@@ -1040,10 +1036,7 @@
    }
    catch(Exception e)
    {
      LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
      mb.append(e.getLocalizedMessage());
      LocalizableMessage msg = ERR_DELETE_REPL_BACKEND_FAILED.get(mb.toString());
      logger.error(msg);
      logger.error(ERR_DELETE_REPL_BACKEND_FAILED.get(e.getLocalizedMessage()));
    }
  }
opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java
@@ -931,8 +931,7 @@
    {
      // looks like two connected LDAP servers have the same serverId
      logger.error(ERR_DUPLICATE_SERVER_ID, localReplicationServer.getMonitorInstanceName(),
          connectedDSs.get(dsHandler.getServerId()).toString(),
          dsHandler.toString(), dsHandler.getServerId());
          connectedDSs.get(dsHandler.getServerId()), dsHandler, dsHandler.getServerId());
      return true;
    }
    return false;
@@ -1534,11 +1533,7 @@
       * An error happened trying to send an error msg to this server.
       * Log an error and close the connection to this server.
       */
      LocalizableMessageBuilder mb2 = new LocalizableMessageBuilder();
      mb2.append(ERR_CHANGELOG_ERROR_SENDING_ERROR.get(this.toString()));
      mb2.append(" ");
      mb2.append(stackTraceToSingleLineString(ignored));
      logger.error(mb2.toMessage());
      logger.error(ERR_CHANGELOG_ERROR_SENDING_ERROR.get(this), ignored);
      stopServer(msgEmitter, false);
    }
  }
@@ -2168,10 +2163,7 @@
    }
    catch (ChangelogException e)
    {
      LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
      mb.append(ERR_ERROR_CLEARING_DB.get(baseDN.toString(), e.getMessage()
          + " " + stackTraceToSingleLineString(e)));
      logger.error(mb.toMessage());
      logger.error(ERR_ERROR_CLEARING_DB.get(baseDN, e.getMessage()), e);
    }
  }
opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java
@@ -222,7 +222,7 @@
             * The remote server has sent an unknown message, close the
             * connection.
             */
            errMessage = NOTE_READER_NULL_MSG.get(handler.toString());
            errMessage = NOTE_READER_NULL_MSG.get(handler);
            logger.error(errMessage);
            return;
          }
opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java
@@ -32,7 +32,6 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.admin.std.server.ReplicationServerCfg;
import org.opends.server.config.ConfigException;
@@ -164,9 +163,8 @@
      final LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
      mb.append(e.getLocalizedMessage());
      mb.append(" ");
      mb.append(String.valueOf(dbDirectory));
      LocalizableMessage msg = ERR_FILE_CHECK_CREATE_FAILED.get(mb.toString());
      throw new ConfigException(msg, e);
      mb.append(dbDirectory);
      throw new ConfigException(ERR_FILE_CHECK_CREATE_FAILED.get(mb), e);
    }
  }
opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
@@ -552,11 +552,8 @@
              //hyphen is allowed but not as the first byte.
                if (index==0)
                {
                  LocalizableMessage msg = ERR_ATTR_SYNTAX_ATTR_ILLEGAL_INITIAL_DASH.
                        get(value.toString());
                  throw new DirectoryException(
                          ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                               msg);
                  throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                      ERR_ATTR_SYNTAX_ATTR_ILLEGAL_INITIAL_DASH.get(value));
                }
                break;
              case '_':
@@ -565,22 +562,15 @@
              // name exceptions option is enabled.
                if (index==0)
                {
                  LocalizableMessage msg =
                          ERR_ATTR_SYNTAX_ATTR_ILLEGAL_INITIAL_UNDERSCORE.
                        get(value.toString(),
                            ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
                  throw new DirectoryException(
                          ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                               msg);
                  throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                      ERR_ATTR_SYNTAX_ATTR_ILLEGAL_INITIAL_UNDERSCORE.get(
                          value, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS));
                }
                else if (!allowExceptions)
                {
                  LocalizableMessage msg = ERR_ATTR_SYNTAX_ATTR_ILLEGAL_UNDERSCORE_CHAR.
                        get(value.toString(),
                            ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
                  throw new DirectoryException(
                          ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                               msg);
                  throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                      ERR_ATTR_SYNTAX_ATTR_ILLEGAL_UNDERSCORE_CHAR.get(
                          value, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS));
                }
                break;
@@ -589,12 +579,9 @@
              //can not be a digit.
                if(index ==0 && isDigit(ch) && !allowExceptions)
                {
                  LocalizableMessage message = ERR_ATTR_SYNTAX_ATTR_ILLEGAL_INITIAL_DIGIT.
                    get(value.toString(), ch,
                        ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
                  throw new DirectoryException(
                          ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                             message);
                  throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                      ERR_ATTR_SYNTAX_ATTR_ILLEGAL_INITIAL_DIGIT.get(
                          value, ch, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS));
                }
                else if(!((ch>='0' && ch<='9') || (ch>='A' && ch<='Z') ||
                        (ch>='a' && ch<='z')))
opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
@@ -209,8 +209,7 @@
    int length = valueString.length();
    if (length < 3)
    {
      invalidReason.append(
              WARN_ATTR_SYNTAX_BIT_STRING_TOO_SHORT.get(value.toString()));
      invalidReason.append(WARN_ATTR_SYNTAX_BIT_STRING_TOO_SHORT.get(value));
      return false;
    }
@@ -219,8 +218,7 @@
        (valueString.charAt(length-2) != '\'') ||
        (valueString.charAt(length-1) != 'B'))
    {
      invalidReason.append(
              WARN_ATTR_SYNTAX_BIT_STRING_NOT_QUOTED.get(value.toString()));
      invalidReason.append(WARN_ATTR_SYNTAX_BIT_STRING_NOT_QUOTED.get(value));
      return false;
    }
opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
@@ -25,11 +25,9 @@
 *      Portions Copyright 2012-2014 ForgeRock AS
 */
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
@@ -40,7 +38,6 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
@@ -90,10 +87,8 @@
      }
      else
      {
        LocalizableMessage message =
            WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN.get(normalizedValue.toString());
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
            message);
            WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN.get(normalizedValue));
      }
    }
  };
opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
@@ -292,8 +292,7 @@
      if (stringValue.charAt(0) < 'A' || stringValue.charAt(0) > 'Z' ||
          stringValue.charAt(1) < 'A' || stringValue.charAt(1) > 'Z')
        {
          invalidReason.append(ERR_ATTR_SYNTAX_COUNTRY_NO_VALID_ISO_CODE
                 .get(value.toString()));
          invalidReason.append(ERR_ATTR_SYNTAX_COUNTRY_NO_VALID_ISO_CODE.get(value));
          return false;
        }
    }
opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
@@ -560,10 +560,9 @@
              }
              else
              {
                LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_UNKNOWN_AUXILIARY_CLASS.
                    get(valueStr, woidBuffer.toString());
                throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                             message);
                    ERR_ATTR_SYNTAX_DCR_UNKNOWN_AUXILIARY_CLASS.get(
                        valueStr, woidBuffer));
              }
            }
            else if (oc.getObjectClassType() != ObjectClassType.AUXILIARY)
@@ -571,8 +570,7 @@
              // This isn't good because it isn't an auxiliary class.
              LocalizableMessage message =
                  ERR_ATTR_SYNTAX_DCR_AUXILIARY_CLASS_NOT_AUXILIARY.
                    get(valueStr, woidBuffer.toString(),
                        oc.getObjectClassType().toString());
                    get(valueStr, woidBuffer, oc.getObjectClassType());
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
            }
@@ -624,8 +622,7 @@
          {
            // This isn't good because it isn't an auxiliary class.
            LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_AUXILIARY_CLASS_NOT_AUXILIARY.
                get(valueStr, woidBuffer.toString(),
                    oc.getObjectClassType().toString());
                get(valueStr, woidBuffer, oc.getObjectClassType());
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                         message);
          }
@@ -833,10 +830,9 @@
              }
              else
              {
                LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_UNKNOWN_PROHIBITED_ATTR.
                    get(valueStr, woidBuffer.toString());
                throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                             message);
                    ERR_ATTR_SYNTAX_DCR_UNKNOWN_PROHIBITED_ATTR.get(
                        valueStr, woidBuffer));
              }
            }
opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
@@ -296,8 +296,7 @@
      String token = tokenizer.nextToken();
      if (! allowedValues.contains(token))
      {
        invalidReason.append(ERR_ATTR_SYNTAX_DELIVERY_METHOD_INVALID_ELEMENT
                .get(value.toString(), token));
        invalidReason.append(ERR_ATTR_SYNTAX_DELIVERY_METHOD_INVALID_ELEMENT.get(value, token));
        return false;
      }
    }
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
@@ -249,11 +249,7 @@
    catch (Exception e)
    {
      logger.traceException(e);
      invalidReason.append(ERR_ATTR_SYNTAX_DN_INVALID.get(value.toString(),
                                      String.valueOf(e)));
      invalidReason.append(ERR_ATTR_SYNTAX_DN_INVALID.get(value, e));
      return false;
    }
  }
opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
@@ -25,11 +25,9 @@
 *      Portions Copyright 2012-2014 ForgeRock AS
 */
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
@@ -40,7 +38,6 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
@@ -90,10 +87,8 @@
      }
      catch (NumberFormatException e)
      {
        LocalizableMessage message =
            WARN_ATTR_SYNTAX_ILLEGAL_INTEGER.get(nvalue.toString());
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
            message);
            WARN_ATTR_SYNTAX_ILLEGAL_INTEGER.get(nvalue));
      }
    }
  };
opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
@@ -573,11 +573,8 @@
              }
              else
              {
                LocalizableMessage message =
                    ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_REQUIRED_ATTR.
                      get(oid, woidBuffer.toString());
                throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                             message);
                    ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_REQUIRED_ATTR.get(oid, woidBuffer));
              }
            }
@@ -618,10 +615,8 @@
            }
            else
            {
              LocalizableMessage message = ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_REQUIRED_ATTR.
                  get(oid, woidBuffer.toString());
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
                  ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_REQUIRED_ATTR.get(oid, woidBuffer));
            }
          }
@@ -658,11 +653,8 @@
              }
              else
              {
                LocalizableMessage message =
                    ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_OPTIONAL_ATTR.
                      get(oid, woidBuffer.toString());
                throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                             message);
                    ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_OPTIONAL_ATTR.get(oid, woidBuffer));
              }
            }
@@ -703,10 +695,8 @@
            }
            else
            {
              LocalizableMessage message = ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_OPTIONAL_ATTR.
                  get(oid, woidBuffer.toString());
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
                  ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_OPTIONAL_ATTR.get(oid, woidBuffer));
            }
          }
opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
@@ -516,11 +516,8 @@
              //hyphen is allowed but not as the first byte.
                if (index==0)
                {
                  LocalizableMessage msg = ERR_OC_SYNTAX_ATTR_ILLEGAL_INITIAL_DASH.
                        get(value.toString());
                  throw new DirectoryException(
                          ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                               msg);
                  throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                      ERR_OC_SYNTAX_ATTR_ILLEGAL_INITIAL_DASH.get(value));
                }
                break;
              case '_':
@@ -529,22 +526,16 @@
              // name exceptions option is enabled.
                if (index==0)
                {
                  LocalizableMessage msg =
                          ERR_OC_SYNTAX_ATTR_ILLEGAL_INITIAL_UNDERSCORE.
                        get(value.toString(),
                            ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
                  throw new DirectoryException(
                          ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                               msg);
                  LocalizableMessage msg = ERR_OC_SYNTAX_ATTR_ILLEGAL_INITIAL_UNDERSCORE
                      .get(value, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
                  throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, msg);
                }
                else if (!allowExceptions)
                {
                  LocalizableMessage msg = ERR_OC_SYNTAX_ATTR_ILLEGAL_UNDERSCORE_CHAR.
                        get(value.toString(),
                            ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
                        get(value, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
                  throw new DirectoryException(
                          ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                               msg);
                          ResultCode.INVALID_ATTRIBUTE_SYNTAX, msg);
                }
                break;
@@ -554,11 +545,9 @@
                if(index ==0 && isDigit(ch) && !allowExceptions)
                {
                  LocalizableMessage message = ERR_OC_SYNTAX_ATTR_ILLEGAL_INITIAL_DIGIT.
                    get(value.toString(), ch,
                        ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
                    get(value, ch, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
                  throw new DirectoryException(
                          ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                             message);
                          ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
                }
                else if(!((ch>='0' && ch<='9') || (ch>='A' && ch<='Z') ||
                        (ch>='a' && ch<='z')))
@@ -721,7 +710,7 @@
                // requires an attribute type that we don't know anything about.
                LocalizableMessage message =
                    WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_REQUIRED_ATTR.
                      get(oid, woidBuffer.toString());
                      get(oid, woidBuffer);
                throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                             message);
              }
@@ -766,7 +755,7 @@
              // an attribute type that we don't know anything about.
              LocalizableMessage message =
                  WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_REQUIRED_ATTR.
                    get(oid, woidBuffer.toString());
                    get(oid, woidBuffer);
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
            }
@@ -807,7 +796,7 @@
                // an attribute type that we don't know anything about.
                LocalizableMessage message =
                  WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_OPTIONAL_ATTR.
                      get(oid, woidBuffer.toString());
                      get(oid, woidBuffer);
                throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                             message);
              }
@@ -852,7 +841,7 @@
              // attribute type that we don't know anything about.
              LocalizableMessage message =
                WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_OPTIONAL_ATTR.
                    get(oid, woidBuffer.toString());
                    get(oid, woidBuffer);
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
            }
@@ -895,8 +884,7 @@
            {
              LocalizableMessage message =
                WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.
                  get(oid, objectClassType.toString(), superiorType.toString(),
                        superiorClass.getNameOrOID());
                  get(oid, objectClassType, superiorType, superiorClass.getNameOrOID());
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
            }
@@ -910,7 +898,7 @@
            {
              LocalizableMessage message =
                WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.
                  get(oid, objectClassType.toString(), superiorType.toString(),
                  get(oid, objectClassType, superiorType,
                        superiorClass.getNameOrOID());
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
@@ -925,7 +913,7 @@
            {
              LocalizableMessage message =
                WARN_ATTR_SYNTAX_OBJECTCLASS_INVALID_SUPERIOR_TYPE.
                  get(oid, objectClassType.toString(), superiorType.toString(),
                  get(oid, objectClassType, superiorType,
                        superiorClass.getNameOrOID());
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java
@@ -338,8 +338,7 @@
          if(containsTimeUnit)
          {
            //We already have time unit found by now.
            message = WARN_ATTR_CONFLICTING_ASSERTION_FORMAT.
                       get(value.toString());
            message = WARN_ATTR_CONFLICTING_ASSERTION_FORMAT.get(value);
          }
          else
          {
@@ -361,9 +360,8 @@
                week = number;
                break;
              default:
                  message =
                          WARN_ATTR_INVALID_RELATIVE_TIME_ASSERTION_FORMAT.
                          get(value.toString(),(char)value.byteAt(index));
                  message = WARN_ATTR_INVALID_RELATIVE_TIME_ASSERTION_FORMAT.
                          get(value,(char)value.byteAt(index));
            }
          }
          if(message !=null)
@@ -912,15 +910,11 @@
            case 'M':
               if(number == 0)
              {
                message =
                        WARN_ATTR_INVALID_MONTH_ASSERTION_FORMAT.
                        get(value.toString(),number);
                message = WARN_ATTR_INVALID_MONTH_ASSERTION_FORMAT.get(value, number);
              }
              else if(month > 0)
              {
                message =
                        WARN_ATTR_DUPLICATE_MONTH_ASSERTION_FORMAT.get(
                        value.toString(),month);
                message = WARN_ATTR_DUPLICATE_MONTH_ASSERTION_FORMAT.get(value, month);
              }
              else
              {
@@ -930,14 +924,11 @@
            case 'Y':
              if(number == 0)
              {
                message =
                        WARN_ATTR_INVALID_YEAR_ASSERTION_FORMAT.
                        get(value.toString(),number);
                message = WARN_ATTR_INVALID_YEAR_ASSERTION_FORMAT.get(value, number);
              }
              else if(year >0)
              {
                message = WARN_ATTR_DUPLICATE_YEAR_ASSERTION_FORMAT.
                        get(value.toString(),year);
                message = WARN_ATTR_DUPLICATE_YEAR_ASSERTION_FORMAT.get(value, year);
              }
              else
              {
@@ -945,9 +936,8 @@
              }
              break;
            default:
                message =
                        WARN_ATTR_INVALID_PARTIAL_TIME_ASSERTION_FORMAT.
                        get(value.toString(),(char)value.byteAt(index));
                message = WARN_ATTR_INVALID_PARTIAL_TIME_ASSERTION_FORMAT.
                        get(value,(char)value.byteAt(index));
          }
          if(message !=null)
          {
@@ -966,12 +956,9 @@
      if(year < 0)
      {
        //A future date is allowed.
        LocalizableMessage message =
                WARN_ATTR_INVALID_YEAR_ASSERTION_FORMAT.
                get(value.toString(),year);
        LocalizableMessage message = WARN_ATTR_INVALID_YEAR_ASSERTION_FORMAT.get(value, year);
        logger.warn(message);
        throw new DirectoryException(
                ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      }
      switch(month)
@@ -1016,12 +1003,9 @@
          month = Calendar.DECEMBER;
          break;
        default:
          LocalizableMessage message =
                WARN_ATTR_INVALID_MONTH_ASSERTION_FORMAT.
                get(value.toString(),month);
          LocalizableMessage message = WARN_ATTR_INVALID_MONTH_ASSERTION_FORMAT.get(value, month);
          logger.warn(message);
           throw new DirectoryException(
                   ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
           throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      }
      boolean invalidDate = false;
@@ -1050,41 +1034,30 @@
      }
      if(invalidDate)
      {
        LocalizableMessage message =
            WARN_ATTR_INVALID_DATE_ASSERTION_FORMAT.get(value.toString(), date);
        LocalizableMessage message = WARN_ATTR_INVALID_DATE_ASSERTION_FORMAT.get(value, date);
        logger.warn(message);
        throw new DirectoryException(
                ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      }
      if(!(hour >=-1 && hour <=23))
      {
         LocalizableMessage message =
                WARN_ATTR_INVALID_HOUR_ASSERTION_FORMAT.
                get(value.toString(),date);
         LocalizableMessage message = WARN_ATTR_INVALID_HOUR_ASSERTION_FORMAT.get(value, date);
         logger.warn(message);
        throw new DirectoryException(
                ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      }
      if(!(minute >=-1 && minute <=59))
      {
            LocalizableMessage message =
                WARN_ATTR_INVALID_MINUTE_ASSERTION_FORMAT.
                get(value.toString(),date);
                logger.warn(message);
        throw new DirectoryException(
                ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        LocalizableMessage message = WARN_ATTR_INVALID_MINUTE_ASSERTION_FORMAT.get(value, date);
        logger.warn(message);
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      }
      if(!(second >=-1 && second <=60)) //Consider leap seconds.
      {
      LocalizableMessage message =
                WARN_ATTR_INVALID_SECOND_ASSERTION_FORMAT.
                get(value.toString(),date);
         logger.warn(message);
        throw new DirectoryException(
                ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        LocalizableMessage message = WARN_ATTR_INVALID_SECOND_ASSERTION_FORMAT.get(value, date);
        logger.warn(message);
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      }
      /**
opendj3-server-dev/src/server/org/opends/server/tasks/DisconnectClientTask.java
@@ -123,7 +123,7 @@
          catch (Exception e)
          {
            LocalizableMessage message =
               ERR_TASK_DISCONNECT_INVALID_CONN_ID.get(v.getValue().toString());
               ERR_TASK_DISCONNECT_INVALID_CONN_ID.get(v.getValue());
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                         message, e);
          }
opendj3-server-dev/src/server/org/opends/server/tools/CreateRCScript.java
@@ -103,7 +103,7 @@
    OperatingSystem operatingSystem = DirectoryServer.getOperatingSystem();
    if (! OperatingSystem.isUNIXBased(operatingSystem))
    {
      err.println(ERR_CREATERC_ONLY_RUNS_ON_UNIX.get().toString());
      err.println(ERR_CREATERC_ONLY_RUNS_ON_UNIX.get());
      return 1;
    }
@@ -173,7 +173,7 @@
    }
    catch (ArgumentException ae)
    {
      err.println(ERR_ERROR_PARSING_ARGS.get(ae.getMessage()).toString());
      err.println(ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
      return 1;
    }
opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java
@@ -778,9 +778,7 @@
          }
          encodedPW = storageScheme.encodePasswordWithScheme(clearPW);
          LocalizableMessage message =
                  ERR_ENCPW_ENCODED_PASSWORD.get(encodedPW.toString());
          out.println(message);
          out.println(ERR_ENCPW_ENCODED_PASSWORD.get(encodedPW));
        }
        catch (DirectoryException de)
        {
opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
@@ -842,7 +842,7 @@
      if (matchedDN != null)
      {
        message = ERR_LDAPPWMOD_FAILURE_MATCHED_DN.get(matchedDN.toString());
        message = ERR_LDAPPWMOD_FAILURE_MATCHED_DN.get(matchedDN);
        err.println(wrapText(message, MAX_LINE_WIDTH));
      }
opendj3-server-dev/src/server/org/opends/server/tools/LDAPToolUtils.java
@@ -281,7 +281,7 @@
    if (matchedDN != null)
    {
      err.println(ERR_TOOL_MATCHED_DN.get(matchedDN.toString()));
      err.println(ERR_TOOL_MATCHED_DN.get(matchedDN));
    }
  }
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
@@ -1144,7 +1144,7 @@
    {
      println();
      // We assume that the app we are running is this one.
      println(INFO_DSCFG_NON_INTERACTIVE.get(commandBuilder.toString()));
      println(INFO_DSCFG_NON_INTERACTIVE.get(commandBuilder));
    }
    if (equivalentCommandFileArgument.isPresent())
    {
@@ -1280,7 +1280,7 @@
      reader.close();
    } catch (IOException ex) {
      println(ERR_DSCFG_ERROR_READING_BATCH_FILE.get(ex.toString()));
      println(ERR_DSCFG_ERROR_READING_BATCH_FILE.get(ex));
    }
  }
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -7946,7 +7946,7 @@
    adminProperties.put(ADSContext.AdministratorProperty.PASSWORD,
        uData.getAdminPwd());
    adminProperties.put(ADSContext.AdministratorProperty.DESCRIPTION,
        INFO_GLOBAL_ADMINISTRATOR_DESCRIPTION.get().toString());
        INFO_GLOBAL_ADMINISTRATOR_DESCRIPTION.get());
    return adminProperties;
  }
@@ -9371,8 +9371,7 @@
    {
      println();
      // We assume that the app we are running is this one.
      println(
          INFO_REPLICATION_NON_INTERACTIVE.get(commandBuilder.toString()));
      println(INFO_REPLICATION_NON_INTERACTIVE.get(commandBuilder));
    }
    if (argParser.equivalentCommandFileArgument.isPresent())
    {
opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskScheduleInteraction.java
@@ -284,7 +284,7 @@
      sb.append(entry.getId());
    }
    app.printlnProgress();
    app.printProgress(INFO_AVAILABLE_DEFINED_TASKS.get(sb.toString()));
    app.printProgress(INFO_AVAILABLE_DEFINED_TASKS.get(sb));
    app.printlnProgress();
    app.printlnProgress();
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
@@ -367,8 +367,8 @@
    context.notify(INFO_UPGRADE_TITLE.get(), TITLE_CALLBACK);
    context.notify(
        INFO_UPGRADE_SUMMARY.get(context.getFromVersion().toString(), context
            .getToVersion().toString()), NOTICE_CALLBACK);
        INFO_UPGRADE_SUMMARY.get(context.getFromVersion(), context.getToVersion()),
        NOTICE_CALLBACK);
    context.notify(INFO_UPGRADE_GENERAL_SEE_FOR_DETAILS.get(UpgradeUtils
        .getInstallationPath()
        + File.separator + UpgradeLog.UPGRADELOGNAME), NOTICE_CALLBACK);
@@ -565,7 +565,7 @@
       * upgrade so that upgrade is idempotent.
       */
      final LocalizableMessage message =
          ERR_UPGRADE_VERSION_UP_TO_DATE.get(context.getToVersion().toString());
          ERR_UPGRADE_VERSION_UP_TO_DATE.get(context.getToVersion());
      context.notify(message, NOTICE_CALLBACK);
      throw new ClientException(EXIT_CODE_SUCCESS, message);
    }
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
@@ -462,9 +462,9 @@
        if (cc.getOptionType() == ConfirmationCallback.YES_NO_OPTION)
        {
          choices.addAll(yesNoDefaultResponses);
          prompt.append(INFO_PROMPT_YES_COMPLETE_ANSWER.get().toString())
          prompt.append(INFO_PROMPT_YES_COMPLETE_ANSWER.get())
              .append("/")
              .append(INFO_PROMPT_NO_COMPLETE_ANSWER.get().toString());
              .append(INFO_PROMPT_NO_COMPLETE_ANSWER.get());
        }
        else if (cc.getOptionType()
            == ConfirmationCallback.YES_NO_CANCEL_OPTION)
@@ -474,11 +474,10 @@
              .arrayToList(new String[] { INFO_TASKINFO_CMD_CANCEL_CHAR.get()
                  .toString() }));
          prompt.append(" ").append("(").append(
              INFO_PROMPT_YES_COMPLETE_ANSWER.get().toString()).append("/")
              .append(INFO_PROMPT_NO_COMPLETE_ANSWER.get().toString())
              .append("/").append(
                  INFO_TASKINFO_CMD_CANCEL_CHAR.get().toString());
          prompt.append(" ")
                .append("(").append(INFO_PROMPT_YES_COMPLETE_ANSWER.get())
                .append("/").append(INFO_PROMPT_NO_COMPLETE_ANSWER.get())
                .append("/").append(INFO_TASKINFO_CMD_CANCEL_CHAR.get());
        }
        prompt.append(")");
@@ -503,26 +502,22 @@
              break;
            }
            if ((value.toLowerCase().equals(
                INFO_PROMPT_YES_FIRST_LETTER_ANSWER.get().toString()) || value
                .toLowerCase().equals(
                    INFO_PROMPT_YES_COMPLETE_ANSWER.get().toString()))
            String valueLC = value.toLowerCase();
            if ((valueLC.equals(INFO_PROMPT_YES_FIRST_LETTER_ANSWER.get())
                || valueLC.equals(INFO_PROMPT_YES_COMPLETE_ANSWER.get()))
                && choices.contains(value))
            {
              cc.setSelectedIndex(ConfirmationCallback.YES);
              break;
            }
            else if ((value.toLowerCase().equals(
                INFO_PROMPT_NO_FIRST_LETTER_ANSWER.get().toString()) || value
                .toLowerCase().equals(
                    INFO_PROMPT_NO_COMPLETE_ANSWER.get().toString()))
            else if ((valueLC.equals(INFO_PROMPT_NO_FIRST_LETTER_ANSWER.get())
                || valueLC.equals(INFO_PROMPT_NO_COMPLETE_ANSWER.get()))
                && choices.contains(value))
            {
              cc.setSelectedIndex(ConfirmationCallback.NO);
              break;
            }
            else if ((value.toLowerCase().equals(INFO_TASKINFO_CMD_CANCEL_CHAR
                .get().toString()))
            else if (valueLC.equals(INFO_TASKINFO_CMD_CANCEL_CHAR.get())
                && choices.contains(value))
            {
              cc.setSelectedIndex(ConfirmationCallback.CANCEL);
opendj3-server-dev/src/server/org/opends/server/types/DN.java
@@ -603,11 +603,8 @@
      // then that's an error.
      if (b != '=')
      {
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_NO_EQUAL.
            get(dnString.toString(), attributeName.toString(),
                (char) b);
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                     message);
            ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(dnString, attributeName, (char) b));
      }
@@ -752,10 +749,8 @@
          // This means that we hit the end of the value before
          // finding a '='.  This is illegal because there is no
          // attribute-value separator.
          LocalizableMessage message = ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.
              get(dnString.toString(), attributeName.toString());
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
              message);
              ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(dnString, attributeName));
        }
@@ -763,11 +758,8 @@
        // then that's an error.
        if (b != '=')
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_DN_NO_EQUAL.
              get(dnString.toString(), attributeName.toString(),
                  (char) b);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       message);
              ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(dnString, attributeName, (char) b));
        }
@@ -1129,10 +1121,8 @@
            // This means that we hit the end of the value before
            // finding a '='.  This is illegal because there is no
            // attribute-value separator.
            LocalizableMessage message = ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.
                get(dnString, attributeName.toString());
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                         message);
                ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(dnString, attributeName));
          }
          else
          {
@@ -1347,10 +1337,8 @@
          // character in the attribute name.
          if (dnBytes.position() == nameStartPos + 1)
          {
            msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_INITIAL_DASH.
                  get(dnBytes.toString());
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                         msg);
            msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_INITIAL_DASH.get(dnBytes);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, msg);
          }
          break;
@@ -1467,18 +1455,14 @@
          if (dnBytes.position() == nameStartPos + 1)
          {
            msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_INITIAL_UNDERSCORE.
                  get(dnBytes.toString(),
                      ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                         msg);
                  get(dnBytes, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, msg);
          }
          else if (!allowExceptions)
          {
            msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_UNDERSCORE_CHAR.
                  get(dnBytes.toString(),
                      ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                         msg);
                  get(dnBytes, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, msg);
          }
          break;
@@ -1549,10 +1533,8 @@
    // least one character.
    if (nameBytes == null || nameBytes.length() == 0)
    {
      LocalizableMessage message =
          ERR_ATTR_SYNTAX_DN_ATTR_NO_NAME.get(dnBytes.toString());
      throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                   message);
      LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_NO_NAME.get(dnBytes);
      throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
    }
    else if (checkForOID)
    {
@@ -1634,13 +1616,11 @@
    else if (isDigit((char)nameBytes.byteAt(0)) && (!allowExceptions))
    {
      LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_INITIAL_DIGIT.
          get(dnBytes.toString(), ((char)nameBytes.byteAt(0)),
          get(dnBytes, ((char)nameBytes.byteAt(0)),
              ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
      throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                   message);
      throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
    }
    return nameBytes;
  }
@@ -2128,17 +2108,14 @@
            else
            {
              LocalizableMessage message = ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.
                  get(dnBytes.toString(), (char) b);
              throw new DirectoryException(
                             ResultCode.INVALID_DN_SYNTAX, message);
                  get(dnBytes, (char) b);
              throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
            }
          }
          else
          {
            LocalizableMessage message = ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT.
                get(dnBytes.toString());
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                         message);
            LocalizableMessage message = ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT.get(dnBytes);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
          }
        }
        else if ((b == ' ') || (b == ',') || (b == ';') || (b == '+'))
@@ -2169,11 +2146,8 @@
      {
        logger.traceException(e);
        LocalizableMessage message =
            ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.
              get(dnBytes.toString(), String.valueOf(e));
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                     message);
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(dnBytes, e);
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
      }
    }
opendj3-server-dev/src/server/org/opends/server/types/LDIFExportConfig.java
@@ -275,9 +275,8 @@
          catch (Exception e)
          {
            // The file could not be created with the correct permissions.
            LocalizableMessage message =
              WARN_EXPORT_LDIF_SET_PERMISSION_FAILED.get(f.toString(),
                    stackTraceToSingleLineString(e));
            LocalizableMessage message = WARN_EXPORT_LDIF_SET_PERMISSION_FAILED
                .get(f, stackTraceToSingleLineString(e));
            throw new IOException(message.toString());
          }
        }
opendj3-server-dev/src/server/org/opends/server/util/Base64.java
@@ -559,8 +559,7 @@
    }
    catch (ArgumentException ae)
    {
      System.err.println(
          ERR_ERROR_PARSING_ARGS.get(ae.getMessage()).toString());
      System.err.println(ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
      System.exit(1);
    }
@@ -593,7 +592,7 @@
      catch (Throwable t)
      {
        // Bug
        System.err.println(ERR_UNEXPECTED.get(t.toString()).toString());
        System.err.println(ERR_UNEXPECTED.get(t));
        System.exit(1);
      }
    }
@@ -614,7 +613,7 @@
        }
        catch(UnsupportedEncodingException ex)
        {
          System.err.println(ERR_UNEXPECTED.get(ex.toString()).toString());
          System.err.println(ERR_UNEXPECTED.get(ex));
          System.exit(1);
        }
      }
opendj3-server-dev/src/server/org/opends/server/util/EMailMessage.java
@@ -558,8 +558,7 @@
    }
    catch (ArgumentException ae)
    {
      System.err.println(
           ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()).toString());
      System.err.println(ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()));
      System.exit(1);
    }
@@ -569,8 +568,7 @@
    }
    catch (ArgumentException ae)
    {
      System.err.println(
          ERR_ERROR_PARSING_ARGS.get(ae.getMessage()).toString());
      System.err.println(ERR_ERROR_PARSING_ARGS.get(ae.getMessage()));
      System.exit(1);
    }
opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
@@ -823,7 +823,7 @@
    if (colonPos <= 0)
    {
      LocalizableMessage message =
              ERR_LDIF_NO_ATTR_NAME.get(lastEntryLineNumber, line.toString());
              ERR_LDIF_NO_ATTR_NAME.get(lastEntryLineNumber, line);
      logToRejectWriter(lines, message);
      throw new LDIFException(message, lastEntryLineNumber, true);
@@ -838,7 +838,7 @@
    else if (! attrName.equals("dn"))
    {
      LocalizableMessage message =
              ERR_LDIF_NO_DN.get(lastEntryLineNumber, line.toString());
              ERR_LDIF_NO_DN.get(lastEntryLineNumber, line);
      logToRejectWriter(lines, message);
      throw new LDIFException(message, lastEntryLineNumber, true);
@@ -1490,7 +1490,7 @@
    {
      logger.traceException(e);
      LocalizableMessage message =
          ERR_LDIF_INVALID_DN.get(lineNumber, line.toString(), e.getMessage());
          ERR_LDIF_INVALID_DN.get(lineNumber, line, e.getMessage());
      throw new LDIFException(message, lineNumber, true);
    }
opendj3-server-dev/src/server/org/opends/server/util/RuntimeInformation.java
@@ -124,8 +124,7 @@
             NOTE_JAVA_HOME.get(System.getProperty("java.home")));
     System.out.println(
             NOTE_JAVA_CLASSPATH.get(System.getProperty("java.class.path")));
     System.out.println(
             NOTE_JE_VERSION.get(JEVersion.CURRENT_VERSION.toString()));
     System.out.println(NOTE_JE_VERSION.get(JEVersion.CURRENT_VERSION));
     System.out.println(
             NOTE_CURRENT_DIRECTORY.get(System.getProperty("user.dir")));
     String installDir = toCanonicalPath(DirectoryServer.getServerRoot());
opendj3-server-dev/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
@@ -855,9 +855,8 @@
          LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
          if (! a.valueIsAcceptable(argValue, invalidReason))
          {
            LocalizableMessage message = ERR_SUBCMDPARSER_VALUE_UNACCEPTABLE_FOR_LONG_ID.
                get(argValue, argName, invalidReason.toString());
            throw new ArgumentException(message);
            throw new ArgumentException(ERR_SUBCMDPARSER_VALUE_UNACCEPTABLE_FOR_LONG_ID
                .get(argValue, argName, invalidReason));
          }
          // If the argument already has a value, then make sure it is
opendj3-server-dev/src/server/org/opends/server/util/cli/ConsoleApplication.java
@@ -649,13 +649,11 @@
      throws CLIException
  {
    String answer = null;
    final LocalizableMessage messageToDisplay =
        INFO_PROMPT_SINGLE_DEFAULT.get(prompt.toString(), defaultValue);
    if (msgStyle == Style.TITLE)
    {
      println();
    }
    print(messageToDisplay);
    print(INFO_PROMPT_SINGLE_DEFAULT.get(prompt, defaultValue));
    out.print(" ");
    try
@@ -710,8 +708,7 @@
    {
      if (defaultValue != null)
      {
        prompt =
            INFO_PROMPT_SINGLE_DEFAULT.get(prompt.toString(), defaultValue);
        prompt = INFO_PROMPT_SINGLE_DEFAULT.get(prompt, defaultValue);
      }
      String response = readLineOfInput(prompt);
@@ -863,9 +860,7 @@
    if (defaultValue != -1)
    {
      prompt =
          INFO_PROMPT_SINGLE_DEFAULT.get(prompt.toString(), String
              .valueOf(defaultValue));
      prompt = INFO_PROMPT_SINGLE_DEFAULT.get(prompt, defaultValue);
    }
    return readValidatedInput(prompt, callback, CONFIRMATION_MAX_TRIES);
@@ -1468,9 +1463,7 @@
    if (defaultValue != -1)
    {
      prompt =
          INFO_PROMPT_SINGLE_DEFAULT.get(prompt.toString(), String
              .valueOf(defaultValue));
      prompt = INFO_PROMPT_SINGLE_DEFAULT.get(prompt, defaultValue);
    }
    return readValidatedInput(prompt, callback, CONFIRMATION_MAX_TRIES);
opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -1574,8 +1574,7 @@
            for (int i = 0; i < chain.length; i++)
            {
              app.println();
              app.println(INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE
                  .get(chain[i].toString()));
              app.println(INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE.get(chain[i]));
            }
            continue;
          }
opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPClassLoaderProvider.java
@@ -218,7 +218,7 @@
            if (this.snmpAdaptor == null) {
              throw new Exception(
                   ERR_SNMP_CONNHANDLER_BAD_CONFIGURATION.get().toString());
                   ERR_SNMP_CONNHANDLER_BAD_CONFIGURATION.get());
            }
            // Create the Usm MIB to allow user management
@@ -232,7 +232,7 @@
                    this.snmpAdaptor.registerUsmMib(server, this.UsmObjName);
                } catch (Exception ex) {
                    throw new Exception(
                      ERR_SNMP_CONNHANDLER_BAD_CONFIGURATION.get().toString());
                      ERR_SNMP_CONNHANDLER_BAD_CONFIGURATION.get());
                }
            }
@@ -246,7 +246,7 @@
            // Check if the snmpAdaptor is online
            if (this.snmpAdaptor.getState() != CommunicatorServer.ONLINE) {
                throw new Exception(
                      ERR_SNMP_CONNHANDLER_BAD_CONFIGURATION.get().toString());
                      ERR_SNMP_CONNHANDLER_BAD_CONFIGURATION.get());
            }
            // Check the trap destinations before trying to sent traps
@@ -282,7 +282,7 @@
        } catch (Exception ex) {
            throw new Exception(
                    ERR_SNMP_CONNHANDLER_BAD_CONFIGURATION.get().toString());
                    ERR_SNMP_CONNHANDLER_BAD_CONFIGURATION.get());
        }
    }
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java
@@ -112,14 +112,14 @@
    Backend b = DirectoryServer.getBackend(DN.valueOf("o=test"));
    assertFalse(cache.containsEntry(testEntriesList.get(0).getName()),
      "Not expected to find " + testEntriesList.get(0).getName().toString() +
      "Not expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
    cache.putEntry(testEntriesList.get(0), b, 1);
    assertTrue(cache.containsEntry(testEntriesList.get(0).getName()),
      "Expected to find " + testEntriesList.get(0).getName().toString() +
      "Expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
@@ -146,14 +146,14 @@
    Backend b = DirectoryServer.getBackend(DN.valueOf("o=test"));
    assertNull(cache.getEntry(testEntriesList.get(0).getName()),
      "Not expected to find " + testEntriesList.get(0).getName().toString() +
      "Not expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
    cache.putEntry(testEntriesList.get(0), b, 1);
    assertNotNull(cache.getEntry(testEntriesList.get(0).getName()),
      "Expected to find " + testEntriesList.get(0).getName().toString() +
      "Expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
@@ -180,14 +180,14 @@
    Backend b = DirectoryServer.getBackend(DN.valueOf("o=test"));
    assertNull(cache.getEntry(testEntriesList.get(0).getName()),
      "Not expected to find " + testEntriesList.get(0).getName().toString() +
      "Not expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
    cache.putEntry(testEntriesList.get(0), b, 1);
    assertNotNull(cache.getEntry(testEntriesList.get(0).getName()),
      "Expected to find " + testEntriesList.get(0).getName().toString() +
      "Expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
@@ -247,14 +247,14 @@
    Backend b = DirectoryServer.getBackend(DN.valueOf("o=test"));
    assertEquals(cache.getEntryID(testEntriesList.get(0).getName()), -1,
      "Not expected to find " + testEntriesList.get(0).getName().toString() +
      "Not expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
    cache.putEntry(testEntriesList.get(0), b, 1);
    assertEquals(cache.getEntryID(testEntriesList.get(0).getName()), 1,
      "Expected to find " + testEntriesList.get(0).getName().toString() +
      "Expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
@@ -282,7 +282,7 @@
    cache.putEntry(testEntriesList.get(0), b, 1);
    assertNotNull(cache.getEntry(testEntriesList.get(0).getName()),
      "Expected to find " + testEntriesList.get(0).getName().toString() +
      "Expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
@@ -313,17 +313,17 @@
    Backend b = DirectoryServer.getBackend(DN.valueOf("o=test"));
    assertTrue(cache.putEntryIfAbsent(testEntriesList.get(0), b, 1),
      "Not expected to find " + testEntriesList.get(0).getName().toString() +
      "Not expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
    assertFalse(cache.putEntryIfAbsent(testEntriesList.get(0), b, 1),
      "Expected to find " + testEntriesList.get(0).getName().toString() +
      "Expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
    assertNotNull(cache.getEntry(testEntriesList.get(0).getName()),
      "Expected to find " + testEntriesList.get(0).getName().toString() +
      "Expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
@@ -358,7 +358,7 @@
    cache.removeEntry(testEntriesList.get(0).getName());
    assertNull(cache.getEntry(testEntriesList.get(0).getName()),
      "Not expected to find " + testEntriesList.get(0).getName().toString() +
      "Not expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
@@ -393,7 +393,7 @@
    cache.clear();
    assertNull(cache.getEntry(testEntriesList.get(0).getName()),
      "Not expected to find " + testEntriesList.get(0).getName().toString() +
      "Not expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
@@ -435,7 +435,7 @@
      ServerConstants.EOL + cache.toVerboseString());
    assertNull(cache.getEntry(testEntriesList.get(0).getName()),
      "Not expected to find " + testEntriesList.get(0).getName().toString() +
      "Not expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
@@ -475,7 +475,7 @@
    cache.clearSubtree(DN.valueOf("o=test"));
    assertNull(cache.getEntry(testEntriesList.get(0).getName()),
      "Not expected to find " + testEntriesList.get(0).getName().toString() +
      "Not expected to find " + testEntriesList.get(0).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java
@@ -463,19 +463,19 @@
      assertNotNull(super.cache.getEntry(
        testSoftRefEntriesList.get(0).getName()),
        "Expected to find " +
        testSoftRefEntriesList.get(0).getName().toString() +
        testSoftRefEntriesList.get(0).getName() +
        " in the cache.  Cache contents:" +
        ServerConstants.EOL + cache.toVerboseString());
      assertNotNull(super.cache.getEntry(
        testFIFOEntriesList.get(0).getName()),
        "Expected to find " +
        testFIFOEntriesList.get(0).getName().toString() +
        testFIFOEntriesList.get(0).getName() +
        " in the cache.  Cache contents:" +
        ServerConstants.EOL + cache.toVerboseString());
      assertNotNull(super.cache.getEntry(
        testFSEntriesList.get(0).getName()),
        "Expected to find " +
        testFSEntriesList.get(0).getName().toString() +
        testFSEntriesList.get(0).getName() +
        " in the cache.  Cache contents:" +
        ServerConstants.EOL + cache.toVerboseString());
    }
@@ -485,19 +485,19 @@
      assertNotNull(softRefCache.getEntry(
        testSoftRefEntriesList.get(0).getName()),
        "Expected to find " +
        testSoftRefEntriesList.get(0).getName().toString() +
        testSoftRefEntriesList.get(0).getName() +
        " in the cache.  Cache contents:" +
        ServerConstants.EOL + cache.toVerboseString());
      assertNotNull(fifoCache.getEntry(
        testFIFOEntriesList.get(0).getName()),
        "Expected to find " +
        testFIFOEntriesList.get(0).getName().toString() +
        testFIFOEntriesList.get(0).getName() +
        " in the cache.  Cache contents:" +
        ServerConstants.EOL + cache.toVerboseString());
      assertNotNull(fsCache.getEntry(
        testFSEntriesList.get(0).getName()),
        "Expected to find " +
        testFSEntriesList.get(0).getName().toString() +
        testFSEntriesList.get(0).getName() +
        " in the cache.  Cache contents:" +
        ServerConstants.EOL + cache.toVerboseString());
    }
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java
@@ -306,7 +306,7 @@
    for(int i = 0; i < super.NUMTESTENTRIES; i++ ) {
      assertFalse(super.cache.containsEntry(
        super.testEntriesList.get(i).getName()), "Not expected to find " +
        super.testEntriesList.get(i).getName().toString() + " in the " +
        super.testEntriesList.get(i).getName() + " in the " +
        "cache.  Cache contents:" + ServerConstants.EOL +
        cache.toVerboseString());
    }
@@ -375,7 +375,7 @@
    for(int i = 0; i < (super.NUMTESTENTRIES - super.MAXENTRIES); i++ ) {
      assertFalse(super.cache.containsEntry(
        super.testEntriesList.get(i).getName()), "Not expected to find " +
        super.testEntriesList.get(i).getName().toString() + " in the " +
        super.testEntriesList.get(i).getName() + " in the " +
        "cache.  Cache contents:" + ServerConstants.EOL +
        cache.toVerboseString());
    }
@@ -387,7 +387,7 @@
    {
      assertTrue(super.cache.containsEntry(
        super.testEntriesList.get(i).getName()), "Expected to find " +
        super.testEntriesList.get(i).getName().toString() + " in the " +
        super.testEntriesList.get(i).getName() + " in the " +
        "cache.  Cache contents:" + ServerConstants.EOL +
        cache.toVerboseString());
    }
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java
@@ -526,7 +526,7 @@
    for(int i = 0; i < (super.NUMTESTENTRIES - super.MAXENTRIES); i++ ) {
      assertFalse(super.cache.containsEntry(
        super.testEntriesList.get(i).getName()), "Not expected to find " +
        super.testEntriesList.get(i).getName().toString() + " in the " +
        super.testEntriesList.get(i).getName() + " in the " +
        "cache.  Cache contents:" + ServerConstants.EOL +
        cache.toVerboseString());
    }
@@ -538,7 +538,7 @@
    {
      assertTrue(super.cache.containsEntry(
        super.testEntriesList.get(i).getName()), "Expected to find " +
        super.testEntriesList.get(i).getName().toString() + " in the " +
        super.testEntriesList.get(i).getName() + " in the " +
        "cache.  Cache contents:" + ServerConstants.EOL +
        cache.toVerboseString());
    }
@@ -575,7 +575,7 @@
        assertTrue(super.cache.containsEntry(
          super.testEntriesList.get(i).getName()),
          "Expected to find " +
          super.testEntriesList.get(i).getName().toString() + " in the " +
          super.testEntriesList.get(i).getName() + " in the " +
          "cache.  Cache contents:" + ServerConstants.EOL +
          cache.toVerboseString());
    }
@@ -584,7 +584,7 @@
    assertTrue(super.cache.containsEntry(
      super.testEntriesList.get(super.NUMTESTENTRIES - 1).getName()),
      "Expected to find " +
      super.testEntriesList.get(super.NUMTESTENTRIES - 1).getName().toString() +
      super.testEntriesList.get(super.NUMTESTENTRIES - 1).getName() +
      " in the cache.  Cache contents:" + ServerConstants.EOL +
      cache.toVerboseString());
@@ -595,7 +595,7 @@
        assertFalse(super.cache.containsEntry(
          super.testEntriesList.get(i).getName()),
          "Not expected to find " +
          super.testEntriesList.get(i).getName().toString() + " in the " +
          super.testEntriesList.get(i).getName() + " in the " +
          "cache.  Cache contents:" + ServerConstants.EOL +
          cache.toVerboseString());
    }
@@ -643,7 +643,7 @@
      assertTrue(super.cache.containsEntry(
          super.testEntriesList.get(i).getName()),
          "Expected to find " +
          super.testEntriesList.get(i).getName().toString() + " in the " +
          super.testEntriesList.get(i).getName() + " in the " +
          "cache.  Cache contents:" + ServerConstants.EOL +
          cache.toVerboseString());
    }
@@ -708,7 +708,7 @@
      assertFalse(super.cache.containsEntry(
          super.testEntriesList.get(i).getName()),
          "Not expected to find " +
          super.testEntriesList.get(i).getName().toString() + " in the " +
          super.testEntriesList.get(i).getName() + " in the " +
          "cache.  Cache contents:" + ServerConstants.EOL +
          cache.toVerboseString());
    }
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java
@@ -202,7 +202,7 @@
    for(int i = 0; i < NUMTESTENTRIES; i++ ) {
      assertNotNull(DirectoryServer.getEntryCache().getEntry(
        testEntriesList.get(i).getName()), "Expected to find " +
        testEntriesList.get(i).getName().toString() +
        testEntriesList.get(i).getName() +
        " in the cache.  Cache contents:" +
        ServerConstants.EOL + toVerboseString());
    }
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -1129,7 +1129,7 @@
      addTask(taskInit, ResultCode.SUCCESS, null);
      waitTaskState(taskInit, TaskState.STOPPED_BY_ERROR, 20000,
          ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(baseDN.toString(), "20"));
          ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(baseDN, "20"));
      // Test 2
      taskInit = TestCaseUtils.makeEntry(
@@ -1185,7 +1185,7 @@
      addTask(taskInit, ResultCode.SUCCESS, null);
      waitTaskState(taskInit, TaskState.STOPPED_BY_ERROR, 20000,
          ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(baseDN.toString(), "0"));
          ERR_NO_REACHABLE_PEER_IN_THE_DOMAIN.get(baseDN, "0"));
      if (replDomain != null)
      {
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
@@ -310,7 +310,7 @@
      {
        assertTrue(eattr.getName().equalsIgnoreCase(genAttrList.get(i).toAttribute().getName()));
        assertTrue(eattr.toString().equalsIgnoreCase(genAttrList.get(i).toAttribute().toString()),
            "Comparing: " + eattr.toString() + " and " + genAttrList.get(i).toAttribute().toString());
            "Comparing: " + eattr + " and " + genAttrList.get(i).toAttribute());
        i++;
      }
    }
@@ -447,7 +447,7 @@
      {
        assertTrue(attr.getName().equalsIgnoreCase(genAttrList.get(i).toAttribute().getName()));
        assertTrue(attr.toString().equalsIgnoreCase(genAttrList.get(i).toAttribute().toString()),
            "Comparing: " + attr.toString() + " and " + genAttrList.get(i).toAttribute().toString());
            "Comparing: " + attr + " and " + genAttrList.get(i).toAttribute());
        i++;
      }
    }
@@ -634,7 +634,7 @@
      {
        assertTrue(attr.getName().equalsIgnoreCase(genAttrList.get(i).toAttribute().getName()));
        assertTrue(attr.toString().equalsIgnoreCase(genAttrList.get(i).toAttribute().toString()),
            "Comparing: " + attr.toString() + " and " + genAttrList.get(i).toAttribute().toString());
            "Comparing: " + attr + " and " + genAttrList.get(i).toAttribute());
        i++;
      }
    }
@@ -835,7 +835,7 @@
      {
        assertTrue(attr.getName().equalsIgnoreCase(genAttrList.get(i).toAttribute().getName()));
        assertTrue(attr.toString().equalsIgnoreCase(genAttrList.get(i).toAttribute().toString()),
            "Comparing: " + attr.toString() + " and " + genAttrList.get(i).toAttribute().toString());
            "Comparing: " + attr + " and " + genAttrList.get(i).toAttribute());
        i++;
      }
    }