Replaced calls to LocalizedLogger.*(ArgN.get(...)) by calls to LocalizedLog...

Jean-Noel Rouvignac

03.39.2014 e6066d274c3a935be7527d1904823b98b5a72079

 opendj3-server-dev/replace.rb

@@ -227,7 +227,7 @@
    :extensions => ["java"],
    :replacements =>
      [
        /(logger\.\s*(trace|debug|warn|info|error)\s*\([^;]*)\s*\.toString\(\)/m,
        /(logger\.\s*(?:trace|debug|warn|info|error)\s*\([^;]*)\s*\.toString\(\)/m,
        '\1',
      ]
  }
@@ -238,7 +238,7 @@
    :replacements =>
      [
        # Need to fix removing the last parentheses
        /(logger\.\s*(trace|debug|warn|info|error)\s*\([^;]*)\s*String\s*\.\s*valueOf\s*\(/m,
        /(logger\.\s*(?:trace|debug|warn|info|error)\s*\([^;]*)\s*String\s*\.\s*valueOf\s*\(/m,
        '\1',
      ]
  }
@@ -248,7 +248,7 @@
    :extensions => ["java"],
    :replacements =>
      [
        /(logger\.\s*(trace|debug|warn|info|error)\s*\([^;]*)\s*(Character|Byte|Boolean|Short|Integer|Long|Float|Double)\s*\.\s*toString\s*\(/m,
        /(logger\.\s*(?:trace|debug|warn|info|error)\s*\([^;]*)\s*(Character|Byte|Boolean|Short|Integer|Long|Float|Double)\s*\.\s*toString\s*\(/m,
        '\1',
        # Need to fix removing the last parentheses
        /([A-Z0-9_]+\s*\.\s*get\s*\([^;]*)\s*(Character|Byte|Boolean|Short|Integer|Long|Float|Double)\s*\.\s*toString\s*\(/m,
@@ -256,6 +256,16 @@
      ]
  }

  LOGGER_AND_ARGN_TO_LOGGER_ONLY = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
    :replacements =>
      [
        /(logger\.\s*(?:trace|debug|warn|info|error)\s*\()\s*([A-Z0-9_]+)\s*\.\s*get\s*\(([^;]+)\)([^;]+)/m,
        '\1\2, \3\4',
      ]
  }

  LOGGER_ISTRACEENABLED_TRACEEXCEPTION = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
@@ -269,7 +279,7 @@
  }

  # List of replacements to run
  REPLACEMENTS = [ LOGGER_MSG_ARGN_PRIMITIVE_TOSTRING ]
  REPLACEMENTS = [ LOGGER_AND_ARGN_TO_LOGGER_ONLY ]


  ################################### Processing methods ########################################

 opendj3-server-dev/src/server/org/opends/server/admin/ClassLoaderProvider.java

@@ -669,11 +669,7 @@
      try {
        // Log build information of extensions in the error log
        String[] information = getBuildInformation(jarFile);
        logger.error(
          NOTE_LOG_EXTENSION_INFORMATION.
            get(jarFile.getName(),
                information[1],
                information[2]));
        logger.error(NOTE_LOG_EXTENSION_INFORMATION, jarFile.getName(), information[1], information[2]);
      } catch(Exception e) {
        // Do not log information for that extension
      }

 opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java

@@ -1143,13 +1143,13 @@
      final DN authDN = authenticationInfo.getAuthenticationDN();
      if (operation == null)
      {
        logger.trace(INFO_CLIENTCONNECTION_AUDIT_HASPRIVILEGES.get(
            getConnectionID(), -1L, authDN, buffer, result));
        logger.trace(INFO_CLIENTCONNECTION_AUDIT_HASPRIVILEGES,
            getConnectionID(), -1L, authDN, buffer, result);
      }
      else
      {
        logger.trace(INFO_CLIENTCONNECTION_AUDIT_HASPRIVILEGES.get(
            getConnectionID(), operation.getOperationID(), authDN, buffer, result));
        logger.trace(INFO_CLIENTCONNECTION_AUDIT_HASPRIVILEGES,
            getConnectionID(), operation.getOperationID(), authDN, buffer, result);
      }

      return result;

 opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java

@@ -1245,7 +1245,7 @@
      if (globalAcis != null)
      {
        aciList.addAci(DN.rootDN(), globalAcis);
        logger.debug(INFO_ACI_ADD_LIST_GLOBAL_ACIS.get(globalAcis.size()));
        logger.debug(INFO_ACI_ADD_LIST_GLOBAL_ACIS, globalAcis.size());
      }
    }
    catch (Exception e)

 opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java

@@ -422,8 +422,7 @@
    if (backend.getEntryCount() > 0
        && !backend.isIndexed(aciType, IndexType.PRESENCE))
    {
      logger.warn(WARN_ACI_ATTRIBUTE_NOT_INDEXED.get(backend
          .getBackendID(), "aci"));
      logger.warn(WARN_ACI_ATTRIBUTE_NOT_INDEXED, backend.getBackendID(), "aci");
    }

    InternalClientConnection conn =

 opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AuthMethod.java

@@ -94,8 +94,7 @@
      {
        String saslMech = expr.substring(5);
        if (DirectoryServer.getSASLMechanismHandler(saslMech) == null) {
          logger.error(NOTE_ACI_SYNTAX_DUBIOUS_AUTHMETHOD_SASL_MECHANISM.
                    get(saslMech));
          logger.error(NOTE_ACI_SYNTAX_DUBIOUS_AUTHMETHOD_SASL_MECHANISM, saslMech);
        }
        return new AuthMethod(EnumAuthMethod.AUTHMETHOD_SASL, saslMech, type);
      }

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryCachePreloader.java

@@ -165,7 +165,7 @@
   */
  protected void preload()
  {
    logger.info(NOTE_CACHE_PRELOAD_PROGRESS_START.get(jeb.getBackendID()));
    logger.info(NOTE_CACHE_PRELOAD_PROGRESS_START, jeb.getBackendID());
    // Start collector thread first.
    collector.start();
    // Kick off a single worker.
@@ -242,7 +242,7 @@
      for (Thread thread : preloadThreads) {
        thread.interrupt();
      }
      logger.warn(WARN_CACHE_PRELOAD_INTERRUPTED.get(jeb.getBackendID()));
      logger.warn(WARN_CACHE_PRELOAD_INTERRUPTED, jeb.getBackendID());
    } finally {
      // Kill the timer task.
      timer.cancel();

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryContainer.java

@@ -552,8 +552,7 @@
        }
        id2subtree.open(); // No-op

        logger.info(NOTE_JEB_SUBORDINATE_INDEXES_DISABLED.get(backend
            .getBackendID()));
        logger.info(NOTE_JEB_SUBORDINATE_INDEXES_DISABLED, backend.getBackendID());
      }

      dn2uri = new DN2URI(databasePrefix + "_" + REFERRAL_DATABASE_NAME,
@@ -569,7 +568,7 @@
        index.open();
        if(!index.isTrusted())
        {
          logger.info(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(index.getName()));
          logger.info(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD, index.getName());
        }
        attrIndexMap.put(indexCfg.getAttribute(), index);
      }
@@ -583,8 +582,7 @@

        if(!vlvIndex.isTrusted())
        {
          logger.error(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
              vlvIndex.getName()));
          logger.error(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD, vlvIndex.getName());
        }

        vlvIndexMap.put(vlvIndexCfg.getName().toLowerCase(), vlvIndex);
@@ -3567,8 +3565,7 @@
          state.putIndexTrustState(null, id2subtree, false);
          id2subtree.open(); // No-op

          logger.error(NOTE_JEB_SUBORDINATE_INDEXES_DISABLED
              .get(cfg.getBackendId()));
          logger.error(NOTE_JEB_SUBORDINATE_INDEXES_DISABLED, cfg.getBackendId());
        }
      }

@@ -3795,8 +3792,7 @@
    id2children.open();
    if (!id2children.isTrusted())
    {
      logger.error(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(id2children
              .getName()));
      logger.error(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD, id2children.getName());
    }
    id2subtree = new Index(databasePrefix + "_" + ID2SUBTREE_DATABASE_NAME,
            new ID2SIndexer(), state, config.getIndexEntryLimit(), 0, true,
@@ -3804,7 +3800,7 @@
    id2subtree.open();
    if (!id2subtree.isTrusted())
    {
      logger.error(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(id2subtree.getName()));
      logger.error(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD, id2subtree.getName());
    }
  }


 opendj3-server-dev/src/server/org/opends/server/backends/jeb/Index.java

@@ -559,7 +559,7 @@
          }

          setTrusted(txn, false);
          logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
          logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD, name);
        }

        if((rebuildRunning || trusted) && addedIDs != null &&
@@ -679,7 +679,7 @@
        }

        setTrusted(txn, false);
        logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
        logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD, name);
      }

      if((rebuildRunning || trusted) && addedIDs != null && addedIDs.size() > 0)
@@ -783,7 +783,7 @@
          }

          setTrusted(txn, false);
          logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
          logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD, name);
        }
      }
    }
@@ -831,7 +831,7 @@
        }

        setTrusted(txn, false);
        logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
        logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD, name);
      }
      else
      {
@@ -864,7 +864,7 @@
        }

        setTrusted(txn, false);
        logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD.get(name));
        logger.error(ERR_JEB_INDEX_CORRUPT_REQUIRES_REBUILD, name);
      }
    }
  }

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java

@@ -536,17 +536,16 @@

    if (oldThreadCount != threadCount)
    {
      logger.error(
          NOTE_JEB_IMPORT_ADJUST_THREAD_COUNT.get(oldThreadCount, threadCount));
      logger.error(NOTE_JEB_IMPORT_ADJUST_THREAD_COUNT, oldThreadCount, threadCount);
    }

    logger.info(NOTE_JEB_IMPORT_LDIF_TOT_MEM_BUF.get(availableMemory, phaseOneBufferCount));
    logger.info(NOTE_JEB_IMPORT_LDIF_TOT_MEM_BUF, availableMemory, phaseOneBufferCount);
    if (tmpEnvCacheSize > 0)
    {
      logger.info(NOTE_JEB_IMPORT_LDIF_TMP_ENV_MEM.get(tmpEnvCacheSize));
      logger.info(NOTE_JEB_IMPORT_LDIF_TMP_ENV_MEM, tmpEnvCacheSize);
    }
    envConfig.setConfigParam(MAX_MEMORY, Long.toString(dbCacheSize));
    logger.info(NOTE_JEB_IMPORT_LDIF_DB_MEM_BUF_INFO.get(dbCacheSize, bufferSize));
    logger.info(NOTE_JEB_IMPORT_LDIF_DB_MEM_BUF_INFO, dbCacheSize, bufferSize);
  }

  /**

 opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java

@@ -672,7 +672,7 @@
          StringBuilder failureReason = new StringBuilder();
          if (! LockFileManager.releaseLock(lockFile, failureReason))
          {
            logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(backendID, failureReason));
            logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backendID, failureReason);
            // FIXME -- Do we need to send an admin alert?
          }
        }
@@ -680,8 +680,8 @@
        {
          logger.traceException(e2);

          logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(backendID,
              stackTraceToSingleLineString(e2)));
          logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backendID,
              stackTraceToSingleLineString(e2));
          // FIXME -- Do we need to send an admin alert?
        }


 opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java

@@ -1242,8 +1242,7 @@
      }


      logger.info(NOTE_DIRECTORY_SERVER_STARTING.get(getVersionString(),
                                                  BUILD_ID, REVISION_NUMBER));
      logger.info(NOTE_DIRECTORY_SERVER_STARTING, getVersionString(), BUILD_ID, REVISION_NUMBER);

      // Acquire an exclusive lock for the Directory Server process.
      if (! serverLocked)
@@ -1625,9 +1624,8 @@
    catch (Exception e)
    {
      logger.traceException(e);

      logger.error(ERR_CANNOT_BOOTSTRAP_SYNTAX.get(syntax.getClass().getName(),
          stackTraceToSingleLineString(e)));
      logger.error(ERR_CANNOT_BOOTSTRAP_SYNTAX, syntax.getClass().getName(),
          stackTraceToSingleLineString(e));
    }
    return syntax;
  }

 opendj3-server-dev/src/server/org/opends/server/core/EntryCacheConfigManager.java

@@ -199,8 +199,8 @@
      if (!cacheOrderMap.isEmpty()) {
        if (cacheOrderMap.containsKey(configuration.getCacheLevel())) {
          // Log error and skip this cache.
          logger.error(ERR_CONFIG_ENTRYCACHE_CONFIG_LEVEL_NOT_ACCEPTABLE.get(
            configuration.dn(), configuration.getCacheLevel()));
          logger.error(ERR_CONFIG_ENTRYCACHE_CONFIG_LEVEL_NOT_ACCEPTABLE,
              configuration.dn(), configuration.getCacheLevel());
          continue;
        }
      }

 opendj3-server-dev/src/server/org/opends/server/core/GroupManager.java

@@ -589,7 +589,7 @@
        filter = groupImplementation.getGroupDefinitionFilter();
        if (backend.getEntryCount() > 0 && ! backend.isIndexed(filter))
        {
          logger.warn(WARN_GROUP_FILTER_NOT_INDEXED.get(filter, configEntryDN, backend.getBackendID()));
          logger.warn(WARN_GROUP_FILTER_NOT_INDEXED, filter, configEntryDN, backend.getBackendID());
        }
      }
      catch (Exception e)

 opendj3-server-dev/src/server/org/opends/server/core/IdentityMapperConfigManager.java

@@ -148,7 +148,7 @@
    }
    else if (! identityMappers.containsKey(mapperDN))
    {
      logger.error(ERR_CONFIG_IDMAPPER_INVALID_PROXY_MAPPER_DN.get(mapperDN));
      logger.error(ERR_CONFIG_IDMAPPER_INVALID_PROXY_MAPPER_DN, mapperDN);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/core/SubentryManager.java

@@ -320,7 +320,7 @@
            ")");
      if (backend.getEntryCount() > 0 && ! backend.isIndexed(filter))
      {
        logger.warn(WARN_SUBENTRY_FILTER_NOT_INDEXED.get(filter, backend.getBackendID()));
        logger.warn(WARN_SUBENTRY_FILTER_NOT_INDEXED, filter, backend.getBackendID());
      }
    }
    catch (Exception e)

 opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java

@@ -1056,9 +1056,8 @@

      // Only log an error once, on first error
      if (isAlreadyLogged.compareAndSet(false, true)) {
        logger.error(ERR_PWPOLICY_REJECT_DUE_TO_UNKNOWN_VALIDATOR_LOG.get(
            userEntry.getName().toNormalizedString(), pwPolicyName,
            validatorName));
        logger.error(ERR_PWPOLICY_REJECT_DUE_TO_UNKNOWN_VALIDATOR_LOG,
            userEntry.getName().toNormalizedString(), pwPolicyName, validatorName);
      }
      return false;
    }

 opendj3-server-dev/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandler.java

@@ -112,10 +112,8 @@
      {
        bindOperation.addAdditionalLogItem(AdditionalLogItem.quotedKeyValue(
            getClass(), "trace", credString));
        logger.error(INFO_SASLANONYMOUS_TRACE.
            get(bindOperation.getConnectionID(), bindOperation.getOperationID(),
                credString));

        logger.error(INFO_SASLANONYMOUS_TRACE,
            bindOperation.getConnectionID(), bindOperation.getOperationID(), credString);
      }
    }


 opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java

@@ -206,15 +206,13 @@
      f = new File(configFile + ".startok");
      if (! f.exists())
      {
        logger.warn(WARN_CONFIG_FILE_NO_STARTOK_FILE.get(f.getAbsolutePath(),
                                                      configFile));
        logger.warn(WARN_CONFIG_FILE_NO_STARTOK_FILE, f.getAbsolutePath(), configFile);
        useLastKnownGoodConfig = false;
        f = new File(configFile);
      }
      else
      {
        logger.info(NOTE_CONFIG_FILE_USING_STARTOK_FILE.get(f.getAbsolutePath(),
                                                         configFile));
        logger.info(NOTE_CONFIG_FILE_USING_STARTOK_FILE, f.getAbsolutePath(), configFile);
      }
    }
    else
@@ -2048,18 +2046,14 @@
        catch (Exception e)
        {
          logger.traceException(e);

          logger.error(ERR_STARTOK_CANNOT_WRITE.get(configFile, tempFilePath,
                                                getExceptionMessage(e)));
          logger.error(ERR_STARTOK_CANNOT_WRITE, configFile, tempFilePath, getExceptionMessage(e));
          return;
        }
      }
      catch (Exception e)
      {
        logger.traceException(e);

        logger.error(ERR_STARTOK_CANNOT_OPEN_FOR_WRITING.get(tempFilePath,
                      getExceptionMessage(e)));
        logger.error(ERR_STARTOK_CANNOT_OPEN_FOR_WRITING, tempFilePath, getExceptionMessage(e));
        return;
      }
      finally
@@ -2070,9 +2064,7 @@
    catch (Exception e)
    {
      logger.traceException(e);

      logger.error(ERR_STARTOK_CANNOT_OPEN_FOR_READING.get(configFile,
                                                       getExceptionMessage(e)));
      logger.error(ERR_STARTOK_CANNOT_OPEN_FOR_READING, configFile, getExceptionMessage(e));
      return;
    }
    finally
@@ -2116,9 +2108,7 @@
    } catch (Exception e)
    {
      logger.traceException(e);

      logger.error(ERR_STARTOK_CANNOT_RENAME.get(tempFilePath, startOKFilePath,
                                             getExceptionMessage(e)));
      logger.error(ERR_STARTOK_CANNOT_RENAME, tempFilePath, startOKFilePath, getExceptionMessage(e));
      return;
    }


 opendj3-server-dev/src/server/org/opends/server/extensions/DiskSpaceMonitor.java

@@ -291,7 +291,7 @@
    }
    catch(Exception e)
    {
      logger.error(ERR_DISK_SPACE_MONITOR_UPDATE_FAILED.get(directory.getPath(), e));
      logger.error(ERR_DISK_SPACE_MONITOR_UPDATE_FAILED, directory.getPath(), e);
      logger.traceException(e);
    }
  }

 opendj3-server-dev/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandler.java

@@ -119,10 +119,11 @@
  public void handleStatusNotification(
                   AccountStatusNotification notification)
  {
    logger.info(NOTE_ERRORLOG_ACCTNOTHANDLER_NOTIFICATION.get(notification.getNotificationType().getName(),
    logger.info(NOTE_ERRORLOG_ACCTNOTHANDLER_NOTIFICATION,
                  notification.getNotificationType().getName(),
                  notification.getUserDN(),
                  notification.getMessage().ordinal(),
                  notification.getMessage()));
                  notification.getMessage());
  }



 opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java

@@ -361,7 +361,7 @@
                // Remove cache entries specific to this backend.
                clearBackend(DirectoryServer.getBackend(backend));
                // Log an error message.
                logger.warn(WARN_FSCACHE_OFFLINE_STATE_FAIL.get(backend));
                logger.warn(WARN_FSCACHE_OFFLINE_STATE_FAIL, backend);
              }
            }
            // Pop max entries limit.

 opendj3-server-dev/src/server/org/opends/server/extensions/GSSAPISASLMechanismHandler.java

@@ -324,7 +324,7 @@
      principal.append("@").append(realm);
    }
    w.write(principal.toString());
    logger.error(INFO_GSSAPI_PRINCIPAL_NAME.get(principal));
    logger.error(INFO_GSSAPI_PRINCIPAL_NAME, principal);
    w.write("\" isInitiator=false;");
    w.newLine();
    w.write("};");

 opendj3-server-dev/src/server/org/opends/server/extensions/MD5PasswordStorageScheme.java

@@ -255,7 +255,7 @@
    catch (Exception e)
    {
      logger.traceException(e);
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(storedPassword, e));
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, e);
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java

@@ -202,7 +202,7 @@
      catch (Exception e)
      {
        logger.traceException(e);
        logger.warn(WARN_QUEUE_UNABLE_TO_CANCEL.get(o, e));
        logger.warn(WARN_QUEUE_UNABLE_TO_CANCEL, o, e);
      }
    }

@@ -217,7 +217,7 @@
      catch (Exception e)
      {
        logger.traceException(e);
        logger.warn(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD.get(t.getName(), e));
        logger.warn(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD, t.getName(), e);
      }
    }
  }
@@ -413,7 +413,7 @@

      // This should not happen.  The only recourse we have is to log a message
      // and try again.
      logger.warn(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION.get(Thread.currentThread().getName(), e));
      logger.warn(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION, Thread.currentThread().getName(), e);
      return retryNextOperation(workerThread, numFailures + 1);
    }
  }

 opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkerThread.java

@@ -213,11 +213,11 @@
    // and we will want to log a message.
    if (stoppedByReducedThreadNumber)
    {
      logger.debug(INFO_WORKER_STOPPED_BY_REDUCED_THREADNUMBER.get(getName()));
      logger.debug(INFO_WORKER_STOPPED_BY_REDUCED_THREADNUMBER, getName());
    }
    else if (! workQueue.shutdownRequested())
    {
      logger.warn(WARN_UNEXPECTED_WORKER_THREAD_EXIT.get(getName()));
      logger.warn(WARN_UNEXPECTED_WORKER_THREAD_EXIT, getName());
    }



 opendj3-server-dev/src/server/org/opends/server/extensions/PasswordModifyExtendedOperation.java

@@ -981,9 +981,9 @@
          // At this point, the user's password is already changed so there's
          // not much point in returning a non-success result.  However, we
          // should at least log that something went wrong.
          logger.warn(WARN_EXTOP_PASSMOD_CANNOT_UPDATE_PWP_STATE.get(userDN,
          logger.warn(WARN_EXTOP_PASSMOD_CANNOT_UPDATE_PWP_STATE, userDN,
                  modOp.getResultCode(),
                  modOp.getErrorMessage()));
                  modOp.getErrorMessage());
        }
      }


 opendj3-server-dev/src/server/org/opends/server/extensions/SHA1PasswordStorageScheme.java

@@ -253,7 +253,7 @@
    catch (Exception e)
    {
      logger.traceException(e);
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(storedPassword, e));
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, e);
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/extensions/SMTPAccountStatusNotificationHandler.java

@@ -654,8 +654,8 @@
    {
      logger.traceException(e);

      logger.error(ERR_SMTP_ASNH_CANNOT_SEND_MESSAGE.get(
          notificationType.getName(), notification.getUserDN(), getExceptionMessage(e)));
      logger.error(ERR_SMTP_ASNH_CANNOT_SEND_MESSAGE,
          notificationType.getName(), notification.getUserDN(), getExceptionMessage(e));
    }
  }


 opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java

@@ -260,7 +260,7 @@
      catch (Exception e)
      {
        logger.traceException(e);
        logger.warn(WARN_QUEUE_UNABLE_TO_CANCEL.get(o, e));
        logger.warn(WARN_QUEUE_UNABLE_TO_CANCEL, o, e);
      }
    }

@@ -274,7 +274,7 @@
      catch (Exception e)
      {
        logger.traceException(e);
        logger.warn(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD.get(t.getName(), e));
        logger.warn(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD, t.getName(), e);
      }
    }
  }
@@ -510,7 +510,7 @@

      // If we've gotten here, then the worker thread was interrupted for some
      // other reason. This should not happen, and we need to log a message.
      logger.warn(WARN_WORKER_INTERRUPTED_WITHOUT_SHUTDOWN.get(Thread.currentThread().getName(), ie));
      logger.warn(WARN_WORKER_INTERRUPTED_WITHOUT_SHUTDOWN, Thread.currentThread().getName(), ie);
    }
    catch (Exception e)
    {
@@ -518,7 +518,7 @@

      // This should not happen. The only recourse we have is to log a message
      // and try again.
      logger.warn(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION.get(Thread.currentThread().getName(), e));
      logger.warn(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION, Thread.currentThread().getName(), e);
    }
    finally
    {

 opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java

@@ -215,11 +215,11 @@
    // and we will want to log a message.
    if (stoppedByReducedThreadNumber)
    {
      logger.debug(INFO_WORKER_STOPPED_BY_REDUCED_THREADNUMBER.get(getName()));
      logger.debug(INFO_WORKER_STOPPED_BY_REDUCED_THREADNUMBER, getName());
    }
    else if (! workQueue.shutdownRequested())
    {
      logger.warn(WARN_UNEXPECTED_WORKER_THREAD_EXIT.get(getName()));
      logger.warn(WARN_UNEXPECTED_WORKER_THREAD_EXIT, getName());
    }



 opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java

@@ -709,11 +709,11 @@
        break;

      case NO_SUCH_OBJECT:
        logger.debug(INFO_PLUGIN_REFERENT_SEARCH_NO_SUCH_OBJECT.get(baseDN));
        logger.debug(INFO_PLUGIN_REFERENT_SEARCH_NO_SUCH_OBJECT, baseDN);
        return;

      default:
        logger.error(ERR_PLUGIN_REFERENT_SEARCH_FAILED.get(operation.getErrorMessage()));
        logger.error(ERR_PLUGIN_REFERENT_SEARCH_FAILED, operation.getErrorMessage());
        return;
    }

@@ -807,7 +807,7 @@
            conn.processModify(entryDN, mods);
    if(modifyOperation.getResultCode() != ResultCode.SUCCESS)
    {
      logger.error(ERR_PLUGIN_REFERENT_MODIFY_FAILED.get(entryDN, modifyOperation.getErrorMessage()));
      logger.error(ERR_PLUGIN_REFERENT_MODIFY_FAILED, entryDN, modifyOperation.getErrorMessage());
    }
  }

@@ -892,7 +892,7 @@
      }
      catch (IOException io)
      {
        logger.error(ERR_PLUGIN_REFERENT_CLOSE_LOGFILE.get(io.getMessage()));
        logger.error(ERR_PLUGIN_REFERENT_CLOSE_LOGFILE, io.getMessage());
      }
    }
  }
@@ -920,7 +920,7 @@
      }
      catch (IOException io)
      {
        logger.error(ERR_PLUGIN_REFERENT_CLOSE_LOGFILE.get(io.getMessage()));
        logger.error(ERR_PLUGIN_REFERENT_CLOSE_LOGFILE, io.getMessage());
      }
    }
  }
@@ -966,7 +966,7 @@
        logFile.delete();
        logFile.createNewFile();
      } catch (IOException io) {
        logger.error(ERR_PLUGIN_REFERENT_REPLACE_LOGFILE.get(io.getMessage()));
        logger.error(ERR_PLUGIN_REFERENT_REPLACE_LOGFILE, io.getMessage());
      }
    }
  }

 opendj3-server-dev/src/server/org/opends/server/plugins/SambaPasswordPlugin.java

@@ -989,7 +989,7 @@
    }
    catch (final Exception e)
    {
      logger.info(ERR_PLUGIN_SAMBA_SYNC_ENCODING.get(e.getMessage()), e);
      logger.info(ERR_PLUGIN_SAMBA_SYNC_ENCODING, e.getMessage(), e);
      modifications = null;
    }

@@ -1051,7 +1051,7 @@
    }
    catch (final DirectoryException e)
    {
      logger.info(ERR_PLUGIN_SAMBA_SYNC_MODIFICATION_PROCESSING.get(e.getMessage()), e);
      logger.info(ERR_PLUGIN_SAMBA_SYNC_MODIFICATION_PROCESSING, e.getMessage(), e);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java

@@ -151,16 +151,16 @@
        // The path specified as the LDIF directory exists, but isn't a
        // directory.  This is probably a mistake, and we should at least log
        // a warning message.
        logger.warn(WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_NOT_DIRECTORY.get(
            ldifDirectory.getAbsolutePath(), configuration.dn()));
        logger.warn(WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_NOT_DIRECTORY,
            ldifDirectory.getAbsolutePath(), configuration.dn());
      }
    }
    else
    {
      // The path specified as the LDIF directory doesn't exist.  We should log
      // a warning message saying that we won't do anything until it's created.
      logger.warn(WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_MISSING.get(
          ldifDirectory.getAbsolutePath(), configuration.dn()));
      logger.warn(WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_MISSING,
          ldifDirectory.getAbsolutePath(), configuration.dn());
    }

    this.currentConfig = configuration;

 opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java

@@ -723,8 +723,8 @@
        // error + alert about the horked config
        logger.traceException(e);

        logger.error(ERR_CONNHANDLER_CANNOT_ACCEPT_CONNECTION.get(friendlyName,
            currentConfig.dn(), getExceptionMessage(e)));
        logger.error(ERR_CONNHANDLER_CANNOT_ACCEPT_CONNECTION,
            friendlyName, currentConfig.dn(), getExceptionMessage(e));

        if (lastIterationFailed)
        {
@@ -771,7 +771,7 @@
    logger.trace("Starting HTTP server...");
    this.httpServer.start();
    logger.trace("HTTP server started");
    logger.info(NOTE_CONNHANDLER_STARTED_LISTENING.get(handlerName));
    logger.info(NOTE_CONNHANDLER_STARTED_LISTENING, handlerName);
  }

  private HttpServer createHttpServer()
@@ -929,7 +929,7 @@
      this.httpServer.shutdownNow();
      cleanUpHttpServer();
      logger.trace("HTTP server stopped");
      logger.info(NOTE_CONNHANDLER_STOPPED_LISTENING.get(handlerName));
      logger.info(NOTE_CONNHANDLER_STOPPED_LISTENING, handlerName);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java

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

      logger.error(ERR_INTERNAL_CANNOT_DECODE_DN.get(fullDNString, getExceptionMessage(de)));
      logger.error(ERR_INTERNAL_CANNOT_DECODE_DN, fullDNString, getExceptionMessage(de));
    }

    connectionID  = nextConnectionID.getAndDecrement();

 opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java

@@ -755,8 +755,8 @@
      // This must mean that the operation has either not yet completed
      // or that it completed without a result for some reason. In any
      // case, log a message and set the response to "operations error".
      logger.error(ERR_LDAP_CLIENT_SEND_RESPONSE_NO_RESULT_CODE.get(operation.getOperationType(),
          operation.getConnectionID(), operation.getOperationID()));
      logger.error(ERR_LDAP_CLIENT_SEND_RESPONSE_NO_RESULT_CODE, operation.getOperationType(),
          operation.getConnectionID(), operation.getOperationID());
      resultCode = DirectoryServer.getServerErrorResultCode();
    }

@@ -826,8 +826,8 @@
      // If this an LDAPv2 client, then we can't send this.
      if (ldapVersion == 2)
      {
        logger.error(ERR_LDAPV2_SKIPPING_EXTENDED_RESPONSE.get(
            getConnectionID(), operation.getOperationID(), operation));
        logger.error(ERR_LDAPV2_SKIPPING_EXTENDED_RESPONSE,
            getConnectionID(), operation.getOperationID(), operation);
        return null;
      }

@@ -855,8 +855,8 @@
    default:
      // This must be a type of operation that doesn't have a response.
      // This shouldn't happen, so log a message and return.
      logger.error(ERR_LDAP_CLIENT_SEND_RESPONSE_INVALID_OP.get(operation.getOperationType(), getConnectionID(),
          operation.getOperationID(), operation));
      logger.error(ERR_LDAP_CLIENT_SEND_RESPONSE_INVALID_OP, operation.getOperationType(), getConnectionID(),
          operation.getOperationID(), operation);
      return null;
    }


 opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java

@@ -973,7 +973,7 @@
          cleanUpSelector();
          listening = false;

          logger.info(NOTE_CONNHANDLER_STOPPED_LISTENING.get(handlerName));
          logger.info(NOTE_CONNHANDLER_STOPPED_LISTENING, handlerName);
        }

        StaticUtils.sleep(1000);
@@ -1003,7 +1003,7 @@
        // administrative action before trying again.
        if (numRegistered == 0)
        {
          logger.error(ERR_LDAP_CONNHANDLER_NO_ACCEPTORS.get(currentConfig.dn()));
          logger.error(ERR_LDAP_CONNHANDLER_NO_ACCEPTORS, currentConfig.dn());

          enabled = false;
          continue;
@@ -1025,9 +1025,8 @@
          catch (Exception e)
          {
            logger.traceException(e);

            logger.error(ERR_CONNHANDLER_CANNOT_ACCEPT_CONNECTION.get(friendlyName,
                currentConfig.dn(), getExceptionMessage(e)));
            logger.error(ERR_CONNHANDLER_CANNOT_ACCEPT_CONNECTION, friendlyName,
                currentConfig.dn(), getExceptionMessage(e));

            if (lastIterationFailed)
            {
@@ -1150,14 +1149,14 @@
        channel.register(selector, SelectionKey.OP_ACCEPT);
        numRegistered++;

        logger.info(NOTE_CONNHANDLER_STARTED_LISTENING.get(handlerName));
        logger.info(NOTE_CONNHANDLER_STARTED_LISTENING, handlerName);
      }
      catch (Exception e)
      {
        logger.traceException(e);

        logger.error(ERR_LDAP_CONNHANDLER_CREATE_CHANNEL_FAILED.get(currentConfig.dn(), a.getHostAddress(), listenPort,
            stackTraceToSingleLineString(e)));
        logger.error(ERR_LDAP_CONNHANDLER_CREATE_CHANNEL_FAILED, currentConfig.dn(), a.getHostAddress(), listenPort,
            stackTraceToSingleLineString(e));
      }
    }
    return numRegistered;

 opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java

@@ -412,7 +412,7 @@
           * Log an error for the repair tool
           * that will need to re-synchronize the servers.
           */
          logger.error(ERR_CANNOT_RECOVER_CHANGES.get(getBaseDNString()));
          logger.error(ERR_CANNOT_RECOVER_CHANGES, getBaseDNString());
        }
      } catch (Exception e)
      {
@@ -423,7 +423,7 @@
         * Log an error for the repair tool
         * that will need to re-synchronize the servers.
         */
        logger.error(ERR_CANNOT_RECOVER_CHANGES.get(getBaseDNString()));
        logger.error(ERR_CANNOT_RECOVER_CHANGES, getBaseDNString());
      }
      finally
      {
@@ -480,8 +480,7 @@
    }
    catch (DirectoryException e)
    {
      logger.error(ERR_LOADING_GENERATION_ID.get(
          getBaseDNString(), stackTraceToSingleLineString(e)));
      logger.error(ERR_LOADING_GENERATION_ID, getBaseDNString(), stackTraceToSingleLineString(e));
    }

    /*
@@ -568,8 +567,7 @@
      // Should not happen as normally already called without problem in
      // isConfigurationChangeAcceptable or isConfigurationAcceptable
      // if we come up to this method
      logger.error(NOTE_ERR_FRACTIONAL.get(getBaseDNString(),
          stackTraceToSingleLineString(e)));
      logger.error(NOTE_ERR_FRACTIONAL, getBaseDNString(), stackTraceToSingleLineString(e));
      return;
    }

@@ -587,8 +585,7 @@
    catch  (ConfigException e)
    {
      // Should not happen
      logger.error(NOTE_ERR_FRACTIONAL.get(getBaseDNString(),
          stackTraceToSingleLineString(e)));
      logger.error(NOTE_ERR_FRACTIONAL, getBaseDNString(), stackTraceToSingleLineString(e));
      return;
    }

@@ -661,10 +658,9 @@
    if (search.getResultCode() != ResultCode.SUCCESS
        && search.getResultCode() != ResultCode.NO_SUCH_OBJECT)
    {
      logger.error(ERR_SEARCHING_GENERATION_ID.get(
        search.getResultCode().getResultCodeName() + " " +
        search.getErrorMessage(),
        getBaseDNString()));
      logger.error(ERR_SEARCHING_GENERATION_ID,
          search.getResultCode().getResultCodeName() + " " + search.getErrorMessage(),
          getBaseDNString());
      return false;
    }

@@ -714,9 +710,9 @@
        }
        if (attr.size() > 1)
        {
          logger.error(ERR_LOADING_GENERATION_ID.get(getBaseDNString(),
              "#Values=" + attr.size() + " Must be exactly 1 in entry "
              + resultEntry.toLDIFString()));
          logger.error(ERR_LOADING_GENERATION_ID,
              getBaseDNString(),
              "#Values=" + attr.size() + " Must be exactly 1 in entry " + resultEntry.toLDIFString());
        }
      }
    }
@@ -775,9 +771,7 @@
    {
      // Should not happen as configuration in domain root entry is flushed
      // from valid configuration in local variables
      logger.error(NOTE_ERR_FRACTIONAL.get(
          fractionalConfig.getBaseDn(),
          stackTraceToSingleLineString(e)));
      logger.error(NOTE_ERR_FRACTIONAL, fractionalConfig.getBaseDn(), stackTraceToSingleLineString(e));
      return false;
    }

@@ -809,9 +803,7 @@
      // Should not happen as configuration in domain root entry is flushed
      // from valid configuration in local variables so both should have already
      // been checked
      logger.error(NOTE_ERR_FRACTIONAL.get(
          fractionalConfig.getBaseDn(),
          stackTraceToSingleLineString(e)));
      logger.error(NOTE_ERR_FRACTIONAL, fractionalConfig.getBaseDn(), stackTraceToSingleLineString(e));
      return false;
    }
  }
@@ -1420,8 +1412,7 @@
    }
    catch(DirectoryException e)
    {
      logger.error(NOTE_ERR_FRACTIONAL.get(getBaseDNString(),
          stackTraceToSingleLineString(e)));
      logger.error(NOTE_ERR_FRACTIONAL, getBaseDNString(), stackTraceToSingleLineString(e));
      return FRACTIONAL_HAS_NO_FRACTIONAL_FILTERED_ATTRIBUTES;
    }
    Set<ObjectClass> entryClasses = entryToModify.getObjectClasses().keySet();
@@ -2016,7 +2007,7 @@
        }
        catch  (NoSuchElementException e)
        {
          logger.error(ERR_OPERATION_NOT_FOUND_IN_PENDING.get(op, curCSN));
          logger.error(ERR_OPERATION_NOT_FOUND_IN_PENDING, op, curCSN);
          return;
        }
      }
@@ -2033,7 +2024,7 @@
          * It should never happen.
          */
          pendingChanges.remove(curCSN);
          logger.error(ERR_UNKNOWN_TYPE.get(op.getOperationType()));
          logger.error(ERR_UNKNOWN_TYPE, op.getOperationType());
          return;
        }

@@ -2053,7 +2044,7 @@
        }
        catch (NoSuchElementException e)
        {
          logger.error(ERR_OPERATION_NOT_FOUND_IN_PENDING.get(op, curCSN));
          logger.error(ERR_OPERATION_NOT_FOUND_IN_PENDING, op, curCSN);
          return;
        }
        // If assured replication is enabled, this will wait for the matching
@@ -2065,7 +2056,7 @@
        } catch (TimeoutException ex)
        {
          // This exception may only be raised if assured replication is enabled
          logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(), getAssuredTimeout(), msg));
          logger.error(NOTE_DS_ACK_TIMEOUT, getBaseDNString(), getAssuredTimeout(), msg);
        }
      }

@@ -2166,7 +2157,7 @@
       ResultCode res = newOp.getResultCode();
       if (res != ResultCode.SUCCESS)
       {
        logger.error(ERR_COULD_NOT_SOLVE_CONFLICT.get(entryDN, res));
        logger.error(ERR_COULD_NOT_SOLVE_CONFLICT, entryDN, res);
       }
     }
   }
@@ -2694,8 +2685,8 @@
    {
      // The other type of errors can not be caused by naming conflicts.
      // Log a message for the repair tool.
      logger.error(ERR_ERROR_REPLAYING_OPERATION.get(
          op, ctx.getCSN(), result, op.getErrorMessage()));
      logger.error(ERR_ERROR_REPLAYING_OPERATION,
          op, ctx.getCSN(), result, op.getErrorMessage());
      return true;
    }
  }
@@ -2762,8 +2753,8 @@
   {
     // The other type of errors can not be caused by naming conflicts.
     // Log a message for the repair tool.
     logger.error(ERR_ERROR_REPLAYING_OPERATION.get(
         op, ctx.getCSN(), result, op.getErrorMessage()));
     logger.error(ERR_ERROR_REPLAYING_OPERATION,
         op, ctx.getCSN(), result, op.getErrorMessage());
     return true;
   }
 }
@@ -2881,8 +2872,8 @@
  {
    // The other type of errors can not be caused by naming conflicts.
    // Log a message for the repair tool.
    logger.error(ERR_ERROR_REPLAYING_OPERATION.get(
        op, ctx.getCSN(), result, op.getErrorMessage()));
    logger.error(ERR_ERROR_REPLAYING_OPERATION,
        op, ctx.getCSN(), result, op.getErrorMessage());
    return true;
  }
}
@@ -2978,8 +2969,8 @@
    {
      // The other type of errors can not be caused by naming conflicts.
      // log a message for the repair tool.
      logger.error(ERR_ERROR_REPLAYING_OPERATION.get(
          op, ctx.getCSN(), result, op.getErrorMessage()));
      logger.error(ERR_ERROR_REPLAYING_OPERATION,
          op, ctx.getCSN(), result, op.getErrorMessage());
      return true;
    }
  }
@@ -3287,8 +3278,7 @@
       * not available, log an error and retry upon timeout
       * should we stop the modifications ?
       */
      logger.error(ERR_LOADING_GENERATION_ID.get(
          getBaseDNString(), stackTraceToSingleLineString(e)));
      logger.error(ERR_LOADING_GENERATION_ID, getBaseDNString(), stackTraceToSingleLineString(e));
      return;
    }

@@ -3366,8 +3356,7 @@

      if (result != ResultCode.SUCCESS)
      {
        logger.error(ERR_UPDATING_GENERATION_ID.get(
            result.getResultCodeName(), getBaseDNString()));
        logger.error(ERR_UPDATING_GENERATION_ID, result.getResultCodeName(), getBaseDNString());
      }
    }
    else
@@ -3419,10 +3408,9 @@
    {
      if (search.getResultCode() != ResultCode.NO_SUCH_OBJECT)
      {
        logger.error(ERR_SEARCHING_GENERATION_ID.get(
            search.getResultCode().getResultCodeName() + " " +
            search.getErrorMessage(),
            getBaseDNString()));
        logger.error(ERR_SEARCHING_GENERATION_ID,
            search.getResultCode().getResultCodeName() + " " + search.getErrorMessage(),
            getBaseDNString());
      }
    }
    else
@@ -3440,9 +3428,9 @@
          Attribute attr = attrs.get(0);
          if (attr.size()>1)
          {
            logger.error(ERR_LOADING_GENERATION_ID.get(
                getBaseDNString(), "#Values=" + attr.size() +
                " Must be exactly 1 in entry " + resultEntry.toLDIFString()));
            logger.error(ERR_LOADING_GENERATION_ID,
                getBaseDNString(),
                "#Values=" + attr.size() + " Must be exactly 1 in entry " + resultEntry.toLDIFString());
          }
          else if (attr.size() == 1)
          {
@@ -3453,8 +3441,7 @@
            }
            catch(Exception e)
            {
              logger.error(ERR_LOADING_GENERATION_ID.get(
                  getBaseDNString(), stackTraceToSingleLineString(e)));
              logger.error(ERR_LOADING_GENERATION_ID, getBaseDNString(), stackTraceToSingleLineString(e));
            }
          }
        }
@@ -4036,8 +4023,7 @@
    catch(Exception e)
    {
      logger.traceException(e);
      logger.error(ERR_CHECK_CREATE_REPL_BACKEND_FAILED.get(
          stackTraceToSingleLineString(e)));
      logger.error(ERR_CHECK_CREATE_REPL_BACKEND_FAILED, stackTraceToSingleLineString(e));
    }
  }

@@ -4102,8 +4088,7 @@
    catch (Exception e)
    {
      throw new ConfigException(NOTE_ERR_UNABLE_TO_ENABLE_ECL.get(
          "Replication Domain on " + getBaseDNString(),
          stackTraceToSingleLineString(e)), e);
          "Replication Domain on " + getBaseDNString(), stackTraceToSingleLineString(e)), e);
    }
  }

@@ -4143,9 +4128,8 @@
      }
      catch (DirectoryException de)
      {
        logger.error(NOTE_ERR_UNABLE_TO_ENABLE_ECL.get(
            "Replication Domain on " + getBaseDNString(),
            stackTraceToSingleLineString(de)));
        logger.error(NOTE_ERR_UNABLE_TO_ENABLE_ECL,
            "Replication Domain on " + getBaseDNString(), stackTraceToSingleLineString(de));
        // and go on
      }
    }
@@ -4156,7 +4140,7 @@
      // Go into bad data set status
      setNewStatus(StatusMachineEvent.TO_BAD_GEN_ID_STATUS_EVENT);
      broker.signalStatusChange(status);
      logger.error(NOTE_FRACTIONAL_BAD_DATA_SET_NEED_RESYNC.get(getBaseDNString()));
      logger.error(NOTE_FRACTIONAL_BAD_DATA_SET_NEED_RESYNC, getBaseDNString());
      return; // Do not send changes to the replication server
    }

@@ -4194,8 +4178,7 @@
      }
    } catch (Exception e)
    {
      logger.error(ERR_PUBLISHING_FAKE_OPS.get(getBaseDNString(),
          stackTraceToSingleLineString(e)));
      logger.error(ERR_PUBLISHING_FAKE_OPS, getBaseDNString(), stackTraceToSingleLineString(e));
    }
  }


 opendj3-server-dev/src/server/org/opends/server/replication/plugin/MultimasterReplication.java

@@ -197,8 +197,8 @@
    }
    catch (ConfigException e)
    {
      logger.error(ERR_COULD_NOT_START_REPLICATION.get(configuration.dn(), e.getLocalizedMessage()
          + " " + stackTraceToSingleLineString(e)));
      logger.error(ERR_COULD_NOT_START_REPLICATION, configuration.dn(),
          e.getLocalizedMessage() + " " + stackTraceToSingleLineString(e));
    }
    return null;
  }

 opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java

@@ -198,7 +198,7 @@
    ServerStatus newStatus = StatusMachine.computeNewStatus(status, event);
    if (newStatus == ServerStatus.INVALID_STATUS)
    {
      logger.error(ERR_RS_CANNOT_CHANGE_STATUS.get(getBaseDN(), serverId, status, event));
      logger.error(ERR_RS_CANNOT_CHANGE_STATUS, getBaseDN(), serverId, status, event);
      // Only change allowed is from NORMAL_STATUS to DEGRADED_STATUS and vice
      // versa. We may be trying to change the status while another status has
      // just been entered: e.g a full update has just been engaged.
@@ -315,7 +315,7 @@
    StatusMachineEvent event = StatusMachineEvent.statusToEvent(reqStatus);
    if (event == StatusMachineEvent.INVALID_EVENT)
    {
      logger.error(ERR_RS_INVALID_NEW_STATUS.get(reqStatus, getBaseDN(), serverId));
      logger.error(ERR_RS_INVALID_NEW_STATUS, reqStatus, getBaseDN(), serverId);
      return ServerStatus.INVALID_STATUS;
    }

@@ -323,7 +323,7 @@
    ServerStatus newStatus = StatusMachine.computeNewStatus(status, event);
    if (newStatus == ServerStatus.INVALID_STATUS)
    {
      logger.error(ERR_RS_CANNOT_CHANGE_STATUS.get(getBaseDN(), serverId, status, event));
      logger.error(ERR_RS_CANNOT_CHANGE_STATUS, getBaseDN(), serverId, status, event);
      return ServerStatus.INVALID_STATUS;
    }


 opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerWriter.java

@@ -161,7 +161,7 @@
    {
      // An unexpected error happened.
      // Log an error and close the connection.
      logger.error(ERR_WRITER_UNEXPECTED_EXCEPTION.get(handler + " " + stackTraceToSingleLineString(e)));
      logger.error(ERR_WRITER_UNEXPECTED_EXCEPTION, handler + " " + stackTraceToSingleLineString(e));
    }
    finally
    {
@@ -257,8 +257,7 @@
      }
      catch (Exception e)
      {
        logger.error(ERR_WRITER_UNEXPECTED_EXCEPTION.get(
            handler + " " + stackTraceToSingleLineString(e)));
        logger.error(ERR_WRITER_UNEXPECTED_EXCEPTION, handler + " " + stackTraceToSingleLineString(e));
        mypsearch.cancel();
      }
    }

 opendj3-server-dev/src/server/org/opends/server/replication/server/MsgQueue.java

@@ -124,12 +124,13 @@
            // Adding 2 msgs with the same CSN is ok only when
            // the 2 msgs are the same
            bytesCount += (update.size() - msgSameCSN.size());
            logger.error(ERR_RSQUEUE_DIFFERENT_MSGS_WITH_SAME_CN.get(
                msgSameCSN.getCSN(), msgSameCSN, update));
            logger.error(ERR_RSQUEUE_DIFFERENT_MSGS_WITH_SAME_CN, msgSameCSN.getCSN(), msgSameCSN, update);
          }
        }
        catch(Exception e)
        {}
        {
          logger.traceException(e);
        }
      }
      else
      {

 opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java

@@ -586,7 +586,7 @@
      catch (Exception e)
      {
        logger.traceException(e);
        logger.error(ERR_BACKEND_EXPORT_ENTRY.get(dnString, e));
        logger.error(ERR_BACKEND_EXPORT_ENTRY, dnString, e);
      }
    }
  }

 opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationDomainMonitor.java

@@ -207,7 +207,7 @@
              // error log with repeated messages.
              if (!pendingMonitorDataServerIDs.contains(serverId))
              {
                logger.info(NOTE_MONITOR_DATA_RECEIVED.get(baseDN, serverId));
                logger.info(NOTE_MONITOR_DATA_RECEIVED, baseDN, serverId);
              }
            }

@@ -218,7 +218,7 @@
              // error log with repeated messages.
              if (!monitorDataLateServers.contains(serverId))
              {
                logger.warn(WARN_MISSING_REMOTE_MONITOR_DATA.get(baseDN, serverId));
                logger.warn(WARN_MISSING_REMOTE_MONITOR_DATA, baseDN, serverId);
              }
            }

@@ -311,7 +311,7 @@
      {
        // This is a response for an earlier request whose computing is
        // already complete.
        logger.debug(INFO_IGNORING_REMOTE_MONITOR_DATA.get(domain.getBaseDN().toNormalizedString(), msg.getSenderID()));
        logger.debug(INFO_IGNORING_REMOTE_MONITOR_DATA, domain.getBaseDN().toNormalizedString(), msg.getSenderID());
        return;
      }

@@ -369,8 +369,7 @@
      catch (RuntimeException e)
      {
        // FIXME: do we really expect these???
        logger.error(ERR_PROCESSING_REMOTE_MONITOR_DATA.get(e.getMessage() + " "
            + stackTraceToSingleLineString(e)));
        logger.error(ERR_PROCESSING_REMOTE_MONITOR_DATA, e.getMessage() + " " + stackTraceToSingleLineString(e));
      }
      finally
      {

 opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServer.java

@@ -799,12 +799,12 @@
      catch (IOException e)
      {
        logger.traceException(e);
        logger.error(ERR_COULD_NOT_CLOSE_THE_SOCKET.get(e));
        logger.error(ERR_COULD_NOT_CLOSE_THE_SOCKET, e);
      }
      catch (InterruptedException e)
      {
        logger.traceException(e);
        logger.error(ERR_COULD_NOT_STOP_LISTEN_THREAD.get(e));
        logger.error(ERR_COULD_NOT_STOP_LISTEN_THREAD, e);
      }
    }

@@ -1029,7 +1029,7 @@
    }
    catch(Exception e)
    {
      logger.error(ERR_DELETE_REPL_BACKEND_FAILED.get(e.getLocalizedMessage()));
      logger.error(ERR_DELETE_REPL_BACKEND_FAILED, e.getLocalizedMessage());
    }
  }


 opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java

@@ -240,8 +240,8 @@
        } else
        {
          // Unknown assured mode: should never happen
          logger.error(ERR_RS_UNKNOWN_ASSURED_MODE.get(
              localReplicationServer.getServerId(), assuredMode, baseDN, update));
          logger.error(ERR_RS_UNKNOWN_ASSURED_MODE,
              localReplicationServer.getServerId(), assuredMode, baseDN, update);
          assuredMessage = false;
        }
      } else
@@ -421,8 +421,7 @@
       * job properly anymore and needs to close all its connections and
       * shutdown itself.
       */
      logger.error(ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR
          .get(stackTraceToSingleLineString(e)));
      logger.error(ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR, stackTraceToSingleLineString(e));
      localReplicationServer.shutdown();
      return false;
    }
@@ -591,8 +590,8 @@
    if (safeDataLevel < (byte) 1)
    {
      // Should never happen
      logger.error(ERR_UNKNOWN_ASSURED_SAFE_DATA_LEVEL.get(
          localReplicationServer.getServerId(), safeDataLevel, baseDN, update));
      logger.error(ERR_UNKNOWN_ASSURED_SAFE_DATA_LEVEL,
          localReplicationServer.getServerId(), safeDataLevel, baseDN, update);
    } else if (sourceGroupId == groupId
    // Assured feature does not cross different group IDS
        && isSameGenerationId(sourceHandler.getGenerationId()))
@@ -1404,7 +1403,7 @@
      if (msg instanceof ErrorMsg)
      {
        ErrorMsg errorMsg = (ErrorMsg) msg;
        logger.error(ERR_ERROR_MSG_RECEIVED.get(errorMsg.getDetails()));
        logger.error(ERR_ERROR_MSG_RECEIVED, errorMsg.getDetails());
      } else if (msg instanceof MonitorRequestMsg)
      {
        replyWithTopologyMonitorMsg(msg, msgEmitter);
@@ -1470,7 +1469,7 @@
        {
          // We log the error. The requestor will detect a timeout or
          // any other failure on the connection.
          logger.error(ERR_CHANGELOG_ERROR_SENDING_MSG.get(msg.getDestination()));
          logger.error(ERR_CHANGELOG_ERROR_SENDING_MSG, msg.getDestination());
        }
      }
    }
@@ -1480,7 +1479,7 @@
      RoutableMsg msg)
  {
    String msgClassname = msg.getClass().getCanonicalName();
    logger.info(NOTE_ERR_ROUTING_TO_SERVER.get(msgClassname));
    logger.info(NOTE_ERR_ROUTING_TO_SERVER, msgClassname);

    LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
    mb.append(NOTE_ERR_ROUTING_TO_SERVER.get(msgClassname));
@@ -1523,7 +1522,7 @@
       * An error happened trying to send an error msg to this server.
       * Log an error and close the connection to this server.
       */
      logger.error(ERR_CHANGELOG_ERROR_SENDING_ERROR.get(this), ignored);
      logger.error(ERR_CHANGELOG_ERROR_SENDING_ERROR, this, ignored);
      stopServer(msgEmitter, false);
    }
  }
@@ -1952,7 +1951,7 @@
          }
        } catch (IOException e)
        {
          logger.error(ERR_EXCEPTION_FORWARDING_RESET_GEN_ID.get(baseDN.toNormalizedString(), e.getMessage()));
          logger.error(ERR_EXCEPTION_FORWARDING_RESET_GEN_ID, baseDN.toNormalizedString(), e.getMessage());
        }
      }

@@ -1965,8 +1964,8 @@
          dsHandler.changeStatusForResetGenId(newGenId);
        } catch (IOException e)
        {
          logger.error(ERR_EXCEPTION_CHANGING_STATUS_AFTER_RESET_GEN_ID.get(baseDN.toNormalizedString(),
              dsHandler.getServerId(), e.getMessage()));
          logger.error(ERR_EXCEPTION_CHANGING_STATUS_AFTER_RESET_GEN_ID, baseDN.toNormalizedString(),
              dsHandler.getServerId(), e.getMessage());
        }
      }

@@ -1977,12 +1976,11 @@
      // treatment.
      sendTopoInfoToAll();

      logger.info(NOTE_RESET_GENERATION_ID.get(baseDN.toNormalizedString(),
          newGenId));
      logger.info(NOTE_RESET_GENERATION_ID, baseDN.toNormalizedString(), newGenId);
    }
    catch(Exception e)
    {
      logger.error(LocalizableMessage.raw(          stackTraceToSingleLineString(e)));
      logger.error(LocalizableMessage.raw(stackTraceToSingleLineString(e)));
    }
    finally
    {
@@ -2093,8 +2091,8 @@
      }
      catch (IOException e)
      {
        logger.error(ERR_EXCEPTION_CHANGING_STATUS_FROM_STATUS_ANALYZER.get(
            baseDN.toNormalizedString(), dsHandler.getServerId(), e.getMessage()));
        logger.error(ERR_EXCEPTION_CHANGING_STATUS_FROM_STATUS_ANALYZER,
            baseDN.toNormalizedString(), dsHandler.getServerId(), e.getMessage());
      }

      if (newStatus == ServerStatus.INVALID_STATUS || newStatus == oldStatus)
@@ -2149,7 +2147,7 @@
    }
    catch (ChangelogException e)
    {
      logger.error(ERR_ERROR_CLEARING_DB.get(baseDN, e.getMessage()), e);
      logger.error(ERR_ERROR_CLEARING_DB, baseDN, e.getMessage(), e);
    }
  }

@@ -2610,10 +2608,9 @@
          catch (IOException e)
          {
            logger.traceException(e);
            logger.error(ERR_CHANGELOG_ERROR_SENDING_MSG
                .get("Replication Server "
                    + localReplicationServer.getReplicationPort() + " "
                    + baseDN + " " + localReplicationServer.getServerId()));
            logger.error(ERR_CHANGELOG_ERROR_SENDING_MSG,
                "Replication Server " + localReplicationServer.getReplicationPort() + " "
                    + baseDN + " " + localReplicationServer.getServerId());
            stopServer(rsHandler, false);
          }
        }

 opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java

@@ -129,15 +129,15 @@
              {
                long referenceGenerationId = handler.getReferenceGenId();
                if (dsStatus == BAD_GEN_ID_STATUS)
                  logger.warn(WARN_IGNORING_UPDATE_FROM_DS_BADGENID.get(handler.getReplicationServerId(),
                  logger.warn(WARN_IGNORING_UPDATE_FROM_DS_BADGENID, handler.getReplicationServerId(),
                      updateMsg.getCSN(), handler.getBaseDN(), handler.getServerId(),
                      session.getReadableRemoteAddress(),
                      handler.getGenerationId(),
                      referenceGenerationId));
                      referenceGenerationId);
                if (dsStatus == FULL_UPDATE_STATUS)
                  logger.warn(WARN_IGNORING_UPDATE_FROM_DS_FULLUP.get(handler.getReplicationServerId(),
                  logger.warn(WARN_IGNORING_UPDATE_FROM_DS_FULLUP, handler.getReplicationServerId(),
                      updateMsg.getCSN(), handler.getBaseDN(), handler.getServerId(),
                      session.getReadableRemoteAddress()));
                      session.getReadableRemoteAddress());
                filtered = true;
              }
            } else
@@ -150,13 +150,12 @@
              if (referenceGenerationId > 0
                  && referenceGenerationId != handler.getGenerationId())
              {
                logger.error(
                    WARN_IGNORING_UPDATE_FROM_RS.get(
                logger.error(WARN_IGNORING_UPDATE_FROM_RS,
                        handler.getReplicationServerId(),
                        updateMsg.getCSN(), handler.getBaseDN(), handler.getServerId(),
                        session.getReadableRemoteAddress(),
                        handler.getGenerationId(),
                        referenceGenerationId));
                        referenceGenerationId);
                filtered = true;
              }
            }

 opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java

@@ -125,17 +125,17 @@
          {
            if (dsStatus == ServerStatus.BAD_GEN_ID_STATUS)
            {
              logger.warn(WARN_IGNORING_UPDATE_TO_DS_BADGENID.get(handler.getReplicationServerId(),
              logger.warn(WARN_IGNORING_UPDATE_TO_DS_BADGENID, handler.getReplicationServerId(),
                  update.getCSN(), handler.getBaseDN(), handler.getServerId(),
                  session.getReadableRemoteAddress(),
                  handler.getGenerationId(),
                  referenceGenerationId));
                  referenceGenerationId);
            }
            else if (dsStatus == ServerStatus.FULL_UPDATE_STATUS)
            {
              logger.warn(WARN_IGNORING_UPDATE_TO_DS_FULLUP.get(handler.getReplicationServerId(),
              logger.warn(WARN_IGNORING_UPDATE_TO_DS_FULLUP, handler.getReplicationServerId(),
                  update.getCSN(), handler.getBaseDN(), handler.getServerId(),
                  session.getReadableRemoteAddress()));
                  session.getReadableRemoteAddress());
            }
            continue;
          }
@@ -150,12 +150,12 @@
              || referenceGenerationId == -1
              || handler.getGenerationId() == -1)
          {
            logger.error(WARN_IGNORING_UPDATE_TO_RS.get(
            logger.error(WARN_IGNORING_UPDATE_TO_RS,
                handler.getReplicationServerId(),
                update.getCSN(), handler.getBaseDN(), handler.getServerId(),
                session.getReadableRemoteAddress(),
                handler.getGenerationId(),
                referenceGenerationId));
                referenceGenerationId);
            continue;
          }
        }

 opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/DraftCNDB.java

@@ -133,8 +133,7 @@
    }
    catch (DatabaseException e)
    {
      logger.info(NOTE_EXCEPTION_CLOSING_DATABASE.get(toString(),
          stackTraceToSingleLineString(e)));
      logger.info(NOTE_EXCEPTION_CLOSING_DATABASE, this, stackTraceToSingleLineString(e));
    }
    finally
    {

 opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDB.java

@@ -291,8 +291,7 @@
      }
      catch (Exception end)
      {
        logger.error(ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH
            .get(stackTraceToSingleLineString(end)));
        logger.error(ERR_EXCEPTION_CHANGELOG_TRIM_FLUSH, stackTraceToSingleLineString(end));
        if (replicationServer != null)
        {
          replicationServer.shutdown();

 opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/JEChangelogDB.java

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

      logger.error(ERR_COULD_NOT_READ_DB.get(this.dbDirectory.getAbsolutePath(),
          e.getLocalizedMessage()));
      logger.error(ERR_COULD_NOT_READ_DB, this.dbDirectory.getAbsolutePath(), e.getLocalizedMessage());
    }
  }

@@ -695,7 +694,7 @@
        catch (Exception e)
        {
          logger.traceException(e);
          logger.error(ERR_CHANGENUMBER_DATABASE.get(e.getLocalizedMessage()));
          logger.error(ERR_CHANGENUMBER_DATABASE, e.getLocalizedMessage());
        }
      }
      return cnIndexDB;

 opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDB.java

@@ -269,8 +269,7 @@
    }
    catch (DatabaseException e)
    {
      logger.info(NOTE_EXCEPTION_CLOSING_DATABASE.get(toString(),
          stackTraceToSingleLineString(e)));
      logger.info(NOTE_EXCEPTION_CLOSING_DATABASE, this, stackTraceToSingleLineString(e));
    }
    finally
    {

 opendj3-server-dev/src/server/org/opends/server/replication/server/changelog/je/ReplicationDbEnv.java

@@ -608,8 +608,7 @@
   */
  void shutdownOnException(DatabaseException e)
  {
    logger.error(ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR
        .get(stackTraceToSingleLineString(e)));
    logger.error(ERR_CHANGELOG_SHUTDOWN_DATABASE_ERROR, stackTraceToSingleLineString(e));
    replicationServer.shutdown();
  }


 opendj3-server-dev/src/server/org/opends/server/replication/service/HeartbeatMonitor.java

@@ -134,9 +134,8 @@
          if (gotOneFailure)
          {
            // Heartbeat is well overdue so the server is assumed to be dead.
            logger.warn(WARN_HEARTBEAT_FAILURE.get(serverID,
                replicationServerID, session.getReadableRemoteAddress(),
                baseDN));
            logger.warn(WARN_HEARTBEAT_FAILURE, serverID,
                replicationServerID, session.getReadableRemoteAddress(), baseDN);

            // Exit monitor and close session.
            shutdown = true;

 opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java

@@ -918,13 +918,13 @@
        final int rsServerId = rs.rsInfo.getServerId();
        if (rsGenId == getGenerationID() || rsGenId == -1)
        {
          logger.info(NOTE_NOW_FOUND_SAME_GENERATION_CHANGELOG.get(serverId, rsServerId, baseDN.toNormalizedString(),
              rs.replicationServer, getGenerationID()));
          logger.info(NOTE_NOW_FOUND_SAME_GENERATION_CHANGELOG, serverId, rsServerId, baseDN.toNormalizedString(),
              rs.replicationServer, getGenerationID());
        }
        else
        {
          logger.warn(WARN_NOW_FOUND_BAD_GENERATION_CHANGELOG.get(serverId, rsServerId, baseDN.toNormalizedString(),
              rs.replicationServer, getGenerationID(), rsGenId));
          logger.warn(WARN_NOW_FOUND_BAD_GENERATION_CHANGELOG, serverId, rsServerId, baseDN.toNormalizedString(),
              rs.replicationServer, getGenerationID(), rsGenId);
        }
      }
      else
@@ -938,12 +938,12 @@

          if (replicationServerInfos.size() > 0)
          {
            logger.warn(WARN_COULD_NOT_FIND_CHANGELOG.get(serverId, baseDN.toNormalizedString(),
                Utils.joinAsString(", ", replicationServerInfos.keySet())));
            logger.warn(WARN_COULD_NOT_FIND_CHANGELOG, serverId, baseDN.toNormalizedString(),
                Utils.joinAsString(", ", replicationServerInfos.keySet()));
          }
          else
          {
            logger.warn(WARN_NO_AVAILABLE_CHANGELOGS.get(serverId, baseDN.toNormalizedString()));
            logger.warn(WARN_NO_AVAILABLE_CHANGELOGS, serverId, baseDN.toNormalizedString());
          }
        }
      }
@@ -1012,9 +1012,9 @@
        warn user and start heartbeat monitor to recover when a server
        with the right group id shows up.
        */
        logger.warn(WARN_CONNECTED_TO_SERVER_WITH_WRONG_GROUP_ID.get(
        logger.warn(WARN_CONNECTED_TO_SERVER_WITH_WRONG_GROUP_ID,
            groupId, rs.getServerId(), rsInfo.getServerURL(), rs.getGroupId(),
            baseDN.toNormalizedString(), getServerId()));
            baseDN.toNormalizedString(), getServerId());
      }
      startRSHeartBeatMonitoring(rs);
      if (rsInfo.getProtocolVersion() >=
@@ -1026,8 +1026,8 @@
    }
    catch (Exception e)
    {
      logger.error(ERR_COMPUTING_FAKE_OPS.get(baseDN.toNormalizedString(), rsInfo.getServerURL(),
          e.getLocalizedMessage() + " " + stackTraceToSingleLineString(e)));
      logger.error(ERR_COMPUTING_FAKE_OPS, baseDN.toNormalizedString(), rsInfo.getServerURL(),
          e.getLocalizedMessage() + " " + stackTraceToSingleLineString(e));
    }
    finally
    {
@@ -1267,8 +1267,8 @@
    }
    catch (Exception e)
    {
      logger.warn(WARN_EXCEPTION_STARTING_SESSION_PHASE.get(getServerId(), server, getBaseDN().toNormalizedString(),
          stackTraceToSingleLineString(e)));
      logger.warn(WARN_EXCEPTION_STARTING_SESSION_PHASE, getServerId(), server, getBaseDN().toNormalizedString(),
          stackTraceToSingleLineString(e));

      rs.session.close();
      setConnectedRS(ConnectedRS.noConnectedRS());
@@ -1320,9 +1320,9 @@
    }
    catch (Exception e)
    {
      logger.error(WARN_EXCEPTION_STARTING_SESSION_PHASE.get(
      logger.error(WARN_EXCEPTION_STARTING_SESSION_PHASE,
          getServerId(), electedRS.rsInfo.getServerURL(),
          getBaseDN().toNormalizedString(), stackTraceToSingleLineString(e)));
          getBaseDN().toNormalizedString(), stackTraceToSingleLineString(e));

      setConnectedRS(ConnectedRS.noConnectedRS());
      return null;
@@ -2690,9 +2690,9 @@
          if (rs.session == null || !rs.session.closeInitiated())
          {
            // We did not initiate the close on our side, log an error message.
            logger.error(WARN_REPLICATION_SERVER_BADLY_DISCONNECTED.get(
            logger.error(WARN_REPLICATION_SERVER_BADLY_DISCONNECTED,
                serverId, baseDN.toNormalizedString(), previousRsServerID,
                rs.replicationServer));
                rs.replicationServer);
          }

          if (!reconnectOnFailure)

 opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java

@@ -341,7 +341,7 @@
    // Sanity check: is it a valid initial status?
    if (!isValidInitialStatus(initStatus))
    {
      logger.error(ERR_DS_INVALID_INIT_STATUS.get(initStatus, getBaseDNString(), getServerId()));
      logger.error(ERR_DS_INVALID_INIT_STATUS, initStatus, getBaseDNString(), getServerId());
    }
    else
    {
@@ -369,7 +369,7 @@
    StatusMachineEvent event = StatusMachineEvent.statusToEvent(reqStatus);
    if (event == StatusMachineEvent.INVALID_EVENT)
    {
      logger.error(ERR_DS_INVALID_REQUESTED_STATUS.get(reqStatus, getBaseDNString(), getServerId()));
      logger.error(ERR_DS_INVALID_REQUESTED_STATUS, reqStatus, getBaseDNString(), getServerId());
      return;
    }

@@ -755,14 +755,14 @@
              attempt of initialization while we have started a new one
              on this side.
              */
              logger.error(ERR_ERROR_MSG_RECEIVED.get(errorMsg.getDetails()));
              logger.error(ERR_ERROR_MSG_RECEIVED, errorMsg.getDetails());
            }
          }
          else
          {
            // Simply log - happen if import/export has been terminated
            // on our side before receiving this ErrorMsg.
            logger.error(ERR_ERROR_MSG_RECEIVED.get(errorMsg.getDetails()));
            logger.error(ERR_ERROR_MSG_RECEIVED, errorMsg.getDetails());
          }
        }
        else if (msg instanceof ChangeStatusMsg)
@@ -885,8 +885,7 @@
        Some problems detected: message did not correctly reach every
        requested servers. Log problem
        */
        logger.error(NOTE_DS_RECEIVED_ACK_ERROR.get(
            getBaseDN(), getServerId(), update, ack.errorsToString()));
        logger.error(NOTE_DS_RECEIVED_ACK_ERROR, getBaseDN(), getServerId(), update, ack.errorsToString());

        List<Integer> failedServers = ack.getFailedServers();

@@ -1384,8 +1383,8 @@

    if (serverToInitialize == RoutableMsg.ALL_SERVERS)
    {
      logger.error(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_START_ALL.get(
          countEntries(), getBaseDNString(), getServerId()));
      logger.error(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_START_ALL,
          countEntries(), getBaseDNString(), getServerId());

      for (DSInfo dsi : getReplicasList())
      {
@@ -1403,8 +1402,8 @@
    }
    else
    {
      logger.error(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_START.get(countEntries(),
          getBaseDNString(), getServerId(), serverToInitialize));
      logger.error(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_START, countEntries(),
          getBaseDNString(), getServerId(), serverToInitialize);

      ieCtx.startList.add(serverToInitialize);

@@ -1520,9 +1519,8 @@
            */
            try { Thread.sleep(1000); }
            catch(Exception e){ /* do nothing */ }
            logger.error(NOTE_RESENDING_INIT_TARGET.get(
                exportRootException.getLocalizedMessage()));

            logger.error(NOTE_RESENDING_INIT_TARGET, exportRootException.getLocalizedMessage());
            continue;
          }

@@ -1559,13 +1557,13 @@
        : exportRootException.getLocalizedMessage();
    if (serverToInitialize == RoutableMsg.ALL_SERVERS)
    {
      logger.error(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_END_ALL.get(
          getBaseDNString(), getServerId(), cause));
      logger.error(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_END_ALL,
          getBaseDNString(), getServerId(), cause);
    }
    else
    {
      logger.error(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_END.get(
          getBaseDNString(), getServerId(), serverToInitialize, cause));
      logger.error(NOTE_FULL_UPDATE_ENGAGED_FOR_REMOTE_END,
          getBaseDNString(), getServerId(), serverToInitialize, cause);
    }


@@ -2235,8 +2233,8 @@
    try
    {
      // Log starting
      logger.error(NOTE_FULL_UPDATE_ENGAGED_FROM_REMOTE_START.get(getBaseDNString(),
          initTargetMsgReceived.getSenderID(), getServerId()));
      logger.error(NOTE_FULL_UPDATE_ENGAGED_FROM_REMOTE_START, getBaseDNString(),
          initTargetMsgReceived.getSenderID(), getServerId());

      // Go into full update status
      setNewStatus(StatusMachineEvent.TO_FULL_UPDATE_STATUS_EVENT);
@@ -2312,8 +2310,8 @@
            Restart the whole import protocol exchange by sending again
            the request
            */
            logger.error(NOTE_RESENDING_INIT_FROM_REMOTE_REQUEST.get(
                ieCtx.getException().getLocalizedMessage()));
            logger.error(NOTE_RESENDING_INIT_FROM_REMOTE_REQUEST,
                ieCtx.getException().getLocalizedMessage());

            broker.publish(ieCtx.initReqMsgSent);

@@ -2331,9 +2329,8 @@
            An error occurs when sending a new request for a new import.
            This error is not stored, preferring to keep the initial one.
            */
            logger.error(ERR_SENDING_NEW_ATTEMPT_INIT_REQUEST.get(
              e.getLocalizedMessage(),
              ieCtx.getException().getLocalizedMessage()));
            logger.error(ERR_SENDING_NEW_ATTEMPT_INIT_REQUEST,
                e.getLocalizedMessage(), ieCtx.getException().getLocalizedMessage());
          }
      }

@@ -2412,7 +2409,7 @@
    ServerStatus newStatus = StatusMachine.computeNewStatus(status, event);
    if (newStatus == ServerStatus.INVALID_STATUS)
    {
      logger.error(ERR_DS_CANNOT_CHANGE_STATUS.get(getBaseDN(), getServerId(), status, event));
      logger.error(ERR_DS_CANNOT_CHANGE_STATUS, getBaseDN(), getServerId(), status, event);
      return;
    }

@@ -3416,7 +3413,7 @@
    } catch (TimeoutException ex)
    {
      // This exception may only be raised if assured replication is enabled
      logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(), getAssuredTimeout(), update));
      logger.error(NOTE_DS_ACK_TIMEOUT, getBaseDNString(), getAssuredTimeout(), update);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java

@@ -88,14 +88,14 @@
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_IA5_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_CASE_IGNORE_IA5_OID, SYNTAX_ACI_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_CASE_IGNORE_IA5_OID, SYNTAX_ACI_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_IA5_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_IA5_OID, SYNTAX_ACI_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_IA5_OID, SYNTAX_ACI_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java

@@ -89,8 +89,8 @@
         DirectoryServer.getEqualityMatchingRule(EMR_AUTH_PASSWORD_EXACT_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_AUTH_PASSWORD_EXACT_NAME, SYNTAX_AUTH_PASSWORD_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_AUTH_PASSWORD_EXACT_NAME, SYNTAX_AUTH_PASSWORD_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java

@@ -105,21 +105,21 @@
         DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_BINARY_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java

@@ -84,7 +84,7 @@
         DirectoryServer.getEqualityMatchingRule(EMR_BIT_STRING_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_BIT_STRING_OID, SYNTAX_BIT_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_BIT_STRING_OID, SYNTAX_BIT_STRING_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java

@@ -118,7 +118,7 @@
         DirectoryServer.getEqualityMatchingRule(EMR_BOOLEAN_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_BOOLEAN_OID, SYNTAX_BOOLEAN_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_BOOLEAN_OID, SYNTAX_BOOLEAN_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java

@@ -90,24 +90,24 @@
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_CASE_IGNORE_OID, SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_CASE_IGNORE_OID, SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_CASE_IGNORE_OID, SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_CASE_IGNORE_OID, SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_OID, SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_OID, SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactMatchingRule.java

@@ -193,7 +193,7 @@
    catch (CertificateException ce)
    {
      // There seems to be a problem while parsing the certificate.
      logger.trace(WARN_CERTIFICATE_MATCH_PARSE_ERROR.get(ce.getMessage()));
      logger.trace(WARN_CERTIFICATE_MATCH_PARSE_ERROR, ce.getMessage());

      // return the raw bytes as a fall back
      return value.toByteString();

 opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java

@@ -91,21 +91,21 @@
         DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_CERTLIST_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java

@@ -91,21 +91,21 @@
         DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_CERTPAIR_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java

@@ -106,24 +106,24 @@
         DirectoryServer.getEqualityMatchingRule(EMR_CERTIFICATE_EXACT_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_CERTIFICATE_EXACT_OID, SYNTAX_CERTIFICATE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_CERTIFICATE_EXACT_OID, SYNTAX_CERTIFICATE_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_OCTET_STRING_OID, SYNTAX_CERTIFICATE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_OCTET_STRING_OID, SYNTAX_CERTIFICATE_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_OCTET_STRING_OID, SYNTAX_CERTIFICATE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_OCTET_STRING_OID, SYNTAX_CERTIFICATE_NAME);
    }

    this.config = configuration;

 opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java

@@ -105,32 +105,32 @@
         DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
    if (defaultApproximateMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_COUNTRY_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_COUNTRY_STRING_NAME);
    }

    defaultEqualityMatchingRule =
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_CASE_IGNORE_OID, SYNTAX_COUNTRY_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_CASE_IGNORE_OID, SYNTAX_COUNTRY_STRING_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_CASE_IGNORE_OID, SYNTAX_COUNTRY_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_CASE_IGNORE_OID, SYNTAX_COUNTRY_STRING_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_OID, SYNTAX_COUNTRY_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_OID, SYNTAX_COUNTRY_STRING_NAME);
    }

    this.config = configuration;

 opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java

@@ -140,32 +140,32 @@
         DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
    if (defaultApproximateMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_DELIVERY_METHOD_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_DELIVERY_METHOD_NAME);
    }

    defaultEqualityMatchingRule =
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_CASE_IGNORE_OID, SYNTAX_DELIVERY_METHOD_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_CASE_IGNORE_OID, SYNTAX_DELIVERY_METHOD_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_CASE_IGNORE_OID, SYNTAX_DELIVERY_METHOD_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_CASE_IGNORE_OID, SYNTAX_DELIVERY_METHOD_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_OID, SYNTAX_DELIVERY_METHOD_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_OID, SYNTAX_DELIVERY_METHOD_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java

@@ -127,32 +127,32 @@
         DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
    if (defaultApproximateMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_DIRECTORY_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_DIRECTORY_STRING_NAME);
    }

    defaultEqualityMatchingRule =
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME);
    }



 opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java

@@ -106,14 +106,14 @@
         DirectoryServer.getEqualityMatchingRule(EMR_DN_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_DN_OID, SYNTAX_DN_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_DN_OID, SYNTAX_DN_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_DN_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_DN_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java

@@ -91,24 +91,24 @@
         DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_OCTET_STRING_OID, SYNTAX_ENHANCED_GUIDE_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java

@@ -124,21 +124,21 @@
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_FAXNUMBER_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java

@@ -90,21 +90,21 @@
         DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_FAX_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_FAX_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_FAX_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_FAX_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_FAX_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_FAX_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java

@@ -107,24 +107,24 @@
         DirectoryServer.getEqualityMatchingRule(EMR_GENERALIZED_TIME_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_GENERALIZED_TIME_OID, SYNTAX_GENERALIZED_TIME_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_GENERALIZED_TIME_OID, SYNTAX_GENERALIZED_TIME_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_GENERALIZED_TIME_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_GENERALIZED_TIME_OID, SYNTAX_GENERALIZED_TIME_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_GENERALIZED_TIME_OID, SYNTAX_GENERALIZED_TIME_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_OID, SYNTAX_GENERALIZED_TIME_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_OID, SYNTAX_GENERALIZED_TIME_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java

@@ -91,21 +91,21 @@
         DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_GUIDE_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java

@@ -91,32 +91,32 @@
         DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
    if (defaultApproximateMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_IA5_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_IA5_STRING_NAME);
    }

    defaultEqualityMatchingRule =
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_IA5_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_CASE_IGNORE_IA5_OID, SYNTAX_IA5_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_CASE_IGNORE_IA5_OID, SYNTAX_IA5_STRING_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_CASE_IGNORE_OID, SYNTAX_IA5_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_CASE_IGNORE_OID, SYNTAX_IA5_STRING_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_IA5_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_IA5_OID, SYNTAX_IA5_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_IA5_OID, SYNTAX_IA5_STRING_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java

@@ -119,21 +119,21 @@
         DirectoryServer.getEqualityMatchingRule(EMR_INTEGER_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_INTEGER_OID, SYNTAX_INTEGER_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_INTEGER_OID, SYNTAX_INTEGER_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_INTEGER_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_INTEGER_OID, SYNTAX_INTEGER_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_INTEGER_OID, SYNTAX_INTEGER_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_EXACT_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_EXACT_OID, SYNTAX_INTEGER_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_EXACT_OID, SYNTAX_INTEGER_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java

@@ -103,21 +103,21 @@
         DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_JPEG_NAME);
    }

    this.config = configuration;

 opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java

@@ -110,21 +110,21 @@
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_LDAP_SYNTAX_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java

@@ -99,21 +99,21 @@
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_MATCHING_RULE_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java

@@ -91,16 +91,16 @@
         DirectoryServer.getEqualityMatchingRule(EMR_UNIQUE_MEMBER_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_UNIQUE_MEMBER_OID, SYNTAX_NAME_AND_OPTIONAL_UID_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_UNIQUE_MEMBER_OID, SYNTAX_NAME_AND_OPTIONAL_UID_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_OID, SYNTAX_NAME_AND_OPTIONAL_UID_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_OID, SYNTAX_NAME_AND_OPTIONAL_UID_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java

@@ -91,24 +91,24 @@
         DirectoryServer.getEqualityMatchingRule(EMR_NUMERIC_STRING_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_NUMERIC_STRING_OID, SYNTAX_NUMERIC_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_NUMERIC_STRING_OID, SYNTAX_NUMERIC_STRING_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_NUMERIC_STRING_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_NUMERIC_STRING_OID, SYNTAX_NUMERIC_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_NUMERIC_STRING_OID, SYNTAX_NUMERIC_STRING_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_EXACT_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_NUMERIC_STRING_OID, SYNTAX_NUMERIC_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_NUMERIC_STRING_OID, SYNTAX_NUMERIC_STRING_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java

@@ -87,14 +87,14 @@
         DirectoryServer.getEqualityMatchingRule(EMR_OID_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OID_OID, SYNTAX_OID_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OID_OID, SYNTAX_OID_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_OID_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_OID_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java

@@ -90,21 +90,21 @@
         DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_OCTET_STRING_OID, SYNTAX_OCTET_STRING_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java

@@ -88,16 +88,16 @@
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_LIST_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_CASE_IGNORE_LIST_OID, SYNTAX_OTHER_MAILBOX_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_CASE_IGNORE_LIST_OID, SYNTAX_OTHER_MAILBOX_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_LIST_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_LIST_OID, SYNTAX_OTHER_MAILBOX_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_LIST_OID, SYNTAX_OTHER_MAILBOX_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java

@@ -89,16 +89,16 @@
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_OID, SYNTAX_DIRECTORY_STRING_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java

@@ -93,32 +93,32 @@
         DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
    if (defaultApproximateMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_PRESENTATION_ADDRESS_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_PRESENTATION_ADDRESS_NAME);
    }

    defaultEqualityMatchingRule =
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_CASE_IGNORE_OID, SYNTAX_PRESENTATION_ADDRESS_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_CASE_IGNORE_OID, SYNTAX_PRESENTATION_ADDRESS_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_CASE_IGNORE_OID, SYNTAX_PRESENTATION_ADDRESS_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_CASE_IGNORE_OID, SYNTAX_PRESENTATION_ADDRESS_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_OID, SYNTAX_PRESENTATION_ADDRESS_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_OID, SYNTAX_PRESENTATION_ADDRESS_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java

@@ -95,32 +95,32 @@
         DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
    if (defaultApproximateMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_PRINTABLE_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_PRINTABLE_STRING_NAME);
    }

    defaultEqualityMatchingRule =
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_CASE_IGNORE_OID, SYNTAX_PRINTABLE_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_CASE_IGNORE_OID, SYNTAX_PRINTABLE_STRING_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_CASE_IGNORE_OID, SYNTAX_PRINTABLE_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_CASE_IGNORE_OID, SYNTAX_PRINTABLE_STRING_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_OID, SYNTAX_PRINTABLE_STRING_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_OID, SYNTAX_PRINTABLE_STRING_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java

@@ -93,32 +93,32 @@
         DirectoryServer.getApproximateMatchingRule(AMR_DOUBLE_METAPHONE_OID);
    if (defaultApproximateMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE.get(
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_PROTOCOL_INFORMATION_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE,
          AMR_DOUBLE_METAPHONE_OID, SYNTAX_PROTOCOL_INFORMATION_NAME);
    }

    defaultEqualityMatchingRule =
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_CASE_IGNORE_OID, SYNTAX_PROTOCOL_INFORMATION_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_CASE_IGNORE_OID, SYNTAX_PROTOCOL_INFORMATION_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_CASE_IGNORE_OID, SYNTAX_PROTOCOL_INFORMATION_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_CASE_IGNORE_OID, SYNTAX_PROTOCOL_INFORMATION_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_OID, SYNTAX_PROTOCOL_INFORMATION_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_OID, SYNTAX_PROTOCOL_INFORMATION_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java

@@ -91,24 +91,24 @@
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_CASE_IGNORE_OID, SYNTAX_SUBSTRING_ASSERTION_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_CASE_IGNORE_OID, SYNTAX_SUBSTRING_ASSERTION_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_CASE_IGNORE_OID, SYNTAX_SUBSTRING_ASSERTION_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_CASE_IGNORE_OID, SYNTAX_SUBSTRING_ASSERTION_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_OID, SYNTAX_SUBSTRING_ASSERTION_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_OID, SYNTAX_SUBSTRING_ASSERTION_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java

@@ -123,22 +123,22 @@
    defaultEqualityMatchingRule = DirectoryServer
        .getEqualityMatchingRule(EMR_OCTET_STRING_OID);
    if (defaultEqualityMatchingRule == null) {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_OCTET_STRING_OID, SYNTAX_SUBTREE_SPECIFICATION_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_OCTET_STRING_OID, SYNTAX_SUBTREE_SPECIFICATION_NAME);
    }

    defaultOrderingMatchingRule = DirectoryServer
        .getOrderingMatchingRule(OMR_OCTET_STRING_OID);
    if (defaultOrderingMatchingRule == null) {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_OCTET_STRING_OID, SYNTAX_SUBTREE_SPECIFICATION_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_OCTET_STRING_OID, SYNTAX_SUBTREE_SPECIFICATION_NAME);
    }

    defaultSubstringMatchingRule = DirectoryServer
        .getSubstringMatchingRule(SMR_OCTET_STRING_OID);
    if (defaultSubstringMatchingRule == null) {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_OCTET_STRING_OID, SYNTAX_SUBTREE_SPECIFICATION_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_OCTET_STRING_OID, SYNTAX_SUBTREE_SPECIFICATION_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java

@@ -91,24 +91,24 @@
         DirectoryServer.getEqualityMatchingRule(EMR_OCTET_STRING_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_OCTET_STRING_OID, SYNTAX_SUPPORTED_ALGORITHM_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_OCTET_STRING_OID, SYNTAX_SUPPORTED_ALGORITHM_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_OCTET_STRING_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_OCTET_STRING_OID, SYNTAX_SUPPORTED_ALGORITHM_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_OCTET_STRING_OID, SYNTAX_SUPPORTED_ALGORITHM_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_OCTET_STRING_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_OCTET_STRING_OID, SYNTAX_SUPPORTED_ALGORITHM_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_OCTET_STRING_OID, SYNTAX_SUPPORTED_ALGORITHM_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java

@@ -107,14 +107,14 @@
         DirectoryServer.getEqualityMatchingRule(EMR_TELEPHONE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_TELEPHONE_OID, SYNTAX_TELEPHONE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_TELEPHONE_OID, SYNTAX_TELEPHONE_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_TELEPHONE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_TELEPHONE_OID, SYNTAX_TELEPHONE_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_TELEPHONE_OID, SYNTAX_TELEPHONE_NAME);
    }



 opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java

@@ -122,24 +122,24 @@
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(
          EMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE,
          EMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(
          OMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE,
          OMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(
          SMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE,
          SMR_CASE_IGNORE_OID, SYNTAX_TELETEX_TERM_ID_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java

@@ -90,21 +90,21 @@
         DirectoryServer.getEqualityMatchingRule(EMR_CASE_IGNORE_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_CASE_IGNORE_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_TELEX_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java

@@ -147,21 +147,21 @@
         DirectoryServer.getEqualityMatchingRule(EMR_GENERALIZED_TIME_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_GENERALIZED_TIME_OID, SYNTAX_UTC_TIME_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_GENERALIZED_TIME_OID, SYNTAX_UTC_TIME_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_GENERALIZED_TIME_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_GENERALIZED_TIME_OID, SYNTAX_UTC_TIME_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_GENERALIZED_TIME_OID, SYNTAX_UTC_TIME_NAME);
    }

    defaultSubstringMatchingRule =
         DirectoryServer.getSubstringMatchingRule(SMR_CASE_IGNORE_OID);
    if (defaultSubstringMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE.get(SMR_CASE_IGNORE_OID, SYNTAX_UTC_TIME_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_SUBSTRING_MATCHING_RULE, SMR_CASE_IGNORE_OID, SYNTAX_UTC_TIME_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java

@@ -86,14 +86,14 @@
         DirectoryServer.getEqualityMatchingRule(EMR_UUID_OID);
    if (defaultEqualityMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE.get(EMR_UUID_OID, SYNTAX_UUID_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_EQUALITY_MATCHING_RULE, EMR_UUID_OID, SYNTAX_UUID_NAME);
    }

    defaultOrderingMatchingRule =
         DirectoryServer.getOrderingMatchingRule(OMR_UUID_OID);
    if (defaultOrderingMatchingRule == null)
    {
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE.get(OMR_UUID_OID, SYNTAX_UUID_NAME));
      logger.error(ERR_ATTR_SYNTAX_UNKNOWN_ORDERING_MATCHING_RULE, OMR_UUID_OID, SYNTAX_UUID_NAME);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java

@@ -619,13 +619,12 @@
    }
    catch (InitializationException e)
    {
      logger.error(ERR_REBUILDINDEX_ERROR_DURING_REBUILD.get(e.getMessage()));
      logger.error(ERR_REBUILDINDEX_ERROR_DURING_REBUILD, e.getMessage());
      returnCode = 1;
    }
    catch (Exception e)
    {
      logger.error(ERR_REBUILDINDEX_ERROR_DURING_REBUILD
          .get(getExceptionMessage(e)));
      logger.error(ERR_REBUILDINDEX_ERROR_DURING_REBUILD, getExceptionMessage(e));
      returnCode = 1;
    }
    finally
@@ -637,13 +636,12 @@
        final StringBuilder failureReason = new StringBuilder();
        if (!LockFileManager.releaseLock(lockFile, failureReason))
        {
          logger.warn(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(), failureReason));
          logger.warn(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), failureReason);
        }
      }
      catch (Exception e)
      {
        logger.error(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend
            .getBackendID(), getExceptionMessage(e)));
        logger.error(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
      }
    }


 opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java

@@ -645,8 +645,7 @@
          final String[] commandLineArgs =
              args.toArray(new String[args.size()]);
          // Displays info about command line args for log only.
          logger.debug(INFO_UPGRADE_REBUILD_INDEX_ARGUMENTS.get(
              Arrays.toString(commandLineArgs)));
          logger.debug(INFO_UPGRADE_REBUILD_INDEX_ARGUMENTS, Arrays.toString(commandLineArgs));

          /*
           * The rebuild-index process just display a status ok / fails. The
@@ -673,8 +672,7 @@
        {
          final LocalizableMessage msg = INFO_UPGRADE_REBUILD_INDEX_NO_BACKEND_FOUND.get();
          logger.debug(msg);
          logger.debug(INFO_UPGRADE_REBUILD_INDEX_DECLINED.get(
              Arrays.toString(indexesListToRebuild.toArray())));
          logger.debug(INFO_UPGRADE_REBUILD_INDEX_DECLINED, indexesListToRebuild);
          context.notifyProgress(pnc.setProgress(100));
        }
      }
@@ -844,11 +842,11 @@
  {
    if (changeCount != 0)
    {
      logger.debug(INFO_UPGRADE_CHANGE_DONE_IN_SPECIFIC_FILE.get(fileName, changeCount));
      logger.debug(INFO_UPGRADE_CHANGE_DONE_IN_SPECIFIC_FILE, fileName, changeCount);
    }
    else
    {
      logger.debug(INFO_UPGRADE_NO_CHANGE_DONE_IN_SPECIFIC_FILE.get(fileName));
      logger.debug(INFO_UPGRADE_NO_CHANGE_DONE_IN_SPECIFIC_FILE, fileName);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/types/Schema.java

@@ -3515,7 +3515,7 @@
      // changes could potentially be sent to the other servers again
      // when this server is restarted, which shouldn't hurt anything.
      // Still, we should log a warning message.
      logger.error(ERR_SCHEMA_CANNOT_WRITE_CONCAT_SCHEMA_FILE.get(concatFilePath, getExceptionMessage(e)));
      logger.error(ERR_SCHEMA_CANNOT_WRITE_CONCAT_SCHEMA_FILE, concatFilePath, getExceptionMessage(e));
    }
  }


 opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java

@@ -1054,8 +1054,7 @@

      if (objectClasses.containsKey(objectClass))
      {
        logger.warn(WARN_LDIF_DUPLICATE_OBJECTCLASS.get(
            entryDN, lastEntryLineNumber, ocName));
        logger.warn(WARN_LDIF_DUPLICATE_OBJECTCLASS, entryDN, lastEntryLineNumber, ocName);
      }
      else
      {

 opendj3-server-dev/src/server/org/opends/server/util/RuntimeInformation.java

@@ -268,7 +268,7 @@
     }
     else
     {
       logger.info(NOTE_INSTALL_DIRECTORY.get(installDir));
       logger.info(NOTE_INSTALL_DIRECTORY, installDir);
     }
     String instanceDir = toCanonicalPath(DirectoryServer.getInstanceRoot());
     if (instanceDir == null)
@@ -277,22 +277,22 @@
     }
     else
     {
       logger.info(NOTE_INSTANCE_DIRECTORY.get(instanceDir));
       logger.info(NOTE_INSTANCE_DIRECTORY, instanceDir);
     }
    logger.info(NOTE_JVM_INFO.get(System.getProperty("java.runtime.version"),
    logger.info(NOTE_JVM_INFO, System.getProperty("java.runtime.version"),
                               System.getProperty("java.vendor"),
                               getArch(),Runtime.getRuntime().maxMemory()));
                               getArch(),Runtime.getRuntime().maxMemory());
    long physicalMemorySize = getPhysicalMemorySize();
    if (physicalMemorySize != -1)
    {
      logger.info(NOTE_JVM_HOST.get(getHostName(), getOSInfo(),
          physicalMemorySize, Runtime.getRuntime().availableProcessors()));
      logger.info(NOTE_JVM_HOST, getHostName(), getOSInfo(),
          physicalMemorySize, Runtime.getRuntime().availableProcessors());
    }
    else
    {
      logger.info(NOTE_JVM_HOST_WITH_UNKNOWN_PHYSICAL_MEM.get(getHostName(),
          getOSInfo(), Runtime.getRuntime().availableProcessors()));
      logger.info(NOTE_JVM_HOST_WITH_UNKNOWN_PHYSICAL_MEM, getHostName(),
          getOSInfo(), Runtime.getRuntime().availableProcessors());
    }
    logger.info(NOTE_JVM_ARGS.get(getInputArguments()));
    logger.info(NOTE_JVM_ARGS, getInputArguments());
   }
 }

 opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendAddOperation.java

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

              logger.error(ERR_ADD_ERROR_NOTIFYING_CHANGE_LISTENER
                  .get(getExceptionMessage(e)));
              logger.error(ERR_ADD_ERROR_NOTIFYING_CHANGE_LISTENER, getExceptionMessage(e));
            }
          }
        }
@@ -292,8 +291,8 @@
        }
        catch (DirectoryException de)
        {
          logger.error(ERR_ADD_SYNCH_CONFLICT_RESOLUTION_FAILED.get(
              getConnectionID(), getOperationID(), getExceptionMessage(de)));
          logger.error(ERR_ADD_SYNCH_CONFLICT_RESOLUTION_FAILED,
              getConnectionID(), getOperationID(), getExceptionMessage(de));
          throw de;
        }
      }
@@ -498,8 +497,8 @@
          }
          catch (DirectoryException de)
          {
            logger.error(ERR_ADD_SYNCH_PREOP_FAILED.get(getConnectionID(),
                getOperationID(), getExceptionMessage(de)));
            logger.error(ERR_ADD_SYNCH_PREOP_FAILED, getConnectionID(),
                getOperationID(), getExceptionMessage(de));
            throw de;
          }
        }
@@ -534,8 +533,8 @@
        {
          logger.traceException(de);

          logger.error(ERR_ADD_SYNCH_POSTOP_FAILED.get(getConnectionID(),
              getOperationID(), getExceptionMessage(de)));
          logger.error(ERR_ADD_SYNCH_POSTOP_FAILED, getConnectionID(),
              getOperationID(), getExceptionMessage(de));
          setResponseData(de);
          break;
        }

 opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendDeleteOperation.java

@@ -575,8 +575,8 @@
              }
          } catch (DirectoryException de) {
              logger.traceException(de);
              logger.error(ERR_DELETE_SYNCH_CONFLICT_RESOLUTION_FAILED.get(getConnectionID(), getOperationID(),
                      getExceptionMessage(de)));
              logger.error(ERR_DELETE_SYNCH_CONFLICT_RESOLUTION_FAILED,
                  getConnectionID(), getOperationID(), getExceptionMessage(de));
              setResponseData(de);
              return false;
          }
@@ -594,8 +594,8 @@
              provider.doPostOperation(this);
          } catch (DirectoryException de) {
              logger.traceException(de);
              logger.error(ERR_DELETE_SYNCH_POSTOP_FAILED.get(getConnectionID(),
                      getOperationID(), getExceptionMessage(de)));
              logger.error(ERR_DELETE_SYNCH_POSTOP_FAILED, getConnectionID(),
                      getOperationID(), getExceptionMessage(de));
              setResponseData(de);
              return;
          }
@@ -622,8 +622,8 @@
              }
          } catch (DirectoryException de) {
              logger.traceException(de);
              logger.error(ERR_DELETE_SYNCH_PREOP_FAILED.get(getConnectionID(),
                      getOperationID(), getExceptionMessage(de)));
              logger.error(ERR_DELETE_SYNCH_PREOP_FAILED, getConnectionID(),
                      getOperationID(), getExceptionMessage(de));
              setResponseData(de);
              return false;
          }

 opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java

@@ -898,8 +898,8 @@
              }
          } catch (DirectoryException de) {
              logger.traceException(de);
              logger.error(ERR_MODDN_SYNCH_CONFLICT_RESOLUTION_FAILED.get(getConnectionID(), getOperationID(),
                      getExceptionMessage(de)));
              logger.error(ERR_MODDN_SYNCH_CONFLICT_RESOLUTION_FAILED,
                  getConnectionID(), getOperationID(), getExceptionMessage(de));

              setResponseData(de);
              return false;
@@ -929,8 +929,8 @@
              }
          } catch (DirectoryException de) {
              logger.traceException(de);
              logger.error(ERR_MODDN_SYNCH_PREOP_FAILED.get(getConnectionID(),
                      getOperationID(), getExceptionMessage(de)));
              logger.error(ERR_MODDN_SYNCH_PREOP_FAILED, getConnectionID(),
                      getOperationID(), getExceptionMessage(de));
              setResponseData(de);
              return false;
          }
@@ -949,8 +949,8 @@
              provider.doPostOperation(this);
          } catch (DirectoryException de) {
              logger.traceException(de);
              logger.error(ERR_MODDN_SYNCH_POSTOP_FAILED.get(getConnectionID(),
                      getOperationID(), getExceptionMessage(de)));
              logger.error(ERR_MODDN_SYNCH_POSTOP_FAILED, getConnectionID(),
                      getOperationID(), getExceptionMessage(de));
              setResponseData(de);
              return;
          }

 opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java

@@ -1417,12 +1417,12 @@
            if (!syntax.isHumanReadable() || syntax.isBinary())
            {
              // Value is not human-readable
              logger.error(ERR_MODIFY_ADD_INVALID_SYNTAX_NO_VALUE.get(entryDN, attr.getName(), invalidReason));
              logger.error(ERR_MODIFY_ADD_INVALID_SYNTAX_NO_VALUE, entryDN, attr.getName(), invalidReason);
            }
            else
            {
              logger.error(ERR_MODIFY_ADD_INVALID_SYNTAX.get(
                  entryDN, attr.getName(), v.getValue(), invalidReason));
              logger.error(ERR_MODIFY_ADD_INVALID_SYNTAX,
                  entryDN, attr.getName(), v.getValue(), invalidReason);
            }
            invalidReason = new LocalizableMessageBuilder();
          }
@@ -1619,13 +1619,13 @@
            if (!syntax.isHumanReadable() || syntax.isBinary())
            {
              // Value is not human-readable
              logger.error(ERR_MODIFY_REPLACE_INVALID_SYNTAX_NO_VALUE.get(
                  entryDN, attr.getName(), invalidReason));
              logger.error(ERR_MODIFY_REPLACE_INVALID_SYNTAX_NO_VALUE,
                  entryDN, attr.getName(), invalidReason);
            }
            else
            {
              logger.error(ERR_MODIFY_REPLACE_INVALID_SYNTAX.get(
                  entryDN, attr.getName(), v.getValue(), invalidReason));
              logger.error(ERR_MODIFY_REPLACE_INVALID_SYNTAX,
                  entryDN, attr.getName(), v.getValue(), invalidReason);
            }
            invalidReason = new LocalizableMessageBuilder();
          }
@@ -2033,8 +2033,8 @@
              }
          } catch (DirectoryException de) {
              logger.traceException(de);
              logger.error(ERR_MODIFY_SYNCH_CONFLICT_RESOLUTION_FAILED.get(getConnectionID(), getOperationID(),
                      getExceptionMessage(de)));
              logger.error(ERR_MODIFY_SYNCH_CONFLICT_RESOLUTION_FAILED,
                  getConnectionID(), getOperationID(), getExceptionMessage(de));
              setResponseData(de);
              return false;
          }
@@ -2062,8 +2062,8 @@
              }
          } catch (DirectoryException de) {
              logger.traceException(de);
              logger.error(ERR_MODIFY_SYNCH_PREOP_FAILED.get(getConnectionID(),
                      getOperationID(), getExceptionMessage(de)));
              logger.error(ERR_MODIFY_SYNCH_PREOP_FAILED, getConnectionID(),
                      getOperationID(), getExceptionMessage(de));
              setResponseData(de);
              return false;
          }
@@ -2081,8 +2081,8 @@
              provider.doPostOperation(this);
          } catch (DirectoryException de) {
              logger.traceException(de);
              logger.error(ERR_MODIFY_SYNCH_POSTOP_FAILED.get(getConnectionID(),
                      getOperationID(), getExceptionMessage(de)));
              logger.error(ERR_MODIFY_SYNCH_POSTOP_FAILED, getConnectionID(),
                      getOperationID(), getExceptionMessage(de));
              setResponseData(de);
              return;
          }