Remove the "configClass" tools argument

Jean-Noël Rouvignac

17.32.2016 cad7abf78a831586b43f185d4abd5f30265a3058

Remove the "configClass" tools argument

 opendj-server-legacy/resource/bin/_mixed-script.bat

@@ -51,7 +51,7 @@
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=%OLD_SCRIPT_NAME%"

rem Check whether is local or remote
"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% %OPENDJ_INVOKE_CLASS% --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%INSTANCE_ROOT%\config\config.ldif" --testIfOffline %*
"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% %OPENDJ_INVOKE_CLASS% --configFile "%INSTANCE_ROOT%\config\config.ldif" --testIfOffline %*
if %errorlevel% == 51 goto launchoffline
if %errorlevel% == 52 goto launchonline
exit /B %errorlevel%
@@ -63,7 +63,7 @@

:launchonline

"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% %OPENDJ_INVOKE_CLASS% --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%INSTANCE_ROOT%\config\config.ldif" %*
"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% %OPENDJ_INVOKE_CLASS% --configFile "%INSTANCE_ROOT%\config\config.ldif" %*

goto end

@@ -82,7 +82,7 @@
if NOT %errorlevel% == 0 exit /B %errorlevel%
set SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=%OLD_SCRIPT_NAME%"

"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_ARGS% %SCRIPT_NAME_ARG% %OPENDJ_INVOKE_CLASS% --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%INSTANCE_ROOT%\config\config.ldif" %*
"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_ARGS% %SCRIPT_NAME_ARG% %OPENDJ_INVOKE_CLASS% --configFile "%INSTANCE_ROOT%\config\config.ldif" %*

goto end


 opendj-server-legacy/resource/bin/_mixed-script.sh

@@ -67,7 +67,6 @@

# Check whether is local or remote
"${OPENDJ_JAVA_BIN}" ${OPENDJ_JAVA_ARGS} ${SCRIPT_ARGS}  ${SCRIPT_NAME_ARG} "${OPENDJ_INVOKE_CLASS}" \
     --configClass org.opends.server.extensions.ConfigFileHandler \
     --configFile "${INSTANCE_ROOT}/config/config.ldif" --testIfOffline "${@}"
EC=${?}
if test ${EC} -eq 51
@@ -106,6 +105,5 @@

  # Launch the server utility.
  "${OPENDJ_JAVA_BIN}" ${OPENDJ_JAVA_ARGS} ${SCRIPT_ARGS} ${SCRIPT_NAME_ARG} "${OPENDJ_INVOKE_CLASS}" \
       --configClass org.opends.server.extensions.ConfigFileHandler \
       --configFile "${INSTANCE_ROOT}/config/config.ldif" "${@}"
fi

 opendj-server-legacy/resource/bin/_server-script.bat

@@ -47,7 +47,7 @@
call "%INSTALL_ROOT%\lib\_script-util.bat" %*
if NOT %errorlevel% == 0 exit /B %errorlevel%

"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_ARGS% %SCRIPT_NAME_ARG% %OPENDJ_INVOKE_CLASS% --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%INSTANCE_ROOT%\config\config.ldif" %*
"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_ARGS% %SCRIPT_NAME_ARG% %OPENDJ_INVOKE_CLASS% --configFile "%INSTANCE_ROOT%\config\config.ldif" %*

:end


 opendj-server-legacy/resource/bin/_server-script.sh

@@ -51,5 +51,4 @@

# Launch the appropriate server utility.
"${OPENDJ_JAVA_BIN}" ${OPENDJ_JAVA_ARGS} ${SCRIPT_ARGS} ${SCRIPT_NAME_ARG} "${OPENDJ_INVOKE_CLASS}" \
     --configClass org.opends.server.extensions.ConfigFileHandler \
     --configFile "${INSTANCE_ROOT}/config/config.ldif" "${@}"

 opendj-server-legacy/resource/bin/start-ds

@@ -80,7 +80,6 @@
# An exit code of anything else means that we're not trying to start the server
# and we can just exit with that exit code.
"${OPENDJ_JAVA_BIN}" -client ${SCRIPT_NAME_ARG} org.opends.server.core.DirectoryServer \
            --configClass org.opends.server.extensions.ConfigFileHandler \
            --configFile "${CONFIG_FILE}" --checkStartability "${@}"
EC=${?}
if test ${EC} -eq 99 -o ${EC} -eq 103
@@ -91,7 +90,6 @@
  touch "${STARTING_FILE}"
  nohup "${OPENDJ_JAVA_BIN}" ${OPENDJ_JAVA_ARGS} ${SCRIPT_NAME_ARG} \
       org.opends.server.core.DirectoryServer \
       --configClass org.opends.server.extensions.ConfigFileHandler \
       --configFile "${CONFIG_FILE}" "${@}" > "${LOG_FILE}" 2>&1 &
  echo $! > "${PID_FILE}"
  if test ${EC} -eq 99
@@ -107,7 +105,6 @@
  then
    # An exit code of 98 means that the server is already running.
    "${OPENDJ_JAVA_BIN}" -client ${SCRIPT_NAME_ARG} org.opends.server.core.DirectoryServer \
            --configClass org.opends.server.extensions.ConfigFileHandler \
            --configFile "${CONFIG_FILE}" --checkStartability > /dev/null 2>&1
    EC=${?}
    if test ${EC} -eq 98
@@ -129,7 +126,6 @@
    rm -f "${LOG_FILE}"
    exec "${OPENDJ_JAVA_BIN}" ${OPENDJ_JAVA_ARGS} ${SCRIPT_NAME_ARG} \
      org.opends.server.core.DirectoryServer \
      --configClass org.opends.server.extensions.ConfigFileHandler \
      --configFile "${CONFIG_FILE}" "${@}"
  elif test ${EC} -eq 104
  then
@@ -140,7 +136,6 @@
    rm -f "${LOG_FILE}"
    exec "${OPENDJ_JAVA_BIN}" ${OPENDJ_JAVA_ARGS} ${SCRIPT_NAME_ARG} \
      org.opends.server.core.DirectoryServer \
      --configClass org.opends.server.extensions.ConfigFileHandler \
      --configFile "${CONFIG_FILE}" "${@}" > /dev/null
  else
    #

 opendj-server-legacy/resource/bin/start-ds.bat

@@ -57,7 +57,7 @@

echo %SCRIPT%: PATH=%PATH% >> %LOG%

"%OPENDJ_JAVA_BIN%" -client %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%INSTANCE_ROOT%\config\config.ldif" --checkStartability %*
"%OPENDJ_JAVA_BIN%" -client %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configFile "%INSTANCE_ROOT%\config\config.ldif" --checkStartability %*

if %errorlevel% == 98 goto serverAlreadyStarted
if %errorlevel% == 99 goto runDetach
@@ -79,7 +79,7 @@
echo. > "%INSTANCE_ROOT%\logs\server.out"
echo. > "%INSTANCE_ROOT%\logs\server.starting"
if exist "%INSTANCE_ROOT%\lib\set-java-args.bat %SCRIPT%" DO call "%INSTANCE_ROOT%\lib\set-java-args.bat"
"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%INSTANCE_ROOT%\config\config.ldif" %*
"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configFile "%INSTANCE_ROOT%\config\config.ldif" %*
set ERROR_CODE=%errorlevel%
goto exitErrorCode

@@ -88,7 +88,7 @@
echo. > "%INSTANCE_ROOT%\logs\server.out"
echo. > "%INSTANCE_ROOT%\logs\server.starting"
if exist "%INSTANCE_ROOT%\lib\set-java-args.bat %SCRIPT%" DO call "%INSTANCE_ROOT%\lib\set-java-args.bat"
"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%INSTANCE_ROOT%\config\config.ldif" %* >> %LOG%
"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configFile "%INSTANCE_ROOT%\config\config.ldif" %* >> %LOG%
set ERROR_CODE=%errorlevel%
goto exitErrorCode

@@ -97,7 +97,7 @@
echo. > "%INSTANCE_ROOT%\logs\server.out"
echo. > "%INSTANCE_ROOT%\logs\server.starting"
if exist "%INSTANCE_ROOT%\lib\set-java-args.bat" DO call "%INSTANCE_ROOT%\lib\set-java-args.bat"
"%INSTALL_ROOT%\lib\winlauncher.exe" start "%INSTANCE_ROOT%" "%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS%  %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%INSTANCE_ROOT%\config\config.ldif" %*
"%INSTALL_ROOT%\lib\winlauncher.exe" start "%INSTANCE_ROOT%" "%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS%  %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configFile "%INSTANCE_ROOT%\config\config.ldif" %*
echo %SCRIPT%: Waiting for "%INSTANCE_ROOT%\logs\server.starting" to be deleted >> %LOG%
"%OPENDJ_JAVA_BIN%" -client org.opends.server.tools.WaitForFileDelete --targetFile "%INSTANCE_ROOT%\logs\server.starting" --logFile "%INSTANCE_ROOT%\logs\server.out" %*
goto checkStarted
@@ -107,7 +107,7 @@
echo. > "%INSTANCE_ROOT%\logs\server.out"
echo. > "%INSTANCE_ROOT%\logs\server.starting"
if exist "%INSTANCE_ROOT%\lib\set-java-args.bat" DO call "%INSTANCE_ROOT%\lib\set-java-args.bat"
"%INSTALL_ROOT%\lib\winlauncher.exe" start "%INSTANCE_ROOT%" "%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS%  %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%INSTANCE_ROOT%\config\config.ldif" %*
"%INSTALL_ROOT%\lib\winlauncher.exe" start "%INSTANCE_ROOT%" "%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS%  %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configFile "%INSTANCE_ROOT%\config\config.ldif" %*
echo %SCRIPT%: Waiting for "%INSTANCE_ROOT%\logs\server.starting" to be deleted >> %LOG%
"%OPENDJ_JAVA_BIN%" -client org.opends.server.tools.WaitForFileDelete --targetFile "%INSTANCE_ROOT%\logs\server.starting" --logFile "%INSTANCE_ROOT%\logs\server.out" %* >> %LOG%
goto checkStarted
@@ -120,7 +120,7 @@
echo. > "%INSTANCE_ROOT%\logs\server.startingservice"
echo. > "%INSTANCE_ROOT%\logs\winservice.out"
if exist "%INSTANCE_ROOT%\lib\set-java-args.bat" DO call "%INSTANCE_ROOT%\lib\set-java-args.bat"
"%INSTALL_ROOT%\lib\winlauncher.exe" start "%INSTANCE_ROOT%" "%OPENDJ_JAVA_BIN%" -Xrs %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%INSTANCE_ROOT%\config\config.ldif" %*
"%INSTALL_ROOT%\lib\winlauncher.exe" start "%INSTANCE_ROOT%" "%OPENDJ_JAVA_BIN%" -Xrs %OPENDJ_JAVA_ARGS% %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configFile "%INSTANCE_ROOT%\config\config.ldif" %*
echo %SCRIPT%: Waiting for "%INSTANCE_ROOT%\logs\server.starting" to be deleted >> %LOG%
"%OPENDJ_JAVA_BIN%" -client org.opends.server.tools.WaitForFileDelete --targetFile "%INSTANCE_ROOT%\logs\server.starting" --logFile "%INSTANCE_ROOT%\logs\server.out" --outputFile "%INSTANCE_ROOT%\logs\winservice.out" %*
erase "%INSTANCE_ROOT%\logs\server.startingservice"
@@ -138,7 +138,7 @@

:checkStarted
echo %SCRIPT%: check started >> %LOG%
"%OPENDJ_JAVA_BIN%" -client %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%INSTANCE_ROOT%\config\config.ldif" --checkStartability > NUL 2>&1
"%OPENDJ_JAVA_BIN%" -client %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configFile "%INSTANCE_ROOT%\config\config.ldif" --checkStartability > NUL 2>&1
if %errorlevel% == 98 goto serverStarted
if %errorlevel% == 101 goto serverStarted
goto serverNotStarted

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java

@@ -230,8 +230,7 @@
        {
          DirectoryServer.deregisterBaseDN(DN.valueOf("cn=config"));
        }
        DirectoryServer.getInstance().initializeConfiguration(ConfigurationHandler.class.getName(),
            ConfigReader.configFile);
        DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
        getInfo().setMustDeregisterConfig(true);
      }
      boolean isFirst = true;
@@ -396,8 +395,7 @@
    {
      if (configHandlerUpdated)
      {
        DirectoryServer.getInstance().initializeConfiguration(
            ConfigReader.configClassName, ConfigReader.configFile);
        DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
        getInfo().startPooling();
      }
    }

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java

@@ -40,7 +40,6 @@
import org.forgerock.opendj.server.config.client.BackendCfgClient;
import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.OpenDsException;
@@ -141,8 +140,7 @@
        {
          DirectoryServer.deregisterBaseDN(DN.valueOf("cn=config"));
        }
        DirectoryServer.getInstance().initializeConfiguration(
            ConfigurationHandler.class.getName(), ConfigReader.configFile);
        DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
        getInfo().setMustDeregisterConfig(true);
      }
      boolean isFirst = true;
@@ -220,7 +218,7 @@
    {
      if (configHandlerUpdated)
      {
        DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configClassName, ConfigReader.configFile);
        DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
        getInfo().startPooling();
      }
    }

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/Task.java

@@ -22,6 +22,7 @@

import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -51,7 +52,6 @@
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.UserData;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.types.Schema;
import org.opends.server.util.Base64;
import org.opends.server.util.SetupUtils;
@@ -728,12 +728,7 @@
   */
  protected List<String> getConfigCommandLineArguments()
  {
    List<String> args = new ArrayList<>();
    args.add("--configClass");
    args.add(ConfigurationHandler.class.getName());
    args.add("--configFile");
    args.add(ConfigReader.configFile);
    return args;
    return Arrays.asList("--configFile", ConfigReader.configFile);
  }

  /**

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/IndexPanel.java

@@ -59,7 +59,6 @@
import org.forgerock.opendj.server.config.client.BackendCfgClient;
import org.forgerock.opendj.server.config.client.BackendIndexCfgClient;
import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.DN;
@@ -559,8 +558,7 @@
          {
            DirectoryServer.deregisterBaseDN(DN.valueOf("cn=config"));
          }
          DirectoryServer.getInstance().initializeConfiguration(
              ConfigurationHandler.class.getName(), ConfigReader.configFile);
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
          getInfo().setMustDeregisterConfig(true);
        }
        else
@@ -616,7 +614,7 @@
      {
        if (configHandlerUpdated)
        {
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configClassName, ConfigReader.configFile);
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
          getInfo().startPooling();
        }
      }

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java

@@ -85,7 +85,6 @@
import org.forgerock.opendj.server.config.meta.BackendCfgDefn;
import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn;
import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn.IndexType;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.BackendCreationHelper;
import org.opends.server.tools.BackendCreationHelper.DefaultIndex;
@@ -884,8 +883,7 @@
        {
          DirectoryServer.deregisterBaseDN(DN.valueOf("cn=config"));
        }
        DirectoryServer.getInstance().initializeConfiguration(
            ConfigurationHandler.class.getName(), ConfigReader.configFile);
        DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
        getInfo().setMustDeregisterConfig(true);
        configHandlerUpdated = true;

@@ -897,7 +895,7 @@
      {
        if (configHandlerUpdated)
        {
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configClassName, ConfigReader.configFile);
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
          getInfo().startPooling();
        }
      }

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java

@@ -52,7 +52,6 @@
import org.forgerock.opendj.server.config.client.BackendIndexCfgClient;
import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.schema.SomeSchemaElement;
@@ -405,8 +404,7 @@
          {
            DirectoryServer.deregisterBaseDN(DN.valueOf("cn=config"));
          }
          DirectoryServer.getInstance().initializeConfiguration(
              ConfigurationHandler.class.getName(), ConfigReader.configFile);
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
          getInfo().setMustDeregisterConfig(true);
        }
        else
@@ -454,7 +452,7 @@
      {
        if (configHandlerUpdated)
        {
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configClassName, ConfigReader.configFile);
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
          getInfo().startPooling();
        }
      }

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java

@@ -48,7 +48,6 @@
import org.forgerock.opendj.server.config.client.BackendVLVIndexCfgClient;
import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
import org.forgerock.opendj.server.config.meta.BackendVLVIndexCfgDefn;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DirectoryServer;

/**
@@ -227,8 +226,7 @@
          {
            DirectoryServer.deregisterBaseDN(DN.valueOf("cn=config"));
          }
          DirectoryServer.getInstance().initializeConfiguration(
              ConfigurationHandler.class.getName(), ConfigReader.configFile);
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
          getInfo().setMustDeregisterConfig(true);
        }
        else
@@ -277,7 +275,7 @@
      {
        if (configHandlerUpdated)
        {
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configClassName, ConfigReader.configFile);
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
          getInfo().startPooling();
        }
      }

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java

@@ -14,7 +14,6 @@
 * Copyright 2008-2009 Sun Microsystems, Inc.
 * Portions Copyright 2011-2016 ForgeRock AS.
 */

package org.opends.guitools.controlpanel.ui;

import static org.opends.guitools.controlpanel.util.Utilities.*;
@@ -67,7 +66,6 @@
import org.forgerock.opendj.server.config.client.BackendVLVIndexCfgClient;
import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DirectoryServer;

/**
@@ -613,8 +611,7 @@
          {
            DirectoryServer.deregisterBaseDN(DN.valueOf("cn=config"));
          }
          DirectoryServer.getInstance().initializeConfiguration(
              ConfigurationHandler.class.getName(), ConfigReader.configFile);
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
          getInfo().setMustDeregisterConfig(true);
        }
        else
@@ -665,7 +662,7 @@
      {
        if (configHandlerUpdated)
        {
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configClassName, ConfigReader.configFile);
          DirectoryServer.getInstance().initializeConfiguration(ConfigReader.configFile);
          getInfo().startPooling();
        }
      }

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java

@@ -32,7 +32,6 @@
import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
import org.opends.guitools.controlpanel.task.OfflineUpdateException;
import org.forgerock.opendj.server.config.meta.AdministrationConnectorCfgDefn;
import org.opends.server.core.ConfigurationBackend;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.tasks.TaskEntry;
import org.forgerock.opendj.ldap.DN;
@@ -52,10 +51,6 @@
{
  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
  /**
   * The class used to read the configuration from a file.
   */
  public static String configClassName;
  /**
   * The configuration file full path (-INSTANCE_ROOT-/config/config.ldif).
   * of the installation of the control panel.
   */
@@ -79,7 +74,6 @@
      Utilities.getInstanceRootDirectory(installRoot).getAbsolutePath();
    configFile = instanceRoot + File.separator + "config" + File.separator +
    "config.ldif";
    configClassName = ConfigurationBackend.class.getName();
    try
    {
      DirectoryEnvironmentConfig env = DirectoryServer.getEnvironmentConfig();
@@ -87,7 +81,7 @@
      DirectoryServer instance = DirectoryServer.getInstance();
      DirectoryServer.bootstrapClient();
      DirectoryServer.initializeJMX();
      instance.initializeConfiguration(configClassName, configFile);
      instance.initializeConfiguration(configFile);
      instance.initializeSchema();
    }
    catch (Throwable t)

 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendStat.java

@@ -17,7 +17,6 @@

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.StaticUtils.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.cli.CommonArguments.*;

@@ -48,7 +47,6 @@
import org.opends.server.backends.pluggable.spi.ReadableTransaction;
import org.opends.server.backends.pluggable.spi.StorageRuntimeException;
import org.opends.server.backends.pluggable.spi.TreeName;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
@@ -279,8 +277,6 @@
  private final SubCommandArgumentParser parser;
  /** The argument which should be used to request usage information. */
  private BooleanArgument showUsageArgument;
  /** The argument which should be used to specify the config class. */
  private StringArgument configClass;
  /** The argument which should be used to specify the config file. */
  private StringArgument configFile;

@@ -351,15 +347,6 @@
  {
    if (!globalArgumentsInitialized)
    {
      configClass =
              StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
                      .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
                      .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .required()
                      .defaultValue(ConfigurationHandler.class.getName())
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildArgument();
      configFile =
              StringArgument.builder("configFile")
                      .shortIdentifier('f')
@@ -374,7 +361,6 @@
      // Register the global arguments.
      parser.addGlobalArgument(showUsageArgument);
      parser.setUsageArgument(showUsageArgument, out);
      parser.addGlobalArgument(configClass);
      parser.addGlobalArgument(configFile);

      globalArgumentsInitialized = true;
@@ -606,7 +592,7 @@

    try
    {
      directoryServer.initializeConfiguration(configClass.getValue(), configFile.getValue());
      directoryServer.initializeConfiguration(configFile.getValue());
    }
    catch (Exception e)
    {

 opendj-server-legacy/src/main/java/org/opends/server/core/ConfigurationHandler.java

@@ -174,19 +174,17 @@
   * Bootstraps the server configuration.
   * <p>
   * The returned ConfigurationHandler is initialized with a partial schema and must be later
   * re-itinialized with the full schema by calling {@code reInitializeWithFullSchema()} method
   * re-initialized with the full schema by calling {@code reInitializeWithFullSchema()} method
   * once the schema has been fully loaded.
   *
   * @param serverContext
   *            The server context.
   * @param configClass
   *            The actual configuration class to use.
   * @return the configuration handler
   * @throws InitializationException
   *            If an error occurs during bootstrapping.
   */
  public static ConfigurationHandler bootstrapConfiguration(ServerContext serverContext,
      Class<ConfigurationHandler> configClass) throws InitializationException {
  public static ConfigurationHandler bootstrapConfiguration(ServerContext serverContext)
      throws InitializationException {
    final ConfigurationFramework configFramework = ConfigurationFramework.getInstance();
    try
    {

 opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java

@@ -286,9 +286,6 @@
  /** The configuration manager that will handle the certificate mapper. */
  private CertificateMapperConfigManager certificateMapperConfigManager;

  /** The class used to provide the config handler implementation. */
  private Class<ConfigurationHandler> configClass;

  /** The configuration handler for the Directory Server. */
  private ConfigurationHandler configurationHandler;

@@ -1036,9 +1033,6 @@
   * Instantiates the configuration handler and loads the Directory Server
   * configuration.
   *
   * @param  configClass  The fully-qualified name of the Java class that will
   *                      serve as the configuration handler for the Directory
   *                      Server.
   * @param  configFile   The path to the file that will hold either the entire
   *                      server configuration or enough information to allow
   *                      the server to access the configuration in some other
@@ -1047,29 +1041,9 @@
   * @throws  InitializationException  If a problem occurs while trying to
   *                                   initialize the config handler.
   */
  public void initializeConfiguration(String configClass, String configFile)
         throws InitializationException
  public void initializeConfiguration(String configFile) throws InitializationException
  {
    Class<?> cfgClass;
    try
    {
      cfgClass = Class.forName(configClass);
    }
    catch (Exception e)
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_CANNOT_LOAD_CONFIG_HANDLER_CLASS.get(
                  configClass, stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }

    File cfgFile = new File(configFile);

    environmentConfig.setConfigClass(cfgClass);
    environmentConfig.setConfigFile(cfgFile);

    environmentConfig.setConfigFile(new File(configFile));
    initializeConfiguration();
  }

@@ -1100,8 +1074,7 @@
  public void initializeConfiguration() throws InitializationException
  {
    configFile = environmentConfig.getConfigFile();
    configClass = environmentConfig.getConfigClass();
    configurationHandler = ConfigurationHandler.bootstrapConfiguration(serverContext, configClass);
    configurationHandler = ConfigurationHandler.bootstrapConfiguration(serverContext);
    serverManagementContext = new ServerManagementContext(configurationHandler);

    final ConfigurationBackend configBackend = new ConfigurationBackend(serverContext, configurationHandler);
@@ -6012,7 +5985,6 @@
    rejectUnauthenticatedRequests = true;
    shuttingDown                  = true;

    configClass              = null;
    configFile               = null;
    configurationHandler     = null;
    coreConfigManager        = null;
@@ -6655,7 +6627,6 @@
    BooleanArgument noDetach               = null;
    BooleanArgument systemInfo             = null;
    BooleanArgument useLastKnownGoodConfig = null;
    StringArgument  configClass            = null;
    StringArgument  configFile             = null;

    // Create the command-line argument parser for use with this program.
@@ -6672,15 +6643,6 @@
              .description(INFO_DSCORE_DESCRIPTION_WINDOWS_NET_START.get())
              .hidden()
              .buildAndAddToParser(argParser);
      configClass =
              StringArgument.builder("configClass")
                      .shortIdentifier('C')
                      .description(INFO_DSCORE_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .required()
                      .defaultValue(ConfigurationHandler.class.getName())
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configFile =
              StringArgument.builder("configFile")
                      .shortIdentifier('f')
@@ -6850,7 +6812,6 @@
    DirectoryEnvironmentConfig environmentConfig = new DirectoryEnvironmentConfig();
    try
    {
      environmentConfig.setProperty(PROPERTY_CONFIG_CLASS, configClass.getValue());
      environmentConfig.setProperty(PROPERTY_CONFIG_FILE, configFile.getValue());
      environmentConfig.setProperty(PROPERTY_USE_LAST_KNOWN_GOOD_CONFIG,
          String.valueOf(useLastKnownGoodConfig.isPresent()));
@@ -6980,7 +6941,6 @@
    {
      theDirectoryServer.setEnvironmentConfig(environmentConfig);
      theDirectoryServer.bootstrapServer();
      theDirectoryServer.initializeConfiguration(configClass.getValue(), configFile.getValue());
    }
    catch (InitializationException ie)
    {

 opendj-server-legacy/src/main/java/org/opends/server/tools/BackUpDB.java

@@ -41,7 +41,6 @@
import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
@@ -138,7 +137,6 @@
  private BooleanArgument signHash;
  private StringArgument  backendID;
  private StringArgument  backupIDString;
  private StringArgument  configClass;
  private StringArgument  configFile;
  private StringArgument  backupDirectory;
  private StringArgument  incrementalBaseID;
@@ -157,19 +155,9 @@
    argParser.setShortToolDescription(REF_SHORT_DESC_BACKUP.get());


    // Initialize all the command-line argument types and register them with the
    // parser.
    // Initialize all the command-line argument types and register them with the parser.
    try
    {
      configClass =
              StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
                      .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
                      .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .required()
                      .defaultValue(ConfigurationHandler.class.getName())
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configFile =
              StringArgument.builder("configFile")
                      .shortIdentifier('f')
@@ -468,8 +456,7 @@

      try
      {
        directoryServer.initializeConfiguration(configClass.getValue(),
                                                configFile.getValue());
        directoryServer.initializeConfiguration(configFile.getValue());
      }
      catch (InitializationException ie)
      {

 opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java

@@ -264,7 +264,6 @@
  private IntegerArgument ldapsPort;
  private IntegerArgument jmxPort;
  private StringArgument baseDNString;
  private StringArgument configClass;
  private StringArgument configFile;
  private StringArgument rootDNString;
  private StringArgument rootPassword;
@@ -367,14 +366,6 @@
                      .required()
                      .valuePlaceholder(INFO_CONFIGFILE_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configClass =
              StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
                      .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
                      .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .defaultValue(ConfigurationHandler.class.getName())
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      String defaultHostName;
      try
      {
@@ -585,7 +576,7 @@

    try
    {
      directoryServer.initializeConfiguration(configClass.getValue(), configFile.getValue());
      directoryServer.initializeConfiguration(configFile.getValue());
    }
    catch (final Exception e)
    {
@@ -964,10 +955,11 @@

    if (certNickNames.isPresent())
    {
      updateCertNicknameEntry(ldapPort, DN_LDAP_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, certNickNames.getValues());
      updateCertNicknameEntry(ldapsPort, DN_LDAPS_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, certNickNames.getValues());
      updateCertNicknameEntry(certNickNames, DN_HTTP_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, certNickNames.getValues());
      updateCertNicknameEntry(jmxPort, DN_JMX_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, certNickNames.getValues());
      final List<String> attrValues = certNickNames.getValues();
      updateCertNicknameEntry(ldapPort, DN_LDAP_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, attrValues);
      updateCertNicknameEntry(ldapsPort, DN_LDAPS_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, attrValues);
      updateCertNicknameEntry(certNickNames, DN_HTTP_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, attrValues);
      updateCertNicknameEntry(jmxPort, DN_JMX_CONNECTION_HANDLER, ATTR_SSL_CERT_NICKNAME, attrValues);
    }
    else
    {

 opendj-server-legacy/src/main/java/org/opends/server/tools/EncodePassword.java

@@ -16,7 +16,6 @@
 */
package org.opends.server.tools;

import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.CliMessages.INFO_FILE_PLACEHOLDER;
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.cli.CommonArguments.*;
@@ -46,7 +45,6 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigConstants;
import org.opends.server.types.Entry;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
@@ -137,7 +135,6 @@
    FileBasedArgument clearPasswordFile    = null;
    StringArgument    encodedPassword      = null;
    FileBasedArgument encodedPasswordFile  = null;
    StringArgument    configClass          = null;
    StringArgument    configFile           = null;
    StringArgument    schemeName           = null;

@@ -187,15 +184,6 @@
                      .description(INFO_ENCPW_DESCRIPTION_ENCODED_PW_FILE.get())
                      .valuePlaceholder(INFO_FILE_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configClass =
              StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
                      .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
                      .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .required()
                      .defaultValue(ConfigurationHandler.class.getName())
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configFile =
              StringArgument.builder("configFile")
                      .shortIdentifier('F')
@@ -328,8 +316,7 @@

      try
      {
        directoryServer.initializeConfiguration(configClass.getValue(),
                                                configFile.getValue());
        directoryServer.initializeConfiguration(configFile.getValue());
      }
      catch (InitializationException ie)
      {

 opendj-server-legacy/src/main/java/org/opends/server/tools/ExportLDIF.java

@@ -36,7 +36,6 @@
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
@@ -135,7 +134,6 @@
  private BooleanArgument signHash;
  private IntegerArgument wrapColumn;
  private StringArgument  backendID;
  private StringArgument  configClass;
  private StringArgument  configFile;
  private StringArgument  excludeAttributeStrings;
  private StringArgument  excludeBranchStrings;
@@ -159,19 +157,9 @@
    argParser.setShortToolDescription(REF_SHORT_DESC_EXPORT_LDIF.get());


    // Initialize all the command-line argument types and register them with the
    // parser.
    // Initialize all the command-line argument types and register them with the parser.
    try
    {
      configClass =
              StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
                      .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
                      .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .required()
                      .defaultValue(ConfigurationHandler.class.getName())
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configFile =
              StringArgument.builder("configFile")
                      .shortIdentifier('f')
@@ -405,8 +393,7 @@

      try
      {
        directoryServer.initializeConfiguration(configClass.getValue(),
                                                configFile.getValue());
        directoryServer.initializeConfiguration(configFile.getValue());
      }
      catch (InitializationException ie)
      {

 opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java

@@ -40,7 +40,6 @@
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
@@ -146,7 +145,6 @@
  private BooleanArgument clearBackend;
  private IntegerArgument randomSeed;
  private StringArgument  backendID;
  private StringArgument  configClass;
  private StringArgument  configFile;
  private StringArgument  excludeAttributeStrings;
  private StringArgument  excludeBranchStrings;
@@ -275,15 +273,6 @@

  private void createArguments(LDAPConnectionArgumentParser argParser) throws ArgumentException
  {
      configClass =
              StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
                      .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
                      .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .required()
                      .defaultValue(ConfigurationHandler.class.getName())
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configFile =
              StringArgument.builder("configFile")
                      .shortIdentifier('f')
@@ -523,8 +512,7 @@

      try
      {
        directoryServer.initializeConfiguration(configClass.getValue(),
                                                configFile.getValue());
        directoryServer.initializeConfiguration(configFile.getValue());
      }
      catch (InitializationException ie)
      {

 opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFDiff.java

@@ -36,7 +36,6 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ModificationType;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
import org.opends.server.loggers.JDKLogging;
@@ -58,7 +57,6 @@
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.StringArgument;

import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.cli.CommonArguments.*;

@@ -148,7 +146,6 @@
    BooleanArgument useCompareResultCode;
    BooleanArgument singleValueChanges;
    BooleanArgument doCheckSchema;
    StringArgument  configClass;
    StringArgument  configFile;
    StringArgument  outputLDIF;
    StringArgument  sourceLDIF;
@@ -217,16 +214,8 @@
                      .hidden()
                      .valuePlaceholder(INFO_CONFIGFILE_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configClass =
              StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
                      .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
                      .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .defaultValue(ConfigurationHandler.class.getName())
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);

      showUsage =  showUsageArgument();
      showUsage = showUsageArgument();
      argParser.addArgument(showUsage);

      useCompareResultCode =
@@ -299,8 +288,7 @@

        try
        {
          directoryServer.initializeConfiguration(configClass.getValue(),
                                                  configFile.getValue());
          directoryServer.initializeConfiguration(configFile.getValue());
        }
        catch (Exception e)
        {

 opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFModify.java

@@ -36,7 +36,6 @@

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
import org.opends.server.loggers.JDKLogging;
@@ -411,7 +410,6 @@
    // Prepare the argument parser.
    BooleanArgument showUsage;
    StringArgument  changesFile;
    StringArgument  configClass;
    StringArgument  configFile;
    StringArgument  sourceFile;
    StringArgument  targetFile;
@@ -432,14 +430,6 @@
                      .required()
                      .valuePlaceholder(INFO_CONFIGFILE_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configClass =
              StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
                      .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
                      .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .defaultValue(ConfigurationHandler.class.getName())
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      sourceFile =
              StringArgument.builder("sourceLDIF")
                      .shortIdentifier('s')
@@ -527,8 +517,7 @@

        try
        {
          directoryServer.initializeConfiguration(configClass.getValue(),
                                                  configFile.getValue());
          directoryServer.initializeConfiguration(configFile.getValue());
        }
        catch (Exception e)
        {

 opendj-server-legacy/src/main/java/org/opends/server/tools/LDIFSearch.java

@@ -37,7 +37,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
import org.opends.server.loggers.JDKLogging;
@@ -128,7 +127,6 @@
    IntegerArgument     timeLimit;
    MultiChoiceArgument<String> scopeString;
    StringArgument      baseDNString;
    StringArgument      configClass;
    StringArgument      configFile;
    StringArgument      ldifFile;
    StringArgument      outputFile;
@@ -173,14 +171,6 @@
                      .hidden()
                      .valuePlaceholder(INFO_CONFIGFILE_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configClass =
              StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
                      .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
                      .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .defaultValue(ConfigurationHandler.class.getName())
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      filterFile =
              StringArgument.builder("filterFile")
                      .shortIdentifier('f')
@@ -412,7 +402,7 @@

        try
        {
          directoryServer.initializeConfiguration(configClass.getValue(), configFile.getValue());
          directoryServer.initializeConfiguration(configFile.getValue());
        }
        catch (Exception e)
        {

 opendj-server-legacy/src/main/java/org/opends/server/tools/ListBackends.java

@@ -121,7 +121,6 @@
    BooleanArgument displayUsage = null;
    StringArgument  backendID    = null;
    StringArgument  baseDN       = null;
    StringArgument  configClass  = null;
    StringArgument  configFile   = null;


@@ -133,19 +132,9 @@
    argParser.setShortToolDescription(REF_SHORT_DESC_LIST_BACKENDS.get());
    argParser.setVersionHandler(new DirectoryServerVersionHandler());

    // Initialize all the command-line argument types and register them with the
    // parser.
    // Initialize all the command-line argument types and register them with the parser.
    try
    {
      configClass =
              StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
                      .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
                      .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .required()
                      .defaultValue(ConfigurationHandler.class.getName())
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configFile =
              StringArgument.builder("configFile")
                      .shortIdentifier('f')
@@ -238,8 +227,7 @@

      try
      {
        directoryServer.initializeConfiguration(configClass.getValue(),
                                                configFile.getValue());
        directoryServer.initializeConfiguration(configFile.getValue());
      }
      catch (InitializationException ie)
      {

 opendj-server-legacy/src/main/java/org/opends/server/tools/RebuildIndex.java

@@ -37,7 +37,6 @@
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.backends.RebuildConfig;
import org.opends.server.backends.RebuildConfig.RebuildMode;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
@@ -72,7 +71,6 @@

  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();

  private StringArgument configClass;
  private StringArgument configFile;
  private StringArgument baseDNString;
  private StringArgument indexList;
@@ -230,15 +228,6 @@
  {
    argParser.setShortToolDescription(REF_SHORT_DESC_REBUILD_INDEX.get());

    configClass =
            StringArgument.builder("configClass")
                    .shortIdentifier('C')
                    .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                    .hidden()
                    .required()
                    .defaultValue(ConfigurationHandler.class.getName())
                    .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                    .buildAndAddToParser(argParser);
    configFile =
            StringArgument.builder("configFile")
                    .shortIdentifier('f')
@@ -418,8 +407,7 @@

    try
    {
      directoryServer.initializeConfiguration(configClass.getValue(),
          configFile.getValue());
      directoryServer.initializeConfiguration(configFile.getValue());
    }
    catch (Exception ex)
    {

 opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java

@@ -38,7 +38,6 @@
import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
@@ -132,7 +131,6 @@
  private BooleanArgument listBackups;
  private BooleanArgument verifyOnly;
  private StringArgument  backupIDString;
  private StringArgument  configClass;
  private StringArgument  configFile;
  private StringArgument  backupDirectory;

@@ -156,15 +154,6 @@
    {
      argParser.setShortToolDescription(REF_SHORT_DESC_RESTORE.get());

      configClass =
              StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
                      .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
                      .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .required()
                      .defaultValue(ConfigurationHandler.class.getName())
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configFile =
              StringArgument.builder("configFile")
                      .shortIdentifier('f')
@@ -311,8 +300,7 @@

      try
      {
        directoryServer.initializeConfiguration(configClass.getValue(),
                                                configFile.getValue());
        directoryServer.initializeConfiguration(configFile.getValue());
      }
      catch (InitializationException ie)
      {

 opendj-server-legacy/src/main/java/org/opends/server/tools/VerifyIndex.java

@@ -35,7 +35,6 @@
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.backends.VerifyConfig;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
@@ -94,7 +93,6 @@
    JDKLogging.enableConsoleLoggingForOpenDJTool();

    // Define the command-line arguments that may be used with this program.
    StringArgument  configClass             = null;
    StringArgument  configFile              = null;
    StringArgument  baseDNString            = null;
    StringArgument  indexList               = null;
@@ -111,19 +109,9 @@
    argParser.setShortToolDescription(REF_SHORT_DESC_VERIFY_INDEX.get());
    argParser.setVersionHandler(new DirectoryServerVersionHandler());

    // Initialize all the command-line argument types and register them with the
    // parser.
    // Initialize all the command-line argument types and register them with the parser.
    try
    {
      configClass =
              StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
                      .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
                      .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .required()
                      .defaultValue(ConfigurationHandler.class.getName())
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configFile =
              StringArgument.builder("configFile")
                      .shortIdentifier('f')
@@ -222,8 +210,7 @@

      try
      {
        directoryServer.initializeConfiguration(configClass.getValue(),
                                                configFile.getValue());
        directoryServer.initializeConfiguration(configFile.getValue());
      }
      catch (InitializationException ie)
      {

 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/LocalPurgeHistorical.java

@@ -17,7 +17,6 @@
package org.opends.server.tools.dsreplication;

import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.CoreMessages.*;

import java.io.File;

@@ -32,7 +31,6 @@
import org.opends.server.types.OpenDsException;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.EmbeddedUtils;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.TimeThread;
import com.forgerock.opendj.cli.ConsoleApplication;
import org.opends.server.util.cli.PointAdder;
@@ -51,7 +49,6 @@
  private final ConsoleApplication app;
  private final ProgressMessageFormatter formatter;
  private final String configFile;
  private final String configClass;

  /**
   * The default constructor.
@@ -61,19 +58,15 @@
   * @param formatter the formatter to be used to generated the messages.
   * @param configFile the file that contains the configuration.  This is
   * required to initialize properly the server.
   * @param configClass the class to be used to read the configuration.  This is
   * required to initialize properly the server.
   */
  public LocalPurgeHistorical(PurgeHistoricalUserData uData,
      ConsoleApplication app,
      ProgressMessageFormatter formatter, String configFile,
      String configClass)
      ProgressMessageFormatter formatter, String configFile)
  {
    this.uData = uData;
    this.app = app;
    this.formatter = formatter;
    this.configFile = configFile;
    this.configClass = configClass;
  }

  /**
@@ -95,30 +88,11 @@
    PointAdder pointAdder = new PointAdder(app);
    pointAdder.start();

    Class<?> cfgClass;

    try
    {
      cfgClass = Class.forName(configClass);
    }
    catch (Exception e)
    {
      pointAdder.stop();
      LocalizableMessage message =
        ERR_CANNOT_LOAD_CONFIG_HANDLER_CLASS.get(
            configClass, StaticUtils.stackTraceToSingleLineString(e));
      app.println(message);
      logger.error(LocalizableMessage.raw("Error loading configuration class "+configClass+
          ": "+e, e));
      return ReplicationCliReturnCode.ERROR_LOCAL_PURGE_HISTORICAL_CLASS_LOAD;
    }

    try
    {
      // Create a configuration for the server.
      DirectoryEnvironmentConfig environmentConfig =
        new DirectoryEnvironmentConfig();
      environmentConfig.setConfigClass(cfgClass);
      environmentConfig.setConfigFile(new File(configFile));
      environmentConfig.setDisableConnectionHandlers(true);
      EmbeddedUtils.startServer(environmentConfig);
@@ -126,10 +100,7 @@
    catch (OpenDsException ode)
    {
      pointAdder.stop();
      LocalizableMessage message = ode.getMessageObject();
        ERR_CANNOT_LOAD_CONFIG_HANDLER_CLASS.get(
            configClass, StaticUtils.stackTraceToSingleLineString(ode));
      app.println(message);
      app.println(ode.getMessageObject());
      logger.error(LocalizableMessage.raw("Error starting server with file "+configFile+
          ": "+ode, ode));
      return ReplicationCliReturnCode.ERROR_LOCAL_PURGE_HISTORICAL_SERVER_START;

 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliArgumentParser.java

@@ -38,7 +38,6 @@
import org.opends.server.admin.client.cli.SecureConnectionCliParser;
import org.opends.server.admin.client.cli.TaskScheduleArgs;
import org.opends.server.config.AdministrationConnector;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
import org.opends.server.tasks.PurgeConflictsHistoricalTask;

@@ -124,7 +123,6 @@

  /** No-prompt argument. */
  BooleanArgument noPromptArg;
  private String defaultLocalHostValue;

  /** Arguments for the first server. */
  ServerArgs server1 = new ServerArgs();
@@ -173,12 +171,6 @@
  BooleanArgument advancedArg;

  /**
   * The argument set by the user to specify the configuration class
   * (useful when dsreplication purge-historical runs locally).
   */
  private StringArgument  configClassArg;

  /**
   * The argument set by the user to specify the configuration file
   * (useful when dsreplication purge-historical runs locally).
   */
@@ -447,10 +439,6 @@
    advancedArg = advancedModeArgument();
    defaultArgs.add(index++, advancedArg);

    configClassArg =
        configClassArgument(ConfigurationHandler.class.getName());
    defaultArgs.add(index++, configClassArg);

    configFileArg = configFileArgument();
    defaultArgs.add(index++, configFileArg);

@@ -1194,17 +1182,6 @@
  }

  /**
   * Returns the config class value provided in the hidden argument of the
   * command-line.
   * @return the config class value provided in the hidden argument of the
   * command-line.
   */
  public String getConfigClass()
  {
    return getValue(configClassArg);
  }

  /**
   * Returns the config file value provided in the hidden argument of the
   * command-line.
   * @return the config file value provided in the hidden argument of the

 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java

@@ -1027,9 +1027,7 @@
    {
      printPurgeProgressMessage(uData);
      LocalPurgeHistorical localPurgeHistorical =
        new LocalPurgeHistorical(uData, this, formatter,
            argParser.getConfigFile(),
            argParser.getConfigClass());
        new LocalPurgeHistorical(uData, this, formatter, argParser.getConfigFile());
      returnCode = localPurgeHistorical.execute();

      if (returnCode == SUCCESSFUL)

 opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliReturnCode.java

@@ -12,9 +12,8 @@
 * information: "Portions Copyright [year] [name of copyright owner]".
 *
 * Copyright 2007-2010 Sun Microsystems, Inc.
 * Portions Copyright 2014-2015 ForgeRock AS.
 * Portions Copyright 2014-2016 ForgeRock AS.
 */

package org.opends.server.tools.dsreplication;

import static org.opends.messages.AdminToolMessages.*;
@@ -94,7 +93,10 @@
  HISTORICAL_CANNOT_BE_PURGED_ON_BASEDN(27, ERR_REPLICATION_NO_MESSAGE.get()),
  /** Error launching purge historical. */
  ERROR_LAUNCHING_PURGE_HISTORICAL(28, ERR_REPLICATION_NO_MESSAGE.get()),
  /** Error loading configuration class in local purge historical. */
  /**
   * Error loading configuration class in local purge historical.
   * @deprecated unused now
   */
  ERROR_LOCAL_PURGE_HISTORICAL_CLASS_LOAD(29, ERR_REPLICATION_NO_MESSAGE.get()),
  /** Error starting server in local purge historical. */
   ERROR_LOCAL_PURGE_HISTORICAL_SERVER_START(30, ERR_REPLICATION_NO_MESSAGE.get()),

 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/MakeLDIF.java

@@ -149,7 +149,6 @@

    BooleanArgument showUsage;
    IntegerArgument randomSeed;
    StringArgument  configClass;
    StringArgument  configFile;
    StringArgument  templatePath;
    StringArgument  ldifFile;
@@ -165,13 +164,6 @@
                      .required()
                      .valuePlaceholder(INFO_CONFIGFILE_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      configClass =
              StringArgument.builder(OPTION_LONG_CONFIG_CLASS)
                      .shortIdentifier(OPTION_SHORT_CONFIG_CLASS)
                      .description(INFO_DESCRIPTION_CONFIG_CLASS.get())
                      .hidden()
                      .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get())
                      .buildAndAddToParser(argParser);
      resourcePath =
              StringArgument.builder("resourcePath")
                      .shortIdentifier('r')
@@ -262,8 +254,7 @@

      try
      {
        directoryServer.initializeConfiguration(configClass.getValue(),
            configFile.getValue());
        directoryServer.initializeConfiguration(configFile.getValue());
      }
      catch (Exception e)
      {

 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java

@@ -39,7 +39,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.messages.RuntimeMessages;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DirectoryServer.DirectoryServerVersionHandler;
import org.opends.server.loggers.JDKLogging;
import org.opends.server.util.StaticUtils;
@@ -63,8 +62,6 @@
  /** The command-line argument parser. */
  private final SubCommandArgumentParser parser;

  /** The argument which should be used to specify the config class. */
  private StringArgument configClass;
  /** The argument which should be used to specify the config file. */
  private StringArgument configFile;

@@ -215,7 +212,6 @@
  {
    if (!globalArgumentsInitialized)
    {
      configClass = configClassArgument(ConfigurationHandler.class.getName());
      configFile = configFileArgument();
      noPrompt = noPromptArgument();
      verbose = verboseArgument();
@@ -235,7 +231,6 @@
      // Register the global arguments.
      parser.addGlobalArgument(showUsageArgument);
      parser.setUsageArgument(showUsageArgument, getOutputStream());
      parser.addGlobalArgument(configClass);
      parser.addGlobalArgument(configFile);
      parser.addGlobalArgument(noPrompt);
      parser.addGlobalArgument(verbose);

 opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java

@@ -30,7 +30,6 @@

import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.quicksetup.util.Utils;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DirectoryServer;

/**
@@ -500,89 +499,6 @@
    return setPathProperty(PROPERTY_CONFIG_FILE, configFile);
  }



  /**
   * Retrieves the class that provides the Directory Server
   * configuration handler implementation.  If no config handler class
   * is defined, or if a problem occurs while attempting to determine
   * the config handler class, then a default class of
   * org.opends.server.extensions.ConfigFileHandler will be returned.
   *
   * @return  The class that provides the Directory Server
   *          configuration handler implementation.
   */
  public Class getConfigClass()
  {
    String className = getProperty(PROPERTY_CONFIG_CLASS);
    if (className == null)
    {
      return ConfigurationHandler.class;
    }
    else
    {
      try
      {
        return Class.forName(className);
      }
      catch (Exception e)
      {
        return ConfigurationHandler.class;
      }
    }
  }



  /**
   * Specifies the class that provides the Directory Server
   * configuration handler implementation.  The class must be a
   * subclass of the org.opends.server.api.ConfigHandler superclass.
   *
   * @param  configClass  The class that proviedes the Directory
   *                      Server configuration handler implementation.
   *
   * @return  The class that was previously configured to provide the
   *          Directory Server configuration handler implementation,
   *          or {@code null} if none was defined.
   *
   * @throws  InitializationException  If the Directory Server is
   *                                   already running or there is a
   *                                   problem with the provided
   *                                   config handler class.
   */
  public Class setConfigClass(Class configClass)
         throws InitializationException
  {
    checkServerIsRunning();

    if (!ConfigurationHandler.class.isAssignableFrom(configClass))
    {
      throw new InitializationException(
              ERR_DIRCFG_INVALID_CONFIG_CLASS.get(
                      configClass.getName()));
    }

    String oldClassName = setProperty(PROPERTY_CONFIG_CLASS, configClass.getName());
    if (oldClassName == null)
    {
      return null;
    }
    else
    {
      try
      {
        return Class.forName(oldClassName);
      }
      catch (Exception e)
      {
        return null;
      }
    }
  }



  /**
   * Indicates whether the Directory Server should attempt to start
   * with the "last known good" configuration rather than the current

 opendj-server-legacy/src/main/java/org/opends/server/util/ServerConstants.java

@@ -2793,18 +2793,6 @@
   */
  public static final String TIME_UNIT_WEEKS_FULL = "weeks";



  /**
   * The name of the system property that can be used to specify the
   * fully-qualified name of theclass that provides the Director Server config
   * handler implementation.
   */
  public static final String PROPERTY_CONFIG_CLASS =
       "org.opends.server.ConfigClass";



  /**
   * The name of the system property that can be used to specify the path to the
   * configuration file that should be used to initialize the config handler.

 opendj-server-legacy/src/messages/org/opends/messages/core.properties

@@ -128,8 +128,6 @@
ERR_CANNOT_BOOTSTRAP_WHILE_RUNNING_118=The Directory Server is \
 currently running. The configuration may not be bootstrapped while the \
 server is online
ERR_CANNOT_LOAD_CONFIG_HANDLER_CLASS_119=Unable to load class %s to \
 serve as the Directory Server configuration handler: %s
ERR_CANNOT_INSTANTIATE_CONFIG_HANDLER_120=Unable to create an instance \
 of class %s to serve as the Directory Server configuration handler: %s
ERR_CANNOT_INITIALIZE_CONFIG_HANDLER_121=An error occurred while trying \

 opendj-server-legacy/src/messages/org/opends/messages/core_de.properties

@@ -109,7 +109,6 @@
WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD_116=Beim Versuch, %s zu benachrichtigen, dass der Directory-Server heruntergefahren wurde, hat die Warteschlange einen Ausnahmefehler festgestellt:  %s
INFO_DISCONNECT_DUE_TO_SERVER_ERROR_117=Serverfehler
ERR_CANNOT_BOOTSTRAP_WHILE_RUNNING_118=Der Directory-Server wird derzeit ausgef\u00fchrt.  Es wird kein Bootstrap der Konfiguration ausgef\u00fchrt, w\u00e4hrend der Server online ist
ERR_CANNOT_LOAD_CONFIG_HANDLER_CLASS_119=Klasse %s konnte nicht geladen werden, um als Directory-Server-Konfigurationshandler zu fungieren:  %s
ERR_CANNOT_INSTANTIATE_CONFIG_HANDLER_120=Es konnte keine Instanz von Klasse %s erstellt werden, um als Directory-Server-Konfigurationhandler zu fungieren: %s
ERR_CANNOT_INITIALIZE_CONFIG_HANDLER_121=Fehler beim Versuch, den Konfigurationshandler %s mithilfe von Konfigurationsdatei %s zu initialisieren:  %s
ERR_CANNOT_START_BEFORE_BOOTSTRAP_122=Der Directory-Server kann erst gestartet werden, wenn ein Bootstrap der Konfiguration ausgef\u00fchrt wurde

 opendj-server-legacy/src/messages/org/opends/messages/core_es.properties

@@ -109,7 +109,6 @@
WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD_116=La cola de trabajo ha detectado una excepci\u00f3n al intentar notificar a %s que se estaba cerrando el servidor de directorios:  %s
INFO_DISCONNECT_DUE_TO_SERVER_ERROR_117=Error del servidor
ERR_CANNOT_BOOTSTRAP_WHILE_RUNNING_118=El Servidor de directorios est\u00e1 en ejecuci\u00f3n.  La configuraci\u00f3n no puede inicializarse mientras el servidor est\u00e9 en l\u00ednea
ERR_CANNOT_LOAD_CONFIG_HANDLER_CLASS_119=No puede cargarse la clase %s para que funcione como el controlador de configuraci\u00f3n del Servidor de directorios:  %s
ERR_CANNOT_INSTANTIATE_CONFIG_HANDLER_120=No puede crearse una instancia de la clase %s para que funcione como el controlador de configuraci\u00f3n del Servidor de directorios: %s
ERR_CANNOT_INITIALIZE_CONFIG_HANDLER_121=Se ha producido un error al tratar de inicializar el controlador de configuraci\u00f3n %s por medio del archivo de configuraci\u00f3n %s:  %s
ERR_CANNOT_START_BEFORE_BOOTSTRAP_122=No se puede iniciar el Servidor de directorios antes de inicializar la configuraci\u00f3n

 opendj-server-legacy/src/messages/org/opends/messages/core_fr.properties

@@ -11,7 +11,7 @@
# information: "Portions Copyright [year] [name of copyright owner]".
#
# Copyright 2006-2010 Sun Microsystems, Inc.
# Portions Copyright 2011-2015 ForgeRock AS.
# Portions Copyright 2011-2016 ForgeRock AS.



@@ -109,7 +109,6 @@
WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD_116=La file d'attente de travail a intercept\u00e9 une exception lors de la notification de %s au sujet de la fermeture de Directory Server\u00a0:  %s
INFO_DISCONNECT_DUE_TO_SERVER_ERROR_117=Erreur de serveur
ERR_CANNOT_BOOTSTRAP_WHILE_RUNNING_118=Directory Server est en cours d\u2019ex\u00e9cution.  Impossible d\u2019initialiser (bootstrap) la configuration pendant que le serveur est en ligne
ERR_CANNOT_LOAD_CONFIG_HANDLER_CLASS_119=Impossible de charger la classe %s \u00e0 utiliser comme gestionnaire de configuration Directory Server\u00a0: %s
ERR_CANNOT_INSTANTIATE_CONFIG_HANDLER_120=Impossible de cr\u00e9er une instance de la classe %s \u00e0 utiliser comme gestionnaire de configuration Directory Server\u00a0: %s
ERR_CANNOT_INITIALIZE_CONFIG_HANDLER_121=Une erreur s\u2019est produite lors de la tentative d\u2019initialisation du gestionnaire de configuration %s avec le fichier de configuration %s\u00a0: %s
ERR_CANNOT_START_BEFORE_BOOTSTRAP_122=Impossible de d\u00e9marrer Directory Server avant l\u2019initialisation (bootstrap) de la configuration

 opendj-server-legacy/src/messages/org/opends/messages/core_ja.properties

@@ -109,7 +109,6 @@
WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD_116=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u304c\u505c\u6b62\u4e2d\u3067\u3042\u308b\u3053\u3068\u3092 %s \u306b\u901a\u77e5\u4e2d\u306b\u3001\u30ef\u30fc\u30af\u30ad\u30e5\u30fc\u306b\u3088\u308a\u4f8b\u5916\u304c\u30ad\u30e3\u30c3\u30c1\u3055\u308c\u307e\u3057\u305f: %s
INFO_DISCONNECT_DUE_TO_SERVER_ERROR_117=\u30b5\u30fc\u30d0\u30fc\u30a8\u30e9\u30fc
ERR_CANNOT_BOOTSTRAP_WHILE_RUNNING_118=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u306f\u7a3c\u50cd\u4e2d\u3067\u3059\u3002\u30b5\u30fc\u30d0\u30fc\u306e\u30aa\u30f3\u30e9\u30a4\u30f3\u4e2d\u306b\u69cb\u6210\u3092\u30d6\u30fc\u30c8\u30b9\u30c8\u30e9\u30c3\u30d7\u51e6\u7406\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093
ERR_CANNOT_LOAD_CONFIG_HANDLER_CLASS_119=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u69cb\u6210\u30cf\u30f3\u30c9\u30e9\u3068\u3057\u3066\u6a5f\u80fd\u3059\u308b\u30af\u30e9\u30b9 %s \u3092\u8aad\u307f\u8fbc\u3081\u307e\u305b\u3093:  %s
ERR_CANNOT_INSTANTIATE_CONFIG_HANDLER_120=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u69cb\u6210\u30cf\u30f3\u30c9\u30e9\u3068\u3057\u3066\u6a5f\u80fd\u3059\u308b\u30af\u30e9\u30b9 %s \u306e\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093: %s
ERR_CANNOT_INITIALIZE_CONFIG_HANDLER_121=\u69cb\u6210\u30d5\u30a1\u30a4\u30eb %2$s \u3092\u4f7f\u7528\u3057\u3066\u69cb\u6210\u30cf\u30f3\u30c9\u30e9 %1$s \u3092\u521d\u671f\u5316\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %3$s
ERR_CANNOT_START_BEFORE_BOOTSTRAP_122=\u69cb\u6210\u304c\u30d6\u30fc\u30c8\u30b9\u30c8\u30e9\u30c3\u30d7\u51e6\u7406\u3055\u308c\u308b\u524d\u306b\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u3092\u8d77\u52d5\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093

 opendj-server-legacy/src/messages/org/opends/messages/core_ko.properties

@@ -109,7 +109,6 @@
WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD_116=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84\uac00 \uc885\ub8cc \uc911\uc784\uc744 %s\uc5d0 \uc54c\ub9ac\ub294 \ub3d9\uc548 \uc791\uc5c5 \ub300\uae30\uc5f4\uc5d0\uc11c \uc608\uc678\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
INFO_DISCONNECT_DUE_TO_SERVER_ERROR_117=\uc11c\ubc84 \uc624\ub958
ERR_CANNOT_BOOTSTRAP_WHILE_RUNNING_118=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84\uac00 \ud604\uc7ac \uc2e4\ud589\ub418\uace0 \uc788\uc2b5\ub2c8\ub2e4.  \uc11c\ubc84\uac00 \uc628\ub77c\uc778 \uc0c1\ud0dc\uc77c \ub54c \uad6c\uc131\uc744 \ubd80\ud2b8\uc2a4\ud2b8\ub7a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
ERR_CANNOT_LOAD_CONFIG_HANDLER_CLASS_119=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uad6c\uc131 \ucc98\ub9ac\uae30\ub85c \uc0ac\uc6a9\ud560 %s \ud074\ub798\uc2a4\ub97c \ub85c\ub4dc\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4: %s
ERR_CANNOT_INSTANTIATE_CONFIG_HANDLER_120=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uad6c\uc131 \ucc98\ub9ac\uae30\ub85c \uc0ac\uc6a9\ud560 %s \ud074\ub798\uc2a4\uc758 \uc778\uc2a4\ud134\uc2a4\ub97c \uc791\uc131\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4: %s
ERR_CANNOT_INITIALIZE_CONFIG_HANDLER_121=\uad6c\uc131 \ud30c\uc77c %2$s\uc744(\ub97c) \uc0ac\uc6a9\ud558\uc5ec \uad6c\uc131 \ucc98\ub9ac\uae30 %1$s\uc744(\ub97c) \ucd08\uae30\ud654\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %3$s
ERR_CANNOT_START_BEFORE_BOOTSTRAP_122=\uad6c\uc131\uc774 \ubd80\ud2b8\uc2a4\ud2b8\ub7a9\ub418\uae30 \uc804\uc5d0 \ub514\ub809\ud1a0\ub9ac \uc11c\ubc84\ub97c \uc2dc\uc791\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.

 opendj-server-legacy/src/messages/org/opends/messages/core_zh_CN.properties

@@ -109,7 +109,6 @@
WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD_116=\u5f53\u76ee\u5f55\u670d\u52a1\u5668\u6b63\u5728\u5173\u95ed\u65f6\uff0c\u5de5\u4f5c\u961f\u5217\u5728\u5c1d\u8bd5\u901a\u77e5 %s \u65f6\u6355\u83b7\u5230\u5f02\u5e38: %s
INFO_DISCONNECT_DUE_TO_SERVER_ERROR_117=\u670d\u52a1\u5668\u9519\u8bef
ERR_CANNOT_BOOTSTRAP_WHILE_RUNNING_118=\u76ee\u5f55\u670d\u52a1\u5668\u5f53\u524d\u6b63\u5728\u8fd0\u884c\u3002\u5f53\u670d\u52a1\u5668\u8054\u673a\u65f6\u914d\u7f6e\u53ef\u80fd\u65e0\u6cd5\u5f15\u5bfc
ERR_CANNOT_LOAD_CONFIG_HANDLER_CLASS_119=\u65e0\u6cd5\u88c5\u5165\u7c7b %s \u4ee5\u7528\u4f5c\u76ee\u5f55\u670d\u52a1\u5668\u914d\u7f6e\u5904\u7406\u7a0b\u5e8f: %s
ERR_CANNOT_INSTANTIATE_CONFIG_HANDLER_120=\u65e0\u6cd5\u521b\u5efa\u7c7b %s \u7684\u5b9e\u4f8b\u4ee5\u7528\u4f5c\u76ee\u5f55\u670d\u52a1\u5668\u914d\u7f6e\u5904\u7406\u7a0b\u5e8f: %s
ERR_CANNOT_INITIALIZE_CONFIG_HANDLER_121=\u5c1d\u8bd5\u4f7f\u7528\u914d\u7f6e\u6587\u4ef6 %2$s \u521d\u59cb\u5316\u914d\u7f6e\u5904\u7406\u7a0b\u5e8f %1$s \u65f6\u51fa\u73b0\u9519\u8bef: %3$s
ERR_CANNOT_START_BEFORE_BOOTSTRAP_122=\u5728\u5f15\u5bfc\u914d\u7f6e\u4e4b\u524d\u76ee\u5f55\u670d\u52a1\u5668\u53ef\u80fd\u65e0\u6cd5\u542f\u52a8

 opendj-server-legacy/src/messages/org/opends/messages/core_zh_TW.properties

@@ -109,7 +109,6 @@
WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD_116=\u5de5\u4f5c\u4f47\u5217\u5617\u8a66\u901a\u77e5 %s \u76ee\u9304\u4f3a\u670d\u5668\u6b63\u5728\u95dc\u6a5f\u6642\uff0c\u767c\u751f\u7570\u5e38: %s
INFO_DISCONNECT_DUE_TO_SERVER_ERROR_117=\u4f3a\u670d\u5668\u932f\u8aa4
ERR_CANNOT_BOOTSTRAP_WHILE_RUNNING_118=\u76ee\u9304\u4f3a\u670d\u5668\u76ee\u524d\u6b63\u5728\u57f7\u884c\u3002\u7576\u4f3a\u670d\u5668\u5728\u7dda\u4e0a\u6642\uff0c\u53ef\u80fd\u7121\u6cd5\u555f\u52d5\u914d\u7f6e
ERR_CANNOT_LOAD_CONFIG_HANDLER_CLASS_119=\u7121\u6cd5\u8f09\u5165\u985e\u5225 %s \u505a\u70ba\u76ee\u9304\u4f3a\u670d\u5668\u914d\u7f6e\u8655\u7406\u7a0b\u5f0f: %s
ERR_CANNOT_INSTANTIATE_CONFIG_HANDLER_120=\u7121\u6cd5\u5efa\u7acb\u985e\u5225 %s \u7684\u5be6\u4f8b\u505a\u70ba\u76ee\u9304\u4f3a\u670d\u5668\u914d\u7f6e\u8655\u7406\u7a0b\u5f0f: %s
ERR_CANNOT_INITIALIZE_CONFIG_HANDLER_121=\u5617\u8a66\u4f7f\u7528\u914d\u7f6e\u6a94\u6848 %2$s \u521d\u59cb\u5316\u914d\u7f6e\u8655\u7406\u7a0b\u5f0f %1$s \u6642\uff0c\u767c\u751f\u932f\u8aa4: %3$s
ERR_CANNOT_START_BEFORE_BOOTSTRAP_122=\u5728\u555f\u52d5\u914d\u7f6e\u4e4b\u524d\uff0c\u7121\u6cd5\u555f\u52d5\u76ee\u9304\u4f3a\u670d\u5668

 opendj-server-legacy/src/messages/org/opends/messages/tool.properties

@@ -58,10 +58,6 @@
INFO_ENCPW_DESCRIPTION_ENCODED_PW_10=Encoded password to compare against the \
 clear-text password
INFO_ENCPW_DESCRIPTION_ENCODED_PW_FILE_11=Encoded password file
INFO_DESCRIPTION_CONFIG_CLASS_12=The fully-qualified name of the Java class \
 to use as the Directory Server configuration handler.  If this is not \
 provided, then a default of org.opends.server.extensions.ConfigFileHandler \
 will be used
INFO_DESCRIPTION_CONFIG_FILE_13=Path to the Directory Server \
 configuration file
INFO_ENCPW_DESCRIPTION_SCHEME_14=Scheme to use for the encoded password
@@ -2031,7 +2027,6 @@
INFO_KEYSTOREPATH_PLACEHOLDER_1504={keyStorePath}
INFO_TRUSTSTOREPATH_PLACEHOLDER_1505={trustStorePath}
INFO_BINDPWD_FILE_PLACEHOLDER_1506={bindPasswordFile}
INFO_CONFIGCLASS_PLACEHOLDER_1507={configClass}
INFO_HOST_PLACEHOLDER_1508={host}
INFO_PORT_PLACEHOLDER_1509={port}
INFO_BASEDN_PLACEHOLDER_1510={baseDN}

 opendj-server-legacy/src/messages/org/opends/messages/tool_de.properties

@@ -49,7 +49,6 @@
INFO_ENCPW_DESCRIPTION_CLEAR_PW_FILE_9=Datei mit Klartext-Passwort
INFO_ENCPW_DESCRIPTION_ENCODED_PW_10=Verschl\u00fcsseltes Passwort zum Abgleich gegen ein Klartext-Passwort
INFO_ENCPW_DESCRIPTION_ENCODED_PW_FILE_11=Datei mit verschl\u00fcsseltem Passwort
INFO_DESCRIPTION_CONFIG_CLASS_12=Vollst\u00e4ndig qualifizierter Name der Java-Klasse f\u00fcr die Verwendung als Konfigurationsbehandlungsroutine des Directory-Servers.  Wenn dieser nicht angegeben wird, wird standardm\u00e4\u00dfig org.opends.server.extensions.ConfigFileHandler verwendet
INFO_DESCRIPTION_CONFIG_FILE_13=Pfad zur Directory-Server-Konfigurationsdatei
INFO_ENCPW_DESCRIPTION_SCHEME_14=Schema f\u00fcr das verschl\u00fcsselte Passwort
ERR_CANNOT_INITIALIZE_ARGS_16=Unerwarteter Fehler beim Versuch, das Befehlszeilenargument zu initialisieren:  %s
@@ -986,7 +985,6 @@
INFO_KEYSTOREPATH_PLACEHOLDER_1504={keyStorePath}
INFO_TRUSTSTOREPATH_PLACEHOLDER_1505={trustStorePath}
INFO_BINDPWD_FILE_PLACEHOLDER_1506={bindPasswordFile}
INFO_CONFIGCLASS_PLACEHOLDER_1507={configClass}
INFO_HOST_PLACEHOLDER_1508={host}
INFO_PORT_PLACEHOLDER_1509={port}
INFO_BASEDN_PLACEHOLDER_1510={baseDN}

 opendj-server-legacy/src/messages/org/opends/messages/tool_es.properties

@@ -49,7 +49,6 @@
INFO_ENCPW_DESCRIPTION_CLEAR_PW_FILE_9=Archivo de contrase\u00f1as de texto no codificado
INFO_ENCPW_DESCRIPTION_ENCODED_PW_10=Contrase\u00f1a codificada para comparar frente a la contrase\u00f1a de texto sin codificar
INFO_ENCPW_DESCRIPTION_ENCODED_PW_FILE_11=Archivo de contrase\u00f1as codificadas
INFO_DESCRIPTION_CONFIG_CLASS_12=El nombre completo de la clase de Java que se utiliza como controlador de configuraci\u00f3n del servidor de directorios.  Si no se especifica, se utilizar\u00e1 un valor predeterminado de org.opends.server.extensions.ConfigFileHandler
INFO_DESCRIPTION_CONFIG_FILE_13=Ruta al archivo de configuraci\u00f3n del servidor de directorios
INFO_ENCPW_DESCRIPTION_SCHEME_14=Esquema que utilizar para la contrase\u00f1a codificada
ERR_CANNOT_INITIALIZE_ARGS_16=Se ha producido un error inesperado al tratar de inicializar los argumentos de l\u00ednea de comandos:  %s
@@ -986,7 +985,6 @@
INFO_KEYSTOREPATH_PLACEHOLDER_1504={keyStorePath}
INFO_TRUSTSTOREPATH_PLACEHOLDER_1505={trustStorePath}
INFO_BINDPWD_FILE_PLACEHOLDER_1506={bindPasswordFile}
INFO_CONFIGCLASS_PLACEHOLDER_1507={configClass}
INFO_HOST_PLACEHOLDER_1508={host}
INFO_PORT_PLACEHOLDER_1509={port}
INFO_BASEDN_PLACEHOLDER_1510={baseDN}

 opendj-server-legacy/src/messages/org/opends/messages/tool_fr.properties

@@ -49,7 +49,6 @@
INFO_ENCPW_DESCRIPTION_CLEAR_PW_FILE_9=Fichier de mots de passe en clair
INFO_ENCPW_DESCRIPTION_ENCODED_PW_10=Mot de passe cod\u00e9 \u00e0 comparer avec le mot de passe en clair
INFO_ENCPW_DESCRIPTION_ENCODED_PW_FILE_11=Fichier de mots de passe cod\u00e9s
INFO_DESCRIPTION_CONFIG_CLASS_12=Nom complet de la classe Java \u00e0 utiliser en tant que gestionnaire de configuration de Directory Server.  S'il n'est pas indiqu\u00e9, un nom par d\u00e9faut de org.opends.server.extensions.ConfigFileHandler sera utilis\u00e9
INFO_DESCRIPTION_CONFIG_FILE_13=Chemin vers le fichier de configuration de Directory Server
INFO_ENCPW_DESCRIPTION_SCHEME_14=Sch\u00e9ma d'utilisation pour le mot de passe cod\u00e9
ERR_CANNOT_INITIALIZE_ARGS_16=Une erreur inattendue s'est produite lors de la tentative d'initialisation des arguments de ligne de commande\u00a0: %s
@@ -986,7 +985,6 @@
INFO_KEYSTOREPATH_PLACEHOLDER_1504={cheminMagasinCl\u00e9s}
INFO_TRUSTSTOREPATH_PLACEHOLDER_1505={cheminMagasinApprobation}
INFO_BINDPWD_FILE_PLACEHOLDER_1506={fichierMotdePasseLiaison}
INFO_CONFIGCLASS_PLACEHOLDER_1507={classeConfig}
INFO_HOST_PLACEHOLDER_1508={h\u00f4te}
INFO_PORT_PLACEHOLDER_1509={port}
INFO_BASEDN_PLACEHOLDER_1510={DNdeBase}

 opendj-server-legacy/src/messages/org/opends/messages/tool_ja.properties

@@ -49,7 +49,6 @@
INFO_ENCPW_DESCRIPTION_CLEAR_PW_FILE_9=\u5e73\u6587\u30d1\u30b9\u30ef\u30fc\u30c9\u30d5\u30a1\u30a4\u30eb
INFO_ENCPW_DESCRIPTION_ENCODED_PW_10=\u5e73\u6587\u30d1\u30b9\u30ef\u30fc\u30c9\u3068\u6bd4\u8f03\u3059\u308b\u7b26\u53f7\u5316\u3055\u308c\u305f\u30d1\u30b9\u30ef\u30fc\u30c9
INFO_ENCPW_DESCRIPTION_ENCODED_PW_FILE_11=\u7b26\u53f7\u5316\u3055\u308c\u305f\u30d1\u30b9\u30ef\u30fc\u30c9\u30d5\u30a1\u30a4\u30eb
INFO_DESCRIPTION_CONFIG_CLASS_12=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u69cb\u6210\u30cf\u30f3\u30c9\u30e9\u3068\u3057\u3066\u4f7f\u7528\u3059\u308b Java \u30af\u30e9\u30b9\u306e\u5b8c\u5168\u6307\u5b9a\u540d\u3002  \u6307\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u5834\u5408\u306f\u3001org.opends.server.extensions.ConfigFileHandler \u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u304c\u4f7f\u7528\u3055\u308c\u307e\u3059
INFO_DESCRIPTION_CONFIG_FILE_13=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u69cb\u6210\u30d5\u30a1\u30a4\u30eb\u3078\u306e\u30d1\u30b9
INFO_ENCPW_DESCRIPTION_SCHEME_14=\u7b26\u53f7\u5316\u3055\u308c\u305f\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u4f7f\u7528\u3059\u308b\u30b9\u30ad\u30fc\u30de
ERR_CANNOT_INITIALIZE_ARGS_16=\u30b3\u30de\u30f3\u30c9\u884c\u5f15\u6570\u306e\u521d\u671f\u5316\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f:  %s
@@ -986,7 +985,6 @@
INFO_KEYSTOREPATH_PLACEHOLDER_1504={keyStorePath}
INFO_TRUSTSTOREPATH_PLACEHOLDER_1505={trustStorePath}
INFO_BINDPWD_FILE_PLACEHOLDER_1506={bindPasswordFile}
INFO_CONFIGCLASS_PLACEHOLDER_1507={configClass}
INFO_HOST_PLACEHOLDER_1508={host}
INFO_PORT_PLACEHOLDER_1509={port}
INFO_BASEDN_PLACEHOLDER_1510={baseDN}

 opendj-server-legacy/src/messages/org/opends/messages/tool_ko.properties

@@ -49,7 +49,6 @@
INFO_ENCPW_DESCRIPTION_CLEAR_PW_FILE_9=\uc77c\ubc18 \ud14d\uc2a4\ud2b8 \ube44\ubc00\ubc88\ud638 \ud30c\uc77c
INFO_ENCPW_DESCRIPTION_ENCODED_PW_10=\uc77c\ubc18 \ud14d\uc2a4\ud2b8 \ube44\ubc00\ubc88\ud638\uc640 \ube44\uad50\ud560 \uc778\ucf54\ub529\ub41c \ube44\ubc00\ubc88\ud638
INFO_ENCPW_DESCRIPTION_ENCODED_PW_FILE_11=\uc778\ucf54\ub529\ub41c \ube44\ubc00\ubc88\ud638 \ud30c\uc77c
INFO_DESCRIPTION_CONFIG_CLASS_12=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uad6c\uc131 \ucc98\ub9ac\uae30\ub85c \uc0ac\uc6a9\ud560 Java \ud074\ub798\uc2a4\uc758 \uc815\uaddc\ud654\ub41c \uc774\ub984.  \uc774 \uc774\ub984\uc744 \uc81c\uacf5\ud558\uc9c0 \uc54a\uc73c\uba74 \uae30\ubcf8\uac12 org.opends.server.extensions.ConfigFileHandler\uac00 \uc0ac\uc6a9\ub429\ub2c8\ub2e4.
INFO_DESCRIPTION_CONFIG_FILE_13=\ub514\ub809\ud1a0\ub9ac \uc11c\ubc84 \uad6c\uc131 \ud30c\uc77c \uacbd\ub85c
INFO_ENCPW_DESCRIPTION_SCHEME_14=\uc778\ucf54\ub529\ub41c \ube44\ubc00\ubc88\ud638\uc5d0 \uc0ac\uc6a9\ud560 \uc2a4\ud0a4\ub9c8
ERR_CANNOT_INITIALIZE_ARGS_16=\uba85\ub839\uc904 \uc778\uc218\ub97c \ucd08\uae30\ud654\ud558\ub294 \ub3d9\uc548 \uc608\uae30\uce58 \uc54a\uc740 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4: %s
@@ -984,7 +983,6 @@
INFO_KEYSTOREPATH_PLACEHOLDER_1504={keyStorePath}
INFO_TRUSTSTOREPATH_PLACEHOLDER_1505={trustStorePath}
INFO_BINDPWD_FILE_PLACEHOLDER_1506={bindPasswordFile}
INFO_CONFIGCLASS_PLACEHOLDER_1507={configClass}
INFO_HOST_PLACEHOLDER_1508={host}
INFO_PORT_PLACEHOLDER_1509={port}
INFO_BASEDN_PLACEHOLDER_1510={baseDN}

 opendj-server-legacy/src/messages/org/opends/messages/tool_zh_CN.properties

@@ -49,7 +49,6 @@
INFO_ENCPW_DESCRIPTION_CLEAR_PW_FILE_9=\u660e\u6587\u5bc6\u7801\u6587\u4ef6
INFO_ENCPW_DESCRIPTION_ENCODED_PW_10=\u8981\u4e0e\u660e\u6587\u5bc6\u7801\u8fdb\u884c\u6bd4\u8f83\u7684\u5df2\u7f16\u7801\u5bc6\u7801
INFO_ENCPW_DESCRIPTION_ENCODED_PW_FILE_11=\u5df2\u7f16\u7801\u5bc6\u7801\u6587\u4ef6
INFO_DESCRIPTION_CONFIG_CLASS_12=\u5c06\u7528\u4f5c\u76ee\u5f55\u670d\u52a1\u5668\u914d\u7f6e\u5904\u7406\u7a0b\u5e8f\u7684 Java \u7c7b\u7684\u5168\u9650\u5b9a\u540d\u79f0\u3002\u5982\u679c\u672a\u63d0\u4f9b\u6b64\u540d\u79f0\uff0c\u5219\u5c06\u4f7f\u7528\u9ed8\u8ba4\u503c org.opends.server.extensions.ConfigFileHandler
INFO_DESCRIPTION_CONFIG_FILE_13=\u76ee\u5f55\u670d\u52a1\u5668\u914d\u7f6e\u6587\u4ef6\u7684\u8def\u5f84
INFO_ENCPW_DESCRIPTION_SCHEME_14=\u7528\u4e8e\u5df2\u7f16\u7801\u5bc6\u7801\u7684\u65b9\u6848
ERR_CANNOT_INITIALIZE_ARGS_16=\u5728\u5c1d\u8bd5\u521d\u59cb\u5316\u547d\u4ee4\u884c\u53c2\u6570\u65f6\u51fa\u73b0\u610f\u5916\u9519\u8bef: %s
@@ -986,7 +985,6 @@
INFO_KEYSTOREPATH_PLACEHOLDER_1504={keyStorePath}
INFO_TRUSTSTOREPATH_PLACEHOLDER_1505={trustStorePath}
INFO_BINDPWD_FILE_PLACEHOLDER_1506={bindPasswordFile}
INFO_CONFIGCLASS_PLACEHOLDER_1507={configClass}
INFO_HOST_PLACEHOLDER_1508={host}
INFO_PORT_PLACEHOLDER_1509={port}
INFO_BASEDN_PLACEHOLDER_1510={baseDN}

 opendj-server-legacy/src/messages/org/opends/messages/tool_zh_TW.properties

@@ -49,7 +49,6 @@
INFO_ENCPW_DESCRIPTION_CLEAR_PW_FILE_9=\u7d14\u6587\u5b57\u5bc6\u78bc\u6a94\u6848
INFO_ENCPW_DESCRIPTION_ENCODED_PW_10=\u8981\u8207\u7d14\u6587\u5b57\u5bc6\u78bc\u6bd4\u8f03\u7684\u5df2\u7de8\u78bc\u5bc6\u78bc
INFO_ENCPW_DESCRIPTION_ENCODED_PW_FILE_11=\u5df2\u7de8\u78bc\u7684\u5bc6\u78bc\u6a94\u6848
INFO_DESCRIPTION_CONFIG_CLASS_12=\u7576\u4f5c\u76ee\u9304\u4f3a\u670d\u5668\u914d\u7f6e\u8655\u7406\u7a0b\u5f0f\u4f7f\u7528\u7684\u5b8c\u5168\u5408\u683c Java \u985e\u5225\u540d\u7a31\u3002\u82e5\u672a\u63d0\u4f9b\u6b64\u540d\u7a31\uff0c\u5c07\u6703\u4f7f\u7528\u9810\u8a2d\u503c org.opends.server.extensions.ConfigFileHandler
INFO_DESCRIPTION_CONFIG_FILE_13=\u76ee\u9304\u4f3a\u670d\u5668\u914d\u7f6e\u6a94\u6848\u7684\u8def\u5f91
INFO_ENCPW_DESCRIPTION_SCHEME_14=\u8981\u7528\u65bc\u5df2\u7de8\u78bc\u5bc6\u78bc\u7684\u6a5f\u5236
ERR_CANNOT_INITIALIZE_ARGS_16=\u5617\u8a66\u521d\u59cb\u5316\u6307\u4ee4\u884c\u5f15\u6578\u6642\uff0c\u767c\u751f\u672a\u9810\u671f\u7684\u932f\u8aa4: %s
@@ -984,7 +983,6 @@
INFO_KEYSTOREPATH_PLACEHOLDER_1504={keyStorePath}
INFO_TRUSTSTOREPATH_PLACEHOLDER_1505={trustStorePath}
INFO_BINDPWD_FILE_PLACEHOLDER_1506={bindPasswordFile}
INFO_CONFIGCLASS_PLACEHOLDER_1507={configClass}
INFO_HOST_PLACEHOLDER_1508={host}
INFO_PORT_PLACEHOLDER_1509={port}
INFO_BASEDN_PLACEHOLDER_1510={baseDN}

 opendj-server-legacy/src/test/java/org/opends/server/ServerContextBuilder.java

@@ -81,8 +81,7 @@
  public ServerContextBuilder withConfigurationBootstrapped()
      throws InitializationException
  {
    final ConfigurationHandler configHandler =
        ConfigurationHandler.bootstrapConfiguration(serverContext, ConfigurationHandler.class);
    final ConfigurationHandler configHandler = ConfigurationHandler.bootstrapConfiguration(serverContext);
    final ServerManagementContext serverManagementContext = new ServerManagementContext(configHandler);
    when(serverContext.getServerManagementContext()).thenReturn(serverManagementContext);
    return this;

 opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java

@@ -47,7 +47,6 @@
import org.opends.server.backends.pluggable.EntryContainer;
import org.opends.server.backends.pluggable.RootContainer;
import org.opends.server.core.AddOperation;
import org.opends.server.core.ConfigurationHandler;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.*;
@@ -417,7 +416,6 @@
      config.setInstanceRoot(testInstanceRoot);

      config.setForceDaemonThreads(true);
      config.setConfigClass(ConfigurationHandler.class);
      config.setConfigFile(new File(testConfigDir, "config.ldif"));

      ConfigurationFramework configurationFramework = ConfigurationFramework.getInstance();

 opendj-server-legacy/src/test/java/org/opends/server/core/ConfigurationHandlerTestCase.java

@@ -83,7 +83,7 @@
        configFile(configFile).
        build();

    return ConfigurationHandler.bootstrapConfiguration(context, ConfigurationHandler.class);
    return ConfigurationHandler.bootstrapConfiguration(context);
  }

  @Test

 opendj-server-legacy/tests/installer.xml

@@ -12,6 +12,7 @@
  information: "Portions Copyright [year] [name of copyright owner]".

  Copyright 2006-2008 Sun Microsystems, Inc.
  Portions Copyright 2016 ForgeRock AS.
 ! -->

<project name="opends-tests-installer" basedir="." default="usage">
@@ -105,8 +106,6 @@
        
        <!-- provide the arguments here -->
        <jvmarg value="-Dorg.opends.server.scriptName=configure-ds"/>
        <arg value="--configClass"/>
        <arg value="org.opends.server.extensions.ConfigFileHandler"/>
        <arg value="--configFile"/>
        <arg value="${full.install.dir}/config/config.ldif"/>
        <arg line="-p ${port.ldap}"/>