external-software/github_OpenIdentityPlatform_OpenDJ.git

Checkpoint commit for OPENDJ-1308 Migrate schema support
Nicolas Capponi
11.41.2014 0bbb2f7f7f74de8b6a43523c88ae7eb8ff8b5e54
 opendj3-server-dev/replace.rb

@@ -27,26 +27,122 @@
#
class Replace

  # Messages map : contains for each message its associated level
  MESSAGES_MAP = {}

  # Mapping of opendj2 log levels to opendj3 logging method
  LOG_LEVELS = {
    'INFO' => 'debug',
    'MILD_WARN' => 'warn',
    'SEVERE_WARN' => 'warn',
    'MILD_ERR' => 'error',
    'SEVERE_ERR' => 'error',
    'FATAL_ERR' => 'error',
    'DEBUG' => 'trace',
    'NOTICE' => 'info',
  }

  # All directories that contains java code
  JAVA_DIRS = ["src/server", "src/quicksetup", "src/ads", "src/guitools", "tests/unit-tests-testng/src"]
  SNMP_DIR = ["src/snmp/src"]
  DSML_DIR = ["src/dsml/org"]

 # Replacement for new config framework
  CONFIG_EXC = {
    :dirs => JAVA_DIRS + SNMP_DIR,
    :extensions => ["java"],
    :stopwords => [],
    :replacements =>
      [
        /import org.opends.server.config.ConfigException;/,
        'import org.forgerock.opendj.config.server.ConfigException;',
       ]
  }


  # Replacement for new config framework
  NEW_CONFIG = {
    :dirs => JAVA_DIRS + SNMP_DIR,
    :extensions => ["java"],
    :stopwords => ["org/opends/server/admin", "api/Config", "MatchingRuleConfigManager"],
    :replacements =>
      [
        /import org.opends.server.admin.std.server\.([^;]+);/,
        'import org.forgerock.opendj.server.config.server.\1;',

        /import org.opends.server.admin.std.meta\.([^;]+);/,
        'import org.forgerock.opendj.server.config.meta.\1;',

        /import org.opends.server.admin.std.client\.([^;]+);/,
        'import org.forgerock.opendj.server.config.client.\1;',

        /import org.opends.server.admin.client\.(\w+);/,
        'import org.forgerock.opendj.config.client.\1;',

        /import org.opends.server.admin.client.ldap\.(\w+);/,
        'import org.forgerock.opendj.config.client.ldap.\1;',

        /import org.opends.server.admin.client.spi\.(\w+);/,
        'import org.forgerock.opendj.config.client.spi.\1;',

        /import org.opends.server.admin.server\.([^;]+);/,
        'import org.forgerock.opendj.config.server.\1;',

        /import org.opends.server.admin\.(\w+);/,
        'import org.forgerock.opendj.config.\1;',

        /import org.forgerock.opendj.config.client.AuthorizationException;/,
        'import org.forgerock.opendj.ldap.ErrorResultException;',

        /import org.forgerock.opendj.config.client.CommunicationException;$/,
        '',

        /catch \(AuthorizationException e\)/,
        'catch (ErrorResultException e)',

        /catch \(CommunicationException e\)/,
        'catch (ErrorResultException e)',

        # Now bring back removed imports that have no replacement
        /import org.forgerock.opendj.config.client.ldap.JNDIDirContextAdaptor;/,
        'import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;',

        /import org.forgerock.opendj.config.AdministrationConnector;/,
        'import org.opends.server.admin.AdministrationConnector;',

        /import org.forgerock.opendj.config.AdministrationDataSync;/,
        'import org.opends.server.admin.AdministrationDataSync;',

        /import org.forgerock.opendj.config.ClassLoaderProvider;/,
        'import org.forgerock.opendj.config.ConfigurationFramework;',

        /import org.opends.server.types.ConfigChangeResult;/,
        'import org.forgerock.opendj.config.server.ConfigChangeResult;',

        /public ConfigChangeResult\s/,
        "public org.forgerock.opendj.config.server.ConfigChangeResult ",

        /new ConfigChangeResult\(/,
        "new org.forgerock.opendj.config.server.ConfigChangeResult(",

        /rdn\(\).getAttributeValue\(0\).getValue\(\).toString\(\)/,
        'rdn().getFirstAVA().getAttributeValue().toString()',

        /^(\s+)ServerManagementContext \w+\s*=\s*ServerManagementContext\s*.getInstance\(\);/m,
        '',

        /^(\s+)RootCfg (\w+)\s+=\s+\w+\.getRootConfiguration\(\);/m,
        '\1RootCfg \2 = serverContext.getServerManagementContext().getRootConfiguration();',

        /^(\s+)RootCfg (\w+)\s+=\s+ServerManagementContext.getInstance\(\)\.getRootConfiguration\(\);/m,
        '\1RootCfg \2 = serverContext.getServerManagementContext().getRootConfiguration();',

        #/(config|configuration|cfg|currentConfig)\.dn\(\)/,
        #'org.forgerock.opendj.adapter.server3x.Converters.to(\1.dn())',

        /(\b\w+\b)\.dn\(\)/,
        'org.forgerock.opendj.adapter.server3x.Converters.to(\1.dn())',

        /(config|configuration|cfg|currentConfig|configEntry|pluginCfg)\.get(\w+)(DN|DNs|Subtrees)\(\)/,
        'org.forgerock.opendj.adapter.server3x.Converters.to(\1.get\2\3())',

        /^(\s+)ConfigChangeResult (\b\w+\b);/,
        '\1org.forgerock.opendj.config.server.ConfigChangeResult \2;',

        /(\s+)AttributeType (\w+) = (configuration|config|cfg|\w+Cfg).get(\w+)Attribute\(\);/,
        '\1AttributeType \2 = \3.get\4Attribute();',

        /^(\s+)public DN dn\(\)/,
        '\1public org.forgerock.opendj.ldap.DN dn()',

      ]
  }


  # Replacement for types
  TYPES = {
@@ -85,122 +181,6 @@
      ]
  }

  # Replacement for exceptions
  # Modify 36 files, for a total of 134 replacements - leaves 1277 compilation errors but mostly from generated config
  EXCEPTIONS = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
    :replacements =>
      [
        /import org.opends.server.admin.client.AuthorizationException;/,
        'import org.forgerock.opendj.ldap.ErrorResultException;',

        /\bAuthorizationException\b/,
        'ErrorResultException',

        /import org.opends.server.admin.client.CommunicationException;\n/,
        '',

        /throws CommunicationException\b, /,
        'throws ',

        /, CommunicationException\b(, )?/,
        '\1',

        /\bCommunicationException\b/,
        'ErrorResultException',
      ]
  }

  # Replacement for loggers
  # Modify 454 files, for a total of 2427 replacements - leaves 72 compilation errors
  # TODO: add I18N loggers
  LOGGERS = {
    :dirs => SNMP_DIR,
    :stopwords => ['src/server/org/opends/server/loggers', 'DebugLogPublisher'],
    :extensions => ["java"],
    :replacements =>
      [
        /import org.opends.server.loggers.debug.DebugTracer;/,
        "import org.forgerock.i18n.LocalizableMessage;\nimport org.forgerock.i18n.slf4j.LocalizedLogger;",

        /import java.util.logging.Logger;/,
        "import org.forgerock.i18n.LocalizableMessage;\nimport org.forgerock.i18n.slf4j.LocalizedLogger;",

        /import java.util.logging.Level;/,
        '',

        /import org.opends.server.types.DebugLogLevel;\n/,
        '',

        #/import (static )?org.opends.server.loggers.debug.DebugLogger.*;\n/,
        #'',

        /DebugTracer TRACER = (DebugLogger.)?getTracer\(\)/,
        "LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass()",

        /^\s*\/\*\*\n.*The tracer object for the debug logger.\n\s*\*\/$\n/,
        '',

        /^\s*\/\/\s*The tracer object for the debug logger.$\n/,
        '',

        /if \(debugEnabled\(\)\)\s*{\s* TRACER.debugCaught\(DebugLogLevel.ERROR, (\b.*\b)\);\s*\n\s*}$/,
        'logger.traceException(\1);',

        /TRACER\.debugCaught\(DebugLogLevel.ERROR, (\b.*\b)\);/,
        'logger.traceException(\1);',

        /TRACER.debug[^(]+\(/,
        'logger.trace(',

        /logger.trace\(DebugLogLevel.\b\w+\b, ?/,
        'logger.trace(',

        /logger.trace\((e|de)\)/,
        'logger.traceException(\1)',

        /(DebugLogger\.|\b)debugEnabled\(\)/,
        'logger.isTraceEnabled()',

        /(LOG|logger).log\((Level.)?WARNING, ?/,
        'logger.warn(',

        /(LOG|logger).log\((Level.)?CONFIG, ?/,
        'logger.info(',

        /(LOG|logger).log\((Level.)?INFO, ?/,
        'logger.debug(',

        /(LOG|logger).log\((Level.)?SEVERE, ?/,
        'logger.error(',

        /(LOG|logger).log\((Level.)?FINE, ?/,
        'logger.trace(',

        /logger.(warn|info|error|debug)([^;]+);/,
        'logger.\1(LocalizableMessage.raw\2);',

        /(private static final|static private final) Logger LOG =[^;]+;/,
        'private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();',
      ]
  }

  I18N_LOGGERS = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
    :replacements =>
      [
         # Message message = ERR_REFINT_UNABLE_TO_EVALUATE_TARGET_CONDITION.get(mo
         #                    .getManagedObjectDefinition().getUserFriendlyName(), String
         #                    .valueOf(mo.getDN()), StaticUtils.getExceptionMessage(e));
         # ErrorLogger.logError(message);
        /\bMessage\b \b(\w+)\b = (\w+\.)?\b(\w+)\b\s*.\s*get([^;]+);\n(\s+)ErrorLogger.logError\(\1\);/m,
        "    Message message = \\2.get\\4;\n" +
        "LocalizedLogger logger = LocalizedLogger.getLocalizedLogger(\\3.resourceName());\n\\5logger.error(\\1);",
     ]
  }

  MSG_ARGN_TOSTRING = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
@@ -293,7 +273,7 @@
  }

  # List of replacements to run
  REPLACEMENTS = [ COLLAPSE_LOCALIZABLE_MESSAGE_TO_LOGGER_ONLY, LOGGER_AND_ARGN_TO_LOGGER_ONLY ]
  REPLACEMENTS = [ CONFIG_EXC ]


  ################################### Processing methods ########################################
@@ -335,10 +315,11 @@
        pattern, replace = replacements[index], replacements[index+1]
        replace = replace.gsub('{CLASSNAME}', classname(file))
        is_replaced = true
        while is_replaced
        #while is_replaced
          #puts "pattern: " + pattern.to_s
          is_replaced = contents.gsub!(pattern, replace)
          if is_replaced then count += 1 end
        end
        #end
      }
      File.open(file + ".copy", "w+") { |f| f.write(contents) }
    }
@@ -360,7 +341,7 @@
    dirs.each { |directory|
      files = files_under_directory(directory, extensions)
      files.each { |file|
        #puts file.to_s
        puts file.to_s + "  stopwords:" + stopwords.to_s
        exclude_file = stopwords.any? { |stopword| file.include?(stopword) }
        next if exclude_file
        count = yield file # call the block
@@ -387,97 +368,13 @@
    count
  end


  # Return all files with provided extensions under the provided directory
  # and all its subdirectories recursively
  def files_under_directory(directory, extensions)
    Dir[directory + '/**/*.{' + extensions.join(",") + '}']
  end

  def run_messages
    prepare_messages
    process_dirs(JAVA_DIRS, ["--nostopword--"], ['java']) { |file|
       process_file(file) { |content|
          count, new_content = process_message(content)
          next count, new_content
       }
    }
  end

  def process_message(content)
    has_logger = /LocalizedLogger\.getLoggerForThisClass/ =~ content
    needs_logger = /logError/ =~ content
    count = 0
    if needs_logger && has_logger.nil?
       count = 1

       content.sub!(/class ([^{]+){/,
          "class \\1{\n\n  " +
          "private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();\n")

       content.sub!(/import (.*);/,
          "import \\1;\nimport org.forgerock.i18n.slf4j.LocalizedLogger;")
    end

    if needs_logger
      count = 1
      pattern = /(final )?(LocalizableMessage )?message\s*=\s*(\w+)\s*.\s*get\(\s*([^;]*)\);\s+(ErrorLogger\.)?logError\(\w+\);/m
      mdata = pattern.match(content)
      while !mdata.nil? do
         msg = mdata[3]
         args = if mdata[4].nil? || mdata[4]=="" then "" else ", " + mdata[4] end
         level = MESSAGES_MAP[msg]
         puts "1... #{level} - #{msg}"
         content.sub!(pattern, "logger.#{level}(#{msg}#{args});")
         mdata = pattern.match(content)
      end

      pattern = /logError\((\w+).get\s*\(\s*/m
      mdata = pattern.match(content)
      stop = {}
      while !mdata.nil? do
         msg = mdata[1]
         break if !stop[msg].nil?
         stop[msg] = msg
         level = MESSAGES_MAP[msg]
         puts "2... #{level} - #{msg}"
         if !level.nil?
            content.sub!(pattern, "logger.#{level}(#{msg}.get(")
         end
         mdata = pattern.match(content)
      end

      # all remaining patterns
      content.gsub!(/(ErrorLogger\.)?logError\(/, 'logger.error(')

    end
    return count, content
  end

  def prepare_messages
    files = Dir['src/messages/messages/*.properties']
    files.each do |file| messages(file) end
  end

  # Build a map of error messages and error level
  def messages(message_file)
    File.open(message_file).each { |line|
      line = line.chomp
      next if line.size==0 || line[0..0]=="#" || line[0..0]==" " || line[0..0]!=line[0..0].upcase || line[0..5]=="global"
      token = line.split("=")
      first, *rest = token[0].split "_"
      level_label = if %w(INFO DEBUG NOTICE).include?(first) then first else first.to_s + "_" + rest[0].to_s end
      level = LOG_LEVELS[level_label]
      label = first + "_" + rest.join("_")
      label = label.gsub("MILD_", '').gsub("SEVERE_", '').gsub("FATAL_", '').gsub("NOTICE_", 'NOTE_').gsub(/_\d+$/, '')
      MESSAGES_MAP[label] = level
      #puts "#{label}=#{level} #{token}"
    }
  end

end

# Launch all replacements defined in the REPLACEMENTS constant
#Replace.new.messages("src/messages/messages/admin.properties")
#Replace.new.run_messages
Replace.new.run

 opendj3-server-dev/resource/admin/metaMO.xsl

@@ -22,7 +22,7 @@
  !
  !
  !      Copyright 2007-2010 Sun Microsystems, Inc.
  !      Portions copyright 2011 ForgeRock AS.
  !      Portions copyright 2011-2014 ForgeRock AS.
  ! -->
<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
  xmlns:admpp="http://www.opends.org/admin-preprocessor"
@@ -1519,15 +1519,15 @@
  <xsl:template name="generate-change-listener-help">
    <xsl:param name="top-name" select="/.." />
    <xsl:param name="name" select="/.." />
    

    <xsl:variable name="_top-length" select="string-length($top-name)" />
    <xsl:variable name="_length" select="string-length($name)" />
    <xsl:variable name="_diff"   select="$_length - $_top-length" />
    <xsl:variable name="_start"  select="substring($name, 1, $_diff - 1)" />
    <xsl:variable name="_middle" select="substring($name, $_diff, 1)" />
    <xsl:variable name="_end" 
    <xsl:variable name="_end"
      select="substring($name, $_diff + 1, $_top-length)" />
    

    <xsl:variable name="short-name">
      <xsl:choose>
        <xsl:when test="not($top-name) or $top-name = $name">
@@ -1541,7 +1541,7 @@
        </xsl:otherwise>
      </xsl:choose>
    </xsl:variable>
    

    <xsl:variable name="java-class">
      <xsl:call-template name="name-to-java">
        <xsl:with-param name="value" select="$name" />
@@ -1702,7 +1702,7 @@
      <!--
        Check that all advanced properties conform to one of
        the following rules:
        

        * is mandatory and has a defined default value(s)
        * is mandatory and is part of an advanced managed object
        * is mandatory and is part of an abstract managed object
@@ -1734,7 +1734,7 @@
        </xsl:when>
      </xsl:choose>
    </xsl:for-each>
    <!-- 
    <!--
      Now generate the definition.
    -->
    <xsl:call-template name="copyright-notice" />
@@ -1976,7 +1976,7 @@
              <import>
                org.opends.server.admin.server.ConfigurationDeleteListener
              </import>
              <import>org.opends.server.config.ConfigException</import>
              <import>org.forgerock.opendj.config.server.ConfigException</import>
            </xsl:if>
            <xsl:if test="$this-all-relations/adm:one-to-zero-or-one">
              <import>java.util.Collection</import>
@@ -1989,10 +1989,10 @@
              <import>
                org.opends.server.admin.server.ConfigurationDeleteListener
              </import>
              <import>org.opends.server.config.ConfigException</import>
              <import>org.forgerock.opendj.config.server.ConfigException</import>
            </xsl:if>
            <xsl:if test="$this-all-relations/adm:one-to-one">
              <import>org.opends.server.config.ConfigException</import>
              <import>org.forgerock.opendj.config.server.ConfigException</import>
            </xsl:if>
            <xsl:if test="$this-all-properties[@multi-valued='true']">
              <import>java.util.SortedSet</import>

 opendj3-server-dev/resource/admin/serverMO.xsl

@@ -22,6 +22,7 @@
  !
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
  !      Portions Copyright 2014 ForgeRock AS
  ! -->
<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
  xmlns:admpp="http://www.opends.org/admin-preprocessor"
@@ -30,7 +31,7 @@
  <xsl:import href="preprocessor.xsl" />
  <xsl:import href="property-types.xsl" />
  <xsl:output method="text" encoding="us-ascii" />
  <!-- 
  <!--
    Template for generating the interface declaration.
  -->
  <xsl:template name="generate-interface-declaration">
@@ -61,7 +62,7 @@
    </xsl:choose>
    <xsl:text>{&#xa;</xsl:text>
  </xsl:template>
  <!-- 
  <!--
    Template for generating the configuration class getter.
  -->
  <xsl:template name="generate-configuration-definition-getter">
@@ -333,7 +334,7 @@
      </xsl:otherwise>
    </xsl:choose>
  </xsl:template>
  <!-- 
  <!--
    Main document parsing template.
  -->
  <xsl:template match="/">
@@ -372,7 +373,7 @@
          </import>
        </xsl:if>
        <xsl:if test="$this-local-relations">
          <import>org.opends.server.config.ConfigException</import>
          <import>org.forgerock.opendj.config.server.ConfigException</import>
        </xsl:if>
        <xsl:if
          test="$this-local-relations/adm:one-to-zero-or-one|$this-local-relations/adm:one-to-many">

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java

@@ -52,6 +52,7 @@
import org.opends.guitools.controlpanel.util.ConfigReader;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
import org.opends.server.admin.client.ldap.LDAPManagementContext;
@@ -240,7 +241,7 @@
   * Update the configuration in the server.
   * @throws OpenDsException if an error occurs.
   */
  private void updateConfiguration() throws OpenDsException
  private void updateConfiguration() throws OpenDsException, ConfigException
  {
    boolean configHandlerUpdated = false;
    final int totalNumber = baseDNsToDelete.size() + backendsToDelete.size();
@@ -439,7 +440,7 @@
   * @throws OpenDsException if an error occurs.
   */
  private void deleteBaseDNs(Set<BaseDNDescriptor> baseDNs)
  throws OpenDsException
  throws OpenDsException, ConfigException
  {
    BackendDescriptor backend = baseDNs.iterator().next().getBackend();

@@ -507,7 +508,7 @@
   * @param backend the backend to be deleted.
   * @throws OpenDsException if an error occurs.
   */
  private void deleteBackend(BackendDescriptor backend) throws OpenDsException
  private void deleteBackend(BackendDescriptor backend) throws OpenDsException, ConfigException
  {
    String dn = getDN(backend);
    Utilities.deleteConfigSubtree(
@@ -655,7 +656,7 @@
   * @throws OpenDsException if an error occurs.
   */
  private void disableReplicationIfRequired(final BaseDNDescriptor baseDN)
  throws OpenDsException
  throws OpenDsException, ConfigException
  {
    if (baseDN.getType() == BaseDNDescriptor.Type.REPLICATED)
    {
@@ -710,7 +711,7 @@
            sync = (ReplicationSynchronizationProviderCfg)
            root.getSynchronizationProvider("Multimaster Synchronization");
          }
          catch (OpenDsException oe)
          catch (ConfigException oe)
          {
            // Ignore this one
          }

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/IndexPanel.java

@@ -69,6 +69,7 @@
import org.opends.guitools.controlpanel.util.ConfigReader;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
import org.opends.server.admin.client.ldap.LDAPManagementContext;
@@ -84,6 +85,7 @@
import org.opends.server.types.OpenDsException;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.ServerConstants;

import com.forgerock.opendj.cli.CommandBuilder;

/**
@@ -744,6 +746,10 @@
        throw new OfflineUpdateException(
            ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe), ioe);
      }
      catch (ConfigException ce)
      {
        throw new org.opends.server.config.ConfigException(ce.getMessageObject(), ce);
      }
      finally
      {
        if (ldifImportConfig != null)

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java

@@ -84,6 +84,7 @@
import org.opends.guitools.controlpanel.util.ConfigReader;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.installer.InstallerHelper;
import org.opends.quicksetup.util.Utils;
@@ -108,6 +109,7 @@
import org.opends.server.types.OpenDsException;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.SetupUtils;

import com.forgerock.opendj.cli.CommandBuilder;

/**
@@ -848,7 +850,7 @@
      return args;
    }

    private void updateConfiguration() throws OpenDsException
    private void updateConfiguration() throws OpenDsException, ConfigException
    {
      boolean configHandlerUpdated = false;
      try
@@ -1479,7 +1481,7 @@
    }

    private void addBaseDN(String backendName, String baseDN)
    throws OpenDsException
    throws OpenDsException, ConfigException
    {
      LinkedList<DN> baseDNs = new LinkedList<DN>();
      for (BackendDescriptor backend :

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java

@@ -73,6 +73,7 @@
import org.opends.guitools.controlpanel.util.ConfigReader;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
import org.opends.server.admin.client.ldap.LDAPManagementContext;
@@ -86,6 +87,7 @@
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.OpenDsException;
import org.opends.server.util.LDIFReader;

import com.forgerock.opendj.cli.CommandBuilder;

/**
@@ -693,7 +695,7 @@
      return canLaunch;
    }

    private void updateConfiguration() throws OpenDsException
    private void updateConfiguration() throws OpenDsException, ConfigException
    {
      boolean configHandlerUpdated = false;
      try
@@ -769,7 +771,7 @@
      }
    }

    private void modifyIndex() throws OpenDsException
    private void modifyIndex() throws OpenDsException, ConfigException
    {
      LDIFImportConfig ldifImportConfig = null;
      try

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java

@@ -46,6 +46,7 @@

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;

import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
@@ -566,22 +567,26 @@
   */
  private void readSchema(InitialLdapContext ctx) throws OpenDsException
  {
    if (isLocal)
    try
    {
      super.readSchema();
    }
    else
    {
      RemoteSchemaLoader loader = new RemoteSchemaLoader();
      try
      if (isLocal)
      {
        super.readSchema();
      }
      else
      {
        RemoteSchemaLoader loader = new RemoteSchemaLoader();
        loader.readSchema(ctx);
        schema = loader.getSchema();
      }
      catch (NamingException ne)
      {
        throw new OnlineUpdateException(ERR_READING_SCHEMA_LDAP.get(ne), ne);
      }
      schema = loader.getSchema();
    }
    catch (NamingException ne)
    {
      throw new OnlineUpdateException(ERR_READING_SCHEMA_LDAP.get(ne), ne);
    }
    catch (ConfigException ce)
    {
      throw new org.opends.server.config.ConfigException(ce.getMessageObject(), ce);
    }
  }


 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigFromFile.java

@@ -76,7 +76,7 @@
import org.opends.server.admin.std.server.RootDNUserCfg;
import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
import org.opends.server.admin.std.server.TaskBackendCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.opends.server.types.OpenDsException;
@@ -142,7 +142,7 @@
      }
      catch (ConfigException ce)
      {
        ex.add(ce);
        ex.add(toConfigException(ce));
      }
      for (String connHandler : root.listConnectionHandlers())
      {
@@ -190,9 +190,9 @@
                    null, index.getIndexType(), index.getIndexEntryLimit()));
              }
            }
            catch (OpenDsException oe)
            catch (ConfigException ce)
            {
              ex.add(oe);
              ex.add(toConfigException(ce));
            }
            indexes.add(new IndexDescriptor("dn2id", null, null,
                new TreeSet<IndexType>(), -1));
@@ -214,9 +214,9 @@
                    sortOrder, index.getMaxBlockSize()));
              }
            }
            catch (OpenDsException oe)
            catch (ConfigException ce)
            {
              ex.add(oe);
              ex.add(toConfigException(ce));
            }
          }
          else if (backend instanceof LDIFBackendCfg)
@@ -257,9 +257,9 @@

          bs.add(desc);
        }
        catch (OpenDsException oe)
        catch (ConfigException ce)
        {
          ex.add(oe);
          ex.add(toConfigException(ce));
        }
      }

@@ -269,9 +269,9 @@
        CryptoManagerCfg cryptoManager = root.getCryptoManager();
        isReplicationSecure = cryptoManager.isSSLEncryption();
      }
      catch (OpenDsException oe)
      catch (ConfigException ce)
      {
        ex.add(oe);
        ex.add(toConfigException(ce));
      }


@@ -282,7 +282,7 @@
        sync = (ReplicationSynchronizationProviderCfg)
        root.getSynchronizationProvider("Multimaster Synchronization");
      }
      catch (OpenDsException oe)
      catch (ConfigException ce)
      {
        // Ignore this one
      }
@@ -337,9 +337,9 @@
            }
          }
        }
        catch (OpenDsException oe)
        catch (ConfigException ce)
        {
          ex.add(oe);
          ex.add(toConfigException(ce));
        }
      }

@@ -358,9 +358,9 @@
          }
        }
      }
      catch (OpenDsException oe)
      catch (ConfigException ce)
      {
        ex.add(oe);
        ex.add(toConfigException(ce));
      }
    }
    catch (OpenDsException oe)
@@ -391,6 +391,12 @@
    backends = Collections.unmodifiableSet(bs);
  }


  private org.opends.server.config.ConfigException toConfigException(ConfigException ce)
  {
    return new org.opends.server.config.ConfigException(ce.getMessageObject(), ce);
  }

  private ConnectionHandlerDescriptor getConnectionHandler(
      ConnectionHandlerCfg connHandler, String name) throws OpenDsException
  {

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ConfigReader.java

@@ -45,7 +45,7 @@
import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
import org.opends.guitools.controlpanel.task.OfflineUpdateException;
import org.opends.server.admin.std.meta.AdministrationConnectorCfgDefn;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.tasks.TaskEntry;
import org.opends.server.types.DN;

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java

@@ -36,7 +36,7 @@
import org.opends.server.admin.Configuration;
import org.opends.server.api.ConfigHandler;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/RemoteSchemaLoader.java

@@ -40,7 +40,7 @@
import org.opends.guitools.controlpanel.browser.BrowserController;
import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
import org.opends.server.config.ConfigConstants;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.schema.AttributeTypeSyntax;
import org.opends.server.schema.ObjectClassSyntax;
import org.opends.server.types.AttributeType;

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/SchemaLoader.java

@@ -39,7 +39,7 @@
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigConstants;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SchemaConfigManager;
import org.opends.server.types.AttributeType;

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java

@@ -111,6 +111,7 @@
import org.opends.guitools.controlpanel.ui.renderer.
 AccessibleTableHeaderRenderer;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.quicksetup.Installation;
import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.util.Utils;
@@ -2487,9 +2488,10 @@
   * subtree.
   * @param dn the DN of the subtree to be deleted.
   * @throws OpenDsException if an error occurs.
   * @throws ConfigException if an error occurs.
   */
  public static void deleteConfigSubtree(ConfigHandler confHandler, DN dn)
  throws OpenDsException
  throws OpenDsException, ConfigException
  {
    ConfigEntry confEntry = confHandler.getConfigEntry(dn);
    if (confEntry != null)

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java

@@ -39,6 +39,7 @@

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.config.server.ConfigException;

import javax.naming.ldap.InitialLdapContext;

@@ -66,6 +67,7 @@
import org.opends.messages.CoreMessages;
import org.opends.messages.JebMessages;
import org.opends.messages.ReplicationMessages;

import static org.opends.messages.QuickSetupMessages.*;

import org.opends.server.tools.ConfigureDS;
@@ -357,6 +359,10 @@
      throw new ApplicationException(
          ReturnCode.CONFIGURATION_ERROR, ode.getMessageObject(), ode);
    }
    catch(ConfigException ce)
    {
      throw new ApplicationException(ReturnCode.CONFIGURATION_ERROR, ce.getMessageObject(), ce);
    }
  }



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

@@ -52,7 +52,7 @@
import org.opends.server.admin.std.server.FileBasedTrustManagerProviderCfg;
import org.opends.server.admin.std.server.LDAPConnectionHandlerCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ServerContext;
import org.opends.server.core.SynchronousStrategy;
import org.opends.server.protocols.ldap.LDAPConnectionHandler;

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

@@ -57,7 +57,7 @@
import org.opends.server.admin.server.ServerManagedObjectChangeListener;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.admin.std.meta.RootCfgDefn;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;

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

@@ -41,7 +41,7 @@
import org.opends.server.admin.condition.Condition;
import org.opends.server.admin.server.ServerConstraintHandler;
import org.opends.server.admin.server.ServerManagedObject;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;




 opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java

@@ -55,7 +55,7 @@
import org.opends.server.admin.std.server.FileBasedTrustManagerProviderCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.std.server.TrustManagerProviderCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;

import com.forgerock.opendj.cli.Argument;

 opendj3-server-dev/src/server/org/opends/server/admin/condition/ANDCondition.java

@@ -37,7 +37,7 @@
import org.opends.server.admin.client.ManagedObject;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.server.ServerManagedObject;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.util.Reject;



 opendj3-server-dev/src/server/org/opends/server/admin/condition/Condition.java

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.admin.condition;

@@ -33,7 +34,7 @@
import org.opends.server.admin.client.ManagedObject;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.server.ServerManagedObject;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;




 opendj3-server-dev/src/server/org/opends/server/admin/condition/Conditions.java

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.admin.condition;

@@ -33,7 +34,7 @@
import org.opends.server.admin.client.ManagedObject;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.server.ServerManagedObject;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;




 opendj3-server-dev/src/server/org/opends/server/admin/condition/ContainsCondition.java

@@ -38,7 +38,7 @@
import org.opends.server.admin.client.ManagedObject;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.server.ServerManagedObject;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.util.Reject;



 opendj3-server-dev/src/server/org/opends/server/admin/condition/IsPresentCondition.java

@@ -37,7 +37,7 @@
import org.opends.server.admin.client.ManagedObject;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.server.ServerManagedObject;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.util.Reject;



 opendj3-server-dev/src/server/org/opends/server/admin/condition/NOTCondition.java

@@ -34,7 +34,7 @@
import org.opends.server.admin.client.ManagedObject;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.server.ServerManagedObject;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.util.Reject;



 opendj3-server-dev/src/server/org/opends/server/admin/condition/ORCondition.java

@@ -37,7 +37,7 @@
import org.opends.server.admin.client.ManagedObject;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.server.ServerManagedObject;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.util.Reject;



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

@@ -45,7 +45,7 @@
import org.opends.server.admin.DefinitionDecodingException.Reason;
import org.opends.server.api.ConfigAddListener;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ConfigChangeResult;

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

@@ -54,7 +54,7 @@
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;

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

@@ -46,7 +46,7 @@
import org.opends.server.admin.DefinitionDecodingException.Reason;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ConfigChangeResult;

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

@@ -30,7 +30,7 @@
import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;

import org.opends.server.admin.DefinitionDecodingException;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DN;

/**

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

@@ -33,7 +33,7 @@
import org.opends.server.api.ConfigAddListener;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;

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

@@ -31,7 +31,7 @@
import java.util.Collection;

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;




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

@@ -55,7 +55,7 @@
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.DN;

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

@@ -74,7 +74,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.AttributeValueDecoder;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.AttributeType;

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

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

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.AccessControlHandlerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
import org.opends.server.workflowelement.localbackend.LocalBackendAddOperation;

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

@@ -33,7 +33,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.
       AccountStatusNotificationHandlerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.AccountStatusNotification;
import org.opends.server.types.InitializationException;


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

@@ -32,7 +32,7 @@
import java.util.List;

import org.opends.server.admin.std.server.AlertHandlerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;



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

@@ -32,7 +32,7 @@
import java.util.List;

import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -32,7 +32,7 @@

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.AuthenticationPolicyCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ServerContext;
import org.opends.server.types.InitializationException;


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

@@ -33,7 +33,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.Configuration;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;

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

@@ -33,7 +33,7 @@
import java.util.List;

import org.opends.server.admin.std.server.CertificateMapperCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;

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

@@ -22,13 +22,14 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.api;



import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -34,7 +34,7 @@

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.ConnectionHandlerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.monitors.ConnectionHandlerMonitor;
import org.opends.server.types.DN;
import org.opends.server.types.HostPort;

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

@@ -35,7 +35,7 @@
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;

import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;

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

@@ -32,7 +32,7 @@

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.ExtendedOperationHandlerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ExtendedOperation;
import org.opends.server.types.InitializationException;

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

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

import java.util.List;
import org.opends.server.admin.std.server.ExtensionCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;



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

@@ -34,7 +34,7 @@
import java.util.Set;

import org.opends.server.admin.std.server.GroupImplementationCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;

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

@@ -32,7 +32,7 @@
import java.util.List;

import org.opends.server.admin.std.server.IdentityMapperCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;

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

@@ -33,7 +33,7 @@
import javax.net.ssl.KeyManager;

import org.opends.server.admin.std.server.KeyManagerProviderCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;


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

@@ -31,7 +31,7 @@
import java.util.List;

import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.InitializationException;


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

@@ -33,7 +33,7 @@
import java.util.concurrent.*;

import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.Attribute;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.InitializationException;

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

@@ -32,7 +32,7 @@
import java.util.List;

import org.opends.server.admin.std.server.PasswordGeneratorCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;


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

@@ -32,7 +32,7 @@
import java.util.List;

import org.opends.server.admin.std.server.PasswordStorageSchemeCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;

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

@@ -33,7 +33,7 @@
import java.util.Set;

import org.opends.server.admin.std.server.PasswordValidatorCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.i18n.LocalizableMessageBuilder;

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

@@ -33,7 +33,7 @@

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.QOSPolicyCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;



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

@@ -32,7 +32,7 @@
import java.util.List;

import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.BindOperation;
import org.opends.server.types.InitializationException;


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

@@ -32,7 +32,7 @@
import java.util.List;

import org.opends.server.admin.std.server.SynchronizationProviderCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;

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

@@ -33,7 +33,7 @@
import javax.net.ssl.TrustManager;

import org.opends.server.admin.std.server.TrustManagerProviderCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;


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

@@ -37,7 +37,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.opends.server.admin.std.server.VirtualAttributeCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.Entry;

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

@@ -30,7 +30,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.WorkQueueCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Operation;

 opendj3-server-dev/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java

@@ -34,7 +34,7 @@

import org.opends.server.admin.std.server.PluginCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DeleteOperation;
import org.opends.server.types.*;
import org.opends.server.types.operation.*;

 opendj3-server-dev/src/server/org/opends/server/api/plugin/InternalDirectoryServerPlugin.java

@@ -34,7 +34,7 @@

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.PluginCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;


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

@@ -41,7 +41,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConfigHandler;
import org.opends.server.backends.jeb.EntryContainer;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.GetEffectiveRightsRequestControl;
import org.opends.server.core.*;
import org.opends.server.protocols.internal.InternalClientConnection;

 opendj3-server-dev/src/server/org/opends/server/backends/BackupBackend.java

@@ -39,7 +39,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.BackupBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;

 opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java

@@ -40,7 +40,7 @@
import org.opends.server.admin.std.server.LDIFBackendCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.SubtreeDeleteControl;
import org.opends.server.core.*;
import org.opends.server.types.*;

 opendj3-server-dev/src/server/org/opends/server/backends/MemoryBackend.java

@@ -41,7 +41,7 @@
import org.opends.server.admin.Configuration;
import org.opends.server.admin.std.server.MemoryBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.SubtreeDeleteControl;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;

 opendj3-server-dev/src/server/org/opends/server/backends/MonitorBackend.java

@@ -39,7 +39,7 @@
import org.opends.server.api.Backend;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

 opendj3-server-dev/src/server/org/opends/server/backends/NullBackend.java

@@ -36,7 +36,7 @@
import org.opends.server.admin.Configuration;
import org.opends.server.admin.std.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.PagedResultsControl;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;

 opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java

@@ -52,7 +52,7 @@
import org.opends.server.api.Backend;
import org.opends.server.api.ClientConnection;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;

 opendj3-server-dev/src/server/org/opends/server/backends/SchemaBackend.java

@@ -70,7 +70,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;

 opendj3-server-dev/src/server/org/opends/server/backends/TrustStoreBackend.java

@@ -63,7 +63,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.TrustStoreBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;

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

@@ -42,7 +42,7 @@
import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn;
import org.opends.server.admin.std.server.LocalDBIndexCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.monitors.DatabaseEnvironmentMonitor;
import org.opends.server.types.*;

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

@@ -51,7 +51,7 @@
import org.opends.server.api.DiskSpaceMonitorHandler;
import org.opends.server.api.MonitorProvider;
import org.opends.server.backends.jeb.importLDIF.Importer;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.extensions.DiskSpaceMonitor;
import org.opends.server.types.*;
@@ -858,6 +858,10 @@
      logger.traceException(de);
      throw createDirectoryException(de);
    }
    catch (ConfigException ce)
    {
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), ce.getMessageObject());
    }
    catch (IdentifiedException e)
    {
      if (e instanceof DirectoryException)

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

@@ -27,7 +27,7 @@
package org.opends.server.backends.jeb;
import org.forgerock.i18n.LocalizableMessage;

import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.util.DynamicConstants;
import org.opends.server.types.CryptoManagerException;

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

@@ -41,7 +41,7 @@
import org.opends.server.admin.std.meta.LocalDBBackendCfgDefn;
import org.opends.server.admin.std.server.LocalDBBackendCfg;
import org.opends.server.config.ConfigConstants;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import com.sleepycat.je.Durability;
import com.sleepycat.je.EnvironmentConfig;
import com.sleepycat.je.dbi.MemoryBudget;

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

@@ -46,7 +46,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.EntryCache;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.*;
import org.opends.server.core.*;
import org.opends.server.protocols.ldap.LDAPResultCode;

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

@@ -42,7 +42,7 @@
import org.opends.server.admin.std.server.LocalDBBackendCfg;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.core.DirectoryServer;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.InitializationException;
import static org.opends.messages.JebMessages.*;

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

@@ -40,7 +40,7 @@
import org.opends.server.admin.std.meta.LocalDBVLVIndexCfgDefn.Scope;
import org.opends.server.admin.std.server.LocalDBVLVIndexCfg;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.ServerSideSortRequestControl;
import org.opends.server.controls.VLVRequestControl;
import org.opends.server.controls.VLVResponseControl;

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

@@ -44,7 +44,7 @@
import org.opends.server.api.DiskSpaceMonitorHandler;
import org.opends.server.backends.jeb.*;
import org.opends.server.backends.jeb.RebuildConfig.RebuildMode;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.DiskSpaceMonitor;
import org.opends.server.types.*;

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

@@ -32,7 +32,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import org.opends.server.backends.jeb.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.backends.jeb.importLDIF.Importer.*;

 opendj3-server-dev/src/server/org/opends/server/backends/task/TaskBackend.java

@@ -51,7 +51,7 @@
import org.opends.server.admin.std.server.TaskBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

 opendj3-server-dev/src/server/org/opends/server/config/StringConfigAttribute.java

@@ -260,24 +260,23 @@
   * Retrieves the active value for this configuration attribute as a string.
   * This is only valid for single-valued attributes that have a value.
   *
   * @return  The active value for this configuration attribute as a string.
   *
   * @throws  ConfigException  If this attribute does not have exactly one
   *                           active value.
   * @return The active value for this configuration attribute as a string.
   * @throws org.forgerock.opendj.config.server.ConfigException
   *           If this attribute does not have exactly one active value.
   */
  public String activeValue()
         throws ConfigException
         throws org.forgerock.opendj.config.server.ConfigException
  {
    if ((activeValues == null) || activeValues.isEmpty())
    {
      LocalizableMessage message = ERR_CONFIG_ATTR_NO_STRING_VALUE.get(getName());
      throw new ConfigException(message);
      throw new org.forgerock.opendj.config.server.ConfigException(message);
    }

    if (activeValues.size() > 1)
    {
      LocalizableMessage message = ERR_CONFIG_ATTR_MULTIPLE_STRING_VALUES.get(getName());
      throw new ConfigException(message);
      throw new org.forgerock.opendj.config.server.ConfigException(message);
    }

    return activeValues.get(0);
@@ -299,17 +298,16 @@

  /**
   * Retrieves the pending value for this configuration attribute as a string.
   * This is only valid for single-valued attributes that have a value.  If this
   * This is only valid for single-valued attributes that have a value. If this
   * attribute does not have any pending values, then the active value will be
   * returned.
   *
   * @return  The pending value for this configuration attribute as a string.
   *
   * @throws  ConfigException  If this attribute does not have exactly one
   *                           pending value.
   * @return The pending value for this configuration attribute as a string.
   * @throws org.forgerock.opendj.config.server.ConfigException
   *           If this attribute does not have exactly one pending value.
   */
  public String pendingValue()
         throws ConfigException
         throws org.forgerock.opendj.config.server.ConfigException
  {
    if (! hasPendingValues())
    {
@@ -319,13 +317,13 @@
    if ((pendingValues == null) || pendingValues.isEmpty())
    {
      LocalizableMessage message = ERR_CONFIG_ATTR_NO_STRING_VALUE.get(getName());
      throw new ConfigException(message);
      throw new org.forgerock.opendj.config.server.ConfigException(message);
    }

    if (pendingValues.size() > 1)
    {
      LocalizableMessage message = ERR_CONFIG_ATTR_MULTIPLE_STRING_VALUES.get(getName());
      throw new ConfigException(message);
      throw new org.forgerock.opendj.config.server.ConfigException(message);
    }

    return pendingValues.get(0);

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.AccessControlHandler;
import org.opends.server.api.AlertGenerator;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -42,7 +42,7 @@
import org.opends.server.admin.std.server.AccountStatusNotificationHandlerCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.AccountStatusNotificationHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.server.AlertHandlerCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.AlertHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -40,7 +40,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.util.Utils;
import org.opends.server.types.AttributeType;

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

@@ -41,7 +41,7 @@
import org.opends.server.api.Backend;
import org.opends.server.api.BackendInitializationListener;
import org.opends.server.api.ConfigHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigConstants;
import org.opends.server.types.*;

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.api.CertificateMapper;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -45,7 +45,7 @@
import org.opends.server.admin.std.server.ConnectionHandlerCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.ConnectionHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.protocols.ldap.LDAPConnectionHandler;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;

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

@@ -36,7 +36,7 @@
import org.opends.server.admin.std.server.GlobalCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ConfigMessages.*;

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

@@ -22,13 +22,13 @@
 *
 *
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 *      Portions Copyright 2011 ForgeRock AS
 *      Portions Copyright 2011-2014 ForgeRock AS
 */
package org.opends.server.core;

import org.opends.server.admin.std.server.AccessControlHandlerCfg;
import org.opends.server.api.AccessControlHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.opends.server.workflowelement.localbackend.*;


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

@@ -137,7 +137,7 @@
import org.opends.server.api.plugin.PluginType;
import org.opends.server.backends.RootDSEBackend;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.config.JMXMBean;
import org.opends.server.controls.PasswordPolicyErrorType;
import org.opends.server.controls.PasswordPolicyResponseControl;

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

@@ -45,7 +45,7 @@
import org.opends.server.api.EntryCache;
import org.opends.server.config.ConfigConstants;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.extensions.DefaultEntryCache;
import org.opends.server.monitors.EntryCacheMonitorProvider;
import org.opends.server.types.ConfigChangeResult;

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

@@ -42,7 +42,7 @@
import org.opends.server.admin.std.server.ExtendedOperationHandlerCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.api.Extension;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -51,7 +51,7 @@
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginResult.PostOperation;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPControl;

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.api.IdentityMapper;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.api.KeyManagerProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -43,7 +43,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.loggers.RetentionPolicy;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;

import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;

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

@@ -42,7 +42,7 @@
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;

import static org.opends.messages.ConfigMessages.*;
import static org.opends.server.util.StaticUtils.*;

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.server.HTTPAccessLogPublisherCfg;
import org.opends.server.admin.std.server.LogPublisherCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.loggers.AbstractLogger;
import org.opends.server.loggers.AccessLogger;
import org.opends.server.loggers.DebugLogger;

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

@@ -48,7 +48,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.AttributeType;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;

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

@@ -42,7 +42,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.server.PasswordGeneratorCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.PasswordGenerator;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -44,7 +44,7 @@
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.api.AuthenticationPolicyFactory;
import org.opends.server.api.SubentryChangeListener;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;

import static org.opends.messages.ConfigMessages.*;

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

@@ -44,7 +44,7 @@
import org.opends.server.admin.std.meta.PasswordPolicyCfgDefn.*;
import org.opends.server.admin.std.server.PasswordPolicyCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.schema.GeneralizedTimeSyntax;
import org.opends.server.types.*;

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

@@ -45,7 +45,7 @@
import org.opends.server.admin.std.server.PasswordStorageSchemeCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.api.PasswordValidator;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -47,7 +47,7 @@
import org.opends.server.api.plugin.InternalDirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.*;

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

@@ -44,7 +44,7 @@
import org.opends.server.admin.std.server.RootDNCfg;
import org.opends.server.admin.std.server.RootDNUserCfg;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.api.SASLMechanismHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -37,7 +37,7 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ModificationType;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.schema.*;
import org.opends.server.types.*;
import org.opends.server.util.LDIFReader;

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

@@ -42,7 +42,7 @@
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.api.PasswordValidator;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;

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

@@ -42,7 +42,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.std.server.SynchronizationProviderCfg;
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.api.TrustManagerProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

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

@@ -44,7 +44,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.std.server.VirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;


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

@@ -37,7 +37,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.std.server.WorkQueueCfg;
import org.opends.server.api.WorkQueue;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.InitializationException;


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

@@ -41,7 +41,7 @@
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.std.server.WorkflowCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.networkgroups.NetworkGroup;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;

 opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java

@@ -56,7 +56,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.QOSPolicy;
import org.opends.server.api.QOSPolicyFactory;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.RootDseWorkflowTopology;
import org.opends.server.core.Workflow;

 opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java

@@ -39,7 +39,7 @@
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.admin.std.server.NetworkGroupCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.forgerock.i18n.slf4j.LocalizedLogger;

 opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupPlugin.java

@@ -39,7 +39,7 @@
import org.opends.server.admin.std.server.PluginCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.AuthenticationType;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;

 opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupStatistics.java

@@ -31,7 +31,7 @@
import java.util.concurrent.atomic.AtomicLong;
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.types.Attribute;

 opendj3-server-dev/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyFactory.java

@@ -36,7 +36,7 @@
import org.opends.server.admin.std.meta.RequestFilteringQOSPolicyCfgDefn.AllowedSearchScopes;
import org.opends.server.admin.std.server.RequestFilteringQOSPolicyCfg;
import org.opends.server.api.QOSPolicyFactory;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;

 opendj3-server-dev/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyFactory.java

@@ -39,7 +39,7 @@
import org.opends.server.admin.std.server.ResourceLimitsQOSPolicyCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.QOSPolicyFactory;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.ConfigChangeResult;

 opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java

@@ -61,7 +61,7 @@
import org.opends.server.api.Backend;
import org.opends.server.backends.TrustStoreBackend;
import org.opends.server.config.ConfigConstants;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
@@ -920,15 +920,19 @@
    // Retrieve instance-key-pair private key part.
    PrivateKey privateKey;
    try {
      privateKey = (PrivateKey)getTrustStoreBackend()
      privateKey = (PrivateKey) getTrustStoreBackend()
              .getKey(ConfigConstants.ADS_CERTIFICATE_ALIAS);
    }
    catch(ConfigException ce)
    {
      throw new CryptoManagerException(
          ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_NO_PRIVATE.get(getExceptionMessage(ce)), ce);
    }
    catch (IdentifiedException ex) {
      // ConfigException, DirectoryException
      logger.traceException(ex);
      throw new CryptoManagerException(
          ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_NO_PRIVATE.get(
                  getExceptionMessage(ex)), ex);
          ERR_CRYPTOMGR_DECODE_SYMMETRIC_KEY_ATTRIBUTE_NO_PRIVATE.get(getExceptionMessage(ex)), ex);
    }

    // Unwrap secret key.

 opendj3-server-dev/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperation.java

@@ -32,7 +32,7 @@
import org.opends.server.admin.std.server.
GetSymmetricKeyExtendedOperationHandlerCfg;
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ExtendedOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;

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

@@ -31,7 +31,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.AESPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -31,7 +31,7 @@
import org.opends.server.admin.std.server.AnonymousSASLMechanismHandlerCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.api.SASLMechanismHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;

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

@@ -31,7 +31,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.Base64PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.extensions;

@@ -33,7 +34,7 @@

import org.opends.server.admin.std.server.BlindTrustManagerProviderCfg;
import org.opends.server.api.TrustManagerProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;


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

@@ -31,7 +31,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.BlowfishPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -41,7 +41,7 @@
import org.opends.server.admin.std.server.CramMD5SASLMechanismHandlerCfg;
import org.opends.server.admin.std.server.SASLMechanismHandlerCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PasswordPolicyState;

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

@@ -30,7 +30,7 @@
import org.opends.server.admin.std.server.CancelExtendedOperationHandlerCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ExtendedOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.io.ASN1;

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

@@ -39,7 +39,7 @@
import org.opends.server.admin.std.server.CharacterSetPasswordValidatorCfg;
import org.opends.server.admin.std.server.PasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;

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

@@ -31,7 +31,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.ClearPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;

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

@@ -61,7 +61,7 @@
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.api.ConfigHandler;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
@@ -1096,7 +1096,7 @@
        configEntries.put(entryDN, newEntry);
        writeUpdatedConfig();
      }
      catch (ConfigException ce)
      catch (org.opends.server.config.ConfigException ce)
      {
        logger.traceException(ce);

@@ -1232,7 +1232,7 @@
        configEntries.remove(entryDN);
        writeUpdatedConfig();
      }
      catch (ConfigException ce)
      catch (org.opends.server.config.ConfigException ce)
      {
        logger.traceException(ce);


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

@@ -37,7 +37,7 @@
import org.opends.server.admin.std.server.CryptPasswordStorageSchemeCfg;
import org.opends.server.admin.std.server.PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

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

@@ -39,7 +39,7 @@
import org.opends.server.api.Backend;
import org.opends.server.api.BackendInitializationListener;
import org.opends.server.api.EntryCache;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.Attribute;

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

@@ -42,7 +42,7 @@
import org.opends.server.admin.std.server.DictionaryPasswordValidatorCfg;
import org.opends.server.admin.std.server.PasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;

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

@@ -43,7 +43,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.IdentityMapper;
import org.opends.server.api.SASLMechanismHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;

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

@@ -30,7 +30,7 @@
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.DiskSpaceMonitorHandler;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -37,7 +37,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.DynamicGroupImplementationCfg;
import org.opends.server.api.Group;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;

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

@@ -38,7 +38,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.EntityTagVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

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

@@ -44,7 +44,7 @@
import org.opends.server.admin.std.server.
       ErrorLogAccountStatusNotificationHandlerCfg;
import org.opends.server.api.AccountStatusNotificationHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.AccountStatusNotification;
import org.opends.server.types.AccountStatusNotificationType;
import org.opends.server.types.ConfigChangeResult;

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

@@ -42,7 +42,7 @@
import org.opends.server.admin.std.server.IdentityMapperCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.IdentityMapper;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;

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

@@ -37,7 +37,7 @@
import org.opends.server.api.CertificateMapper;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.SASLMechanismHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;

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

@@ -39,7 +39,7 @@
import org.opends.server.admin.std.server.FIFOEntryCacheCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.EntryCache;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.CacheEntry;
import org.opends.server.types.ConfigChangeResult;

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

@@ -44,7 +44,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.FileBasedKeyManagerProviderCfg;
import org.opends.server.api.KeyManagerProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;

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

@@ -45,7 +45,7 @@
import org.opends.server.admin.std.server.TrustManagerProviderCfg;
import org.opends.server.admin.std.server.FileBasedTrustManagerProviderCfg;
import org.opends.server.api.TrustManagerProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;

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

@@ -62,7 +62,7 @@
import org.opends.server.api.Backend;
import org.opends.server.api.EntryCache;
import org.opends.server.backends.jeb.ConfigurableEnvironment;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

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

@@ -42,7 +42,7 @@
import org.opends.server.admin.std.server.FingerprintCertificateMapperCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.CertificateMapper;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;

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

@@ -62,7 +62,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.IdentityMapper;
import org.opends.server.api.SASLMechanismHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;

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

@@ -29,7 +29,7 @@
import org.opends.server.admin.std.server.
            GetConnectionIdExtendedOperationHandlerCfg;
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ExtendedOperation;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.io.ASN1;

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

@@ -55,7 +55,7 @@
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.AlertHandler;
import org.opends.server.api.DirectoryServerMBean;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.config.JMXMBean;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;

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

@@ -48,7 +48,7 @@
import org.opends.server.admin.std.meta.LDAPPassThroughAuthenticationPolicyCfgDefn.MappingPolicy;
import org.opends.server.admin.std.server.LDAPPassThroughAuthenticationPolicyCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.core.ServerContext;

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

@@ -36,7 +36,7 @@
import org.opends.server.admin.std.server.LengthBasedPasswordValidatorCfg;
import org.opends.server.admin.std.server.PasswordValidatorCfg;
import org.opends.server.api.PasswordValidator;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;

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

@@ -34,7 +34,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.MD5PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -40,7 +40,7 @@
import org.opends.server.admin.std.server.MemberVirtualAttributeCfg;
import org.opends.server.api.Group;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.AttributeValue;

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.extensions;

@@ -31,7 +32,7 @@

import org.opends.server.admin.std.server.KeyManagerProviderCfg;
import org.opends.server.api.KeyManagerProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;


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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.extensions;

@@ -31,7 +32,7 @@

import org.opends.server.admin.std.server.TrustManagerProviderCfg;
import org.opends.server.api.TrustManagerProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;


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

@@ -38,7 +38,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.PBKDF2PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -42,7 +42,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.PKCS11KeyManagerProviderCfg;
import org.opends.server.api.KeyManagerProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;

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

@@ -41,7 +41,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.ParallelWorkQueueCfg;
import org.opends.server.api.WorkQueue;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.monitors.ParallelWorkQueueMonitor;

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.server.ExtendedOperationHandlerCfg;
import org.opends.server.admin.std.server.PasswordModifyExtendedOperationHandlerCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.PasswordPolicyErrorType;
import org.opends.server.controls.PasswordPolicyResponseControl;
import org.opends.server.controls.PasswordPolicyWarningType;

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

@@ -44,7 +44,7 @@
import org.opends.server.api.AuthenticationPolicy;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;

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

@@ -44,7 +44,7 @@
import org.opends.server.api.AuthenticationPolicyState;
import org.opends.server.api.IdentityMapper;
import org.opends.server.api.SASLMechanismHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;

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

@@ -31,7 +31,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.RC4PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -39,7 +39,7 @@
import org.opends.server.admin.std.server.PasswordGeneratorCfg;
import org.opends.server.admin.std.server.RandomPasswordGeneratorCfg;
import org.opends.server.api.PasswordGenerator;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -45,7 +45,7 @@
import org.opends.server.admin.std.server.RegularExpressionIdentityMapperCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.IdentityMapper;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;

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

@@ -34,7 +34,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.SHA1PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -44,7 +44,7 @@
import org.opends.server.admin.std.server.
            SMTPAccountStatusNotificationHandlerCfg;
import org.opends.server.api.AccountStatusNotificationHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.util.Utils;

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

@@ -38,7 +38,7 @@
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.AlertHandler;
import org.opends.server.core.DirectoryServer;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.InitializationException;

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

@@ -35,7 +35,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.SaltedMD5PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -35,7 +35,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.SaltedSHA1PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -35,7 +35,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.SaltedSHA256PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -35,7 +35,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.SaltedSHA384PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -35,7 +35,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.SaltedSHA512PasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -31,7 +31,7 @@
import java.util.Set;

import org.opends.server.api.PasswordValidator;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;

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

@@ -42,7 +42,7 @@
import org.opends.server.api.Backend;
import org.opends.server.api.DirectoryThread;
import org.opends.server.api.EntryCache;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
import org.opends.server.types.CacheEntry;

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

@@ -30,7 +30,7 @@
import org.opends.server.admin.std.server.StartTLSExtendedOperationHandlerCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ExtendedOperation;
import org.opends.server.types.InitializationException;
import org.forgerock.opendj.ldap.ResultCode;

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

@@ -40,7 +40,7 @@
import org.opends.server.api.Group;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.core.DirectoryServer;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.ldap.LDAPControl;

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

@@ -42,7 +42,7 @@
import org.opends.server.admin.std.server.SubjectAttributeToUserAttributeCertificateMapperCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.CertificateMapper;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;

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

@@ -44,7 +44,7 @@
import org.opends.server.admin.std.server.SubjectDNToUserAttributeCertificateMapperCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.CertificateMapper;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;

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

@@ -37,7 +37,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.SubjectEqualsDNCertificateMapperCfg;
import org.opends.server.api.CertificateMapper;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.TraditionalWorkQueueCfg;
import org.opends.server.api.WorkQueue;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.monitors.TraditionalWorkQueueMonitor;

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

@@ -31,7 +31,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.TripleDESPasswordStorageSchemeCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -37,7 +37,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.UserDefinedVirtualAttributeCfg;
import org.opends.server.api.VirtualAttributeProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.SearchOperation;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

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

@@ -36,7 +36,7 @@
import org.opends.server.admin.std.server.VirtualStaticGroupImplementationCfg;
import org.opends.server.api.Group;
import org.opends.server.core.DirectoryServer;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;

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

@@ -32,7 +32,7 @@
import org.opends.server.admin.std.server.WhoAmIExtendedOperationHandlerCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.ProxiedAuthV1Control;
import org.opends.server.controls.ProxiedAuthV2Control;
import org.opends.server.core.ExtendedOperation;

 opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java

@@ -42,7 +42,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.std.server.LogPublisherCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.opends.server.types.ConfigChangeResult;

 opendj3-server-dev/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisher.java

@@ -48,7 +48,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.Group;
import org.opends.server.authorization.dseecompat.PatternDN;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

 opendj3-server-dev/src/server/org/opends/server/loggers/ConsoleDebugLogPublisher.java

@@ -31,7 +31,7 @@
import java.text.SimpleDateFormat;

import org.opends.server.admin.std.server.DebugLogPublisherCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

 opendj3-server-dev/src/server/org/opends/server/loggers/LogPublisher.java

@@ -31,7 +31,7 @@

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.LogPublisherCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

 opendj3-server-dev/src/server/org/opends/server/loggers/RetentionPolicy.java

@@ -22,14 +22,14 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions copyright 2013 ForgeRock AS
 *      Portions Copyright 2013-2014 ForgeRock AS
 */
package org.opends.server.loggers;

import java.io.File;

import org.opends.server.admin.std.server.LogRetentionPolicyCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;


 opendj3-server-dev/src/server/org/opends/server/loggers/RotationPolicy.java

@@ -22,12 +22,13 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.loggers;

import org.opends.server.admin.std.server.LogRotationPolicyCfg;
import org.opends.server.types.InitializationException;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;


/**

 opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRotationPolicy.java

@@ -33,7 +33,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.ConfigChangeResult;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;


import java.util.List;

 opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java

@@ -41,7 +41,7 @@
import org.opends.server.admin.std.server.FileBasedAccessLogPublisherCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ExtendedOperationHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

 opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java

@@ -41,7 +41,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.FileBasedAuditLogPublisherCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

 opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java

@@ -39,7 +39,7 @@
import org.opends.server.admin.std.server.DebugTargetCfg;
import org.opends.server.admin.std.server.FileBasedDebugLogPublisherCfg;
import org.opends.server.api.DirectoryThread;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.opends.server.types.ConfigChangeResult;

 opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java

@@ -45,7 +45,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.ErrorLogPublisherCfgDefn;
import org.opends.server.admin.std.server.FileBasedErrorLogPublisherCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.opends.server.types.ConfigChangeResult;

 opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java

@@ -44,7 +44,7 @@
import org.forgerock.util.Utils;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.FileBasedHTTPAccessLogPublisherCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.opends.server.types.ConfigChangeResult;

 opendj3-server-dev/src/server/org/opends/server/loggers/ThreadFilterTextErrorLogPublisher.java

@@ -30,7 +30,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.messages.Severity;
import org.opends.server.admin.std.server.ErrorLogPublisherCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ServerContext;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;

 opendj3-server-dev/src/server/org/opends/server/monitors/ClientConnectionMonitorProvider.java

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.monitors;

@@ -35,7 +36,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConnectionHandler;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeBuilder;

 opendj3-server-dev/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitor.java

@@ -40,7 +40,7 @@
import org.opends.server.backends.jeb.EntryContainer;
import org.opends.server.backends.jeb.Index;
import org.opends.server.backends.jeb.RootContainer;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

 opendj3-server-dev/src/server/org/opends/server/monitors/EntryCacheMonitorProvider.java

@@ -35,7 +35,7 @@
import org.opends.server.api.EntryCache;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigConstants;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;


 opendj3-server-dev/src/server/org/opends/server/monitors/MemoryUsageMonitorProvider.java

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.monitors;

@@ -37,7 +38,7 @@

import org.opends.server.admin.std.server.MemoryUsageMonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;


 opendj3-server-dev/src/server/org/opends/server/monitors/ParallelWorkQueueMonitor.java

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.monitors;

@@ -33,7 +34,7 @@
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.ParallelWorkQueue;
import org.opends.server.types.Attribute;

 opendj3-server-dev/src/server/org/opends/server/monitors/StackTraceMonitorProvider.java

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.monitors;

@@ -33,7 +34,7 @@

import org.opends.server.admin.std.server.StackTraceMonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;


 opendj3-server-dev/src/server/org/opends/server/monitors/SystemInfoMonitorProvider.java

@@ -44,7 +44,7 @@

import org.opends.server.admin.std.server.SystemInfoMonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

 opendj3-server-dev/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitor.java

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.monitors;

@@ -33,7 +34,7 @@
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.TraditionalWorkQueue;
import org.opends.server.types.Attribute;

 opendj3-server-dev/src/server/org/opends/server/monitors/VersionMonitorProvider.java

@@ -32,7 +32,7 @@

import org.opends.server.admin.std.server.VersionMonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -43,7 +43,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -41,7 +41,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.io.ASN1Writer;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.OperationContext;

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

@@ -43,7 +43,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PreOperationAddOperation;

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

@@ -39,7 +39,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.AttributeType;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryConfig;

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

@@ -43,7 +43,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.PreOperationAddOperation;

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

@@ -52,7 +52,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PasswordPolicy;
import org.opends.server.core.SubentryPasswordPolicy;

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

@@ -60,7 +60,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;

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

@@ -47,7 +47,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.LDAPAssertionRequestControl;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;

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

@@ -37,7 +37,7 @@
import org.opends.server.admin.std.server.SevenBitCleanPluginCfg;
import org.opends.server.admin.std.server.PluginCfg;
import org.opends.server.api.plugin.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

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

@@ -42,7 +42,7 @@
import org.opends.server.api.plugin.*;
import org.opends.server.api.plugin.PluginResult.PostOperation;
import org.opends.server.api.plugin.PluginResult.PreOperation;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;

 opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java

@@ -41,7 +41,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.DN;

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

@@ -73,7 +73,7 @@
import org.opends.server.admin.std.server.ConnectionHandlerCfg;
import org.opends.server.admin.std.server.HTTPConnectionHandlerCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.NullKeyManagerProvider;
import org.opends.server.extensions.NullTrustManagerProvider;

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

@@ -35,7 +35,7 @@
import org.opends.server.admin.std.server.*;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConnectionHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.opends.server.types.HostPort;

 opendj3-server-dev/src/server/org/opends/server/protocols/jmx/JmxConnectionHandler.java

@@ -42,7 +42,7 @@
import org.opends.server.api.ClientConnection;
import org.opends.server.api.ConnectionHandler;
import org.opends.server.api.ServerShutdownListener;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

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

@@ -51,7 +51,7 @@
import org.opends.server.admin.std.server.LDAPConnectionHandlerCfg;
import org.opends.server.api.*;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PluginConfigManager;
import org.opends.server.core.QueueingStrategy;

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

@@ -40,7 +40,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;


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

@@ -36,7 +36,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.plugin.LDAPReplicationDomain.*;
import org.opends.server.types.*;

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

 /**

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

@@ -54,7 +54,7 @@
import org.opends.server.api.DirectoryThread;
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.backends.task.Task;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchListener;

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

@@ -27,7 +27,9 @@
package org.opends.server.replication.plugin;

import java.util.*;

import org.forgerock.i18n.slf4j.LocalizedLogger;

import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.LinkedBlockingQueue;
@@ -40,9 +42,9 @@
import org.opends.server.admin.std.server.ReplicationDomainCfg;
import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.types.operation.*;

@@ -250,7 +252,7 @@
  @Override
  public void initializeSynchronizationProvider(
      ReplicationSynchronizationProviderCfg configuration)
  throws ConfigException
  throws org.forgerock.opendj.config.server.ConfigException
  {
    domains.clear();
    replicationServerListener = new ReplicationServerListener(configuration);

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

@@ -34,7 +34,7 @@
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
import org.opends.server.admin.std.server.ReplicationServerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.types.ConfigChangeResult;
import org.forgerock.opendj.ldap.ResultCode;

 opendj3-server-dev/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java

@@ -36,7 +36,7 @@
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;

import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.CryptoManager;
import org.opends.server.types.DirectoryConfig;


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

@@ -32,7 +32,7 @@

import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.common.DSInfo;

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

@@ -33,7 +33,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.common.CSN;

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

@@ -45,7 +45,7 @@
import org.opends.server.api.Backend;
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.backends.jeb.BackupManager;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;

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

@@ -41,7 +41,7 @@
import org.opends.server.admin.std.server.ReplicationServerCfg;
import org.opends.server.admin.std.server.UserDefinedVirtualAttributeCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.WorkflowImpl;
import org.opends.server.core.networkgroups.NetworkGroup;

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

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

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.AssuredMode;
import org.opends.server.replication.common.CSN;

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

@@ -35,7 +35,7 @@
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.DirectoryThread;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.common.CSN;

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

@@ -34,7 +34,7 @@

import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.admin.std.server.ReplicationServerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.common.ServerState;

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

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions copyright 2011-2014 ForgeRock AS
 *      Portions Copyright 2011-2014 ForgeRock AS
 */
package org.opends.server.replication.server.changelog.je;

@@ -35,7 +35,7 @@
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.DirectoryThread;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.UpdateMsg;

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

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.server.ReplicationDomainCfg;
import org.opends.server.api.DirectoryThread;
import org.opends.server.backends.task.Task;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.replication.common.*;
import org.opends.server.replication.protocol.*;
import org.opends.server.tasks.InitializeTargetTask;

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

@@ -34,7 +34,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;



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

@@ -44,7 +44,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.schema;

@@ -30,7 +31,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -33,7 +34,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -36,7 +36,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;


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

@@ -32,7 +32,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AttributeValue;
import org.opends.server.types.DirectoryException;

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;

import org.opends.server.types.*;

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -36,7 +36,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -33,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -40,7 +40,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.ConfigChangeResult;

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

@@ -41,7 +41,7 @@
import org.opends.server.admin.std.meta.CollationMatchingRuleCfgDefn.MatchingRuleType;
import org.opends.server.admin.std.server.CollationMatchingRuleCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DirectoryException;

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2014 ForgeRock AS.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.schema;

@@ -33,7 +34,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.forgerock.opendj.server.config.server.CoreSchemaCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -38,7 +38,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.ConfigChangeResult;

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

@@ -42,7 +42,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

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

@@ -40,7 +40,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;

import org.forgerock.i18n.slf4j.LocalizedLogger;

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

@@ -38,7 +38,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -40,7 +40,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;



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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;

import org.forgerock.i18n.slf4j.LocalizedLogger;

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -37,7 +37,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -42,7 +42,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -34,7 +34,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;

import org.opends.server.types.*;

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

@@ -39,7 +39,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;
import org.opends.server.types.ConfigChangeResult;

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -41,7 +41,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.CommonSchemaElements;
import org.opends.server.types.DirectoryException;

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

@@ -38,7 +38,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;



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

@@ -41,7 +41,7 @@
import org.opends.server.api.MatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;

import org.forgerock.i18n.slf4j.LocalizedLogger;

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

@@ -34,7 +34,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;


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

@@ -42,7 +42,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -44,7 +44,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2014 ForgeRock AS.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.schema;

@@ -30,7 +31,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.forgerock.opendj.server.config.server.SchemaProviderCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -38,7 +38,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ByteSequence;

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -39,7 +39,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;


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

@@ -37,7 +37,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -43,7 +43,7 @@
import org.forgerock.opendj.ldap.spi.IndexingOptions;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;

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

@@ -41,7 +41,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.types.*;

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -35,7 +35,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

 /**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

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

@@ -36,7 +36,7 @@
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.OrderingMatchingRule;
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;



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

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */


@@ -32,7 +33,7 @@
import org.opends.server.api.MatchingRuleFactory;
import org.opends.server.admin.std.server.MatchingRuleCfg;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;

/**

 opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java

@@ -38,7 +38,7 @@
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.backends.task.Task;
import org.opends.server.backends.task.TaskState;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.SchemaConfigManager;
import org.forgerock.i18n.slf4j.LocalizedLogger;

 opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java

@@ -46,7 +46,7 @@
import org.opends.server.api.Backend;
import org.opends.server.api.ClientConnection;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.BackupConfig;

 opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java

@@ -43,7 +43,7 @@
import org.opends.server.api.Backend;
import org.opends.server.api.ClientConnection;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.BackupDirectory;

 opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java

@@ -41,7 +41,7 @@
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
@@ -86,7 +86,7 @@
           (StringConfigAttribute) configEntry.getConfigAttribute(idStub);
      return idAttr.activeValue();
    }
    catch (ConfigException ce)
    catch (org.opends.server.config.ConfigException ce)
    {
      logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), ce.getMessage());
      return null;
@@ -168,7 +168,7 @@
          backendID = idAttr.activeValue();
        }
      }
      catch (ConfigException ce)
      catch (org.opends.server.config.ConfigException ce)
      {
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), ce.getMessage());
        continue;

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

@@ -43,7 +43,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;

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

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

import org.opends.server.api.Backend;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.config.DNConfigAttribute;
import org.opends.server.types.DN;
@@ -137,7 +137,7 @@
          backendID = idAttr.activeValue();
        }
      }
      catch (ConfigException ce)
      catch (org.opends.server.config.ConfigException ce)
      {
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), ce.getMessage());
        return 1;
@@ -168,7 +168,7 @@
          backendClassName = classAttr.activeValue();
        }
      }
      catch (ConfigException ce)
      catch (org.opends.server.config.ConfigException ce)
      {
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_CLASS, configEntry.getDN(), ce.getMessage());
        return 1;

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

@@ -36,7 +36,7 @@
import org.opends.server.admin.std.server.LocalDBBackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.backends.jeb.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;

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

@@ -46,7 +46,7 @@
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigConstants;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PasswordStorageSchemeConfigManager;

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

@@ -37,7 +37,7 @@

import org.opends.server.api.Backend;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;

import static org.opends.server.config.ConfigConstants.*;


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

@@ -49,7 +49,7 @@
import org.opends.server.admin.std.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;

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

@@ -39,7 +39,7 @@
import java.util.TreeSet;

import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.config.DNConfigAttribute;
import org.opends.server.config.StringConfigAttribute;
import org.opends.server.core.DirectoryServer;

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

@@ -30,7 +30,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.DecodeException;

import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;

import org.opends.server.tools.tasks.TaskClient;

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

@@ -44,7 +44,7 @@

import org.opends.server.util.args.LDAPConnectionArgumentParser;
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.loggers.DebugLogger;
import org.opends.server.loggers.ErrorLogPublisher;
import org.opends.server.loggers.JDKLogging;

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

@@ -39,7 +39,7 @@
import java.util.List;

import org.opends.server.api.Backend;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;

import static org.opends.server.config.ConfigConstants.*;


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

@@ -43,7 +43,7 @@
import org.opends.server.api.Backend;
import org.opends.server.backends.jeb.BackendImpl;
import org.opends.server.backends.jeb.VerifyConfig;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;

 opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java

@@ -54,7 +54,7 @@
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
import org.opends.server.admin.client.ldap.LDAPConnection;
import org.opends.server.admin.client.ldap.LDAPManagementContext;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;


 opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java

@@ -73,7 +73,7 @@
import org.opends.server.admin.std.meta.ReplicationServerCfgDefn;
import org.opends.server.admin.std.meta.
    ReplicationSynchronizationProviderCfgDefn;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tasks.PurgeConflictsHistoricalTask;
import org.opends.server.tools.tasks.TaskEntry;

 opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java

@@ -58,7 +58,7 @@
import org.opends.server.admin.AdministrationConnector;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import com.forgerock.opendj.cli.ClientException;
import org.opends.server.tools.dsconfig.LDAPManagementContextFactory;
import org.opends.server.types.DN;

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

@@ -39,7 +39,7 @@
import java.util.LinkedHashMap;
import java.util.LinkedList;

import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;

import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.CoreMessages.*;

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

@@ -37,7 +37,7 @@
import java.util.LinkedList;
import java.util.TimeZone;

import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.util.Base64;

import org.forgerock.i18n.slf4j.LocalizedLogger;

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

@@ -22,10 +22,11 @@
 *
 *
 *      Copyright 2006-2009 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.types;

import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;

import javax.crypto.Mac;
import javax.crypto.CipherOutputStream;
@@ -402,7 +403,7 @@
   * @param sslCertNickname The name of the local certificate to use,
   *                        or null if none is specified.
   * @return A new SSL Context.
   * @throws org.opends.server.config.ConfigException If the context
   * @throws ConfigException If the context
   * could not be created.
   */
  SSLContext getSslContext(String sslCertNickname)

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

@@ -46,7 +46,7 @@
import org.opends.server.api.SubstringMatchingRule;
import org.opends.server.api.MatchingRule;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;

/**

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

@@ -33,7 +33,7 @@
import java.util.Random;
import java.util.SortedSet;

import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;

import static org.opends.messages.UtilityMessages.*;
import static org.opends.server.util.StaticUtils.*;

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

@@ -28,12 +28,13 @@



import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryEnvironmentConfig;
import org.opends.server.types.InitializationException;

import static org.opends.messages.UtilityMessages.*;

import org.forgerock.i18n.LocalizableMessage;


@@ -68,15 +69,12 @@
   *
   * @param  config  The environment configuration to use for the server.
   *
   * @throws  ConfigException  If a configuration problem is detected during
   *                           the server initialization or startup process.
   *
   * @throws  InitializationException  If the Directory Server is already
   *                                   running, or if an error occurs during
   *                                   server initialization or startup.
   */
  public static void startServer(DirectoryEnvironmentConfig config)
         throws ConfigException, InitializationException
         throws InitializationException
  {
    if (DirectoryServer.isRunning())
    {
@@ -85,7 +83,14 @@
    }

    DirectoryServer directoryServer = DirectoryServer.reinitialize(config);
    directoryServer.startServer();
    try
    {
      directoryServer.startServer();
    }
    catch (ConfigException e)
    {
      throw new InitializationException(e.getMessageObject(), e);
    }
  }


@@ -130,7 +135,7 @@
   */
  public static void initializeForClientUse()
  {
    DirectoryServer directoryServer = DirectoryServer.getInstance();
    DirectoryServer.getInstance();
    DirectoryServer.bootstrapClient();
  }
}

 opendj3-server-dev/src/server/org/opends/server/workflowelement/WorkflowElementConfigManager.java

@@ -41,7 +41,7 @@
import org.opends.server.admin.std.meta.WorkflowElementCfgDefn;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.std.server.WorkflowElementCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ServerContext;
import org.opends.server.types.ConfigChangeResult;
@@ -118,9 +118,9 @@
   *
   * @param workflowName workflow identifier
   * @return workflowelement associated with the workflowName of null
   * @throws org.opends.server.config.ConfigException Exception will reading
   * @throws ConfigException Exception will reading
   *         the config
   * @throws org.opends.server.types.InitializationException Exception while
   * @throws InitializationException Exception while
   *         initializing the workflow element
   */
  public WorkflowElement<?> loadAndRegisterWorkflowElement(String workflowName)

 opendj3-server-dev/src/server/org/opends/server/workflowelement/WorkflowElementStatistics.java

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.workflowelement;

@@ -29,7 +30,7 @@
import java.util.List;
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.Attribute;
import org.opends.server.types.Attributes;
import org.opends.server.types.InitializationException;

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

@@ -40,7 +40,7 @@
import org.opends.server.admin.std.server.LocalBackendWorkflowElementCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.Backend;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.LDAPPostReadRequestControl;
import org.opends.server.controls.LDAPPostReadResponseControl;
import org.opends.server.controls.LDAPPreReadRequestControl;

 opendj3-server-dev/src/snmp/src/org/opends/server/snmp/SNMPConnectionHandler.java

@@ -45,7 +45,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.HostPort;
import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.InitializationException;


 opendj3-server-dev/tests/unit-tests-testng/src/server/org/forgerock/opendj/config/server/AdminTestCaseUtils.java

New file
@@ -0,0 +1,136 @@
/*
 * CDDL HEADER START
 *
 * The contents of this file are subject to the terms of the
 * Common Development and Distribution License, Version 1.0 only
 * (the "License").  You may not use this file except in compliance
 * with the License.
 *
 * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
 * or http://forgerock.org/license/CDDLv1.0.html.
 * See the License for the specific language governing permissions
 * and limitations under the License.
 *
 * When distributing Covered Code, include this CDDL HEADER in each
 * file and include the License file at legal-notices/CDDLv1_0.txt.
 * If applicable, add the following below this CDDL HEADER, with the
 * fields enclosed by brackets "[]" replaced with your own identifying
 * information:
 *      Portions Copyright [yyyy] [name of copyright owner]
 *
 * CDDL HEADER END
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.forgerock.opendj.config.server;




import org.forgerock.opendj.adapter.server3x.Converters;
import org.forgerock.opendj.config.AbstractManagedObjectDefinition;
import org.forgerock.opendj.config.Configuration;
import org.forgerock.opendj.config.ConfigurationClient;
import org.forgerock.opendj.config.DefinitionDecodingException;
import org.forgerock.opendj.config.LDAPProfile;
import org.forgerock.opendj.config.ManagedObjectPath;
import org.forgerock.opendj.config.RelationDefinition;
import org.forgerock.opendj.config.SingletonRelationDefinition;
import org.forgerock.opendj.config.server.ConstraintViolationException;
import org.forgerock.opendj.config.server.ServerManagedObject;
import org.forgerock.opendj.config.server.ServerManagedObjectDecodingException;
import org.forgerock.opendj.config.server.ServerManagementContext;
import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.opends.server.types.Entry;



/**
 * This class defines some utility functions which can be used by test
 * cases which interact with the admin framework.
 */
public final class AdminTestCaseUtils {

  // The relation name which will be used for dummy configurations. A
  // deliberately obfuscated name is chosen to avoid clashes.
  private static final String DUMMY_TEST_RELATION = "*dummy*test*relation*";

  // Indicates if the dummy relation profile has been registered.
  private static boolean isProfileRegistered = false;

  // Prevent instantiation.
  private AdminTestCaseUtils() {
    // No implementation required.
  }



  /**
   * Decodes a configuration entry into the required type of server
   * configuration.
   *
   * @param <S>
   *          The type of server configuration to be decoded.
   * @param definition
   *          The required definition of the required managed object.
   * @param entry
   *          An entry containing the configuration to be decoded.
   * @return Returns the new server-side configuration.
   * @throws ConfigException
   *           If the entry could not be decoded.
   */
  public static <C extends ConfigurationClient, S extends Configuration> S getConfiguration(
      AbstractManagedObjectDefinition<C, S> definition, Entry entry) throws ConfigException {
    try {
      ServerManagementContext context = new ServerManagementContext(null);
      ServerManagedObject<? extends S> mo = context.decode(getPath(definition), Converters.from(entry));

      // Ensure constraints are satisfied.
      mo.ensureIsUsable();

      return mo.getConfiguration();
    } catch (DefinitionDecodingException e) {
      throw ConfigExceptionFactory.getInstance().createDecodingExceptionAdaptor(Converters.from(entry.getName()), e);
    } catch (ServerManagedObjectDecodingException e) {
      throw ConfigExceptionFactory.getInstance().createDecodingExceptionAdaptor(e);
    } catch (ConstraintViolationException e) {
      throw ConfigExceptionFactory.getInstance()
      .createDecodingExceptionAdaptor(e);
    }
  }



  // Construct a dummy path.
  private synchronized static <C extends ConfigurationClient, S extends Configuration>
  ManagedObjectPath<C, S> getPath(AbstractManagedObjectDefinition<C, S> d) {
    if (!isProfileRegistered) {
      LDAPProfile.Wrapper profile = new LDAPProfile.Wrapper() {

        /**
         * {@inheritDoc}
         */
        @Override
        public String getRelationRDNSequence(RelationDefinition<?, ?> r) {
          if (r.getName().equals(DUMMY_TEST_RELATION)) {
            return "cn=dummy configuration,cn=config";
          } else {
            return null;
          }
        }

      };

      LDAPProfile.getInstance().pushWrapper(profile);
      isProfileRegistered = true;
    }

    SingletonRelationDefinition.Builder<C, S> builder = new SingletonRelationDefinition.Builder<C, S>(
        RootCfgDefn.getInstance(), DUMMY_TEST_RELATION, d);
    ManagedObjectPath<?, ?> root = ManagedObjectPath.emptyPath();
    return root.child(builder.getInstance());

  }
}

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java

@@ -45,7 +45,7 @@
import org.opends.server.api.WorkQueue;
import org.opends.server.backends.MemoryBackend;
import org.opends.server.backends.jeb.*;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfg.java

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2007-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.admin;

@@ -32,7 +33,7 @@
import org.opends.server.admin.server.ConfigurationAddListener;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;


 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.java

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2007-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.admin;

@@ -58,7 +59,7 @@
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.server.ServerManagedObject;
import org.opends.server.admin.UndefinedDefaultBehaviorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;


 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java

@@ -38,7 +38,7 @@
import org.opends.server.admin.SingletonRelationDefinition;
import org.opends.server.admin.std.meta.RootCfgDefn;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.Entry;



 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java

@@ -45,7 +45,7 @@
import org.opends.server.admin.std.meta.LDAPConnectionHandlerCfgDefn;
import org.opends.server.admin.std.server.ConnectionHandlerCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.forgerock.opendj.ldap.ResultCode;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java

@@ -42,7 +42,7 @@
import org.opends.server.admin.TestParentCfg;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.ConfigChangeResult;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java

@@ -41,7 +41,7 @@
import org.opends.server.admin.TestParentCfg;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/admin/server/MockConstraint.java

@@ -35,7 +35,7 @@
import org.opends.server.admin.Constraint;
import org.opends.server.admin.client.ClientConstraintHandler;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.testng.Assert;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java

@@ -85,7 +85,7 @@
    sigList.add("void");
    sigList.add("java.util.Set");
    sigList.add("org.opends.server.admin.std.server.PluginCfg");
    sigList.add("org.opends.server.config.ConfigException");
    sigList.add("org.forgerock.opendj.config.server.ConfigException");
    sigList.add("org.opends.server.types.InitializationException");
    expectedAbstractMethods.add(sigList);


 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java

@@ -31,7 +31,7 @@

import org.forgerock.opendj.ldap.SearchScope;
import org.opends.server.TestCaseUtils;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java

@@ -41,7 +41,7 @@
import org.opends.server.admin.std.server.PasswordPolicyCfg;
import org.opends.server.api.PasswordStorageScheme;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.tools.LDAPModify;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DN;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java

@@ -41,7 +41,7 @@
import org.opends.server.admin.std.meta.AttributeValuePasswordValidatorCfgDefn;
import org.opends.server.admin.std.server.AttributeValuePasswordValidatorCfg;
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java

@@ -40,7 +40,7 @@
            CramMD5SASLMechanismHandlerCfgDefn;
import org.opends.server.admin.std.server.
            CramMD5SASLMechanismHandlerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DirectoryServer;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java

@@ -41,7 +41,7 @@
import org.opends.server.admin.std.meta.CharacterSetPasswordValidatorCfgDefn;
import org.opends.server.admin.std.server.CharacterSetPasswordValidatorCfg;
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java

@@ -43,7 +43,7 @@
import org.opends.server.admin.std.meta.DictionaryPasswordValidatorCfgDefn;
import org.opends.server.admin.std.server.DictionaryPasswordValidatorCfg;
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java

@@ -41,7 +41,7 @@
            DigestMD5SASLMechanismHandlerCfgDefn;
import org.opends.server.admin.std.server.
            DigestMD5SASLMechanismHandlerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.BindOperation;
import org.opends.server.core.DeleteOperation;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java

@@ -35,7 +35,7 @@
import org.opends.server.admin.std.server.AlertHandlerCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.AlertHandler;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.InitializationException;
import org.forgerock.opendj.ldap.ResultCode;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java

@@ -47,7 +47,7 @@
import org.opends.server.admin.std.server.
       ErrorLogAccountStatusNotificationHandlerCfg;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.PasswordPolicy;
import org.opends.server.types.AccountStatusNotification;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java

@@ -36,7 +36,7 @@
import org.opends.server.admin.std.meta.ExactMatchIdentityMapperCfgDefn;
import org.opends.server.admin.std.server.ExactMatchIdentityMapperCfg;
import org.opends.server.api.IdentityMapper;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java

@@ -41,7 +41,7 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.ExternalSASLMechanismHandlerCfgDefn;
import org.opends.server.admin.std.server.ExternalSASLMechanismHandlerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2013 ForgeRock AS
 *      Portions Copyright 2013-2014 ForgeRock AS
 */
package org.opends.server.extensions;

@@ -37,7 +37,7 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.FileBasedKeyManagerProviderCfgDefn;
import org.opends.server.admin.std.server.FileBasedKeyManagerProviderCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java

@@ -22,6 +22,7 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.extensions;

@@ -38,7 +39,7 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.FileBasedTrustManagerProviderCfgDefn;
import org.opends.server.admin.std.server.FileBasedTrustManagerProviderCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java

@@ -38,7 +38,7 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.FingerprintCertificateMapperCfgDefn;
import org.opends.server.admin.std.server.FingerprintCertificateMapperCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java

@@ -39,7 +39,7 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.LengthBasedPasswordValidatorCfgDefn;
import org.opends.server.admin.std.server.LengthBasedPasswordValidatorCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java

@@ -38,7 +38,7 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.PasswordModifyExtendedOperationHandlerCfgDefn;
import org.opends.server.admin.std.server.PasswordModifyExtendedOperationHandlerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.*;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.tools.LDAPPasswordModify;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java

@@ -39,7 +39,7 @@
import org.opends.server.admin.std.meta.RandomPasswordGeneratorCfgDefn;
import org.opends.server.admin.std.server.RandomPasswordGeneratorCfg;
import org.opends.server.config.ConfigEntry;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java

@@ -40,7 +40,7 @@
            RegularExpressionIdentityMapperCfgDefn;
import org.opends.server.admin.std.server.RegularExpressionIdentityMapperCfg;
import org.opends.server.api.IdentityMapper;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java

@@ -44,7 +44,7 @@
import org.opends.server.admin.std.server.
            RepeatedCharactersPasswordValidatorCfg;
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java

@@ -36,7 +36,7 @@
import org.testng.annotations.Test;
import org.opends.server.TestCaseUtils;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java

@@ -39,7 +39,7 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.SubjectAttributeToUserAttributeCertificateMapperCfgDefn;
import org.opends.server.admin.std.server.SubjectAttributeToUserAttributeCertificateMapperCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java

@@ -38,7 +38,7 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.SubjectDNToUserAttributeCertificateMapperCfgDefn;
import org.opends.server.admin.std.server.SubjectDNToUserAttributeCertificateMapperCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;
import org.opends.server.protocols.internal.InternalClientConnection;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java

@@ -44,7 +44,7 @@
import org.opends.server.admin.std.server.
            UniqueCharactersPasswordValidatorCfg;
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.types.Attributes;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/TestMonitorProvider.java

@@ -22,13 +22,14 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */

package org.opends.server.monitors;

import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Attribute;


 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java

@@ -39,7 +39,7 @@
import org.opends.server.admin.std.server.AttributeCleanupPluginCfg;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperationBasis;
import org.opends.server.core.ModifyOperationBasis;
import org.opends.server.protocols.internal.InternalClientConnection;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java

@@ -38,7 +38,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.ControlDecoder;
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java

@@ -40,7 +40,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.ControlDecoder;
import org.forgerock.opendj.io.ASN1Writer;
import org.opends.server.types.CanceledOperationException;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java

@@ -41,7 +41,7 @@
import org.opends.server.admin.std.meta.EntryUUIDPluginCfgDefn;
import org.opends.server.admin.std.server.EntryUUIDPluginCfg;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.protocols.internal.InternalClientConnection;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java

@@ -43,7 +43,7 @@
            LDAPAttributeDescriptionListPluginCfgDefn;
import org.opends.server.admin.std.server.LDAPAttributeDescriptionListPluginCfg;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.types.Attribute;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java

@@ -41,7 +41,7 @@
import org.opends.server.admin.std.meta.LastModPluginCfgDefn;
import org.opends.server.admin.std.server.LastModPluginCfg;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyDNOperation;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java

@@ -38,7 +38,7 @@
import org.opends.server.admin.std.meta.PasswordPolicyImportPluginCfgDefn;
import org.opends.server.admin.std.server.PasswordPolicyImportPluginCfg;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeValue;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java

@@ -41,7 +41,7 @@
import org.opends.server.admin.std.server.ReferentialIntegrityPluginCfg;
import org.opends.server.api.Group;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.SubtreeDeleteControl;
import org.opends.server.core.*;
import org.opends.server.protocols.internal.InternalClientConnection;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java

@@ -45,7 +45,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.controls.ControlDecoder;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryException;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java

@@ -36,7 +36,7 @@
import org.opends.server.admin.std.meta.UniqueAttributePluginCfgDefn;
import org.opends.server.admin.std.server.UniqueAttributePluginCfg;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyDNOperation;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/plugins/UpdatePreOpPlugin.java

@@ -35,7 +35,7 @@
import org.opends.server.api.plugin.DirectoryServerPlugin;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.api.plugin.PluginResult;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
import org.opends.server.types.DirectoryException;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions copyright 2013 ForgeRock AS
 *      Portions Copyright 2013-2014 ForgeRock AS
 */
package org.opends.server.protocols.ldap ;

@@ -36,7 +36,7 @@
import org.opends.server.admin.server.AdminTestCaseUtils;
import org.opends.server.admin.std.meta.LDAPConnectionHandlerCfgDefn;
import org.opends.server.admin.std.server.LDAPConnectionHandlerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.Attribute;
import org.opends.server.types.Attributes;
import org.opends.server.types.Entry;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java

@@ -38,7 +38,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.server.LDAPConnectionHandlerCfg;
import org.opends.server.api.ClientConnection;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java

@@ -38,7 +38,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.server.ReplicationDomainCfg;
import org.opends.server.backends.task.TaskState;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DeleteOperation;
import org.opends.server.core.DirectoryServer;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java

@@ -35,7 +35,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.AddOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyOperation;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java

@@ -37,7 +37,7 @@
import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.IsolationPolicy;
import org.opends.server.admin.std.server.ExternalChangelogDomainCfg;
import org.opends.server.admin.std.server.ReplicationDomainCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DN;
import org.opends.server.types.DirectoryException;


 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java

@@ -38,7 +38,7 @@
import org.forgerock.opendj.ldap.ModificationType;
import org.opends.server.TestCaseUtils;
import org.opends.server.backends.task.Task;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.CSNGenerator;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java

@@ -38,7 +38,7 @@
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.AssuredType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.CSN;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/MultimasterReplicationFakeConf.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2009 Sun Microsystems, Inc.
 *      Portions copyright 2011 ForgeRock AS.
 *      Portions Copyright 2011-2014 ForgeRock AS.
 */
package org.opends.server.replication.plugin;

@@ -33,7 +33,7 @@
import org.opends.server.admin.std.server.ReplicationServerCfg;
import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
import org.opends.server.admin.std.server.SynchronizationProviderCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DN;

public class MultimasterReplicationFakeConf implements

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java

@@ -32,7 +32,7 @@

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.TestCaseUtils;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.server.ReplServerFakeConfiguration;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java

@@ -33,7 +33,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.AssuredType;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.AssuredMode;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java

@@ -39,7 +39,7 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.AssuredType;
import org.opends.server.admin.std.server.ReplicationDomainCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.*;
import org.opends.server.replication.plugin.DomainFakeCfg;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java

@@ -31,7 +31,7 @@

import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.server.ReplicationServerCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.CSN;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeReplicationDomain.java

@@ -32,7 +32,7 @@
import java.util.SortedSet;
import java.util.concurrent.BlockingQueue;

import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.replication.plugin.DomainFakeCfg;
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.types.DN;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeStressReplicationDomain.java

@@ -32,7 +32,7 @@
import java.util.SortedSet;
import java.util.concurrent.BlockingQueue;

import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.replication.plugin.DomainFakeCfg;
import org.opends.server.replication.protocol.UpdateMsg;
import org.opends.server.types.DN;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateSyntaxTest.java

@@ -30,7 +30,7 @@
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.admin.std.server.CertificateAttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.testng.annotations.DataProvider;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/CountryStringSyntaxTest.java

@@ -22,7 +22,7 @@
 *
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 *      Portions Copyright 2012 Forgerock AS
 *      Portions Copyright 2012-2014 ForgeRock AS
 *      Portions Copyright 2012 Manuel Gaupp
 */
package org.opends.server.schema;
@@ -31,7 +31,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.admin.std.server.CountryStringAttributeSyntaxCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.types.DN;

import org.testng.annotations.DataProvider;

 opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/JPEGSyntaxTest.java

@@ -29,7 +29,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.admin.std.server.JPEGAttributeSyntaxCfg;
import org.opends.server.config.ConfigException;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.util.Base64;
			@@ -27,26 +27,122 @@
			#
			class Replace

			# Messages map : contains for each message its associated level
			MESSAGES_MAP = {}

			# Mapping of opendj2 log levels to opendj3 logging method
			LOG_LEVELS = {
			'INFO' => 'debug',
			'MILD_WARN' => 'warn',
			'SEVERE_WARN' => 'warn',
			'MILD_ERR' => 'error',
			'SEVERE_ERR' => 'error',
			'FATAL_ERR' => 'error',
			'DEBUG' => 'trace',
			'NOTICE' => 'info',
			}

			# All directories that contains java code
			JAVA_DIRS = ["src/server", "src/quicksetup", "src/ads", "src/guitools", "tests/unit-tests-testng/src"]
			SNMP_DIR = ["src/snmp/src"]
			DSML_DIR = ["src/dsml/org"]

			# Replacement for new config framework
			CONFIG_EXC = {
			:dirs => JAVA_DIRS + SNMP_DIR,
			:extensions => ["java"],
			:stopwords => [],
			:replacements =>
			[
			/import org.opends.server.config.ConfigException;/,
			'import org.forgerock.opendj.config.server.ConfigException;',
			]
			}


			# Replacement for new config framework
			NEW_CONFIG = {
			:dirs => JAVA_DIRS + SNMP_DIR,
			:extensions => ["java"],
			:stopwords => ["org/opends/server/admin", "api/Config", "MatchingRuleConfigManager"],
			:replacements =>
			[
			/import org.opends.server.admin.std.server\.([^;]+);/,
			'import org.forgerock.opendj.server.config.server.\1;',

			/import org.opends.server.admin.std.meta\.([^;]+);/,
			'import org.forgerock.opendj.server.config.meta.\1;',

			/import org.opends.server.admin.std.client\.([^;]+);/,
			'import org.forgerock.opendj.server.config.client.\1;',

			/import org.opends.server.admin.client\.(\w+);/,
			'import org.forgerock.opendj.config.client.\1;',

			/import org.opends.server.admin.client.ldap\.(\w+);/,
			'import org.forgerock.opendj.config.client.ldap.\1;',

			/import org.opends.server.admin.client.spi\.(\w+);/,
			'import org.forgerock.opendj.config.client.spi.\1;',

			/import org.opends.server.admin.server\.([^;]+);/,
			'import org.forgerock.opendj.config.server.\1;',

			/import org.opends.server.admin\.(\w+);/,
			'import org.forgerock.opendj.config.\1;',

			/import org.forgerock.opendj.config.client.AuthorizationException;/,
			'import org.forgerock.opendj.ldap.ErrorResultException;',

			/import org.forgerock.opendj.config.client.CommunicationException;$/,
			'',

			/catch \(AuthorizationException e\)/,
			'catch (ErrorResultException e)',

			/catch \(CommunicationException e\)/,
			'catch (ErrorResultException e)',

			# Now bring back removed imports that have no replacement
			/import org.forgerock.opendj.config.client.ldap.JNDIDirContextAdaptor;/,
			'import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;',

			/import org.forgerock.opendj.config.AdministrationConnector;/,
			'import org.opends.server.admin.AdministrationConnector;',

			/import org.forgerock.opendj.config.AdministrationDataSync;/,
			'import org.opends.server.admin.AdministrationDataSync;',

			/import org.forgerock.opendj.config.ClassLoaderProvider;/,
			'import org.forgerock.opendj.config.ConfigurationFramework;',

			/import org.opends.server.types.ConfigChangeResult;/,
			'import org.forgerock.opendj.config.server.ConfigChangeResult;',

			/public ConfigChangeResult\s/,
			"public org.forgerock.opendj.config.server.ConfigChangeResult ",

			/new ConfigChangeResult\(/,
			"new org.forgerock.opendj.config.server.ConfigChangeResult(",

			/rdn\(\).getAttributeValue\(0\).getValue\(\).toString\(\)/,
			'rdn().getFirstAVA().getAttributeValue().toString()',

			/^(\s+)ServerManagementContext \w+\s=\sServerManagementContext\s*.getInstance\(\);/m,
			'',

			/^(\s+)RootCfg (\w+)\s+=\s+\w+\.getRootConfiguration\(\);/m,
			'\1RootCfg \2 = serverContext.getServerManagementContext().getRootConfiguration();',

			/^(\s+)RootCfg (\w+)\s+=\s+ServerManagementContext.getInstance\(\)\.getRootConfiguration\(\);/m,
			'\1RootCfg \2 = serverContext.getServerManagementContext().getRootConfiguration();',

			#/(config\|configuration\|cfg\|currentConfig)\.dn\(\)/,
			#'org.forgerock.opendj.adapter.server3x.Converters.to(\1.dn())',

			/(\b\w+\b)\.dn\(\)/,
			'org.forgerock.opendj.adapter.server3x.Converters.to(\1.dn())',

			/(config\|configuration\|cfg\|currentConfig\|configEntry\|pluginCfg)\.get(\w+)(DN\|DNs\|Subtrees)\(\)/,
			'org.forgerock.opendj.adapter.server3x.Converters.to(\1.get\2\3())',

			/^(\s+)ConfigChangeResult (\b\w+\b);/,
			'\1org.forgerock.opendj.config.server.ConfigChangeResult \2;',

			/(\s+)AttributeType (\w+) = (configuration\|config\|cfg\|\w+Cfg).get(\w+)Attribute\(\);/,
			'\1AttributeType \2 = \3.get\4Attribute();',

			/^(\s+)public DN dn\(\)/,
			'\1public org.forgerock.opendj.ldap.DN dn()',

			]
			}


			# Replacement for types
			TYPES = {
			@@ -85,122 +181,6 @@
			]
			}

			# Replacement for exceptions
			# Modify 36 files, for a total of 134 replacements - leaves 1277 compilation errors but mostly from generated config
			EXCEPTIONS = {
			:dirs => JAVA_DIRS,
			:extensions => ["java"],
			:replacements =>
			[
			/import org.opends.server.admin.client.AuthorizationException;/,
			'import org.forgerock.opendj.ldap.ErrorResultException;',

			/\bAuthorizationException\b/,
			'ErrorResultException',

			/import org.opends.server.admin.client.CommunicationException;\n/,
			'',

			/throws CommunicationException\b, /,
			'throws ',

			/, CommunicationException\b(, )?/,
			'\1',

			/\bCommunicationException\b/,
			'ErrorResultException',
			]
			}

			# Replacement for loggers
			# Modify 454 files, for a total of 2427 replacements - leaves 72 compilation errors
			# TODO: add I18N loggers
			LOGGERS = {
			:dirs => SNMP_DIR,
			:stopwords => ['src/server/org/opends/server/loggers', 'DebugLogPublisher'],
			:extensions => ["java"],
			:replacements =>
			[
			/import org.opends.server.loggers.debug.DebugTracer;/,
			"import org.forgerock.i18n.LocalizableMessage;\nimport org.forgerock.i18n.slf4j.LocalizedLogger;",

			/import java.util.logging.Logger;/,
			"import org.forgerock.i18n.LocalizableMessage;\nimport org.forgerock.i18n.slf4j.LocalizedLogger;",

			/import java.util.logging.Level;/,
			'',

			/import org.opends.server.types.DebugLogLevel;\n/,
			'',

			#/import (static )?org.opends.server.loggers.debug.DebugLogger.*;\n/,
			#'',

			/DebugTracer TRACER = (DebugLogger.)?getTracer\(\)/,
			"LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass()",

			/^\s\/\\\n.The tracer object for the debug logger.\n\s\\/$\n/,
			'',

			/^\s\/\/\sThe tracer object for the debug logger.$\n/,
			'',

			/if \(debugEnabled\(\)\)\s{\s TRACER.debugCaught\(DebugLogLevel.ERROR, (\b.\b)\);\s\n\s*}$/,
			'logger.traceException(\1);',

			/TRACER\.debugCaught\(DebugLogLevel.ERROR, (\b.*\b)\);/,
			'logger.traceException(\1);',

			/TRACER.debug[^(]+\(/,
			'logger.trace(',

			/logger.trace\(DebugLogLevel.\b\w+\b, ?/,
			'logger.trace(',

			/logger.trace\((e\|de)\)/,
			'logger.traceException(\1)',

			/(DebugLogger\.\|\b)debugEnabled\(\)/,
			'logger.isTraceEnabled()',

			/(LOG\|logger).log\((Level.)?WARNING, ?/,
			'logger.warn(',

			/(LOG\|logger).log\((Level.)?CONFIG, ?/,
			'logger.info(',

			/(LOG\|logger).log\((Level.)?INFO, ?/,
			'logger.debug(',

			/(LOG\|logger).log\((Level.)?SEVERE, ?/,
			'logger.error(',

			/(LOG\|logger).log\((Level.)?FINE, ?/,
			'logger.trace(',

			/logger.(warn\|info\|error\|debug)([^;]+);/,
			'logger.\1(LocalizableMessage.raw\2);',

			/(private static final\|static private final) Logger LOG =[^;]+;/,
			'private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();',
			]
			}

			I18N_LOGGERS = {
			:dirs => JAVA_DIRS,
			:extensions => ["java"],
			:replacements =>
			[
			# Message message = ERR_REFINT_UNABLE_TO_EVALUATE_TARGET_CONDITION.get(mo
			# .getManagedObjectDefinition().getUserFriendlyName(), String
			# .valueOf(mo.getDN()), StaticUtils.getExceptionMessage(e));
			# ErrorLogger.logError(message);
			/\bMessage\b \b(\w+)\b = (\w+\.)?\b(\w+)\b\s.\sget([^;]+);\n(\s+)ErrorLogger.logError\(\1\);/m,
			" Message message = \\2.get\\4;\n" +
			"LocalizedLogger logger = LocalizedLogger.getLocalizedLogger(\\3.resourceName());\n\\5logger.error(\\1);",
			]
			}

			MSG_ARGN_TOSTRING = {
			:dirs => JAVA_DIRS,
			:extensions => ["java"],
			@@ -293,7 +273,7 @@
			}

			# List of replacements to run
			REPLACEMENTS = [ COLLAPSE_LOCALIZABLE_MESSAGE_TO_LOGGER_ONLY, LOGGER_AND_ARGN_TO_LOGGER_ONLY ]
			REPLACEMENTS = [ CONFIG_EXC ]


			################################### Processing methods ########################################
			@@ -335,10 +315,11 @@
			pattern, replace = replacements[index], replacements[index+1]
			replace = replace.gsub('{CLASSNAME}', classname(file))
			is_replaced = true
			while is_replaced
			#while is_replaced
			#puts "pattern: " + pattern.to_s
			is_replaced = contents.gsub!(pattern, replace)
			if is_replaced then count += 1 end
			end
			#end
			}
			File.open(file + ".copy", "w+") { \|f\| f.write(contents) }
			}
			@@ -360,7 +341,7 @@
			dirs.each { \|directory\|
			files = files_under_directory(directory, extensions)
			files.each { \|file\|
			#puts file.to_s
			puts file.to_s + " stopwords:" + stopwords.to_s
			exclude_file = stopwords.any? { \|stopword\| file.include?(stopword) }
			next if exclude_file
			count = yield file # call the block
			@@ -387,97 +368,13 @@
			count
			end


			# Return all files with provided extensions under the provided directory
			# and all its subdirectories recursively
			def files_under_directory(directory, extensions)
			Dir[directory + '/*/.{' + extensions.join(",") + '}']
			end

			def run_messages
			prepare_messages
			process_dirs(JAVA_DIRS, ["--nostopword--"], ['java']) { \|file\|
			process_file(file) { \|content\|
			count, new_content = process_message(content)
			next count, new_content
			}
			}
			end

			def process_message(content)
			has_logger = /LocalizedLogger\.getLoggerForThisClass/ =~ content
			needs_logger = /logError/ =~ content
			count = 0
			if needs_logger && has_logger.nil?
			count = 1

			content.sub!(/class ([^{]+){/,
			"class \\1{\n\n " +
			"private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();\n")

			content.sub!(/import (.*);/,
			"import \\1;\nimport org.forgerock.i18n.slf4j.LocalizedLogger;")
			end

			if needs_logger
			count = 1
			pattern = /(final )?(LocalizableMessage )?message\s=\s(\w+)\s.\sget\(\s([^;])\);\s+(ErrorLogger\.)?logError\(\w+\);/m
			mdata = pattern.match(content)
			while !mdata.nil? do
			msg = mdata[3]
			args = if mdata[4].nil? \|\| mdata[4]=="" then "" else ", " + mdata[4] end
			level = MESSAGES_MAP[msg]
			puts "1... #{level} - #{msg}"
			content.sub!(pattern, "logger.#{level}(#{msg}#{args});")
			mdata = pattern.match(content)
			end

			pattern = /logError\((\w+).get\s\(\s/m
			mdata = pattern.match(content)
			stop = {}
			while !mdata.nil? do
			msg = mdata[1]
			break if !stop[msg].nil?
			stop[msg] = msg
			level = MESSAGES_MAP[msg]
			puts "2... #{level} - #{msg}"
			if !level.nil?
			content.sub!(pattern, "logger.#{level}(#{msg}.get(")
			end
			mdata = pattern.match(content)
			end

			# all remaining patterns
			content.gsub!(/(ErrorLogger\.)?logError\(/, 'logger.error(')

			end
			return count, content
			end

			def prepare_messages
			files = Dir['src/messages/messages/*.properties']
			files.each do \|file\| messages(file) end
			end

			# Build a map of error messages and error level
			def messages(message_file)
			File.open(message_file).each { \|line\|
			line = line.chomp
			next if line.size==0 \|\| line[0..0]=="#" \|\| line[0..0]==" " \|\| line[0..0]!=line[0..0].upcase \|\| line[0..5]=="global"
			token = line.split("=")
			first, *rest = token[0].split "_"
			level_label = if %w(INFO DEBUG NOTICE).include?(first) then first else first.to_s + "_" + rest[0].to_s end
			level = LOG_LEVELS[level_label]
			label = first + "_" + rest.join("_")
			label = label.gsub("MILD_", '').gsub("SEVERE_", '').gsub("FATAL_", '').gsub("NOTICE_", 'NOTE_').gsub(/_\d+$/, '')
			MESSAGES_MAP[label] = level
			#puts "#{label}=#{level} #{token}"
			}
			end

			end

			# Launch all replacements defined in the REPLACEMENTS constant
			#Replace.new.messages("src/messages/messages/admin.properties")
			#Replace.new.run_messages
			Replace.new.run
			@@ -22,7 +22,7 @@
			!
			!
			! Copyright 2007-2010 Sun Microsystems, Inc.
			! Portions copyright 2011 ForgeRock AS.
			! Portions copyright 2011-2014 ForgeRock AS.
			! -->
			<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
			xmlns:admpp="http://www.opends.org/admin-preprocessor"
			@@ -1519,15 +1519,15 @@
			<xsl:template name="generate-change-listener-help">
			<xsl:param name="top-name" select="/.." />
			<xsl:param name="name" select="/.." />


			<xsl:variable name="_top-length" select="string-length($top-name)" />
			<xsl:variable name="_length" select="string-length($name)" />
			<xsl:variable name="_diff" select="$_length - $_top-length" />
			<xsl:variable name="_start" select="substring($name, 1, $_diff - 1)" />
			<xsl:variable name="_middle" select="substring($name, $_diff, 1)" />
			<xsl:variable name="_end"
			<xsl:variable name="_end"
			select="substring($name, $_diff + 1, $_top-length)" />


			<xsl:variable name="short-name">
			<xsl:choose>
			<xsl:when test="not($top-name) or $top-name = $name">
			@@ -1541,7 +1541,7 @@
			</xsl:otherwise>
			</xsl:choose>
			</xsl:variable>


			<xsl:variable name="java-class">
			<xsl:call-template name="name-to-java">
			<xsl:with-param name="value" select="$name" />
			@@ -1702,7 +1702,7 @@
			<!--
			Check that all advanced properties conform to one of
			the following rules:


			* is mandatory and has a defined default value(s)
			* is mandatory and is part of an advanced managed object
			* is mandatory and is part of an abstract managed object
			@@ -1734,7 +1734,7 @@
			</xsl:when>
			</xsl:choose>
			</xsl:for-each>
			<!--
			<!--
			Now generate the definition.
			-->
			<xsl:call-template name="copyright-notice" />
			@@ -1976,7 +1976,7 @@
			<import>
			org.opends.server.admin.server.ConfigurationDeleteListener
			</import>
			<import>org.opends.server.config.ConfigException</import>
			<import>org.forgerock.opendj.config.server.ConfigException</import>
			</xsl:if>
			<xsl:if test="$this-all-relations/adm:one-to-zero-or-one">
			<import>java.util.Collection</import>
			@@ -1989,10 +1989,10 @@
			<import>
			org.opends.server.admin.server.ConfigurationDeleteListener
			</import>
			<import>org.opends.server.config.ConfigException</import>
			<import>org.forgerock.opendj.config.server.ConfigException</import>
			</xsl:if>
			<xsl:if test="$this-all-relations/adm:one-to-one">
			<import>org.opends.server.config.ConfigException</import>
			<import>org.forgerock.opendj.config.server.ConfigException</import>
			</xsl:if>
			<xsl:if test="$this-all-properties[@multi-valued='true']">
			<import>java.util.SortedSet</import>
			@@ -22,6 +22,7 @@
			!
			!
			! Copyright 2007-2008 Sun Microsystems, Inc.
			! Portions Copyright 2014 ForgeRock AS
			! -->
			<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
			xmlns:admpp="http://www.opends.org/admin-preprocessor"
			@@ -30,7 +31,7 @@
			<xsl:import href="preprocessor.xsl" />
			<xsl:import href="property-types.xsl" />
			<xsl:output method="text" encoding="us-ascii" />
			<!--
			<!--
			Template for generating the interface declaration.
			-->
			<xsl:template name="generate-interface-declaration">
			@@ -61,7 +62,7 @@
			</xsl:choose>
			<xsl:text>{ </xsl:text>
			</xsl:template>
			<!--
			<!--
			Template for generating the configuration class getter.
			-->
			<xsl:template name="generate-configuration-definition-getter">
			@@ -333,7 +334,7 @@
			</xsl:otherwise>
			</xsl:choose>
			</xsl:template>
			<!--
			<!--
			Main document parsing template.
			-->
			<xsl:template match="/">
			@@ -372,7 +373,7 @@
			</import>
			</xsl:if>
			<xsl:if test="$this-local-relations">
			<import>org.opends.server.config.ConfigException</import>
			<import>org.forgerock.opendj.config.server.ConfigException</import>
			</xsl:if>
			<xsl:if
			test="$this-local-relations/adm:one-to-zero-or-one\|$this-local-relations/adm:one-to-many">
			@@ -52,6 +52,7 @@
			import org.opends.guitools.controlpanel.util.ConfigReader;
			import org.opends.guitools.controlpanel.util.Utilities;
			import org.forgerock.i18n.LocalizableMessage;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.opends.server.admin.client.ManagementContext;
			import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
			import org.opends.server.admin.client.ldap.LDAPManagementContext;
			@@ -240,7 +241,7 @@
			* Update the configuration in the server.
			* @throws OpenDsException if an error occurs.
			*/
			private void updateConfiguration() throws OpenDsException
			private void updateConfiguration() throws OpenDsException, ConfigException
			{
			boolean configHandlerUpdated = false;
			final int totalNumber = baseDNsToDelete.size() + backendsToDelete.size();
			@@ -439,7 +440,7 @@
			* @throws OpenDsException if an error occurs.
			*/
			private void deleteBaseDNs(Set<BaseDNDescriptor> baseDNs)
			throws OpenDsException
			throws OpenDsException, ConfigException
			{
			BackendDescriptor backend = baseDNs.iterator().next().getBackend();

			@@ -507,7 +508,7 @@
			* @param backend the backend to be deleted.
			* @throws OpenDsException if an error occurs.
			*/
			private void deleteBackend(BackendDescriptor backend) throws OpenDsException
			private void deleteBackend(BackendDescriptor backend) throws OpenDsException, ConfigException
			{
			String dn = getDN(backend);
			Utilities.deleteConfigSubtree(
			@@ -655,7 +656,7 @@
			* @throws OpenDsException if an error occurs.
			*/
			private void disableReplicationIfRequired(final BaseDNDescriptor baseDN)
			throws OpenDsException
			throws OpenDsException, ConfigException
			{
			if (baseDN.getType() == BaseDNDescriptor.Type.REPLICATED)
			{
			@@ -710,7 +711,7 @@
			sync = (ReplicationSynchronizationProviderCfg)
			root.getSynchronizationProvider("Multimaster Synchronization");
			}
			catch (OpenDsException oe)
			catch (ConfigException oe)
			{
			// Ignore this one
			}
			@@ -69,6 +69,7 @@
			import org.opends.guitools.controlpanel.util.ConfigReader;
			import org.opends.guitools.controlpanel.util.Utilities;
			import org.forgerock.i18n.LocalizableMessage;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.opends.server.admin.client.ManagementContext;
			import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
			import org.opends.server.admin.client.ldap.LDAPManagementContext;
			@@ -84,6 +85,7 @@
			import org.opends.server.types.OpenDsException;
			import org.opends.server.util.LDIFReader;
			import org.opends.server.util.ServerConstants;

			import com.forgerock.opendj.cli.CommandBuilder;

			/**
			@@ -744,6 +746,10 @@
			throw new OfflineUpdateException(
			ERR_CTRL_PANEL_ERROR_UPDATING_CONFIGURATION.get(ioe), ioe);
			}
			catch (ConfigException ce)
			{
			throw new org.opends.server.config.ConfigException(ce.getMessageObject(), ce);
			}
			finally
			{
			if (ldifImportConfig != null)
			@@ -84,6 +84,7 @@
			import org.opends.guitools.controlpanel.util.ConfigReader;
			import org.opends.guitools.controlpanel.util.Utilities;
			import org.forgerock.i18n.LocalizableMessage;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.opends.quicksetup.Installation;
			import org.opends.quicksetup.installer.InstallerHelper;
			import org.opends.quicksetup.util.Utils;
			@@ -108,6 +109,7 @@
			import org.opends.server.types.OpenDsException;
			import org.opends.server.util.LDIFReader;
			import org.opends.server.util.SetupUtils;

			import com.forgerock.opendj.cli.CommandBuilder;

			/**
			@@ -848,7 +850,7 @@
			return args;
			}

			private void updateConfiguration() throws OpenDsException
			private void updateConfiguration() throws OpenDsException, ConfigException
			{
			boolean configHandlerUpdated = false;
			try
			@@ -1479,7 +1481,7 @@
			}

			private void addBaseDN(String backendName, String baseDN)
			throws OpenDsException
			throws OpenDsException, ConfigException
			{
			LinkedList<DN> baseDNs = new LinkedList<DN>();
			for (BackendDescriptor backend :
			@@ -73,6 +73,7 @@
			import org.opends.guitools.controlpanel.util.ConfigReader;
			import org.opends.guitools.controlpanel.util.Utilities;
			import org.forgerock.i18n.LocalizableMessage;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.opends.server.admin.client.ManagementContext;
			import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
			import org.opends.server.admin.client.ldap.LDAPManagementContext;
			@@ -86,6 +87,7 @@
			import org.opends.server.types.LDIFImportConfig;
			import org.opends.server.types.OpenDsException;
			import org.opends.server.util.LDIFReader;

			import com.forgerock.opendj.cli.CommandBuilder;

			/**
			@@ -693,7 +695,7 @@
			return canLaunch;
			}

			private void updateConfiguration() throws OpenDsException
			private void updateConfiguration() throws OpenDsException, ConfigException
			{
			boolean configHandlerUpdated = false;
			try
			@@ -769,7 +771,7 @@
			}
			}

			private void modifyIndex() throws OpenDsException
			private void modifyIndex() throws OpenDsException, ConfigException
			{
			LDIFImportConfig ldifImportConfig = null;
			try
			@@ -46,6 +46,7 @@

			import org.forgerock.i18n.LocalizableMessage;
			import org.forgerock.i18n.slf4j.LocalizedLogger;
			import org.forgerock.opendj.config.server.ConfigException;

			import javax.naming.NamingEnumeration;
			import javax.naming.NamingException;
			@@ -566,22 +567,26 @@
			*/
			private void readSchema(InitialLdapContext ctx) throws OpenDsException
			{
			if (isLocal)
			try
			{
			super.readSchema();
			}
			else
			{
			RemoteSchemaLoader loader = new RemoteSchemaLoader();
			try
			if (isLocal)
			{
			super.readSchema();
			}
			else
			{
			RemoteSchemaLoader loader = new RemoteSchemaLoader();
			loader.readSchema(ctx);
			schema = loader.getSchema();
			}
			catch (NamingException ne)
			{
			throw new OnlineUpdateException(ERR_READING_SCHEMA_LDAP.get(ne), ne);
			}
			schema = loader.getSchema();
			}
			catch (NamingException ne)
			{
			throw new OnlineUpdateException(ERR_READING_SCHEMA_LDAP.get(ne), ne);
			}
			catch (ConfigException ce)
			{
			throw new org.opends.server.config.ConfigException(ce.getMessageObject(), ce);
			}
			}
			@@ -76,7 +76,7 @@
			import org.opends.server.admin.std.server.RootDNUserCfg;
			import org.opends.server.admin.std.server.SNMPConnectionHandlerCfg;
			import org.opends.server.admin.std.server.TaskBackendCfg;
			import org.opends.server.config.ConfigException;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.opends.server.core.DirectoryServer;
			import org.opends.server.types.DN;
			import org.opends.server.types.OpenDsException;
			@@ -142,7 +142,7 @@
			}
			catch (ConfigException ce)
			{
			ex.add(ce);
			ex.add(toConfigException(ce));
			}
			for (String connHandler : root.listConnectionHandlers())
			{
			@@ -190,9 +190,9 @@
			null, index.getIndexType(), index.getIndexEntryLimit()));
			}
			}
			catch (OpenDsException oe)
			catch (ConfigException ce)
			{
			ex.add(oe);
			ex.add(toConfigException(ce));
			}
			indexes.add(new IndexDescriptor("dn2id", null, null,
			new TreeSet<IndexType>(), -1));
			@@ -214,9 +214,9 @@
			sortOrder, index.getMaxBlockSize()));
			}
			}
			catch (OpenDsException oe)
			catch (ConfigException ce)
			{
			ex.add(oe);
			ex.add(toConfigException(ce));
			}
			}
			else if (backend instanceof LDIFBackendCfg)
			@@ -257,9 +257,9 @@

			bs.add(desc);
			}
			catch (OpenDsException oe)
			catch (ConfigException ce)
			{
			ex.add(oe);
			ex.add(toConfigException(ce));
			}
			}

			@@ -269,9 +269,9 @@
			CryptoManagerCfg cryptoManager = root.getCryptoManager();
			isReplicationSecure = cryptoManager.isSSLEncryption();
			}
			catch (OpenDsException oe)
			catch (ConfigException ce)
			{
			ex.add(oe);
			ex.add(toConfigException(ce));
			}


			@@ -282,7 +282,7 @@
			sync = (ReplicationSynchronizationProviderCfg)
			root.getSynchronizationProvider("Multimaster Synchronization");
			}
			catch (OpenDsException oe)
			catch (ConfigException ce)
			{
			// Ignore this one
			}
			@@ -337,9 +337,9 @@
			}
			}
			}
			catch (OpenDsException oe)
			catch (ConfigException ce)
			{
			ex.add(oe);
			ex.add(toConfigException(ce));
			}
			}

			@@ -358,9 +358,9 @@
			}
			}
			}
			catch (OpenDsException oe)
			catch (ConfigException ce)
			{
			ex.add(oe);
			ex.add(toConfigException(ce));
			}
			}
			catch (OpenDsException oe)
			@@ -391,6 +391,12 @@
			backends = Collections.unmodifiableSet(bs);
			}


			private org.opends.server.config.ConfigException toConfigException(ConfigException ce)
			{
			return new org.opends.server.config.ConfigException(ce.getMessageObject(), ce);
			}

			private ConnectionHandlerDescriptor getConnectionHandler(
			ConnectionHandlerCfg connHandler, String name) throws OpenDsException
			{
			@@ -45,7 +45,7 @@
			import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
			import org.opends.guitools.controlpanel.task.OfflineUpdateException;
			import org.opends.server.admin.std.meta.AdministrationConnectorCfgDefn;
			import org.opends.server.config.ConfigException;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.opends.server.core.DirectoryServer;
			import org.opends.server.tools.tasks.TaskEntry;
			import org.opends.server.types.DN;
			@@ -36,7 +36,7 @@
			import org.opends.server.admin.Configuration;
			import org.opends.server.api.ConfigHandler;
			import org.opends.server.config.ConfigEntry;
			import org.opends.server.config.ConfigException;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.opends.server.core.AddOperation;
			import org.opends.server.core.DeleteOperation;
			import org.opends.server.core.DirectoryServer;
			@@ -40,7 +40,7 @@
			import org.opends.guitools.controlpanel.browser.BrowserController;
			import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
			import org.opends.server.config.ConfigConstants;
			import org.opends.server.config.ConfigException;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.opends.server.schema.AttributeTypeSyntax;
			import org.opends.server.schema.ObjectClassSyntax;
			import org.opends.server.types.AttributeType;
			@@ -39,7 +39,7 @@
			import org.opends.server.api.AttributeSyntax;
			import org.opends.server.api.MatchingRule;
			import org.opends.server.config.ConfigConstants;
			import org.opends.server.config.ConfigException;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.opends.server.core.DirectoryServer;
			import org.opends.server.core.SchemaConfigManager;
			import org.opends.server.types.AttributeType;
			@@ -111,6 +111,7 @@
			import org.opends.guitools.controlpanel.ui.renderer.
			AccessibleTableHeaderRenderer;
			import org.forgerock.i18n.LocalizableMessage;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.opends.quicksetup.Installation;
			import org.opends.quicksetup.ui.UIFactory;
			import org.opends.quicksetup.util.Utils;
			@@ -2487,9 +2488,10 @@
			* subtree.
			* @param dn the DN of the subtree to be deleted.
			* @throws OpenDsException if an error occurs.
			* @throws ConfigException if an error occurs.
			*/
			public static void deleteConfigSubtree(ConfigHandler confHandler, DN dn)
			throws OpenDsException
			throws OpenDsException, ConfigException
			{
			ConfigEntry confEntry = confHandler.getConfigEntry(dn);
			if (confEntry != null)
			@@ -39,6 +39,7 @@

			import org.forgerock.i18n.LocalizableMessage;
			import org.forgerock.i18n.slf4j.LocalizedLogger;
			import org.forgerock.opendj.config.server.ConfigException;

			import javax.naming.ldap.InitialLdapContext;

			@@ -66,6 +67,7 @@
			import org.opends.messages.CoreMessages;
			import org.opends.messages.JebMessages;
			import org.opends.messages.ReplicationMessages;

			import static org.opends.messages.QuickSetupMessages.*;

			import org.opends.server.tools.ConfigureDS;
			@@ -357,6 +359,10 @@
			throw new ApplicationException(
			ReturnCode.CONFIGURATION_ERROR, ode.getMessageObject(), ode);
			}
			catch(ConfigException ce)
			{
			throw new ApplicationException(ReturnCode.CONFIGURATION_ERROR, ce.getMessageObject(), ce);
			}
			}
			@@ -52,7 +52,7 @@
			import org.opends.server.admin.std.server.FileBasedTrustManagerProviderCfg;
			import org.opends.server.admin.std.server.LDAPConnectionHandlerCfg;
			import org.opends.server.admin.std.server.RootCfg;
			import org.opends.server.config.ConfigException;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.opends.server.core.ServerContext;
			import org.opends.server.core.SynchronousStrategy;
			import org.opends.server.protocols.ldap.LDAPConnectionHandler;
			@@ -57,7 +57,7 @@
			import org.opends.server.admin.server.ServerManagedObjectChangeListener;
			import org.opends.server.admin.server.ServerManagementContext;
			import org.opends.server.admin.std.meta.RootCfgDefn;
			import org.opends.server.config.ConfigException;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.forgerock.i18n.slf4j.LocalizedLogger;
			import org.opends.server.types.ConfigChangeResult;
			import org.opends.server.types.DN;
			@@ -41,7 +41,7 @@
			import org.opends.server.admin.condition.Condition;
			import org.opends.server.admin.server.ServerConstraintHandler;
			import org.opends.server.admin.server.ServerManagedObject;
			import org.opends.server.config.ConfigException;
			import org.forgerock.opendj.config.server.ConfigException;
			@@ -55,7 +55,7 @@
			import org.opends.server.admin.std.server.FileBasedTrustManagerProviderCfg;
			import org.opends.server.admin.std.server.RootCfg;
			import org.opends.server.admin.std.server.TrustManagerProviderCfg;
			import org.opends.server.config.ConfigException;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.opends.server.core.DirectoryServer;

			import com.forgerock.opendj.cli.Argument;
			@@ -37,7 +37,7 @@
			import org.opends.server.admin.client.ManagedObject;
			import org.opends.server.admin.client.ManagementContext;
			import org.opends.server.admin.server.ServerManagedObject;
			import org.opends.server.config.ConfigException;
			import org.forgerock.opendj.config.server.ConfigException;
			import org.forgerock.util.Reject;