OPENDJ-3476 Remove getters for core configuration from DirectoryServer class

Nicolas Capponi

21.17.2016 58df6f18fee34844ed7a92a84379e3ec2bebed6d

OPENDJ-3476 Remove getters for core configuration from DirectoryServer class

 opendj-server-legacy/src/main/java/org/forgerock/opendj/reactive/LDAPClientConnection2.java

@@ -223,7 +223,7 @@
        statTracker = this.connectionHandler.getStatTracker();
        if (keepStats) {
            statTracker.updateConnect();
            this.useNanoTime = DirectoryServer.getUseNanoTime();
            this.useNanoTime = DirectoryServer.getCoreConfigManager().isUseNanoTime();
        } else {
            this.useNanoTime = false;
        }
@@ -427,7 +427,7 @@
            // case, log a message and set the response to "operations error".
            logger.error(ERR_LDAP_CLIENT_SEND_RESPONSE_NO_RESULT_CODE, operation.getOperationType(),
                    operation.getConnectionID(), operation.getOperationID());
            resultCode = DirectoryServer.getServerErrorResultCode();
            resultCode = DirectoryServer.getCoreConfigManager().getServerErrorResultCode();
        }

        LocalizableMessageBuilder errorMessage = operation.getErrorMessage();
@@ -685,7 +685,7 @@
        case SERVER_SHUTDOWN:
            return LDAPResultCode.UNAVAILABLE;
        case SERVER_ERROR:
            return DirectoryServer.getServerErrorResultCode().intValue();
            return DirectoryServer.getCoreConfigManager().getServerErrorResultCode().intValue();
        case ADMIN_LIMIT_EXCEEDED:
        case IDLE_TIME_LIMIT_EXCEEDED:
        case MAX_REQUEST_SIZE_EXCEEDED:
@@ -775,7 +775,7 @@
            logger.traceException(e);

            LocalizableMessage message = WARN_LDAP_CLIENT_CANNOT_ENQUEUE.get(getExceptionMessage(e));
            throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
            throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
        }
    }


 opendj-server-legacy/src/main/java/org/forgerock/opendj/reactive/LDAPConnectionHandler2.java

@@ -879,7 +879,7 @@
            return sslEngine;
        } catch (Exception e) {
            logger.traceException(e);
            ResultCode resCode = DirectoryServer.getServerErrorResultCode();
            ResultCode resCode = DirectoryServer.getCoreConfigManager().getServerErrorResultCode();
            LocalizableMessage message = ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE.get(getExceptionMessage(e));
            throw new DirectoryException(resCode, message, e);
        }
@@ -937,7 +937,7 @@
            return sslContext;
        } catch (Exception e) {
            logger.traceException(e);
            ResultCode resCode = DirectoryServer.getServerErrorResultCode();
            ResultCode resCode = DirectoryServer.getCoreConfigManager().getServerErrorResultCode();
            LocalizableMessage message = ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE.get(getExceptionMessage(e));
            throw new DirectoryException(resCode, message, e);
        }

 opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicy.java

@@ -120,7 +120,7 @@
        else
        {
          throw new DirectoryException(
              DirectoryServer.getServerErrorResultCode(), message);
              DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
        }
      }


 opendj-server-legacy/src/main/java/org/opends/server/api/ClientConnection.java

@@ -34,6 +34,7 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.core.AuthenticatedUsers;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PersistentSearch;
import org.opends.server.core.PluginConfigManager;
@@ -138,10 +139,11 @@
    saslBindInProgress = new AtomicBoolean(false);
    bindInProgress     = new AtomicBoolean(false);
    startTLSInProgress = new AtomicBoolean(false);
    sizeLimit          = DirectoryServer.getSizeLimit();
    timeLimit          = DirectoryServer.getTimeLimit();
    CoreConfigManager coreConfigManager = DirectoryServer.getCoreConfigManager();
    sizeLimit          = coreConfigManager.getSizeLimit();
    timeLimit          = coreConfigManager.getTimeLimit();
    idleTimeLimit      = DirectoryServer.getIdleTimeLimit();
    lookthroughLimit   = DirectoryServer.getLookthroughLimit();
    lookthroughLimit   = coreConfigManager.getLookthroughLimit();
    finalized          = false;
  }


 opendj-server-legacy/src/main/java/org/opends/server/api/CompressedSchema.java

@@ -205,7 +205,7 @@
    final AttributeDescription ad = mappings.adDecodeMap.get(adId);
    if (ad == null)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_COMPRESSEDSCHEMA_UNRECOGNIZED_AD_TOKEN.get(adId));
    }

@@ -258,7 +258,7 @@
    Map<ObjectClass, String> ocMap = mappings.ocDecodeMap.get(ocId);
    if (ocMap == null)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_COMPRESSEDSCHEMA_UNKNOWN_OC_TOKEN.get(ocId));
    }
    return ocMap;

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

@@ -417,7 +417,7 @@
    // If the requested entry was null, then throw an exception.
    if (entryDN == null)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_BACKEND_GET_ENTRY_NULL.get(getBackendID()));
    }

@@ -501,7 +501,7 @@

      LocalizableMessage message =
          ERR_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY.get(getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   message);
    }

@@ -569,7 +569,7 @@

      LocalizableMessage message = ERR_BACKUP_ERROR_GETTING_BACKUP_DIRECTORY
          .get(getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          message);
    }


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

@@ -298,7 +298,7 @@
  {
    if (entryDN == null)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_BACKEND_GET_ENTRY_NULL.get(getBackendID()));
    }
    throw new RuntimeException("Not implemented");

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

@@ -221,7 +221,7 @@
                       stackTraceToSingleLineString(e));
      DirectoryServer.sendAlertNotification(this,
                           ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }

@@ -243,7 +243,7 @@
                         stackTraceToSingleLineString(e));
        DirectoryServer.sendAlertNotification(this,
                             ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     m, e);
      }
    }
@@ -264,7 +264,7 @@
                       stackTraceToSingleLineString(e));
      DirectoryServer.sendAlertNotification(this,
                           ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }

@@ -276,7 +276,7 @@
                       currentConfig.dn());
      DirectoryServer.sendAlertNotification(this,
                           ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), m);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), m);
    }

    if (tempFile.exists())
@@ -320,7 +320,7 @@
                       stackTraceToSingleLineString(e));
      DirectoryServer.sendAlertNotification(this,
                           ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }
  }
@@ -982,7 +982,7 @@
        {
          LocalizableMessage m =
              ERR_LDIF_BACKEND_CANNOT_WRITE_ENTRY_TO_LDIF.get(entryDN, stackTraceToSingleLineString(e));
          throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), m, e);
          throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), m, e);
        }
      }
    }
@@ -1006,7 +1006,7 @@
    {
      logger.traceException(e);
      LocalizableMessage m = ERR_LDIF_BACKEND_CANNOT_CREATE_LDIF_WRITER.get(stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), m, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), m, e);
    }
  }

@@ -1058,7 +1058,7 @@
              LocalizableMessage m = ERR_LDIF_BACKEND_ERROR_READING_LDIF.get(
                               stackTraceToSingleLineString(le));
              throw new DirectoryException(
                             DirectoryServer.getServerErrorResultCode(), m, le);
                             DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), m, le);
            }
            continue;
          }
@@ -1132,7 +1132,7 @@
      catch (Exception e)
      {
        LocalizableMessage m = ERR_LDIF_BACKEND_ERROR_READING_LDIF.get(stackTraceToSingleLineString(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), m, e);
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), m, e);
      }
    }
    finally
@@ -1162,7 +1162,7 @@
    catch (Exception e)
    {
      LocalizableMessage m = ERR_LDIF_BACKEND_CANNOT_CREATE_LDIF_READER.get(stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), m, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), m, e);
    }
  }


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

@@ -583,7 +583,7 @@
    {
      logger.traceException(e);

      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_WRITER.get(e), e);
    }

@@ -599,7 +599,7 @@
    }
    catch (Exception e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_MEMORYBACKEND_CANNOT_WRITE_ENTRY_TO_LDIF.get(entryDN, e), e);
    }
    finally
@@ -632,7 +632,7 @@
        {
          if (! le.canContinueReading())
          {
            throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
            throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                ERR_MEMORYBACKEND_ERROR_READING_LDIF.get(e), le);
          }
          continue;
@@ -658,7 +658,7 @@
    }
    catch (Exception e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_MEMORYBACKEND_ERROR_DURING_IMPORT.get(e), e);
    }
  }
@@ -671,7 +671,7 @@
    }
    catch (Exception e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_READER.get(e), e);
    }
  }

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

@@ -142,7 +142,7 @@

      ccr.addMessage(ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY.get(
          configEntryDN, stackTraceToSingleLineString(e)));
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }

    userDefinedAttributes = userAttrs;
@@ -252,7 +252,7 @@
      {
        logger.traceException(e);
        final LocalizableMessage message = ERR_MONITOR_UNABLE_TO_EXPORT_BASE.get(stackTraceToSingleLineString(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
      }

      // Get all the monitor providers, convert them to entries, and write them to LDIF.
@@ -268,7 +268,7 @@
          final LocalizableMessage message =
              ERR_MONITOR_UNABLE_TO_EXPORT_PROVIDER_ENTRY.get(monitorProvider.getMonitorInstanceName(),
                  stackTraceToSingleLineString(e));
          throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
          throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
        }
      }
    }
@@ -289,7 +289,7 @@
      logger.traceException(e);

      final LocalizableMessage message = ERR_ROOTDSE_UNABLE_TO_CREATE_LDIF_WRITER.get(stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
    }
  }

@@ -319,7 +319,7 @@
    // If the requested entry was null, then throw an exception.
    if (entryDN == null)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_BACKEND_GET_ENTRY_NULL.get(getBackendID()));
    }


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

@@ -371,7 +371,7 @@
  private DirectoryException newDirectoryException(Exception e)
  {
    LocalizableMessage message = LocalizableMessage.raw(e.getMessage());
    return new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
    return new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
  }

  private LDIFReader getReader(LDIFImportConfig importConfig) throws DirectoryException

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

@@ -580,7 +580,7 @@

      LocalizableMessage message = ERR_ROOTDSE_UNABLE_TO_CREATE_LDIF_WRITER.get(
          stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   message);
    }

@@ -596,7 +596,7 @@

      LocalizableMessage message =
          ERR_ROOTDSE_UNABLE_TO_EXPORT_DSE.get(stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   message);
    }
    finally
@@ -671,7 +671,7 @@

      ccr.addMessage(ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY.get(
              configEntryDN, stackTraceToSingleLineString(e)));
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }

    if (ccr.getResultCode() == ResultCode.SUCCESS)

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

@@ -1573,7 +1573,7 @@

      LocalizableMessage message = ERR_SCHEMA_UNABLE_TO_CREATE_LDIF_WRITER.get(
          stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   message);
    }

@@ -1589,7 +1589,7 @@

      LocalizableMessage message =
          ERR_SCHEMA_UNABLE_TO_EXPORT_BASE.get(stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   message);
    }
    finally
@@ -1638,7 +1638,7 @@
          if (! le.canContinueReading())
          {
            throw new DirectoryException(
                DirectoryServer.getServerErrorResultCode(),
                DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                ERR_MEMORYBACKEND_ERROR_READING_LDIF.get(e), le);
          }
          continue;
@@ -1657,7 +1657,7 @@
    }
    catch (Exception e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_MEMORYBACKEND_ERROR_DURING_IMPORT.get(e), e);
    }
  }
@@ -1670,7 +1670,7 @@
    }
    catch (Exception e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_READER.get(e), e);
    }
  }
@@ -1744,7 +1744,7 @@

      ccr.addMessage(ERR_SCHEMA_CANNOT_DETERMINE_BASE_DN.get(
          configEntryDN, getExceptionMessage(e)));
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      newBaseDNs = null;
    }

@@ -1761,7 +1761,7 @@

      ccr.addMessage(ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY.get(
          configEntryDN, stackTraceToSingleLineString(e)));
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }

    if (ccr.getResultCode() == ResultCode.SUCCESS)
@@ -1791,7 +1791,7 @@
          logger.traceException(e);

          ccr.addMessage(ERR_SCHEMA_CANNOT_DEREGISTER_BASE_DN.get(dn, getExceptionMessage(e)));
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        }
      }

@@ -1808,7 +1808,7 @@
          logger.traceException(e);

          ccr.addMessage(ERR_SCHEMA_CANNOT_REGISTER_BASE_DN.get(dn, getExceptionMessage(e)));
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        }
      }


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

@@ -353,7 +353,7 @@
    // If the requested entry was null, then throw an exception.
    if (entryDN == null)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_BACKEND_GET_ENTRY_NULL.get(getBackendID()));
    }

@@ -734,7 +734,7 @@
    File f = getFileForPath(newTrustStoreFile);
    if (!f.exists() || !f.isFile())
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ERR_TRUSTSTORE_NO_SUCH_FILE.get(newTrustStoreFile, configEntryDN));
    }

@@ -755,7 +755,7 @@
      logger.traceException(kse);

      ccr.addMessage(ERR_TRUSTSTORE_INVALID_TYPE.get(newTrustStoreType, configEntryDN, getExceptionMessage(kse)));
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }

    char[] newPIN = null;
@@ -765,7 +765,7 @@
    }
    catch (InitializationException e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(e.getMessageObject());
    }

@@ -817,7 +817,7 @@

      LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_CREATE_FACTORY.get(
          trustStoreFile, getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   message, e);
    }
  }
@@ -833,7 +833,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_LOAD.get(trustStoreFile, getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
  }

@@ -866,7 +866,7 @@

      LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_CREATE_FACTORY.get(
          trustStoreFile, getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   message, e);
    }
  }
@@ -897,7 +897,7 @@

      LocalizableMessage message = ERR_TRUSTSTORE_ERROR_READING_KEY.get(
           alias, trustStoreFile, getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   message, e);
    }
  }
@@ -941,7 +941,7 @@
          LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_GENERATE_CERT.get(
              certAlias, trustStoreFile, getExceptionMessage(e));
          throw new DirectoryException(
               DirectoryServer.getServerErrorResultCode(), message, e);
               DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
        }
      }
      else
@@ -952,7 +952,7 @@
          LocalizableMessage message =
               ERR_TRUSTSTORE_ENTRY_MISSING_CERT_ATTR.get(entryDN, ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE);
          throw new DirectoryException(
               DirectoryServer.getServerErrorResultCode(), message);
               DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
        }
        Attribute certAttr = certAttrs.next();
        if (certAttrs.hasNext())
@@ -960,7 +960,7 @@
          LocalizableMessage message =
               ERR_TRUSTSTORE_ENTRY_HAS_MULTIPLE_CERT_ATTRS.get(entryDN, ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE);
          throw new DirectoryException(
               DirectoryServer.getServerErrorResultCode(), message);
               DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
        }

        Iterator<ByteString> i = certAttr.iterator();
@@ -970,7 +970,7 @@
          LocalizableMessage message =
               ERR_TRUSTSTORE_ENTRY_MISSING_CERT_VALUE.get(entryDN, ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE);
          throw new DirectoryException(
               DirectoryServer.getServerErrorResultCode(), message);
               DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
        }

        ByteString certBytes = i.next();
@@ -980,7 +980,7 @@
          LocalizableMessage message =
               ERR_TRUSTSTORE_ENTRY_HAS_MULTIPLE_CERT_VALUES.get(entryDN, ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE);
          throw new DirectoryException(
               DirectoryServer.getServerErrorResultCode(), message);
               DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
        }

        try
@@ -1007,7 +1007,7 @@
          LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_WRITE_CERT.get(
              certAlias, getExceptionMessage(e));
          throw new DirectoryException(
               DirectoryServer.getServerErrorResultCode(), message, e);
               DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
        }
      }
    }
@@ -1016,7 +1016,7 @@
      LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_ADD_CERT.get(
           certAlias, trustStoreFile, getExceptionMessage(e));
      throw new DirectoryException(
           DirectoryServer.getServerErrorResultCode(), message, e);
           DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
  }

@@ -1048,7 +1048,7 @@
      LocalizableMessage message = ERR_TRUSTSTORE_CANNOT_DELETE_CERT.get(
           certAlias, trustStoreFile, getExceptionMessage(e));
      throw new DirectoryException(
           DirectoryServer.getServerErrorResultCode(), message, e);
           DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
  }


 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/JEStorage.java

@@ -1143,7 +1143,7 @@
    catch(IOException e)
    {
      LocalizableMessage msg = ERR_CANNOT_RENAME_RESTORE_DIRECTORY.get(restoreDirectory, targetDirectory.getPath());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), msg);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), msg);
    }
  }


 opendj-server-legacy/src/main/java/org/opends/server/backends/pdb/PDBStorage.java

@@ -1116,7 +1116,7 @@
    }
    catch (Exception e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_BACKEND_LIST_FILES_TO_BACKUP.get(config.getBackendId(), stackTraceToSingleLineString(e)));
    }
  }
@@ -1169,7 +1169,7 @@
    catch(IOException e)
    {
      LocalizableMessage msg = ERR_CANNOT_RENAME_RESTORE_DIRECTORY.get(restoreDirectory, targetDirectory.getPath());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), msg);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), msg);
    }
  }

@@ -1187,7 +1187,7 @@
    }
    catch (RemoteException e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_BACKEND_SWITCH_TO_APPEND_MODE.get(config.getBackendId(), stackTraceToSingleLineString(e)));
    }
  }
@@ -1206,7 +1206,7 @@
    }
    catch (RemoteException e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_BACKEND_END_APPEND_MODE.get(config.getBackendId(), stackTraceToSingleLineString(e)));
    }
  }

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

@@ -976,7 +976,7 @@
    }
    catch (Exception e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(e)));
    }


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

@@ -18,7 +18,6 @@

import static org.forgerock.util.Reject.*;
import static org.opends.messages.BackendMessages.*;
import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;

@@ -369,7 +368,8 @@
    }
    catch (Exception e)
    {
      throw new DirectoryException(getServerErrorResultCode(), LocalizableMessage.raw(e.getMessage()), e);
      throw new DirectoryException(
          serverContext.getCoreConfigManager().getServerErrorResultCode(), LocalizableMessage.raw(e.getMessage()), e);
    }
    finally
    {
@@ -580,7 +580,7 @@
    if (rootContainer == null)
    {
      LocalizableMessage msg = ERR_ROOT_CONTAINER_NOT_INITIALIZED.get(getBackendID());
      throw new DirectoryException(getServerErrorResultCode(), msg);
      throw new DirectoryException(serverContext.getCoreConfigManager().getServerErrorResultCode(), msg);
    }
  }

@@ -603,7 +603,8 @@
    }
    catch (IOException ioe)
    {
      throw new DirectoryException(getServerErrorResultCode(), ERR_EXPORT_IO_ERROR.get(ioe.getMessage()), ioe);
      throw new DirectoryException(serverContext.getCoreConfigManager()
          .getServerErrorResultCode(), ERR_EXPORT_IO_ERROR.get(ioe.getMessage()), ioe);
    }
    catch (StorageRuntimeException de)
    {
@@ -611,7 +612,8 @@
    }
    catch (ConfigException | InitializationException | LDIFException e)
    {
      throw new DirectoryException(getServerErrorResultCode(), e.getMessageObject(), e);
      throw new DirectoryException(
          serverContext.getCoreConfigManager().getServerErrorResultCode(), e.getMessageObject(), e);
    }
    finally
    {
@@ -634,7 +636,8 @@
    // We can't do import while the backend is online.
    if (rootContainer != null)
    {
      throw new DirectoryException(getServerErrorResultCode(), ERR_IMPORT_BACKEND_ONLINE.get());
      throw new DirectoryException(
          serverContext.getCoreConfigManager().getServerErrorResultCode(), ERR_IMPORT_BACKEND_ONLINE.get());
    }

    try
@@ -649,7 +652,8 @@
      }
      catch (Exception e)
      {
        throw new DirectoryException(getServerErrorResultCode(), ERR_REMOVE_FAIL.get(e.getMessage()), e);
        throw new DirectoryException(
            serverContext.getCoreConfigManager().getServerErrorResultCode(), ERR_REMOVE_FAIL.get(e.getMessage()), e);
      }
      rootContainer = newRootContainer(AccessMode.READ_WRITE);
      rootContainer.getStorage().close();
@@ -746,7 +750,8 @@
     */
    if (!openRootContainer && rebuildConfig.includesSystemIndex())
    {
      throw new DirectoryException(getServerErrorResultCode(), ERR_REBUILD_BACKEND_ONLINE.get());
      throw new DirectoryException(
          serverContext.getCoreConfigManager().getServerErrorResultCode(), ERR_REBUILD_BACKEND_ONLINE.get());
    }

    try
@@ -849,7 +854,7 @@
    }
    catch (Exception e)
    {
      ccr.setResultCode(getServerErrorResultCode());
      ccr.setResultCode(serverContext.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(LocalizableMessage.raw(stackTraceToSingleLineString(e)));
    }
    return ccr;
@@ -887,7 +892,7 @@
        {
          logger.traceException(e);

          ccr.setResultCode(getServerErrorResultCode());
          ccr.setResultCode(serverContext.getCoreConfigManager().getServerErrorResultCode());
          ccr.addMessage(ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(baseDN, e));
          return false;
        }
@@ -944,9 +949,11 @@
    }
    if (e instanceof LocalizableException)
    {
      return new DirectoryException(getServerErrorResultCode(), ((LocalizableException) e).getMessageObject());
      return new DirectoryException(serverContext
          .getCoreConfigManager().getServerErrorResultCode(), ((LocalizableException) e).getMessageObject());
    }
    return new DirectoryException(getServerErrorResultCode(), LocalizableMessage.raw(e.getMessage()), e);
    return new DirectoryException(serverContext
        .getCoreConfigManager().getServerErrorResultCode(), LocalizableMessage.raw(e.getMessage()), e);
  }

  private RootContainer newRootContainer(AccessMode accessMode)

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

@@ -216,7 +216,7 @@
      }
      catch(Exception e)
      {
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(LocalizableMessage.raw(e.getLocalizedMessage()));
      }
      return ccr;
@@ -250,7 +250,7 @@
      }
      catch (Exception de)
      {
        ccr.setResultCode(getServerErrorResultCode());
        ccr.setResultCode(getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(de)));
      }
      finally
@@ -300,7 +300,7 @@
      }
      catch(Exception e)
      {
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(e)));
      }
      return ccr;
@@ -331,7 +331,7 @@
      }
      catch (Exception e)
      {
        ccr.setResultCode(getServerErrorResultCode());
        ccr.setResultCode(getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(e)));
      }
      finally
@@ -1506,7 +1506,7 @@
              msg = stackTraceToSingleLineString(e);
            }
            throw new DirectoryException(
                DirectoryServer.getServerErrorResultCode(), ERR_UNCHECKED_EXCEPTION.get(msg), e);
                DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), ERR_UNCHECKED_EXCEPTION.get(msg), e);
          }
        }
      });
@@ -1660,7 +1660,7 @@
                final EntryID entryID = new EntryID(entryIDLong);
                if (!cursor.positionToKey(entryID.toByteString()))
                {
                  throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                  throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                               ERR_MISSING_ID2ENTRY_RECORD.get(entryID));
                }
                final Entry entry = cursor.getValue();
@@ -1705,7 +1705,7 @@
              msg = stackTraceToSingleLineString(e);
            }
            throw new DirectoryException(
                DirectoryServer.getServerErrorResultCode(), ERR_UNCHECKED_EXCEPTION.get(msg), e);
                DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), ERR_UNCHECKED_EXCEPTION.get(msg), e);
          }
        }

@@ -1717,7 +1717,7 @@
                    getPluginConfigManager().invokeSubordinateDeletePlugins(deleteOperation, entry);
            if (!pluginResult.continueProcessing())
            {
              throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
              throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                           ERR_DELETE_ABORTED_BY_SUBORDINATE_PLUGIN.get(entry.getName()));
            }
          }
@@ -1916,7 +1916,7 @@
              msg = stackTraceToSingleLineString(e);
            }
            throw new DirectoryException(
                DirectoryServer.getServerErrorResultCode(), ERR_UNCHECKED_EXCEPTION.get(msg), e);
                DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), ERR_UNCHECKED_EXCEPTION.get(msg), e);
          }
        }
      });
@@ -2049,7 +2049,7 @@
              msg = stackTraceToSingleLineString(e);
            }
            throw new DirectoryException(
                DirectoryServer.getServerErrorResultCode(), ERR_UNCHECKED_EXCEPTION.get(msg), e);
                DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), ERR_UNCHECKED_EXCEPTION.get(msg), e);
          }
        }

@@ -2066,7 +2066,7 @@
          final EntryID newEntryID = new EntryID(renamedEntryID.getSecond());
          if (!cursor.positionToKey(oldEntryID.toByteString()))
          {
            throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
            throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                         ERR_MISSING_ID2ENTRY_RECORD.get(oldEntryID));
          }

@@ -2142,7 +2142,7 @@

            if (!pluginResult.continueProcessing())
            {
              throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
              throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                           ERR_MODIFYDN_ABORTED_BY_SUBORDINATE_PLUGIN.get(oldEntry.getName(),
                                                                                          newEntry.getName()));
            }
@@ -2152,7 +2152,7 @@
              LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
              if (!newEntry.conformsToSchema(null, false, false, false, invalidReason))
              {
                throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                             ERR_MODIFYDN_ABORTED_BY_SUBORDINATE_SCHEMA_ERROR.get(oldEntry.getName(),
                                                                                                  newEntry.getName(),
                                                                                                  invalidReason));
@@ -2430,7 +2430,7 @@
    }
    catch (Exception e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(LocalizableMessage.raw(stackTraceToSingleLineString(e)));
    }
    finally
@@ -2562,7 +2562,7 @@
      catch (Exception e)
      {
        LocalizableMessage message = ERR_ENTRYIDSORTER_CANNOT_EXAMINE_ENTRY.get(id, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
      }
    }


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

@@ -95,7 +95,7 @@
  private static EntryCodec acquireEntryCodec()
  {
    EntryCodec codec = ENTRY_CODEC_CACHE.get();
    if (codec.maxBufferSize != getMaxInternalBufferSize())
    if (codec.maxBufferSize != getCoreConfigManager().getMaxInternalBufferSize())
    {
      // Setting has changed, so recreate the codec.
      codec = new EntryCodec();
@@ -130,7 +130,7 @@

    private EntryCodec()
    {
      this.maxBufferSize = getMaxInternalBufferSize();
      this.maxBufferSize = getCoreConfigManager().getMaxInternalBufferSize();
    }

    private void release()
@@ -464,7 +464,8 @@
    }
    catch (Exception e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), ERR_ENTRY_DATABASE_CORRUPT.get(entryID));
      throw new DirectoryException(
          DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), ERR_ENTRY_DATABASE_CORRUPT.get(entryID));
    }
  }


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

@@ -222,7 +222,7 @@
    }
    catch (final Exception e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_COMPSCHEMA_CANNOT_STORE_EX.get(e.getMessage()), e);
    }
  }

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

@@ -281,7 +281,7 @@
      catch (final StorageRuntimeException de)
      {
        ccr.addMessage(LocalizableMessage.raw(StaticUtils.stackTraceToSingleLineString(de)));
        ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      }
    }


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

@@ -176,7 +176,7 @@
   */
  public static void addErrorMessage(ConfigChangeResult ccr, LocalizableMessage message)
  {
    ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
    ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    ccr.addMessage(message);
  }


 opendj-server-legacy/src/main/java/org/opends/server/backends/task/RecurringTask.java

@@ -212,7 +212,7 @@
      logger.traceException(ie);

      LocalizableMessage message = ERR_RECURRINGTASK_CANNOT_INITIALIZE_INTERNAL.get( taskClassName, ie.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, ie);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, ie);
    }

    task.initializeTask();

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

@@ -982,7 +982,7 @@
  protected void sendNotificationEMailMessage()
          throws MessagingException
  {
    if (DirectoryServer.mailServerConfigured())
    if (DirectoryServer.getCoreConfigManager().isMailServerConfigured())
    {
      LinkedHashSet<String> recipients = new LinkedHashSet<>(notifyOnCompletion);
      if (! TaskState.isSuccessful(taskState))

 opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java

@@ -960,7 +960,8 @@
          if (!le.canContinueReading())
          {
            LocalizableMessage message = ERR_TASKS_CANNOT_EXPORT_TO_FILE.get(e);
            throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, le);
            throw new DirectoryException(
                serverContext.getCoreConfigManager().getServerErrorResultCode(), message, le);
          }
          continue;
        }
@@ -982,7 +983,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_TASKS_CANNOT_EXPORT_TO_FILE.get(e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
  }

@@ -996,7 +997,7 @@
    {
      logger.traceException(e);
      LocalizableMessage message = ERR_TASKS_CANNOT_EXPORT_TO_FILE.get(stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
    }
  }

@@ -1164,7 +1165,7 @@
      logger.traceException(e);

      ccr.addMessage(ERR_TASKBE_ERROR_GETTING_BACKING_FILE.get(getExceptionMessage(e)));
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }

    long tmpRetentionTime = configEntry.getTaskRetentionTime();

 opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java

@@ -1850,7 +1850,7 @@

      LocalizableMessage message = ERR_TASKSCHED_CANNOT_LOAD_CLASS.
          get(taskClassName, ATTR_TASK_CLASS, stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
    }

    // Instantiate the class as a task.
@@ -1865,7 +1865,7 @@

      LocalizableMessage message = ERR_TASKSCHED_CANNOT_INSTANTIATE_CLASS_AS_TASK.get(
          taskClassName, Task.class.getName());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
    }

    // Perform the necessary internal and external initialization for the task.
@@ -1879,17 +1879,17 @@

      LocalizableMessage message = ERR_TASKSCHED_CANNOT_INITIALIZE_INTERNAL.get(
          taskClassName, ie.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_TASKSCHED_CANNOT_INITIALIZE_INTERNAL.get(
          taskClassName, stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
    }

    if (!TaskState.isDone(task.getTaskState()) &&
        !DirectoryServer.getAllowedTasks().contains(taskClassName))
        !DirectoryServer.getCoreConfigManager().getAllowedTasks().contains(taskClassName))
    {
      LocalizableMessage message = ERR_TASKSCHED_NOT_ALLOWED_TASK.get(taskClassName);
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);

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

@@ -707,7 +707,7 @@
        {
          logger.traceException(e);
          LocalizableMessage message = ERR_CONFIG_FILE_WRITE_ERROR.get(entry.getName(), e);
          throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
          throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
        }
      }
    }
@@ -715,7 +715,7 @@
    {
      logger.traceException(e);
      LocalizableMessage message = ERR_CONFIG_LDIF_WRITE_ERROR.get(e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
  }

@@ -1515,7 +1515,7 @@
    {
      LocalizableMessage message =
          ERR_CONFIG_CANNOT_CALCULATE_DIGEST.get(latestFile.getAbsolutePath(), stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
  }

@@ -1535,7 +1535,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_CANNOT_CALCULATE_DIGEST.get(configFile, stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
  }


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

@@ -153,7 +153,7 @@
      // operations that have been abandoned, it may be a good idea to do so
      // to ensure that the requestor isn't left hanging.  This will be a
      // configurable option in the server.
      boolean notifyRequestor = DirectoryServer.notifyAbandonedOperations();
      boolean notifyRequestor = DirectoryServer.getCoreConfigManager().isNotifyAbandonedOperations();

      LocalizableMessage cancelReason = INFO_CANCELED_BY_ABANDON_REQUEST.get(messageID);


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

@@ -316,7 +316,7 @@
    catch (InitializationException e)
    {
      ccr.addMessage(e.getMessageObject());
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }

    return ccr;

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

@@ -189,7 +189,7 @@
    catch (InitializationException ie)
    {
      changeResult.addMessage (ie.getMessageObject());
      changeResult.setResultCode (DirectoryServer.getServerErrorResultCode());
      changeResult.setResultCode (DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      return changeResult;
    }

@@ -256,7 +256,7 @@
      catch (InitializationException ie)
      {
        changeResult.addMessage (ie.getMessageObject());
        changeResult.setResultCode (DirectoryServer.getServerErrorResultCode());
        changeResult.setResultCode (DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        return changeResult;
      }
    }

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

@@ -518,7 +518,7 @@
      if(cancelRequest == null || cancelResult == null ||
          cancelResult.getResultCode() != ResultCode.CANCELLED ||
          cancelRequest.notifyOriginalRequestor() ||
          DirectoryServer.notifyAbandonedOperations())
          DirectoryServer.getCoreConfigManager().isNotifyAbandonedOperations())
      {
        clientConnection.sendResponse(this);
      }

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

@@ -158,7 +158,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }

@@ -271,7 +271,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }


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

@@ -837,7 +837,7 @@
      {
        logger.traceException(e);

        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(ERR_CONFIG_BACKEND_UNABLE_TO_DETERMINE_ENABLED_STATE.get(backendDN,
            stackTraceToSingleLineString(e)));
        return ccr;
@@ -867,7 +867,7 @@
        {
          logger.traceException(e);

          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          ccr.addMessage(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.get(
                  className, backendDN, stackTraceToSingleLineString(e)));
          return ccr;
@@ -923,7 +923,7 @@
        logger.error(message);

        // FIXME -- Do we need to send an admin alert?
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(message);
        return false;
      }
@@ -1025,7 +1025,7 @@
      catch (Exception e)
      {
        logger.traceException(e);
        changeResult.setResultCode(DirectoryServer.getServerErrorResultCode());
        changeResult.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        changeResult.addMessage(
            ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.get(className, backendDN, stackTraceToSingleLineString(e)));
        return changeResult;
@@ -1050,7 +1050,7 @@
    catch (Exception e)
    {
      logger.traceException(e);
      changeResult.setResultCode(DirectoryServer.getServerErrorResultCode());
      changeResult.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      changeResult.addMessage(
          ERR_CONFIG_BACKEND_CANNOT_INITIALIZE.get(cfg.getJavaClass(), cfg.dn(), stackTraceToSingleLineString(e)));
      releaseSharedLock(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backend, cfg.getBackendId());

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

@@ -377,7 +377,7 @@
  @Override
  public final void setAuthFailureReason(LocalizableMessage message)
  {
    if (DirectoryServer.returnBindErrorMessages())
    if (DirectoryServer.getCoreConfigManager().isReturnBindErrorMessages())
    {
      appendErrorMessage(message);
    }

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

@@ -114,7 +114,7 @@
  @Override
  public void setAuthFailureReason(LocalizableMessage reason)
  {
    if (DirectoryServer.returnBindErrorMessages())
    if (DirectoryServer.getCoreConfigManager().isReturnBindErrorMessages())
    {
      getOperation().appendErrorMessage(reason);
    }

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

@@ -164,7 +164,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }

@@ -279,7 +279,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }


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

@@ -371,7 +371,7 @@
      if(cancelRequest == null || cancelResult == null ||
          cancelResult.getResultCode() != ResultCode.CANCELLED ||
          cancelRequest.notifyOriginalRequestor() ||
          DirectoryServer.notifyAbandonedOperations())
          DirectoryServer.getCoreConfigManager().isNotifyAbandonedOperations())
      {
        clientConnection.sendResponse(this);
      }

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

@@ -103,12 +103,12 @@
        logger.traceException(e);

        ccr.addMessage(e.getMessageObject());
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      } catch (Exception e) {
        logger.traceException(e);
        ccr.addMessage(ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
            configuration.getJavaClass(), dn, stackTraceToSingleLineString(e)));
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      }
    }

@@ -144,14 +144,14 @@
        } catch (ConfigException e) {
          logger.traceException(e);

          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          ccr.addMessage(e.getMessageObject());
        } catch (Exception e) {
          logger.traceException(e);

          ccr.addMessage(ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
              configuration.getJavaClass(), dn, stackTraceToSingleLineString(e)));
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        }
      }
    } else {

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

@@ -435,19 +435,19 @@
      if (subDNs.isEmpty())
      {
        // This is fine -- we'll just use the set of user-defined suffixes.
        return true;
      }
      else
      boolean hasError = false;
      for (DN baseDN : subDNs)
      {
        for (DN baseDN : subDNs)
        LocalBackend<?> backend = serverContext.getBackendConfigManager().findLocalBackendForEntry(baseDN);
        if (backend == null)
        {
          LocalBackend<?> backend = serverContext.getBackendConfigManager().findLocalBackendForEntry(baseDN);
          if (backend == null)
          {
            unacceptableReasons.add(WARN_ROOTDSE_NO_BACKEND_FOR_SUBORDINATE_BASE.get(baseDN));
            return false;
          }
          unacceptableReasons.add(WARN_ROOTDSE_NO_BACKEND_FOR_SUBORDINATE_BASE.get(baseDN));
          hasError = true;
        }
      }
      return !hasError;
    }
    catch (Exception e)
    {
@@ -455,7 +455,6 @@
      unacceptableReasons.add(WARN_ROOTDSE_SUBORDINATE_BASE_EXCEPTION.get(stackTraceToSingleLineString(e)));
      return false;
    }
    return true;
  }

  private void applySubordinateDNsChange(GlobalCfg cfg, CoreAttributes coreAttrs)
@@ -511,7 +510,7 @@
    }
    catch (ConfigException e)
    {
      changeResult.setResultCode(DirectoryServer.getServerErrorResultCode());
      changeResult.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      changeResult.addMessage(e.getMessageObject());
    }


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

@@ -244,7 +244,7 @@
        final LocalizableMessage message = ERR_COMPRESSEDSCHEMA_CANNOT_WRITE_UPDATED_DATA
            .get(stackTraceToSingleLineString(e));
        throw new DirectoryException(
            DirectoryServer.getServerErrorResultCode(), message, e);
            DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
      }
    }
  }

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

@@ -239,7 +239,7 @@
      if(cancelRequest == null || cancelResult == null ||
          cancelResult.getResultCode() != ResultCode.CANCELLED ||
          cancelRequest.notifyOriginalRequestor() ||
          DirectoryServer.notifyAbandonedOperations())
          DirectoryServer.getCoreConfigManager().isNotifyAbandonedOperations())
      {
        clientConnection.sendResponse(this);
      }

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

@@ -44,7 +44,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
@@ -133,7 +132,6 @@
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalConnectionHandler;
import org.opends.server.schema.SchemaHandler;
import org.opends.server.types.AcceptRejectWarn;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.Control;
import org.opends.server.types.CryptoManager;
@@ -149,7 +147,6 @@
import org.opends.server.types.Privilege;
import org.opends.server.types.RestoreConfig;
import org.opends.server.types.VirtualAttributeRule;
import org.opends.server.types.WritabilityMode;
import org.opends.server.util.BuildVersion;
import org.opends.server.util.CronExecutorService;
import org.opends.server.util.MultiOutputStream;
@@ -1577,30 +1574,6 @@
  }

  /**
   * Indicates whether the Directory Server is configured with information about
   * one or more mail servers and may therefore be used to send e-mail messages.
   *
   * @return  {@code true} if the Directory Server is configured to be able to
   *          send e-mail messages, or {@code false} if not.
   */
  public static boolean mailServerConfigured()
  {
    return getCoreConfigManager().isMailServerConfigured();
  }

  /**
   * Retrieves the sets of information about the mail servers configured for use
   * by the Directory Server.
   *
   * @return  The sets of information about the mail servers configured for use
   *          by the Directory Server.
   */
  public static List<Properties> getMailServerPropertySets()
  {
    return getCoreConfigManager().getMailServerPropertySets();
  }

  /**
   * Initializes the schema handler, which is responsible for building the complete schema for the
   * server.
   *
@@ -2552,18 +2525,6 @@
  }

  /**
   * Retrieves the DN of the configuration entry for the default password policy
   * for the Directory Server.
   *
   * @return  The DN of the configuration entry for the default password policy
   *          for the Directory Server.
   */
  public static DN getDefaultPasswordPolicyDN()
  {
    return getCoreConfigManager().getDefaultPasswordPolicyDN();
  }

  /**
   * Resets the default password policy to null.
   */
  public static void resetDefaultPasswordPolicy()
@@ -2590,20 +2551,17 @@
    {
      DN defaultPasswordPolicyDN = getCoreConfigManager().getDefaultPasswordPolicyDN();
      assert null != directoryServer.authenticationPolicies
          .get(defaultPasswordPolicyDN) :
            "Internal Error: no default password policy defined.";
          .get(defaultPasswordPolicyDN) : "Internal Error: no default password policy defined.";

      if (directoryServer.defaultPasswordPolicy == null
          && defaultPasswordPolicyDN != null)
      {
        // The correct policy type is enforced by the core config manager.
        directoryServer.defaultPasswordPolicy = (PasswordPolicy)
          directoryServer.authenticationPolicies
            .get(defaultPasswordPolicyDN);
          directoryServer.authenticationPolicies.get(defaultPasswordPolicyDN);
      }
      assert directoryServer.authenticationPolicies.get(defaultPasswordPolicyDN) ==
          directoryServer.defaultPasswordPolicy :
             "Internal Error: inconsistency between defaultPasswordPolicy"
          directoryServer.defaultPasswordPolicy : "Internal Error: inconsistency between defaultPasswordPolicy"
          + " cache and value in authenticationPolicies map.";
      return directoryServer.defaultPasswordPolicy;
    }
@@ -3041,100 +2999,6 @@
  }

  /**
   * Retrieves the result code that should be used when the Directory Server
   * encounters an internal server error.
   *
   * @return  The result code that should be used when the Directory Server
   *          encounters an internal server error.
   */
  public static ResultCode getServerErrorResultCode()
  {
    return getCoreConfigManager().getServerErrorResultCode();
  }

  /**
   * Indicates whether the Directory Server should automatically add missing RDN
   * attributes to an entry whenever it is added.
   *
   * @return  <CODE>true</CODE> if the Directory Server should automatically add
   *          missing RDN attributes to an entry, or <CODE>false</CODE> if it
   *          should return an error to the client.
   */
  public static boolean addMissingRDNAttributes()
  {
    return getCoreConfigManager().isAddMissingRDNAttributes();
  }

  /**
   * Indicates whether to be more flexible in the set of characters allowed for
   * attribute names.  The standard requires that only ASCII alphabetic letters,
   * numeric digits, and hyphens be allowed, and that the name start with a
   * letter.  If attribute name exceptions are enabled, then underscores will
   * also be allowed, and the name will be allowed to start with a digit.
   *
   * @return  <CODE>true</CODE> if the server should use a more flexible
   *          syntax for attribute names, or <CODE>false</CODE> if not.
   * @deprecated The schema option SchemaOptions.ALLOW_MALFORMED_NAMES_AND_OPTIONS from the
   *  schema should be used instead
   */
  @Deprecated
  public static boolean allowAttributeNameExceptions()
  {
    return getCoreConfigManager().isAllowAttributeNameExceptions();
  }

  /**
   * Indicates whether the Directory Server should perform schema checking.
   *
   * @return  <CODE>true</CODE> if the Directory Server should perform schema
   *          checking, or <CODE>false</CODE> if not.
   */
  public static boolean checkSchema()
  {
    return getCoreConfigManager().isCheckSchema();
  }

  /**
   * Retrieves the policy that should be used regarding enforcement of a single
   * structural objectclass per entry.
   *
   * @return  The policy that should be used regarding enforcement of a single
   *          structural objectclass per entry.
   */
  public static AcceptRejectWarn getSingleStructuralObjectClassPolicy()
  {
    return getCoreConfigManager().getSingleStructuralObjectClassPolicy();
  }

  /**
   * Retrieves the policy that should be used when an attribute value is found
   * that is not valid according to the associated attribute syntax.
   *
   * @return  The policy that should be used when an attribute value is found
   *          that is not valid according to the associated attribute syntax.
   */
  public static AcceptRejectWarn getSyntaxEnforcementPolicy()
  {
    return getCoreConfigManager().getSyntaxEnforcementPolicy();
  }

  /**
   * Indicates whether the Directory Server should send a response to an
   * operation that has been abandoned.  Sending such a response is technically
   * a violation of the LDAP protocol specification, but not doing so in that
   * case can cause problems with clients that are expecting a response and may
   * hang until they get one.
   *
   * @return  <CODE>true</CODE> if the Directory Server should send a response
   *          to an operation that has been abandoned, or <CODE>false</CODE> if
   *          not.
   */
  public static boolean notifyAbandonedOperations()
  {
    return getCoreConfigManager().isNotifyAbandonedOperations();
  }

  /**
   * Retrieves the DN of the entry containing the server schema definitions.
   *
   * @return  The DN of the entry containing the server schema definitions, or
@@ -3843,24 +3707,17 @@
    directoryServer.synchronizationProviders.remove(provider);
  }

  /**
   * Returns the core configuration manager.
   *
   * @return the core config manager
   */
  public static CoreConfigManager getCoreConfigManager()
  {
    return directoryServer.coreConfigManager;
  }

  /**
   * Retrieves a set containing the names of the allowed tasks that may be
   * invoked in the server.
   *
   * @return  A set containing the names of the allowed tasks that may be
   *          invoked in the server.
   */
  public static Set<String> getAllowedTasks()
  {
    return getCoreConfigManager().getAllowedTasks();
  }

  /**
   * Indicates whether the specified privilege is disabled.
   *
   * @param  privilege  The privilege for which to make the determination.
@@ -3874,18 +3731,6 @@
  }

  /**
   * Indicates whether responses to failed bind operations should include a
   * message explaining the reason for the failure.
   *
   * @return  {@code true} if bind responses should include error messages, or
   *          {@code false} if not.
   */
  public static boolean returnBindErrorMessages()
  {
    return getCoreConfigManager().isReturnBindErrorMessages();
  }

  /**
   * Retrieves the maximum length of time in milliseconds that client
   * connections should be allowed to remain idle without being disconnected.
   *
@@ -4696,30 +4541,6 @@
  }

  /**
   * Retrieves the default maximum number of entries that should be returned for
   * a search.
   *
   * @return  The default maximum number of entries that should be returned for
   *          a search.
   */
  public static int getSizeLimit()
  {
    return getCoreConfigManager().getSizeLimit();
  }

  /**
   * Retrieves the default maximum number of entries that should checked for
   * matches during a search.
   *
   * @return  The default maximum number of entries that should checked for
   *          matches during a search.
   */
  public static int getLookthroughLimit()
  {
    return getCoreConfigManager().getLookthroughLimit();
  }

  /**
   *  Registers a new persistent search by increasing the count
   *  of active persistent searches. After receiving a persistent
   *  search request, a Local or Remote WFE must call this method to
@@ -4756,55 +4577,6 @@
  }

  /**
   * Retrieves the default maximum length of time in seconds that should be
   * allowed when processing a search.
   *
   * @return  The default maximum length of time in seconds that should be
   *          allowed when processing a search.
   */
  public static int getTimeLimit()
  {
    return getCoreConfigManager().getTimeLimit();
  }

  /**
   * Retrieves whether operation processing times should be collected with
   * nanosecond resolution.
   *
   * @return  <code>true</code> if nanosecond resolution times are collected
   *          or <code>false</code> if only millisecond resolution times are
   *          being collected.
   */
  public static boolean getUseNanoTime()
  {
    return getCoreConfigManager().isUseNanoTime();
  }

  /**
   * Retrieves the writability mode for the Directory Server.  This will only
   * be applicable for user suffixes.
   *
   * @return  The writability mode for the Directory Server.
   */
  public static WritabilityMode getWritabilityMode()
  {
    return getCoreConfigManager().getWritabilityMode();
  }

  /**
   * Indicates whether simple bind requests that contain a bind DN will also be
   * required to have a password.
   *
   * @return  <CODE>true</CODE> if simple bind requests containing a bind DN
   *          will be required to have a password, or <CODE>false</CODE> if not
   *          (and therefore will be treated as anonymous binds).
   */
  public static boolean bindWithDNRequiresPassword()
  {
    return getCoreConfigManager().isBindWithDNRequiresPassword();
  }

  /**
   * Indicates whether the Directory Server is currently configured to operate
   * in the lockdown mode, in which all non-root requests will be rejected and
   * all connection attempts from non-loopback clients will be rejected.
@@ -5511,20 +5283,6 @@
  }

  /**
   * Returns the threshold capacity beyond which internal cached buffers used
   * for encoding and decoding entries and protocol messages will be trimmed
   * after use.
   *
   * @return The threshold capacity beyond which internal cached buffers used
   *         for encoding and decoding entries and protocol messages will be
   *         trimmed after use.
   */
  public static int getMaxInternalBufferSize()
  {
    return getCoreConfigManager().getMaxInternalBufferSize();
  }

  /**
   * Returns the lock manager which will be used for coordinating access to LDAP entries.
   *
   * @return the lock manager which will be used for coordinating access to LDAP entries.

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

@@ -301,7 +301,7 @@
    catch (InitializationException ie)
    {
      changeResult.addMessage (ie.getMessageObject());
      changeResult.setResultCode (DirectoryServer.getServerErrorResultCode());
      changeResult.setResultCode (DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      return changeResult;
    }

@@ -364,7 +364,7 @@
      catch (InitializationException ie)
      {
        changeResult.addMessage (ie.getMessageObject());
        changeResult.setResultCode (DirectoryServer.getServerErrorResultCode());
        changeResult.setResultCode (DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        return changeResult;
      }
    }

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

@@ -354,7 +354,7 @@
      if(cancelRequest == null || cancelResult == null ||
          cancelResult.getResultCode() != ResultCode.CANCELLED ||
          cancelRequest.notifyOriginalRequestor() ||
          DirectoryServer.notifyAbandonedOperations())
          DirectoryServer.getCoreConfigManager().isNotifyAbandonedOperations())
      {
        clientConnection.sendResponse(this);
      }

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

@@ -164,13 +164,13 @@
          logger.traceException(e);

          ccr.addMessage(e.getMessageObject());
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        } catch (Exception e) {
          logger.traceException(e);

          ccr.addMessage(ERR_CONFIG_EXTOP_INITIALIZATION_FAILED.get(
              configuration.getJavaClass(), dn, stackTraceToSingleLineString(e)));
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        }
      }
    } else {
@@ -232,7 +232,7 @@
        logger.traceException(e);

        ccr.addMessage(e.getMessageObject());
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      }
      catch (Exception e)
      {
@@ -240,7 +240,7 @@

        ccr.addMessage(ERR_CONFIG_EXTOP_INITIALIZATION_FAILED.get(
            configuration.getJavaClass(), dn, stackTraceToSingleLineString(e)));
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      }
    }


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

@@ -227,7 +227,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }

@@ -369,7 +369,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }


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

@@ -167,13 +167,13 @@
    }
    catch (HttpApplicationException e)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ERR_CONFIG_HTTPENDPOINT_UNABLE_TO_START.get(configuration.dn(), stackTraceToSingleLineString(e)));
      router.addRoute(newRoute(configuration.getBasePath()), ErrorHandler.INTERNAL_SERVER_ERROR);
    }
    catch (InitializationException | ConfigException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
      router.addRoute(newRoute(configuration.getBasePath()), ErrorHandler.INTERNAL_SERVER_ERROR);
    }
@@ -340,7 +340,7 @@
        }
        catch (ConfigException e)
        {
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          ccr.addMessage(ERR_CONFIG_HTTPENDPOINT_UNABLE_TO_START.get(endpointName, stackTraceToSingleLineString(e)));
          continue;
        }
@@ -398,7 +398,7 @@
      }
      catch (InitializationException ie)
      {
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(ie.getMessageObject());
      }
      return ccr;

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

@@ -114,9 +114,6 @@
      }
    }

    // Now that all of the identity mappers are defined, see if the Directory
    // Server's proxied auth mapper is valid.  If not, then log a warning
    // message.
    DN mapperDN = serverContext.getCoreConfigManager().getProxiedAuthorizationIdentityMapperDN();
    if (mapperDN == null)
    {
@@ -177,7 +174,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }

@@ -293,7 +290,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }


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

@@ -167,7 +167,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }

@@ -282,7 +282,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }


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

@@ -116,13 +116,13 @@
    catch (ConfigException e) {
      logger.traceException(e);
      ccr.addMessage(e.getMessageObject());
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    } catch (Exception e) {
      logger.traceException(e);

      ccr.addMessage(ERR_CONFIG_RETENTION_POLICY_CANNOT_CREATE_POLICY.get(
          config.dn(),stackTraceToSingleLineString(e)));
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }

    return ccr;
@@ -142,7 +142,7 @@
    else
    {
      // TODO: Add message and check for usage
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }

    return ccr;

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

@@ -114,13 +114,13 @@
    catch (ConfigException e) {
      logger.traceException(e);
      ccr.addMessage(e.getMessageObject());
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    } catch (Exception e) {
      logger.traceException(e);

      ccr.addMessage(ERR_CONFIG_ROTATION_POLICY_CANNOT_CREATE_POLICY.get(config.dn(),
              stackTraceToSingleLineString(e)));
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }

    return ccr;
@@ -140,7 +140,7 @@
    else
    {
      // TODO: Add message and check for usage
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }

    return ccr;

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

@@ -415,7 +415,7 @@
      if(cancelRequest == null || cancelResult == null ||
          cancelResult.getResultCode() != ResultCode.CANCELLED ||
          cancelRequest.notifyOriginalRequestor() ||
          DirectoryServer.notifyAbandonedOperations())
          DirectoryServer.getCoreConfigManager().isNotifyAbandonedOperations())
      {
        clientConnection.sendResponse(this);
      }

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

@@ -356,7 +356,7 @@
      if(cancelRequest == null || cancelResult == null ||
          cancelResult.getResultCode() != ResultCode.CANCELLED ||
          cancelRequest.notifyOriginalRequestor() ||
          DirectoryServer.notifyAbandonedOperations())
          DirectoryServer.getCoreConfigManager().isNotifyAbandonedOperations())
      {
        clientConnection.sendResponse(this);
      }

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

@@ -161,7 +161,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }

@@ -273,7 +273,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }


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

@@ -196,7 +196,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }

@@ -259,7 +259,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }


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

@@ -96,7 +96,7 @@
    }

    // Get the DN of the default password policy from the core configuration.
    if (DirectoryServer.getDefaultPasswordPolicyDN() == null)
    if (DirectoryServer.getCoreConfigManager().getDefaultPasswordPolicyDN() == null)
    {
      LocalizableMessage message = ERR_CONFIG_PWPOLICY_NO_DEFAULT_POLICY.get();
      throw new ConfigException(message);
@@ -115,7 +115,7 @@
    // registered, then fail.
    if (null == DirectoryServer.getDefaultPasswordPolicy())
    {
      DN defaultPolicyDN = DirectoryServer.getDefaultPasswordPolicyDN();
      DN defaultPolicyDN = DirectoryServer.getCoreConfigManager().getDefaultPasswordPolicyDN();
      throw new ConfigException(ERR_CONFIG_PWPOLICY_MISSING_DEFAULT_POLICY.get(defaultPolicyDN));
    }

@@ -188,13 +188,13 @@
    catch (InitializationException ie)
    {
      ccr.addMessage(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(configuration.dn(), ie.getMessage()));
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }
    catch (Exception e)
    {
      ccr.addMessage(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
          configuration.dn(), stackTraceToSingleLineString(e)));
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }
    return ccr;
  }
@@ -207,7 +207,7 @@
    // FIXME: something like a referential integrity check is needed to ensure
    // a policy is not removed when referenced by a user entry (either
    // directly or via a virtual attribute).
    DN defaultPolicyDN = DirectoryServer.getDefaultPasswordPolicyDN();
    DN defaultPolicyDN = DirectoryServer.getCoreConfigManager().getDefaultPasswordPolicyDN();
    if (defaultPolicyDN != null && defaultPolicyDN.equals(configuration.dn()))
    {
      unacceptableReason.add(WARN_CONFIG_PWPOLICY_CANNOT_DELETE_DEFAULT_POLICY.get(defaultPolicyDN));
@@ -225,7 +225,7 @@
    // directly or via a virtual attribute).
    final ConfigChangeResult ccr = new ConfigChangeResult();
    DN policyDN = configuration.dn();
    DN defaultPolicyDN = DirectoryServer.getDefaultPasswordPolicyDN();
    DN defaultPolicyDN = DirectoryServer.getCoreConfigManager().getDefaultPasswordPolicyDN();
    if (defaultPolicyDN != null && defaultPolicyDN.equals(policyDN))
    {
      ccr.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
@@ -357,7 +357,7 @@
  {
    // If this is going to be the default password policy then check the type is
    // correct.
    if (policyConfiguration.dn().equals(DirectoryServer.getDefaultPasswordPolicyDN())
    if (policyConfiguration.dn().equals(DirectoryServer.getCoreConfigManager().getDefaultPasswordPolicyDN())
        && !(policyConfiguration instanceof PasswordPolicyCfg))
    {
      throw new ConfigException(ERR_CONFIG_PWPOLICY_DEFAULT_POLICY_IS_WRONG_TYPE.get(policyConfiguration.dn()));
@@ -413,7 +413,7 @@
  {
    // If this is going to be the default password policy then check the type is
    // correct.
    if (policyConfiguration.dn().equals(DirectoryServer.getDefaultPasswordPolicyDN())
    if (policyConfiguration.dn().equals(DirectoryServer.getCoreConfigManager().getDefaultPasswordPolicyDN())
        && !(policyConfiguration instanceof PasswordPolicyCfg))
    {
      unacceptableReasons.add(ERR_CONFIG_PWPOLICY_DEFAULT_POLICY_IS_WRONG_TYPE.get(policyConfiguration.dn()));

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

@@ -121,13 +121,13 @@
      {
        ccr.addMessage(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
            configuration.dn(), ie.getMessage()));
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      }
      catch (Exception e)
      {
        ccr.addMessage(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
            configuration.dn(), stackTraceToSingleLineString(e)));
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      }
      return ccr;
    }

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

@@ -186,7 +186,7 @@
    catch (InitializationException ie)
    {
      changeResult.addMessage (ie.getMessageObject());
      changeResult.setResultCode (DirectoryServer.getServerErrorResultCode());
      changeResult.setResultCode (DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      return changeResult;
    }

@@ -254,7 +254,7 @@
      catch (InitializationException ie)
      {
        changeResult.addMessage (ie.getMessageObject());
        changeResult.setResultCode (DirectoryServer.getServerErrorResultCode());
        changeResult.setResultCode (DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        return changeResult;
      }
    }

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

@@ -168,7 +168,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }

@@ -287,7 +287,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }


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

@@ -1796,8 +1796,8 @@
            stackTraceToSingleLineString(e));
    logger.error(message);

    return PluginResult.PreParse.stopProcessing(DirectoryServer
        .getServerErrorResultCode(), message);
    return PluginResult.PreParse.stopProcessing(
        serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
  }

  private PluginResult.PreParse handlePreParseResult(
@@ -1809,8 +1809,8 @@
            .getPluginEntryDN(), operation.getConnectionID(), operation.getOperationID());
    logger.error(message);

    return PluginResult.PreParse.stopProcessing(DirectoryServer
        .getServerErrorResultCode(), message);
    return PluginResult.PreParse.stopProcessing(
        serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
  }

  /**
@@ -2558,8 +2558,8 @@

    registerSkippedPreOperationPlugins(i, plugins, operation);

    return PluginResult.PreOperation.stopProcessing(DirectoryServer
        .getServerErrorResultCode(), message);
    return PluginResult.PreOperation.stopProcessing(
        serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
  }

  private PluginResult.PreOperation handlePreOperationResult(
@@ -2575,8 +2575,8 @@

    registerSkippedPreOperationPlugins(i, plugins, operation);

    return PluginResult.PreOperation.stopProcessing(DirectoryServer
        .getServerErrorResultCode(), message);
    return PluginResult.PreOperation.stopProcessing(
        serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
  }

  /**
@@ -4034,7 +4034,7 @@
        logger.error(message);

        return PluginResult.IntermediateResponse.stopProcessing(false,
            DirectoryServer.getServerErrorResultCode(), message);
            serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
      }

      if (result == null)
@@ -4047,7 +4047,7 @@
        logger.error(message);

        return PluginResult.IntermediateResponse.stopProcessing(false,
            DirectoryServer.getServerErrorResultCode(), message);
            serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
      }
      else if (! result.continuePluginProcessing())
      {
@@ -4106,7 +4106,7 @@
        logger.error(message);

        return PluginResult.IntermediateResponse.stopProcessing(false,
            DirectoryServer.getServerErrorResultCode(), message);
            serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
      }

      if (result == null)
@@ -4119,7 +4119,7 @@
        logger.error(message);

        return PluginResult.IntermediateResponse.stopProcessing(false,
            DirectoryServer.getServerErrorResultCode(), message);
            serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
      }
      else if (! result.continuePluginProcessing())
      {
@@ -4184,7 +4184,7 @@
        logger.error(message);

        return PluginResult.SubordinateModifyDN.stopProcessing(
            DirectoryServer.getServerErrorResultCode(), message);
            serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
      }

      if (result == null)
@@ -4197,7 +4197,7 @@
        logger.error(message);

        return PluginResult.SubordinateModifyDN.stopProcessing(
            DirectoryServer.getServerErrorResultCode(), message);
            serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
      }
      else if (! result.continuePluginProcessing())
      {
@@ -4254,7 +4254,7 @@
        logger.error(message);

        return PluginResult.SubordinateDelete.stopProcessing(
            DirectoryServer.getServerErrorResultCode(), message);
            serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
      }

      if (result == null)
@@ -4267,7 +4267,7 @@
        logger.error(message);

        return PluginResult.SubordinateDelete.stopProcessing(
            DirectoryServer.getServerErrorResultCode(), message);
            serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
      }
      else if (! result.continuePluginProcessing())
      {
@@ -4318,7 +4318,7 @@
        logger.error(message);

        return PluginResult.IntermediateResponse.stopProcessing
            (false, DirectoryServer.getServerErrorResultCode(), message);
            (false, serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
      }

      if (result == null)
@@ -4329,7 +4329,7 @@
        logger.error(message);

        return PluginResult.IntermediateResponse.stopProcessing
            (false, DirectoryServer.getServerErrorResultCode(), message);
            (false, serverContext.getCoreConfigManager().getServerErrorResultCode(), message);
      }
      else if (! result.continuePluginProcessing())
      {
@@ -4398,7 +4398,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(serverContext.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }

@@ -4508,7 +4508,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(serverContext.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }


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

@@ -174,7 +174,7 @@
      {
        // This shouldn't happen, since the set of DNs should have already been
        // validated.
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(de.getMessageObject());

        for (DN dn : altBindDNs)
@@ -281,7 +281,7 @@
      {
        // This shouldn't happen, since the set of DNs should have already been
        // validated.
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(de.getMessageObject());

        for (DN addedDN : addedDNs)

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

@@ -165,7 +165,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }

@@ -275,7 +275,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }


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

@@ -1039,7 +1039,7 @@
        }
      }
      else if(cancelRequest.notifyOriginalRequestor() ||
          DirectoryServer.notifyAbandonedOperations())
          DirectoryServer.getCoreConfigManager().isNotifyAbandonedOperations())
      {
        sendSearchResultDone();
      }

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

@@ -160,7 +160,7 @@
          {
            logger.traceException(e);
            ccr.addMessage(e.getMessageObject());
            ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
            ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          }
        }
        catch (Exception e)
@@ -169,7 +169,7 @@

          ccr.addMessage(ERR_CONFIG_SYNCH_ERROR_INITIALIZING_PROVIDER.get(configuration.dn(),
              stackTraceToSingleLineString(e)));
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        }
      }
    }
@@ -243,7 +243,7 @@
        {
          logger.traceException(e);
          ccr.addMessage(e.getMessageObject());
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        }
      }
      catch (Exception e)
@@ -252,7 +252,7 @@

        ccr.addMessage(ERR_CONFIG_SYNCH_ERROR_INITIALIZING_PROVIDER.get(configuration.dn(),
            stackTraceToSingleLineString(e)));
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      }
    }


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

@@ -167,7 +167,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }

@@ -283,7 +283,7 @@
    }
    catch (InitializationException ie)
    {
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ie.getMessageObject());
    }


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

@@ -250,7 +250,7 @@
      }
      catch (InitializationException ie)
      {
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(ie.getMessageObject());
      }
    }
@@ -372,7 +372,7 @@
      }
      catch (InitializationException ie)
      {
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(ie.getMessageObject());
      }
    }

 opendj-server-legacy/src/main/java/org/opends/server/crypto/CryptoManagerSync.java

@@ -249,7 +249,7 @@
      catch (CryptoManagerException e)
      {
        throw new DirectoryException(
             DirectoryServer.getServerErrorResultCode(), e);
             DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), e);
      }
    }
  }

 opendj-server-legacy/src/main/java/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java

@@ -151,12 +151,12 @@
    }
    catch (CryptoManagerException e)
    {
      operation.setResultCode(DirectoryServer.getServerErrorResultCode());
      operation.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      operation.appendErrorMessage(e.getMessageObject());
    }
    catch (Exception e)
    {
      operation.setResultCode(DirectoryServer.getServerErrorResultCode());
      operation.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      operation.appendErrorMessage(StaticUtils.getExceptionMessage(e));
    }
  }

 opendj-server-legacy/src/main/java/org/opends/server/extensions/AESPasswordStorageScheme.java

@@ -95,7 +95,7 @@

      LocalizableMessage m = ERR_PWSCHEME_CANNOT_ENCRYPT.get(STORAGE_SCHEME_NAME_AES,
                                                  getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }
    finally
@@ -131,7 +131,7 @@

      LocalizableMessage m = ERR_PWSCHEME_CANNOT_ENCRYPT.get(STORAGE_SCHEME_NAME_AES,
                                                  getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }
    finally
@@ -186,7 +186,7 @@

      LocalizableMessage m = ERR_PWSCHEME_CANNOT_DECRYPT.get(STORAGE_SCHEME_NAME_AES,
                                                  getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }
  }

 opendj-server-legacy/src/main/java/org/opends/server/extensions/BlowfishPasswordStorageScheme.java

@@ -95,7 +95,7 @@

      LocalizableMessage m = ERR_PWSCHEME_CANNOT_ENCRYPT.get(STORAGE_SCHEME_NAME_BLOWFISH,
                                                  getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }
    finally
@@ -132,7 +132,7 @@

      LocalizableMessage m = ERR_PWSCHEME_CANNOT_ENCRYPT.get(STORAGE_SCHEME_NAME_BLOWFISH,
                                                  getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }
    finally
@@ -185,7 +185,7 @@

      LocalizableMessage m = ERR_PWSCHEME_CANNOT_DECRYPT.get(STORAGE_SCHEME_NAME_BLOWFISH,
                                                  getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }
  }

 opendj-server-legacy/src/main/java/org/opends/server/extensions/CryptPasswordStorageScheme.java

@@ -113,7 +113,7 @@
    {
      LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
          CLASS_NAME, stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   message, e);
    }
    finally
@@ -157,7 +157,7 @@
    {
      LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
          CLASS_NAME, stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   message, e);
    }
    return ByteString.valueOfUtf8(output);
@@ -178,7 +178,7 @@
      LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
          CLASS_NAME, stackTraceToSingleLineString(e));
      throw new DirectoryException(
          DirectoryServer.getServerErrorResultCode(), message, e);
          DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
    finally
    {
@@ -205,7 +205,7 @@
      LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
          CLASS_NAME, stackTraceToSingleLineString(e));
      throw new DirectoryException(
          DirectoryServer.getServerErrorResultCode(), message, e);
          DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
    finally
    {

 opendj-server-legacy/src/main/java/org/opends/server/extensions/DynamicGroupSearchThread.java

@@ -151,7 +151,7 @@
        {
          LocalizableMessage message = ERR_DYNAMICGROUP_CANNOT_RETURN_ENTRY.
              get(searchEntry.getName(), memberList.getDynamicGroupDN());
          throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
          throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
        }

        return;

 opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedKeyManagerProvider.java

@@ -140,7 +140,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_FILE_KEYMANAGER_CANNOT_LOAD.get(keyStoreFile, getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
  }

@@ -167,7 +167,7 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_FILE_KEYMANAGER_CANNOT_CREATE_FACTORY.get(keyStoreFile, getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
  }

@@ -246,7 +246,7 @@
    File f = getFileForPath(keyStoreFile);
    if (!f.exists() || !f.isFile())
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ERR_FILE_KEYMANAGER_NO_SUCH_FILE.get(keyStoreFile, cfg.dn()));
    }
    return keyStoreFile;
@@ -265,7 +265,7 @@
      catch (KeyStoreException e)
      {
        logger.traceException(e);
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(ERR_FILE_KEYMANAGER_INVALID_TYPE.get(cfg.getKeyStoreType(), cfg.dn(), getExceptionMessage(e)));
      }
    }
@@ -289,7 +289,7 @@
    }
    catch (InitializationException e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(e.getMessageObject());
      return null;
    }

 opendj-server-legacy/src/main/java/org/opends/server/extensions/FileBasedTrustManagerProvider.java

@@ -112,7 +112,7 @@
    {
      logger.traceException(e);
      LocalizableMessage message = ERR_FILE_TRUSTMANAGER_CANNOT_LOAD.get(trustStoreFile, getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }

    try
@@ -134,7 +134,7 @@

      LocalizableMessage message =
              ERR_FILE_TRUSTMANAGER_CANNOT_CREATE_FACTORY.get(trustStoreFile, getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
  }

@@ -186,7 +186,7 @@
    final File f = getFileForPath(keyStoreFile);
    if (!f.exists() || !f.isFile())
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ERR_FILE_TRUSTMANAGER_NO_SUCH_FILE.get(keyStoreFile, cfg.dn()));
    }
    return keyStoreFile;
@@ -206,7 +206,7 @@
      catch (KeyStoreException e)
      {
        logger.traceException(e);
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(ERR_FILE_TRUSTMANAGER_INVALID_TYPE.get(trustStoreType, cfg.dn(), getExceptionMessage(e)));
      }
    }
@@ -230,7 +230,7 @@
    }
    catch (InitializationException e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(e.getMessageObject());
      return null;
    }

 opendj-server-legacy/src/main/java/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProvider.java

@@ -190,7 +190,7 @@
    {
      boolean obsolete = true;
      AcceptRejectWarn structuralPolicy =
        DirectoryServer.getSingleStructuralObjectClassPolicy();
        DirectoryServer.getCoreConfigManager().getSingleStructuralObjectClassPolicy();
      for (NameForm nf : listForms)
      {
        if (!nf.isObsolete())

 opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPKeyManagerProvider.java

@@ -122,7 +122,7 @@
    {
      LocalizableMessage message = ERR_LDAP_KEYMANAGER_CANNOT_CREATE_FACTORY.get(currentConfig.getBaseDN(),
                                                                                 getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
  }

@@ -174,7 +174,7 @@
    }
    catch (InitializationException e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(e.getMessageObject());
    }
    return ccr;

 opendj-server-legacy/src/main/java/org/opends/server/extensions/LDAPTrustManagerProvider.java

@@ -112,7 +112,7 @@
    {
      LocalizableMessage message = ERR_LDAP_TRUSTMANAGER_CANNOT_CREATE_FACTORY.get(currentConfig.getBaseDN(),
                                                                                   getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
  }

@@ -148,7 +148,7 @@
    }
    catch (InitializationException e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(e.getMessageObject());
    }
    return ccr;

 opendj-server-legacy/src/main/java/org/opends/server/extensions/MD5PasswordStorageScheme.java

@@ -117,7 +117,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally
@@ -158,7 +158,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally

 opendj-server-legacy/src/main/java/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java

@@ -339,7 +339,7 @@
    logger.traceException(e);

    LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(CLASS_NAME, getExceptionMessage(e));
    return new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
    return new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
  }

  private static byte[] concatenateHashPlusSalt(byte[] saltBytes, byte[] digestBytes) {

 opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS11KeyManagerProvider.java

@@ -104,7 +104,7 @@
            logger.traceException(e);

            LocalizableMessage message = ERR_PKCS11_KEYMANAGER_CANNOT_LOAD.get(getExceptionMessage(e));
            throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
            throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
        }

        try
@@ -119,7 +119,7 @@
            logger.traceException(e);

            LocalizableMessage message = ERR_PKCS11_KEYMANAGER_CANNOT_CREATE_FACTORY.get(getExceptionMessage(e));
            throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
            throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
        }
    }

@@ -157,7 +157,7 @@
        }
        catch (InitializationException e)
        {
            ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
            ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
            ccr.addMessage(e.getMessageObject());
        }
        return ccr;

 opendj-server-legacy/src/main/java/org/opends/server/extensions/PKCS5S2PasswordStorageScheme.java

@@ -304,7 +304,7 @@
    logger.traceException(e);

    LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(CLASS_NAME, getExceptionMessage(e));
    return new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
    return new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
  }

  private static byte[] concatenateSaltPlusHash(byte[] saltBytes, byte[] digestBytes) {

 opendj-server-legacy/src/main/java/org/opends/server/extensions/ParallelWorkerThread.java

@@ -12,7 +12,7 @@
 * information: "Portions Copyright [year] [name of copyright owner]".
 *
 * Copyright 2006-2009 Sun Microsystems, Inc.
 * Portions Copyright 2013-2015 ForgeRock AS.
 * Portions Copyright 2013-2016 ForgeRock AS.
 */
package org.opends.server.extensions;

@@ -168,7 +168,7 @@
              ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION.get(getName(), operation, stackTraceToSingleLineString(t));
          logger.error(message);

          operation.setResultCode(DirectoryServer.getServerErrorResultCode());
          operation.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          operation.appendErrorMessage(message);
          operation.getClientConnection().sendResponse(operation);
        }

 opendj-server-legacy/src/main/java/org/opends/server/extensions/PasswordModifyExtendedOperation.java

@@ -378,7 +378,7 @@
      {
        logger.traceException(de);

        operation.setResultCode(DirectoryServer.getServerErrorResultCode());
        operation.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        operation.appendErrorMessage(ERR_EXTOP_PASSMOD_CANNOT_GET_PW_POLICY.get(userDN, de.getMessageObject()));
        return;
      }
@@ -978,7 +978,7 @@
    {
      logger.traceException(e);

      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ERR_EXTOP_PASSMOD_CANNOT_DETERMINE_ID_MAPPER.get(config.dn(), getExceptionMessage(e)));
    }


 opendj-server-legacy/src/main/java/org/opends/server/extensions/RC4PasswordStorageScheme.java

@@ -95,7 +95,7 @@

      LocalizableMessage m = ERR_PWSCHEME_CANNOT_ENCRYPT.get(STORAGE_SCHEME_NAME_RC4,
                                                  getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }
    finally
@@ -132,7 +132,7 @@

      LocalizableMessage m = ERR_PWSCHEME_CANNOT_ENCRYPT.get(STORAGE_SCHEME_NAME_RC4,
                                                  getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }
    finally
@@ -185,7 +185,7 @@

      LocalizableMessage m = ERR_PWSCHEME_CANNOT_DECRYPT.get(STORAGE_SCHEME_NAME_RC4,
                                                  getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }
  }

 opendj-server-legacy/src/main/java/org/opends/server/extensions/RandomPasswordGenerator.java

@@ -380,7 +380,7 @@
      logger.traceException(e);

      ccr.addMessage(ERR_RANDOMPWGEN_CANNOT_DETERMINE_CHARSETS.get(getExceptionMessage(e)));
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }

    // Get the value that describes which character set(s) and how many
@@ -421,7 +421,7 @@
          logger.traceException(e);

          ccr.addMessage(ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(newFormatString));
          ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        }
      }
    }
@@ -430,7 +430,7 @@
      logger.traceException(e);

      ccr.addMessage(ERR_RANDOMPWGEN_CANNOT_DETERMINE_PWFORMAT.get(getExceptionMessage(e)));
      ccr.setResultCodeIfSuccess(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCodeIfSuccess(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
    }

    // If everything looks OK, then apply the changes.

 opendj-server-legacy/src/main/java/org/opends/server/extensions/SHA1PasswordStorageScheme.java

@@ -117,7 +117,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally
@@ -158,7 +158,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally

 opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java

@@ -116,7 +116,7 @@

    // Make sure that the Directory Server is configured with information about
    // one or more mail servers.
    List<Properties> propList = DirectoryServer.getMailServerPropertySets();
    List<Properties> propList = DirectoryServer.getCoreConfigManager().getMailServerPropertySets();
    if (propList == null || propList.isEmpty())
    {
      throw new ConfigException(ERR_SMTP_ASNH_NO_MAIL_SERVERS_CONFIGURED.get(configuration.dn()));
@@ -607,7 +607,7 @@

    // Make sure that the Directory Server is configured with information about
    // one or more mail servers.
    List<Properties> propList = DirectoryServer.getMailServerPropertySets();
    List<Properties> propList = DirectoryServer.getCoreConfigManager().getMailServerPropertySets();
    if (propList == null || propList.isEmpty())
    {
      unacceptableReasons.add(ERR_SMTP_ASNH_NO_MAIL_SERVERS_CONFIGURED.get(configuration.dn()));

 opendj-server-legacy/src/main/java/org/opends/server/extensions/SMTPAlertHandler.java

@@ -63,8 +63,8 @@
  {
    // Make sure that the Directory Server is configured with information about
    // at least one SMTP server.
    if (DirectoryServer.getMailServerPropertySets() == null ||
        DirectoryServer.getMailServerPropertySets().isEmpty())
    if (DirectoryServer.getCoreConfigManager().getMailServerPropertySets() == null ||
        DirectoryServer.getCoreConfigManager().getMailServerPropertySets().isEmpty())
    {
      throw new ConfigException(ERR_SMTPALERTHANDLER_NO_SMTP_SERVERS.get());
    }

 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java

@@ -138,7 +138,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally
@@ -192,7 +192,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally
@@ -315,7 +315,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally

 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java

@@ -138,7 +138,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally
@@ -192,7 +192,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally
@@ -315,7 +315,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally

 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java

@@ -140,7 +140,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally
@@ -194,7 +194,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally
@@ -319,7 +319,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally

 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java

@@ -140,7 +140,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally
@@ -194,7 +194,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally
@@ -319,7 +319,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally

 opendj-server-legacy/src/main/java/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java

@@ -140,7 +140,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally
@@ -194,7 +194,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally
@@ -319,7 +319,7 @@

        LocalizableMessage message = ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD.get(
            CLASS_NAME, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                     message, e);
      }
      finally

 opendj-server-legacy/src/main/java/org/opends/server/extensions/StaticGroup.java

@@ -213,7 +213,7 @@
        catch (LocalizedIllegalArgumentException e)
        {
          logger.traceException(e);
          if (DirectoryServer.getSyntaxEnforcementPolicy() == AcceptRejectWarn.REJECT)
          if (DirectoryServer.getCoreConfigManager().getSyntaxEnforcementPolicy() == AcceptRejectWarn.REJECT)
          {
            logger.error(ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN,
              v, someMemberAttributeType.getNameOrOID(), groupEntry.getName(), e.getMessageObject());

 opendj-server-legacy/src/main/java/org/opends/server/extensions/TraditionalWorkerThread.java

@@ -12,7 +12,7 @@
 * information: "Portions Copyright [year] [name of copyright owner]".
 *
 * Copyright 2006-2010 Sun Microsystems, Inc.
 * Portions Copyright 2011-2014 ForgeRock AS.
 * Portions Copyright 2011-2016 ForgeRock AS.
 */
package org.opends.server.extensions;

@@ -167,7 +167,7 @@

          // Ensure that the client receives some kind of result so that it does
          // not hang.
          operation.setResultCode(DirectoryServer.getServerErrorResultCode());
          operation.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          operation.appendErrorMessage(message);
          operation.getClientConnection().sendResponse(operation);
        }

 opendj-server-legacy/src/main/java/org/opends/server/extensions/TripleDESPasswordStorageScheme.java

@@ -95,7 +95,7 @@

      LocalizableMessage m = ERR_PWSCHEME_CANNOT_ENCRYPT.get(STORAGE_SCHEME_NAME_3DES,
                                                  getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }
    finally
@@ -132,7 +132,7 @@

      LocalizableMessage m = ERR_PWSCHEME_CANNOT_ENCRYPT.get(STORAGE_SCHEME_NAME_3DES,
                                                  getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }
    finally
@@ -185,7 +185,7 @@

      LocalizableMessage m = ERR_PWSCHEME_CANNOT_DECRYPT.get(STORAGE_SCHEME_NAME_3DES,
                                                  getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   m, e);
    }
  }

 opendj-server-legacy/src/main/java/org/opends/server/extensions/VirtualStaticGroup.java

@@ -232,7 +232,7 @@
    if (targetGroup == null)
    {
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET_GROUP.get(targetGroupDN, groupEntryDN);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
    }
    else if (targetGroup instanceof VirtualStaticGroup)
    {
@@ -260,7 +260,7 @@
    if (targetGroup == null)
    {
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET_GROUP.get(targetGroupDN, groupEntryDN);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
    }
    else if (targetGroup instanceof VirtualStaticGroup)
    {
@@ -293,7 +293,7 @@
    if (targetGroup == null)
    {
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET_GROUP.get(targetGroupDN, groupEntryDN);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
    }
    else if (targetGroup instanceof VirtualStaticGroup)
    {
@@ -316,7 +316,7 @@
    if (targetGroup == null)
    {
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET_GROUP.get(targetGroupDN, groupEntryDN);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
    }
    else if (targetGroup instanceof VirtualStaticGroup)
    {

 opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractLogger.java

@@ -254,13 +254,13 @@
      {
        LocalizedLogger.getLoggerForThisClass().traceException(e);
        ccr.addMessage(e.getMessageObject());
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      }
      catch (Exception e)
      {
        LocalizedLogger.getLoggerForThisClass().traceException(e);
        ccr.addMessage(ERR_CONFIG_LOGGER_CANNOT_CREATE_LOGGER.get(config.dn(), stackTraceToSingleLineString(e)));
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      }
    }
    return ccr;
@@ -317,7 +317,7 @@
        {
          LocalizedLogger.getLoggerForThisClass().traceException(e);
          ccr.addMessage(ERR_CONFIG_LOGGER_CANNOT_UPDATE_LOGGER.get(config.dn(), stackTraceToSingleLineString(e)));
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        }
      }
      else
@@ -356,7 +356,7 @@
      {
        LocalizedLogger.getLoggerForThisClass().traceException(e);
        ccr.addMessage(ERR_CONFIG_LOGGER_CANNOT_DELETE_LOGGER.get(config.dn(), stackTraceToSingleLineString(e)));
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      }
    }
    else

 opendj-server-legacy/src/main/java/org/opends/server/loggers/FileNumberRetentionPolicy.java

@@ -77,7 +77,7 @@
    File[] files = fileNamingPolicy.listFiles();
    if(files == null)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_LOGGER_ERROR_LISTING_FILES.get(fileNamingPolicy.getInitialName()));
    }


 opendj-server-legacy/src/main/java/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java

@@ -81,7 +81,7 @@
    File[] files = fileNamingPolicy.listFiles();
    if(files == null)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_LOGGER_ERROR_LISTING_FILES.get(fileNamingPolicy.getInitialName()));
    }

@@ -101,7 +101,7 @@
      LocalizableMessage message =
          ERR_LOGGER_ERROR_OBTAINING_FREE_SPACE.get(files[0],
              stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                                   message, e);
    }


 opendj-server-legacy/src/main/java/org/opends/server/loggers/SizeBasedRetentionPolicy.java

@@ -82,7 +82,7 @@
    File[] files = fileNamingPolicy.listFiles();
    if(files == null)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_LOGGER_ERROR_LISTING_FILES.get(fileNamingPolicy.getInitialName()));
    }


 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAccessLogPublisher.java

@@ -173,7 +173,7 @@
    }
    catch (final Exception e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn(), stackTraceToSingleLineString(e)));
    }

 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextAuditLogPublisher.java

@@ -121,7 +121,7 @@
    }
    catch (Exception e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn(), stackTraceToSingleLineString(e)));
    }

 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextDebugLogPublisher.java

@@ -260,7 +260,7 @@
    }
    catch(Exception e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn(), stackTraceToSingleLineString(e)));
    }

 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java

@@ -169,7 +169,7 @@
        int equalPos = overrideSeverity.indexOf('=');
        if (equalPos < 0)
        {
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          ccr.addMessage(WARN_ERROR_LOGGER_INVALID_OVERRIDE_SEVERITY.get(overrideSeverity));
          return;
        }
@@ -196,7 +196,7 @@
              }
              catch (Exception e)
              {
                ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
                ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
                ccr.addMessage(WARN_ERROR_LOGGER_INVALID_SEVERITY.get(severityName));
                return;
              }
@@ -206,7 +206,7 @@
        }
        catch (Exception e)
        {
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          ccr.addMessage(WARN_ERROR_LOGGER_INVALID_CATEGORY.get(category));
          return;
        }
@@ -346,7 +346,7 @@
    }
    catch(Exception e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn(), stackTraceToSingleLineString(e)));
    }

 opendj-server-legacy/src/main/java/org/opends/server/loggers/TextHTTPAccessLogPublisher.java

@@ -213,7 +213,7 @@
        LocalizableMessage errorMessage = setLogFormatFields(cfg.getLogFormat());
        if (errorMessage != null)
        {
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          ccr.setAdminActionRequired(true);
          ccr.addMessage(errorMessage);
        }
@@ -221,7 +221,7 @@
    }
    catch (final Exception e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn(), stackTraceToSingleLineString(e)));
    }

 opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java

@@ -645,7 +645,7 @@
                  AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_1);
        if (defaultAuthSchemes[0] == null)
        {
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          ccr.addMessage(ERR_PLUGIN_PWIMPORT_NO_DEFAULT_AUTH_SCHEMES.get(
                  AUTH_PASSWORD_SCHEME_NAME_SALTED_SHA_1));
        }
@@ -661,12 +661,12 @@
             DirectoryServer.getPasswordStorageScheme(schemeDN);
        if (defaultAuthSchemes[i] == null)
        {
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          ccr.addMessage(ERR_PLUGIN_PWIMPORT_NO_SUCH_DEFAULT_AUTH_SCHEME.get(schemeDN));
        }
        else if (! defaultAuthSchemes[i].supportsAuthPasswordSyntax())
        {
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          ccr.addMessage(ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_AUTH_SCHEME.get(schemeDN));
        }
        i++;
@@ -695,7 +695,7 @@
                  toLowerCase(STORAGE_SCHEME_NAME_SALTED_SHA_1));
        if (defaultUserSchemes[0] == null)
        {
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          ccr.addMessage(ERR_PLUGIN_PWIMPORT_NO_DEFAULT_USER_SCHEMES.get(
                  STORAGE_SCHEME_NAME_SALTED_SHA_1));
        }
@@ -711,7 +711,7 @@
             DirectoryServer.getPasswordStorageScheme(schemeDN);
        if (defaultUserSchemes[i] == null)
        {
          ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
          ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
          ccr.addMessage(ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_USER_SCHEME.get(schemeDN));
        }
        i++;

 opendj-server-legacy/src/main/java/org/opends/server/plugins/UniqueAttributePlugin.java

@@ -335,7 +335,7 @@
      }

      return PluginResult.PreOperation.stopProcessing(
          DirectoryServer.getServerErrorResultCode(), message);
          DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
    }
    return null;
  }

 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPClientConnection.java

@@ -250,7 +250,7 @@
    if (this.keepStats)
    {
      this.statTracker.updateConnect();
      this.useNanoTime = DirectoryServer.getUseNanoTime();
      this.useNanoTime = DirectoryServer.getCoreConfigManager().isUseNanoTime();
    }
    this.connectionID = DirectoryServer.newConnectionAccepted(this);
    context.asContext(HttpLogContext.class).setConnectionID(connectionID);

 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/HTTPConnectionHandler.java

@@ -837,7 +837,7 @@
    catch (Exception e)
    {
      logger.traceException(e);
      ResultCode resCode = DirectoryServer.getServerErrorResultCode();
      ResultCode resCode = DirectoryServer.getCoreConfigManager().getServerErrorResultCode();
      throw new DirectoryException(resCode, ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE.get(getExceptionMessage(e)), e);
    }
  }

 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java

@@ -145,7 +145,7 @@
      }
      catch (RuntimeException e)
      {
        ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
        ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
        ccr.addMessage(LocalizableMessage.raw(e.getMessage()));
      }
    }

 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java

@@ -319,7 +319,7 @@
    private ASN1WriterHolder()
    {
      this.buffer = new ByteStringBuilder();
      this.maxBufferSize = getMaxInternalBufferSize();
      this.maxBufferSize = getCoreConfigManager().getMaxInternalBufferSize();
      this.writer = ASN1.getWriter(buffer, maxBufferSize);
    }

@@ -345,7 +345,7 @@
  private ASN1WriterHolder getASN1Writer()
  {
    ASN1WriterHolder holder = ASN1_WRITER_CACHE.get();
    if (holder.maxBufferSize != getMaxInternalBufferSize())
    if (holder.maxBufferSize != getCoreConfigManager().getMaxInternalBufferSize())
    {
      // Setting has changed, so recreate the holder.
      holder = new ASN1WriterHolder();
@@ -467,7 +467,7 @@
    if (keepStats)
    {
      statTracker.updateConnect();
      this.useNanoTime=DirectoryServer.getUseNanoTime();
      this.useNanoTime=DirectoryServer.getCoreConfigManager().isUseNanoTime();
    }
    else
    {
@@ -707,7 +707,7 @@
      // case, log a message and set the response to "operations error".
      logger.error(ERR_LDAP_CLIENT_SEND_RESPONSE_NO_RESULT_CODE, operation.getOperationType(),
          operation.getConnectionID(), operation.getOperationID());
      resultCode = DirectoryServer.getServerErrorResultCode();
      resultCode = DirectoryServer.getCoreConfigManager().getServerErrorResultCode();
    }

    LocalizableMessageBuilder errorMessage = operation.getErrorMessage();
@@ -1078,7 +1078,7 @@
    case SERVER_SHUTDOWN:
      return LDAPResultCode.UNAVAILABLE;
    case SERVER_ERROR:
      return DirectoryServer.getServerErrorResultCode().intValue();
      return DirectoryServer.getCoreConfigManager().getServerErrorResultCode().intValue();
    case ADMIN_LIMIT_EXCEEDED:
    case IDLE_TIME_LIMIT_EXCEEDED:
    case MAX_REQUEST_SIZE_EXCEEDED:
@@ -1189,8 +1189,7 @@

      LocalizableMessage message =
        WARN_LDAP_CLIENT_CANNOT_ENQUEUE.get(getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer
          .getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
  }


 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPConnectionHandler.java

@@ -1269,7 +1269,7 @@
    catch (Exception e)
    {
      logger.traceException(e);
      ResultCode resCode = DirectoryServer.getServerErrorResultCode();
      ResultCode resCode = DirectoryServer.getCoreConfigManager().getServerErrorResultCode();
      LocalizableMessage message = ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE
          .get(getExceptionMessage(e));
      throw new DirectoryException(resCode, message, e);
@@ -1347,7 +1347,7 @@
    catch (Exception e)
    {
      logger.traceException(e);
      ResultCode resCode = DirectoryServer.getServerErrorResultCode();
      ResultCode resCode = DirectoryServer.getCoreConfigManager().getServerErrorResultCode();
      LocalizableMessage message = ERR_CONNHANDLER_SSL_CANNOT_INITIALIZE
          .get(getExceptionMessage(e));
      throw new DirectoryException(resCode, message, e);

 opendj-server-legacy/src/main/java/org/opends/server/schema/CoreSchemaProvider.java

@@ -152,7 +152,7 @@
    }
    catch (DirectoryException e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(e.getMessageObject());
    }
    return ccr;

 opendj-server-legacy/src/main/java/org/opends/server/schema/JsonSchemaProvider.java

@@ -140,7 +140,7 @@
    }
    catch (DirectoryException e)
    {
      ccr.setResultCode(DirectoryServer.getServerErrorResultCode());
      ccr.setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      ccr.addMessage(e.getMessageObject());
    }
    finally

 opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaFilesWriter.java

@@ -160,7 +160,7 @@

      LocalizableMessage message =
          ERR_SCHEMA_MODIFY_CANNOT_WRITE_NEW_SCHEMA.get(getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }
    finally
    {
@@ -1057,7 +1057,7 @@
        message = ERR_SCHEMA_MODIFY_CANNOT_WRITE_ORIG_FILES_NOT_CLEANED.get(getExceptionMessage(e));
        DirectoryServer.sendAlertNotification(alertGenerator, ALERT_TYPE_CANNOT_COPY_SCHEMA_FILES, message);
      }
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }

    // Try to copy all of the temporary files into place over the installed
@@ -1108,7 +1108,7 @@
        message = ERR_SCHEMA_MODIFY_CANNOT_WRITE_NEW_FILES_NOT_RESTORED.get(getExceptionMessage(e));
        DirectoryServer.sendAlertNotification(alertGenerator, ALERT_TYPE_CANNOT_WRITE_NEW_SCHEMA_FILES, message);
      }
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
    }

    deleteFiles(origFileList);

 opendj-server-legacy/src/main/java/org/opends/server/tasks/AddSchemaFileTask.java

@@ -151,7 +151,7 @@
        logger.traceException(e);

        LocalizableMessage message = ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE.get(schemaFile, e.getMessage());
        throw new DirectoryException(getServerErrorResultCode(), message, e);
        throw new DirectoryException(getCoreConfigManager().getServerErrorResultCode(), message, e);
      }
    }
  }

 opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java

@@ -655,7 +655,7 @@
        logger.traceException(de);

        DirectoryServer.notifyImportEnded(backend, importConfig, false);
        if (de.getResultCode().equals(DirectoryServer.getServerErrorResultCode()))
        if (de.getResultCode().equals(DirectoryServer.getCoreConfigManager().getServerErrorResultCode()))
        {
          logger.error(ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(de.getMessageObject()));
        }

 opendj-server-legacy/src/main/java/org/opends/server/tasks/TaskUtils.java

@@ -197,7 +197,8 @@
    }
    catch (ConfigException e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), e.getMessageObject(), e);
      throw new DirectoryException(
          DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), e.getMessageObject(), e);
    }

    ModifyRequest modifyRequest = newModifyRequest(configEntryDN)

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

@@ -863,7 +863,7 @@
    }
    catch (DirectoryException de)
    {
      if (de.getResultCode().equals(DirectoryServer.getServerErrorResultCode()))
      if (de.getResultCode().equals(DirectoryServer.getCoreConfigManager().getServerErrorResultCode()))
      {
        logger.error(ERR_LDIFIMPORT_ERROR_DURING_IMPORT.get(de.getMessageObject()));
      }

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

@@ -158,7 +158,7 @@
    this.clientConnection = clientConnection;
    this.operationID      = operationID;
    this.messageID        = messageID;
    this.useNanoTime = DirectoryServer.getUseNanoTime();
    this.useNanoTime = DirectoryServer.getCoreConfigManager().isUseNanoTime();
    this.requestControls = requestControls != null ? requestControls : new ArrayList<Control>(0);
    authorizationEntry = clientConnection.getAuthenticationInfo().getAuthorizationEntry();
  }

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

@@ -154,7 +154,7 @@
   */
  public static ResultCode getServerErrorResultCode()
  {
    return DirectoryServer.getServerErrorResultCode();
    return DirectoryServer.getCoreConfigManager().getServerErrorResultCode();
  }

  /**

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

@@ -1560,7 +1560,7 @@
    // Get the structural objectclass for the entry.  If there isn't
    // one, or if there's more than one, then see if that's OK.
    AcceptRejectWarn structuralPolicy =
         DirectoryServer.getSingleStructuralObjectClassPolicy();
         DirectoryServer.getCoreConfigManager().getSingleStructuralObjectClassPolicy();
    ObjectClass structuralClass = null;
    boolean multipleOCErrorLogged = false;
    for (ObjectClass oc : objectClasses.keySet())
@@ -3347,7 +3347,7 @@
        LocalizableMessage message = ERR_ENTRY_DECODE_UNRECOGNIZED_VERSION.get(
            byteToHex(version));
        throw new DirectoryException(
                       DirectoryServer.getServerErrorResultCode(),
                       DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                       message);
      }

@@ -3413,7 +3413,7 @@

      LocalizableMessage message = ERR_ENTRY_DECODE_EXCEPTION.get(getExceptionMessage(e));
      throw new DirectoryException(
                     DirectoryServer.getServerErrorResultCode(),
                     DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                     message, e);
    }
  }

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

@@ -278,7 +278,7 @@
    {
      LocalizableMessage message = ERR_ENTRYENCODECFG_INVALID_LENGTH.get();
      throw new DirectoryException(
                     DirectoryServer.getServerErrorResultCode(),
                     DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                     message);
    }


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

@@ -2252,7 +2252,7 @@
      LocalizableMessage message =
          ERR_SEARCH_FILTER_COMPOUND_COMPONENTS_NULL.
            get(entry.getName(), completeFilter, filterType);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
    }
    else if (filterComponents.isEmpty())
    {
@@ -2276,7 +2276,7 @@
      {
        LocalizableMessage message = ERR_SEARCH_FILTER_NESTED_TOO_DEEP.
            get(entry.getName(), completeFilter);
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
      }

      for (SearchFilter f : filterComponents)
@@ -2308,7 +2308,7 @@
            LocalizableMessage message =
                ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
                  get(entry.getName(), completeFilter, result);
            throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
            throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
        }
      }

@@ -2357,7 +2357,7 @@
          ERR_SEARCH_FILTER_COMPOUND_COMPONENTS_NULL.
            get(entry.getName(), completeFilter, filterType);
      throw new DirectoryException(
                     DirectoryServer.getServerErrorResultCode(),
                     DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                     message);
    }
    else if (filterComponents.isEmpty())
@@ -2383,7 +2383,7 @@
        LocalizableMessage message = ERR_SEARCH_FILTER_NESTED_TOO_DEEP.
            get(entry.getName(), completeFilter);
        throw new DirectoryException(
                       DirectoryServer.getServerErrorResultCode(),
                       DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                       message);
      }

@@ -2420,7 +2420,7 @@
                  get(entry.getName(), completeFilter, result);
            throw new
                 DirectoryException(
                      DirectoryServer.getServerErrorResultCode(),
                      DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                      message);
        }
      }
@@ -2469,7 +2469,7 @@
      LocalizableMessage message = ERR_SEARCH_FILTER_NOT_COMPONENT_NULL.
          get(entry.getName(), completeFilter);
      throw new DirectoryException(
                     DirectoryServer.getServerErrorResultCode(),
                     DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                     message);
    }
    else
@@ -2482,7 +2482,7 @@
        LocalizableMessage message = ERR_SEARCH_FILTER_NESTED_TOO_DEEP.
            get(entry.getName(), completeFilter);
        throw new DirectoryException(
                       DirectoryServer.getServerErrorResultCode(),
                       DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                       message);
      }

@@ -2523,7 +2523,7 @@
              get(entry.getName(), completeFilter, result);
          throw new
               DirectoryException(
                    DirectoryServer.getServerErrorResultCode(),
                    DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                    message);
      }
    }

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

@@ -208,7 +208,7 @@
      if (bytes != null && !Arrays.equals(bytes, hash))
      {
        LocalizableMessage message = getErrorMessageForCheck(backupID);
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
      }
    }

@@ -228,7 +228,7 @@
        logger.traceException(e);
        StaticUtils.close(output);
        LocalizableMessage message = ERR_BACKUP_CANNOT_GET_CIPHER.get(stackTraceToSingleLineString(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
      }
    }

@@ -249,7 +249,7 @@
        logger.traceException(e);
        StaticUtils.close(inputStream);
        LocalizableMessage message = ERR_BACKUP_CANNOT_GET_CIPHER.get(stackTraceToSingleLineString(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
      }
    }
  }
@@ -308,7 +308,7 @@
      {
        LocalizableMessage message = ERR_BACKUP_CANNOT_GET_MAC_KEY_ID.get(backupParams.backupID,
            stackTraceToSingleLineString(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
      }
      retrieveMacEngine(macKeyID);
    }
@@ -331,7 +331,7 @@
      catch (Exception e)
      {
        LocalizableMessage message = ERR_BACKUP_CANNOT_GET_MAC.get(macKeyID, stackTraceToSingleLineString(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
      }
    }

@@ -405,7 +405,7 @@
      {
        LocalizableMessage message =
            ERR_BACKUP_CANNOT_GET_DIGEST.get(digestAlgorithm, stackTraceToSingleLineString(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
      }
    }

@@ -563,7 +563,7 @@
      catch (Exception e)
      {
        logger.traceException(e);
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
            ERR_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR.get(
                newBackupParams.backupDir.getDescriptorPath(), stackTraceToSingleLineString(e)),
            e);
@@ -663,14 +663,15 @@
      catch (ConfigException e)
      {
        logger.traceException(e);
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), e.getMessageObject());
        throw new DirectoryException(
            DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), e.getMessageObject());
      }
      catch (Exception e)
      {
        logger.traceException(e);
        LocalizableMessage message = ERR_BACKUP_CANNOT_UPDATE_BACKUP_DESCRIPTOR.get(
            backupDir.getDescriptorPath(), stackTraceToSingleLineString(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
      }

      return archiveFile.delete();
@@ -779,7 +780,7 @@
      catch (IOException e)
      {
        logger.traceException(e);
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
            ERR_BACKUP_CANNOT_WRITE_ARCHIVE_FILE.get(ZIPENTRY_EMPTY_PLACEHOLDER, archive.getBackupID(),
                stackTraceToSingleLineString(e)),
            e);
@@ -829,7 +830,7 @@
      {
        logger.traceException(e);
        throw new DirectoryException(
             DirectoryServer.getServerErrorResultCode(),
             DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
             ERR_BACKUP_CANNOT_WRITE_ARCHIVE_FILE.get(zipEntryName, archive.getBackupID(),
                 stackTraceToSingleLineString(e)), e);
      }
@@ -858,7 +859,7 @@
          catch (IOException e)
          {
            logger.traceException(e);
            throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
            throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
                 ERR_BACKUP_CANNOT_WRITE_ARCHIVE_FILE.get(relativePath, archive.getBackupID(),
                     stackTraceToSingleLineString(e)), e);
          }
@@ -893,7 +894,7 @@
        StaticUtils.close(output);
        LocalizableMessage message = ERR_BACKUP_CANNOT_CREATE_ARCHIVE_FILE.
            get(archiveFilename, backupPath, archive.getBackupID(), stackTraceToSingleLineString(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message, e);
      }
    }

@@ -981,8 +982,9 @@
      catch (IOException e)
      {
        logger.traceException(e);
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), ERR_BACKUP_CANNOT_RESTORE.get(
            identifier, stackTraceToSingleLineString(e)), e);
        throw new DirectoryException(
            DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
            ERR_BACKUP_CANNOT_RESTORE.get(identifier, stackTraceToSingleLineString(e)), e);
      }
    }

@@ -1009,7 +1011,7 @@
      catch (IOException e)
      {
        logger.traceException(e);
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
            ERR_BACKUP_CANNOT_RESTORE.get(identifier, stackTraceToSingleLineString(e)), e);
      }

@@ -1118,7 +1120,7 @@
        }
        catch (IOException e)
        {
          throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
          throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
              ERR_BACKUP_CANNOT_CREATE_DIRECTORY_TO_RESTORE_FILE.get(fileToRestore, identifier));
        }
      }
@@ -1160,7 +1162,7 @@
      }
      catch (FileNotFoundException e)
      {
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
            ERR_BACKUP_CANNOT_RESTORE.get(identifier, stackTraceToSingleLineString(e)), e);
      }
    }
@@ -1226,7 +1228,8 @@
    catch (IOException e)
    {
      logger.traceException(e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), ERR_BACKUP_CANNOT_CLOSE_ZIP_STREAM.get(
      throw new DirectoryException(
          DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), ERR_BACKUP_CANNOT_CLOSE_ZIP_STREAM.get(
          newArchive.getArchiveFilename(), backupParams.backupDir.getPath(), stackTraceToSingleLineString(e)), e);
    }

@@ -1323,7 +1326,7 @@
      catch (Exception e)
      {
        logger.traceException(e);
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
        throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
            ERR_BACKUP_CANNOT_CLOSE_ZIP_STREAM.get(backupFile, backupPath, stackTraceToSingleLineString(e)), e);
      }
    }
@@ -1389,7 +1392,7 @@
    if (backupInfo == null)
    {
      LocalizableMessage message = ERR_BACKUP_MISSING_BACKUPID.get(backupID, backupDir.getPath());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(), message);
    }
    return backupInfo;
  }
@@ -1418,7 +1421,7 @@
    }
    catch (Exception e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_BACKUP_CANNOT_LIST_LOG_FILES.get(directory.getAbsolutePath(), identifier), e);
    }
    if (files == null)
@@ -1493,7 +1496,7 @@
    }
    catch (IOException e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_BACKUP_CANNOT_SAVE_FILES_BEFORE_RESTORE.get(rootDirectory, targetDirectory, identifier,
              stackTraceToSingleLineString(e)), e);
    }
@@ -1516,7 +1519,7 @@
    }
    catch (IOException e)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
      throw new DirectoryException(DirectoryServer.getCoreConfigManager().getServerErrorResultCode(),
          ERR_BACKUP_CANNOT_CREATE_SAVE_DIRECTORY.get(baseDirectoryPath, identifier,
          stackTraceToSingleLineString(e)), e);
    }

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

@@ -343,7 +343,7 @@
  public void send()
         throws MessagingException
  {
    send(DirectoryServer.getMailServerPropertySets());
    send(DirectoryServer.getCoreConfigManager().getMailServerPropertySets());
  }



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

@@ -766,14 +766,14 @@
        throw new LDIFException(message, lastEntryLineNumber,true);
      }
      if (checkSchema &&
          DirectoryServer.getSyntaxEnforcementPolicy() != AcceptRejectWarn.ACCEPT)
          DirectoryServer.getCoreConfigManager().getSyntaxEnforcementPolicy() != AcceptRejectWarn.ACCEPT)
      {
        LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
        if (! attrType.getSyntax().valueIsAcceptable(value, invalidReason))
        {
          LocalizableMessage message = WARN_LDIF_VALUE_VIOLATES_SYNTAX.get(
              entryDN, lastEntryLineNumber, value, attrDescStr, invalidReason);
          if (DirectoryServer.getSyntaxEnforcementPolicy() == AcceptRejectWarn.WARN)
          if (DirectoryServer.getCoreConfigManager().getSyntaxEnforcementPolicy() == AcceptRejectWarn.WARN)
          {
            logger.error(message);
          }

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

@@ -1154,7 +1154,7 @@
        if (!isAlpha(c)
            && !isDigit(c)
            && c != '-'
            && (c != '_' || !DirectoryServer.allowAttributeNameExceptions()))
            && (c != '_' || !DirectoryServer.getCoreConfigManager().isAllowAttributeNameExceptions()))
        {
          // This is an illegal character for an attribute name.
          invalidReason.append(ERR_SCHEMANAME_ILLEGAL_CHAR.get(element, c, i));
@@ -1167,7 +1167,7 @@
      // This should indicate an OID, but it may also be a name if name
      // exceptions are enabled.  Since we don't know for sure, we'll just
      // hold off until we know for sure.
      boolean isKnown    = !DirectoryServer.allowAttributeNameExceptions();
      boolean isKnown    = !DirectoryServer.getCoreConfigManager().isAllowAttributeNameExceptions();
      boolean isNumeric  = true;
      boolean lastWasDot = false;


 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java

@@ -376,7 +376,7 @@
      // operation is not a synchronization operation,
      // check to see if the entry is valid according to the server schema,
      // and also whether its attributes are valid according to their syntax.
      if (DirectoryServer.checkSchema() && !isSynchronizationOperation())
      if (DirectoryServer.getCoreConfigManager().isCheckSchema() && !isSynchronizationOperation())
      {
        checkSchema(parentEntry);
      }
@@ -573,7 +573,7 @@
    if (attrList == null)
    {
      if (!isSynchronizationOperation()
          && !DirectoryServer.addMissingRDNAttributes())
          && !DirectoryServer.getCoreConfigManager().isAddMissingRDNAttributes())
      {
        throw newDirectoryException(entryDN, ResultCode.CONSTRAINT_VIOLATION,
            ERR_ADD_MISSING_RDN_ATTRIBUTE.get(entryDN, n));
@@ -600,7 +600,7 @@
    }

    // not found
    if (!isSynchronizationOperation() && !DirectoryServer.addMissingRDNAttributes())
    if (!isSynchronizationOperation() && !DirectoryServer.getCoreConfigManager().isAddMissingRDNAttributes())
    {
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
          ERR_ADD_MISSING_RDN_ATTRIBUTE.get(entryDN, n));
@@ -859,7 +859,7 @@
                message = WARN_ADD_OP_INVALID_SYNTAX.get(entryDN, v, a.getAttributeDescription(), invalidReason);
              }

              switch (DirectoryServer.getSyntaxEnforcementPolicy())
              switch (DirectoryServer.getCoreConfigManager().getSyntaxEnforcementPolicy())
              {
              case REJECT:
                throw new DirectoryException(

 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java

@@ -139,9 +139,10 @@
    clientConnection         = getClientConnection();
    returnAuthzID            = false;
    executePostOpPlugins     = false;
    sizeLimit                = DirectoryServer.getSizeLimit();
    timeLimit                = DirectoryServer.getTimeLimit();
    lookthroughLimit         = DirectoryServer.getLookthroughLimit();
    CoreConfigManager coreConfigManager = DirectoryServer.getCoreConfigManager();
    sizeLimit                = coreConfigManager.getSizeLimit();
    timeLimit                = coreConfigManager.getTimeLimit();
    lookthroughLimit         = coreConfigManager.getLookthroughLimit();
    idleTimeLimit            = DirectoryServer.getIdleTimeLimit();
    bindDN                   = getBindDN();
    saslMechanism            = getSASLMechanism();
@@ -536,7 +537,7 @@
    }

    // If there is a bind DN, then see whether that is acceptable.
    if (DirectoryServer.bindWithDNRequiresPassword()
    if (DirectoryServer.getCoreConfigManager().isBindWithDNRequiresPassword()
        && bindDN != null && !bindDN.isRootDN())
    {
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
@@ -761,7 +762,7 @@
        ((policy.getLockoutFailureCount() > 0) ||
         ((policy.getLastLoginTimeAttribute() != null) &&
          (policy.getLastLoginTimeFormat() != null))) &&
        ((DirectoryServer.getWritabilityMode() == WritabilityMode.DISABLED) ||
        ((DirectoryServer.getCoreConfigManager().getWritabilityMode() == WritabilityMode.DISABLED) ||
         (backend.getWritabilityMode() == WritabilityMode.DISABLED)))
    {
      // This policy isn't applicable to root users, so if it's a root

 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java

@@ -664,7 +664,7 @@
    // If the server is configured to check the schema and the operation is not
    // a synchronization operation, make sure that the resulting entry is valid
    // as per the server schema.
    if (DirectoryServer.checkSchema() && !isSynchronizationOperation())
    if (DirectoryServer.getCoreConfigManager().isCheckSchema() && !isSynchronizationOperation())
    {
      LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
      if (! newEntry.conformsToSchema(null, false, true, true,
@@ -736,7 +736,7 @@

    // Make sure that the updated entry still conforms to the server
    // schema.
    if (DirectoryServer.checkSchema() && checkSchema)
    if (DirectoryServer.getCoreConfigManager().isCheckSchema() && checkSchema)
    {
      LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
      if (! newEntry.conformsToSchema(null, false, true, true,

 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java

@@ -1175,7 +1175,7 @@

  private boolean mustCheckSchema()
  {
    return !isSynchronizationOperation() && DirectoryServer.checkSchema();
    return !isSynchronizationOperation() && DirectoryServer.getCoreConfigManager().isCheckSchema();
  }

  /**
@@ -1189,7 +1189,7 @@
      Arg4<Object, Object, Object, Object> invalidSyntaxErrorMsg,
      Arg3<Object, Object, Object> invalidSyntaxNoValueErrorMsg) throws DirectoryException
  {
    AcceptRejectWarn syntaxPolicy = DirectoryServer.getSyntaxEnforcementPolicy();
    AcceptRejectWarn syntaxPolicy = DirectoryServer.getCoreConfigManager().getSyntaxEnforcementPolicy();
    AttributeDescription attrDesc = attr.getAttributeDescription();
    Syntax syntax = attrDesc.getAttributeType().getSyntax();


 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendSearchOperation.java

@@ -251,7 +251,7 @@
    {
      logger.traceException(e);

      setResultCode(DirectoryServer.getServerErrorResultCode());
      setResultCode(DirectoryServer.getCoreConfigManager().getServerErrorResultCode());
      appendErrorMessage(ERR_SEARCH_BACKEND_EXCEPTION
          .get(getExceptionMessage(e)));


 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java

@@ -693,7 +693,7 @@
  {
    if (!backend.isPrivateBackend())
    {
      checkIfWritable(DirectoryServer.getWritabilityMode(), op, serverMsg, entryDN);
      checkIfWritable(DirectoryServer.getCoreConfigManager().getWritabilityMode(), op, serverMsg, entryDN);
      checkIfWritable(backend.getWritabilityMode(), op, backendMsg, entryDN);
    }
  }

 opendj-server-legacy/src/test/java/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java

@@ -12,7 +12,7 @@
 * information: "Portions Copyright [year] [name of copyright owner]".
 *
 * Copyright 2008 Sun Microsystems, Inc.
 * Portions Copyright 2014-2015 ForgeRock AS.
 * Portions Copyright 2014-2016 ForgeRock AS.
 */
package org.opends.server.protocols;

@@ -28,6 +28,7 @@
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
import org.opends.server.api.ConnectionHandler;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;

import static org.testng.Assert.*;
@@ -168,7 +169,8 @@
  public void testValidConfigLDIF()
         throws Exception
  {
    assertEquals(DirectoryServer.getSizeLimit(), 1000);
    CoreConfigManager coreConfigManager = TestCaseUtils.getServerContext().getCoreConfigManager();
    assertEquals(coreConfigManager.getSizeLimit(), 1000);
    TestCaseUtils.initializeTestBackend(false);

    File tempDir =
@@ -230,7 +232,7 @@
      }

      assertTrue(found);
      assertEquals(DirectoryServer.getSizeLimit(), 100);
      assertEquals(coreConfigManager.getSizeLimit(), 100);
    }
    finally
    {
@@ -239,7 +241,7 @@
      TestCaseUtils.dsconfig(
        "set-global-configuration-prop",
        "--set", "size-limit:1000");
      assertEquals(DirectoryServer.getSizeLimit(), 1000);
      assertEquals(coreConfigManager.getSizeLimit(), 1000);
    }
  }


 opendj-server-legacy/src/test/java/org/opends/server/schema/EqualityMatchingRuleTest.java

@@ -80,7 +80,7 @@
      String value1, String value2, Boolean result)
      throws Exception
  {
    AcceptRejectWarn accept = DirectoryServer.getSyntaxEnforcementPolicy();
    AcceptRejectWarn accept = DirectoryServer.getCoreConfigManager().getSyntaxEnforcementPolicy();
    setSyntaxEnforcementPolicy(GlobalCfgDefn.InvalidAttributeSyntaxBehavior.WARN);
    try
    {