OPENDJ-1235: Migrate configuration framework

Matthew Swift

06.48.2014 65293eb331bcfa7bb6c6187e15220c7d217eea97

OPENDJ-1235: Migrate configuration framework

* remove config ref guide as it should be part of the server
* relocate some classes and interfaces
* remove some redundant methods.

 opendj-admin/src/main/java/org/opends/server/admin/AbstractManagedObjectDefinition.java

@@ -739,7 +739,6 @@
     *             definition was abstract.
     * @see DefinitionResolver
     */
    @SuppressWarnings("unchecked")
    public final ManagedObjectDefinition<? extends C, ? extends S> resolveManagedObjectDefinition(DefinitionResolver r)
            throws DefinitionDecodingException {
        AbstractManagedObjectDefinition<? extends C, ? extends S> rd;

 opendj-admin/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java

@@ -27,6 +27,7 @@

import static com.forgerock.opendj.ldap.AdminMessages.*;
import static com.forgerock.opendj.util.StaticUtils.*;

import org.forgerock.util.Reject;

import java.util.Collection;
@@ -47,13 +48,13 @@
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.condition.Condition;
import org.opends.server.admin.condition.Conditions;
import org.opends.server.admin.server.ConfigChangeResult;
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.server.ServerConstraintHandler;
import org.opends.server.admin.server.ServerManagedObject;
import org.opends.server.admin.server.ServerManagedObjectChangeListener;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.config.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.config.spi.ConfigException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.forgerock.i18n.LocalizableMessage;

 opendj-admin/src/main/java/org/opends/server/admin/GenericConstraint.java

@@ -37,7 +37,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.opends.server.config.spi.ConfigException;

/**
 * A generic constraint which comprises of an underlying condition and a

 opendj-admin/src/main/java/org/opends/server/admin/IPAddressMaskPropertyDefinition.java

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

import java.util.EnumSet;

import org.opends.server.config.ConfigException;
import org.opends.server.config.spi.ConfigException;
import org.opends.server.types.AddressMask;

/**

 opendj-admin/src/main/java/org/opends/server/admin/client/ldap/LDAPManagedObject.java

@@ -160,9 +160,11 @@
            // be required anyway).
            DN dn;
            if (r instanceof InstantiableRelationDefinition) {
                dn = LDAPNameBuilder.create(parent, (InstantiableRelationDefinition) r, driver.getLDAPProfile());
                dn = LDAPNameBuilder.create(parent, (InstantiableRelationDefinition<?, ?>) r,
                        driver.getLDAPProfile());
            } else {
                dn = LDAPNameBuilder.create(parent, (SetRelationDefinition) r, driver.getLDAPProfile());
                dn = LDAPNameBuilder.create(parent, (SetRelationDefinition<?, ?>) r,
                        driver.getLDAPProfile());
            }

            if (!driver.entryExists(dn)) {

 opendj-admin/src/main/java/org/opends/server/admin/client/spi/Driver.java

@@ -189,8 +189,8 @@

        // Get an inherited property value.
        @SuppressWarnings("unchecked")
        private Collection<T> getInheritedProperty(ManagedObjectPath target, AbstractManagedObjectDefinition<?, ?> d,
            String propertyName) {
        private Collection<T> getInheritedProperty(ManagedObjectPath<?, ?> target,
                AbstractManagedObjectDefinition<?, ?> d, String propertyName) {
            // First check that the requested type of managed object
            // corresponds to the path.
            AbstractManagedObjectDefinition<?, ?> supr = target.getManagedObjectDefinition();

 opendj-admin/src/main/java/org/opends/server/admin/condition/ANDCondition.java

@@ -33,8 +33,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.opends.server.config.spi.ConfigException;
import org.forgerock.util.Reject;

/**

 opendj-admin/src/main/java/org/opends/server/admin/condition/Condition.java

@@ -30,7 +30,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.opends.server.config.spi.ConfigException;

/**
 * An interface for evaluating conditions.

 opendj-admin/src/main/java/org/opends/server/admin/condition/Conditions.java

@@ -30,7 +30,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.opends.server.config.spi.ConfigException;

/**
 * This class consists exclusively of static methods that operate on or return

 opendj-admin/src/main/java/org/opends/server/admin/condition/ContainsCondition.java

@@ -35,7 +35,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.opends.server.config.spi.ConfigException;

/**
 * A condition which evaluates to <code>true</code> if and only if a property

 opendj-admin/src/main/java/org/opends/server/admin/condition/IsPresentCondition.java

@@ -33,8 +33,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.opends.server.config.spi.ConfigException;
import org.forgerock.util.Reject;

/**

 opendj-admin/src/main/java/org/opends/server/admin/condition/NOTCondition.java

@@ -30,8 +30,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.opends.server.config.spi.ConfigException;
import org.forgerock.util.Reject;

/**

 opendj-admin/src/main/java/org/opends/server/admin/condition/ORCondition.java

@@ -33,8 +33,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.opends.server.config.spi.ConfigException;
import org.forgerock.util.Reject;

/**

 opendj-admin/src/main/java/org/opends/server/admin/doc/ConfigGuideGeneration.java

File was deleted

 opendj-admin/src/main/java/org/opends/server/admin/doc/package-info.java

File was deleted

 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigAddListenerAdaptor.java

@@ -40,9 +40,8 @@
import org.opends.server.admin.OptionalRelationDefinition;
import org.opends.server.admin.SetRelationDefinition;
import org.opends.server.admin.DefinitionDecodingException.Reason;
import org.opends.server.api.ConfigAddListener;
import org.opends.server.config.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.config.spi.ConfigAddListener;
import org.opends.server.config.spi.ConfigException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.Entry;
import org.slf4j.Logger;

 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigChangeListenerAdaptor.java

@@ -52,11 +52,10 @@
import org.opends.server.admin.PropertyDefinition;
import org.opends.server.admin.RelativeInheritedDefaultBehaviorProvider;
import org.opends.server.admin.UndefinedDefaultBehaviorProvider;
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.config.ConfigException;
import org.opends.server.config.ConfigurationRepository;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.config.spi.ConfigChangeListener;
import org.opends.server.config.spi.ConfigDeleteListener;
import org.opends.server.config.spi.ConfigException;
import org.opends.server.config.spi.ConfigurationRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.forgerock.opendj.ldap.DN;
@@ -89,7 +88,7 @@
         * Finds the dependencies associated with the provided property
         * definition.
         *
         * @param <T>
         * @param <T> The type of property definition.
         * @param path
         *            The current base path used for relative name resolution.
         * @param pd

 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigChangeResult.java

File was renamed from opendj-admin/src/main/java/org/opends/server/types/ConfigChangeResult.java
@@ -23,7 +23,7 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.server.types;
package org.opends.server.admin.server;

import java.util.ArrayList;
import java.util.Iterator;

 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigDeleteListenerAdaptor.java

@@ -42,9 +42,8 @@
import org.opends.server.admin.OptionalRelationDefinition;
import org.opends.server.admin.SetRelationDefinition;
import org.opends.server.admin.DefinitionDecodingException.Reason;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.config.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.config.spi.ConfigDeleteListener;
import org.opends.server.config.spi.ConfigException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.Entry;
import org.slf4j.Logger;

 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigExceptionFactory.java

@@ -30,7 +30,7 @@
import static com.forgerock.opendj.util.StaticUtils.*;

import org.opends.server.admin.DefinitionDecodingException;
import org.opends.server.config.ConfigException;
import org.opends.server.config.spi.ConfigException;
import org.opends.server.util.DynamicConstants;

import com.forgerock.opendj.ldap.AdminMessages;

 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationAddListener.java

@@ -30,7 +30,6 @@
import java.util.List;

import org.opends.server.admin.Configuration;
import org.opends.server.types.ConfigChangeResult;

/**
 * This interface defines the methods that a Directory Server configurable

 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationChangeListener.java

@@ -30,7 +30,6 @@
import java.util.List;

import org.opends.server.admin.Configuration;
import org.opends.server.types.ConfigChangeResult;

/**
 * This interface defines the methods that a Directory Server configurable

 opendj-admin/src/main/java/org/opends/server/admin/server/ConfigurationDeleteListener.java

@@ -30,7 +30,6 @@
import java.util.List;

import org.opends.server.admin.Configuration;
import org.opends.server.types.ConfigChangeResult;

/**
 * This interface defines the methods that a Directory Server configurable

 opendj-admin/src/main/java/org/opends/server/admin/server/DelayedConfigAddListener.java

@@ -25,11 +25,10 @@
 */
package org.opends.server.admin.server;

import org.opends.server.api.ConfigAddListener;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.config.ConfigException;
import org.opends.server.config.ConfigurationRepository;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.config.spi.ConfigAddListener;
import org.opends.server.config.spi.ConfigDeleteListener;
import org.opends.server.config.spi.ConfigException;
import org.opends.server.config.spi.ConfigurationRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.forgerock.opendj.ldap.DN;

 opendj-admin/src/main/java/org/opends/server/admin/server/ServerConstraintHandler.java

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

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

/**
 * An interface for performing server-side constraint validation.

 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObject.java

@@ -48,11 +48,11 @@
import org.opends.server.admin.RelationDefinition;
import org.opends.server.admin.SetRelationDefinition;
import org.opends.server.admin.SingletonRelationDefinition;
import org.opends.server.api.ConfigAddListener;
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.config.ConfigException;
import org.opends.server.config.ConfigurationRepository;
import org.opends.server.config.spi.ConfigAddListener;
import org.opends.server.config.spi.ConfigChangeListener;
import org.opends.server.config.spi.ConfigDeleteListener;
import org.opends.server.config.spi.ConfigException;
import org.opends.server.config.spi.ConfigurationRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListener.java

@@ -30,7 +30,6 @@
import java.util.List;

import org.opends.server.admin.Configuration;
import org.opends.server.types.ConfigChangeResult;

/**
 * This interface defines the methods that a Directory Server configurable

 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectAddListenerAdaptor.java

@@ -29,7 +29,6 @@

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.Configuration;
import org.opends.server.types.ConfigChangeResult;

/**
 * An adaptor class which converts {@link ServerManagedObjectAddListener}

 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListener.java

@@ -30,7 +30,6 @@
import java.util.List;

import org.opends.server.admin.Configuration;
import org.opends.server.types.ConfigChangeResult;

/**
 * This interface defines the methods that a Directory Server configurable

 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectChangeListenerAdaptor.java

@@ -29,7 +29,6 @@

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.Configuration;
import org.opends.server.types.ConfigChangeResult;

/**
 * An adaptor class which converts {@link ServerManagedObjectChangeListener}

 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListener.java

@@ -30,7 +30,6 @@
import java.util.List;

import org.opends.server.admin.Configuration;
import org.opends.server.types.ConfigChangeResult;

/**
 * This interface defines the methods that a Directory Server configurable

 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagedObjectDeleteListenerAdaptor.java

@@ -29,7 +29,6 @@

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.Configuration;
import org.opends.server.types.ConfigChangeResult;

/**
 * An adaptor class which converts {@link ServerManagedObjectDeleteListener}

 opendj-admin/src/main/java/org/opends/server/admin/server/ServerManagementContext.java

@@ -70,8 +70,8 @@
import org.opends.server.admin.RelativeInheritedDefaultBehaviorProvider;
import org.opends.server.admin.UndefinedDefaultBehaviorProvider;
import org.opends.server.admin.DefinitionDecodingException.Reason;
import org.opends.server.config.ConfigException;
import org.opends.server.config.ConfigurationRepository;
import org.opends.server.config.spi.ConfigException;
import org.opends.server.config.spi.ConfigurationRepository;
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.admin.meta.RootCfgDefn;
import org.forgerock.opendj.admin.server.RootCfg;

 opendj-admin/src/main/java/org/opends/server/config/package-info.java

File was deleted

 opendj-admin/src/main/java/org/opends/server/config/spi/ConfigAddListener.java

File was renamed from opendj-admin/src/main/java/org/opends/server/api/ConfigAddListener.java
@@ -23,11 +23,11 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.server.api;
package org.opends.server.config.spi;

import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.opendj.ldap.Entry;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.admin.server.ConfigChangeResult;

/**
 * This interface defines the methods that a Directory Server component should

 opendj-admin/src/main/java/org/opends/server/config/spi/ConfigChangeListener.java

File was renamed from opendj-admin/src/main/java/org/opends/server/api/ConfigChangeListener.java
@@ -23,9 +23,9 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.server.api;
package org.opends.server.config.spi;

import org.opends.server.types.ConfigChangeResult;
import org.opends.server.admin.server.ConfigChangeResult;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.opendj.ldap.Entry;


 opendj-admin/src/main/java/org/opends/server/config/spi/ConfigDeleteListener.java

File was renamed from opendj-admin/src/main/java/org/opends/server/api/ConfigDeleteListener.java
@@ -23,9 +23,9 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.server.api;
package org.opends.server.config.spi;

import org.opends.server.types.ConfigChangeResult;
import org.opends.server.admin.server.ConfigChangeResult;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.opendj.ldap.Entry;


 opendj-admin/src/main/java/org/opends/server/config/spi/ConfigException.java

File was renamed from opendj-admin/src/main/java/org/opends/server/config/ConfigException.java
@@ -23,7 +23,7 @@
 *
 *      Copyright 2006-2008 Sun Microsystems, Inc.
 */
package org.opends.server.config;
package org.opends.server.config.spi;

import org.forgerock.i18n.LocalizableException;
import org.forgerock.i18n.LocalizableMessage;

 opendj-admin/src/main/java/org/opends/server/config/spi/ConfigurationRepository.java

File was renamed from opendj-admin/src/main/java/org/opends/server/config/ConfigurationRepository.java
@@ -23,15 +23,13 @@
 *
 *      Copyright 2013 ForgeRock AS.
 */
package org.opends.server.config;
package org.opends.server.config.spi;

import java.util.List;
import java.util.Set;

import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.Entry;
import org.opends.server.api.ConfigAddListener;
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.api.ConfigDeleteListener;

/**
 * Provides configuration entries and listener registration on the entries.

 opendj-admin/src/main/java/org/opends/server/config/spi/package-info.java

File was renamed from opendj-admin/src/main/java/org/opends/server/api/package-info.java
@@ -40,5 +40,5 @@
 * effects or that does not work properly across different Directory
 * Server versions.
 */
package org.opends.server.api;
package org.opends.server.config.spi;


 opendj-admin/src/main/java/org/opends/server/types/AddressMask.java

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

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

/**
 * This class defines an address mask, which can be used to perform efficient

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

File was deleted

 opendj-admin/src/main/java/org/opends/server/util/EmbeddedUtils.java

File was deleted

 opendj-admin/src/main/java/org/opends/server/util/package-info.java

File was deleted

 opendj-admin/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java

@@ -144,7 +144,7 @@
         */
        @SuppressWarnings("unchecked")
        private <T> Object getDefaultValue(ManagedObjectDefinition<?, ?> definition,
                Method getPropertyDefMethod, @SuppressWarnings("unused") Class<T> propertyReturnClass)
                Method getPropertyDefMethod, Class<T> propertyReturnClass)
                throws Exception {
            PropertyDefinition<T> propertyDefinition = (PropertyDefinition<T>) getPropertyDefMethod.invoke(definition);
            DefaultBehaviorProvider<T> defaultBehaviorProvider = (DefaultBehaviorProvider<T>) propertyDefinition

 opendj-admin/src/test/java/org/opends/server/admin/AdminTestCase.java

@@ -33,12 +33,13 @@
import org.forgerock.opendj.ldif.LDIF;
import org.opends.server.admin.server.ServerManagedObject;
import org.opends.server.admin.server.ServerManagementContext;
import org.opends.server.config.ConfigurationRepository;
import org.opends.server.config.spi.ConfigurationRepository;
import org.testng.annotations.Test;

/**
 * An abstract class that all admin unit tests should extend.
 */
@SuppressWarnings("javadoc")
@Test(groups = { "precommit", "admin" }, singleThreaded = true)
public abstract class AdminTestCase extends ConfigTestCase {


 opendj-admin/src/test/java/org/opends/server/admin/ClassPropertyDefinitionTest.java

@@ -131,7 +131,6 @@
            { "java.lang.Runnable", "java.lang.String", Number.class, Number.class }, };
    }

    @SuppressWarnings("unused")
    @Test(dataProvider = "loadClassesIllegal", expectedExceptions = { IllegalPropertyValueException.class })
    public <T> void testLoadClassIllegal(String interfaceName, String loadClassName, Class<T> instanceOfClass,
            Class<?> expectedClass) {

 opendj-admin/src/test/java/org/opends/server/admin/TestParentCfg.java

@@ -32,7 +32,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.opends.server.config.spi.ConfigException;

/**
 * A server-side interface for querying Test Parent settings.

 opendj-admin/src/test/java/org/opends/server/admin/TestParentCfgDefn.java

@@ -41,7 +41,7 @@
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.server.ConfigurationDeleteListener;
import org.opends.server.admin.server.ServerManagedObject;
import org.opends.server.config.ConfigException;
import org.opends.server.config.spi.ConfigException;

/**
 * An interface for querying the Test Parent managed object definition meta

 opendj-admin/src/test/java/org/opends/server/admin/server/AdminTestCaseUtils.java

@@ -35,7 +35,7 @@
import org.opends.server.admin.ManagedObjectPath;
import org.opends.server.admin.RelationDefinition;
import org.opends.server.admin.SingletonRelationDefinition;
import org.opends.server.config.ConfigException;
import org.opends.server.config.spi.ConfigException;

/**
 * This class defines some utility functions which can be used by test cases
@@ -61,6 +61,7 @@
     *
     * @param <S>
     *            The type of server configuration to be decoded.
     * @param context The server management context.
     * @param definition
     *            The required definition of the required managed object.
     * @param entry

 opendj-admin/src/test/java/org/opends/server/admin/server/AggregationServerTest.java

@@ -58,11 +58,10 @@
import org.opends.server.admin.TestParentCfg;
import org.opends.server.admin.UndefinedDefaultBehaviorProvider;
import org.opends.server.admin.condition.Conditions;
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.config.ConfigException;
import org.opends.server.config.ConfigurationRepository;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.config.spi.ConfigChangeListener;
import org.opends.server.config.spi.ConfigDeleteListener;
import org.opends.server.config.spi.ConfigException;
import org.opends.server.config.spi.ConfigurationRepository;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;

 opendj-admin/src/test/java/org/opends/server/admin/server/ConstraintTest.java

@@ -44,12 +44,11 @@
import org.opends.server.admin.TestChildCfg;
import org.opends.server.admin.TestChildCfgDefn;
import org.opends.server.admin.TestParentCfg;
import org.opends.server.api.ConfigAddListener;
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.config.ConfigException;
import org.opends.server.config.ConfigurationRepository;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.config.spi.ConfigAddListener;
import org.opends.server.config.spi.ConfigChangeListener;
import org.opends.server.config.spi.ConfigDeleteListener;
import org.opends.server.config.spi.ConfigException;
import org.opends.server.config.spi.ConfigurationRepository;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;

 opendj-admin/src/test/java/org/opends/server/admin/server/DefaultBehaviorTest.java

@@ -48,10 +48,9 @@
import org.opends.server.admin.TestCfg;
import org.opends.server.admin.TestChildCfg;
import org.opends.server.admin.TestParentCfg;
import org.opends.server.api.ConfigAddListener;
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.config.ConfigurationRepository;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.config.spi.ConfigAddListener;
import org.opends.server.config.spi.ConfigChangeListener;
import org.opends.server.config.spi.ConfigurationRepository;
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;

 opendj-admin/src/test/java/org/opends/server/admin/server/ListenerTest.java

@@ -39,11 +39,11 @@
import org.opends.server.admin.PropertyDefinitionsOptions;
import org.opends.server.admin.TestCfg;
import org.opends.server.admin.TestParentCfg;
import org.opends.server.api.ConfigAddListener;
import org.opends.server.api.ConfigChangeListener;
import org.opends.server.api.ConfigDeleteListener;
import org.opends.server.config.ConfigException;
import org.opends.server.config.ConfigurationRepository;
import org.opends.server.config.spi.ConfigAddListener;
import org.opends.server.config.spi.ConfigChangeListener;
import org.opends.server.config.spi.ConfigDeleteListener;
import org.opends.server.config.spi.ConfigException;
import org.opends.server.config.spi.ConfigurationRepository;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;

 opendj-admin/src/test/java/org/opends/server/admin/server/MockConstraint.java

@@ -32,8 +32,8 @@
import org.forgerock.opendj.ldap.DN;
import org.opends.server.admin.Constraint;
import org.opends.server.admin.client.ClientConstraintHandler;
import org.opends.server.config.ConfigException;
import org.opends.server.config.ConfigurationRepository;
import org.opends.server.config.spi.ConfigException;
import org.opends.server.config.spi.ConfigurationRepository;
import org.testng.Assert;

/**