Minor changes:

Matthew Swift

10.43.2014 44d9730b69143d1fd7cd8b382b557e2c9d65225e

Minor changes:

* rename remaining "admin" to "config"
* move all config related files under "config" source and output folders
* use  META-INF/services for config manifest file allowing us to use ServiceLoader in future
* fixed redundant imports from earlier commit.

 opendj-config-maven-plugin/src/main/java/org/forgerock/opendj/maven/OpendjConfigMojo.java

@@ -64,7 +64,7 @@
     * Root directory where definitions of configuration as xml files are
     * located.
     *
     * @parameter default-value="${basedir}/src/main/resources/definitions"
     * @parameter default-value="${basedir}/src/main/resources/config/xml"
     * @required
     */
    private String xmlDefinitionsRootDir;
@@ -73,7 +73,7 @@
     * Directory containing stylesheets (xsl files) to generate code and other
     * artefacts.
     *
     * @parameter default-value="${basedir}/src/main/resources/stylesheets"
     * @parameter default-value="${basedir}/src/main/resources/config/stylesheets"
     * @required
     */
    private String xslDir;
@@ -93,7 +93,7 @@
     * responsibility of project that use this plugin to concatenate all
     * generated files into a single file.
     *
     * @parameter default-value="${project.build.directory}/tmp"
     * @parameter default-value="${project.build.directory}/config"
     * @required
     */
    private String generatedManifestsTempDir;
@@ -105,7 +105,7 @@
     * responsibility of project that use this plugin to concatenate all
     * generated files into a single file.
     *
     * @parameter default-value="${project.build.directory}/admin/core.manifest"
     * @parameter default-value="${project.build.outputDirectory}/META-INF/services/org.forgerock.opendj.config.AbstractManagedObjectDefinition"
     * @required
     */
    private String generatedManifestsLocation;
@@ -113,7 +113,7 @@
    /**
     * Root directory containing generated messages for configuration.
     *
     * @parameter default-value="${basedir}/src/main/resources/config/messages"
     * @parameter default-value="${project.build.outputDirectory}/config/messages"
     * @required
     */
    private String generatedMessagesRootDir;

 opendj-config/src/main/java/org/forgerock/opendj/config/ClassLoaderProvider.java

@@ -22,13 +22,14 @@
 *
 *
 *      Copyright 2008-2009 Sun Microsystems, Inc.
 *      Portions copyright 2012 ForgeRock AS.
 *      Portions copyright 2012-2014 ForgeRock AS.
 */
package org.forgerock.opendj.config;

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

import org.forgerock.util.Reject;

import java.io.ByteArrayOutputStream;
@@ -80,6 +81,8 @@
 */
public final class ClassLoaderProvider {

    private static final String MANIFEST =
            "META-INF/services/org.forgerock.opendj.config.AbstractManagedObjectDefinition";
    private static final LocalizedLogger adminLogger = LocalizedLogger.getLocalizedLogger(AdminMessages
        .resourceName());
    private static final Logger debugLogger = LoggerFactory.getLogger(ClassLoaderProvider.class);
@@ -124,14 +127,6 @@

    }

    // The name of the manifest file listing the core configuration
    // definition classes.
    private static final String CORE_MANIFEST = "core.manifest";

    // The name of the manifest file listing a extension's configuration
    // definition classes.
    private static final String EXTENSION_MANIFEST = "extension.manifest";

    // The name of the lib directory.
    private static final String LIB_DIR = "lib";

@@ -411,11 +406,10 @@

        for (File extension : extensions) {
            // retrieve MANIFEST entry and display name, build number and
            // revision
            // number
            // revision number
            try {
                JarFile jarFile = new JarFile(extension);
                JarEntry entry = jarFile.getJarEntry("admin/" + EXTENSION_MANIFEST);
                JarEntry entry = jarFile.getJarEntry(MANIFEST);
                if (entry == null) {
                    continue;
                }
@@ -546,19 +540,17 @@
     *             configuration definition classes could not be initialized.
     */
    private void initializeCoreComponents() throws InitializationException {
        InputStream is = RootCfgDefn.class.getResourceAsStream("/admin/" + CORE_MANIFEST);

        InputStream is = RootCfgDefn.class.getResourceAsStream(MANIFEST);
        if (is == null) {
            LocalizableMessage message = ERR_ADMIN_CANNOT_FIND_CORE_MANIFEST.get(CORE_MANIFEST);
            LocalizableMessage message = ERR_ADMIN_CANNOT_FIND_CORE_MANIFEST.get(MANIFEST);
            throw new InitializationException(message);
        }

        try {
            loadDefinitionClasses(is);
        } catch (InitializationException e) {
            debugLogger.trace("Unable to initialize core components", e);
            LocalizableMessage message =
                ERR_CLASS_LOADER_CANNOT_LOAD_CORE.get(CORE_MANIFEST,
                ERR_CLASS_LOADER_CANNOT_LOAD_CORE.get(MANIFEST,
                    stackTraceToSingleLineString(e, DynamicConstants.DEBUG_BUILD));
            throw new InitializationException(message);
        }
@@ -576,7 +568,7 @@
     *             initialized.
     */
    private void initializeExtension(JarFile jarFile) throws InitializationException {
        JarEntry entry = jarFile.getJarEntry("admin/" + EXTENSION_MANIFEST);
        JarEntry entry = jarFile.getJarEntry(MANIFEST);
        if (entry != null) {
            InputStream is;
            try {
@@ -584,7 +576,7 @@
            } catch (Exception e) {
                debugLogger.trace("Unable to get input stream from jar", e);
                LocalizableMessage message =
                    ERR_ADMIN_CANNOT_READ_EXTENSION_MANIFEST.get(EXTENSION_MANIFEST, jarFile.getName(),
                    ERR_ADMIN_CANNOT_READ_EXTENSION_MANIFEST.get(MANIFEST, jarFile.getName(),
                        stackTraceToSingleLineString(e, DynamicConstants.DEBUG_BUILD));
                throw new InitializationException(message);
            }
@@ -594,7 +586,7 @@
            } catch (InitializationException e) {
                debugLogger.trace("Unable to load classes from input stream", e);
                LocalizableMessage message =
                    ERR_CLASS_LOADER_CANNOT_LOAD_EXTENSION.get(jarFile.getName(), EXTENSION_MANIFEST,
                    ERR_CLASS_LOADER_CANNOT_LOAD_EXTENSION.get(jarFile.getName(), MANIFEST,
                        stackTraceToSingleLineString(e, DynamicConstants.DEBUG_BUILD));
                throw new InitializationException(message);
            }

 opendj-config/src/main/resources/config/stylesheets/abbreviations.xsl

 opendj-config/src/main/resources/config/stylesheets/admin-cli.xsd

 opendj-config/src/main/resources/config/stylesheets/admin-ldap.xsd

 opendj-config/src/main/resources/config/stylesheets/admin-preprocessor.xsd

 opendj-config/src/main/resources/config/stylesheets/admin.xsd

 opendj-config/src/main/resources/config/stylesheets/catalog.xml

 opendj-config/src/main/resources/config/stylesheets/cliMOProfile.xsl

 opendj-config/src/main/resources/config/stylesheets/clientMO.xsl

 opendj-config/src/main/resources/config/stylesheets/conditions.xsl

 opendj-config/src/main/resources/config/stylesheets/java-utilities.xsl

 opendj-config/src/main/resources/config/stylesheets/ldapMOProfile.xsl

 opendj-config/src/main/resources/config/stylesheets/manifestMO.xsl

 opendj-config/src/main/resources/config/stylesheets/messagesMO.xsl

 opendj-config/src/main/resources/config/stylesheets/metaMO.xsl

 opendj-config/src/main/resources/config/stylesheets/package-info.xsl

 opendj-config/src/main/resources/config/stylesheets/preprocessor.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/aci.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/aggregation.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/attribute-type.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/boolean.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/dn.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/duration.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/enumeration.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/extensible-matching-rule-type.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/integer.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/ip-address-mask.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/ip-address.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/java-class.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/oid.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/password.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/size.xsl

 opendj-config/src/main/resources/config/stylesheets/property-types/string.xsl

 opendj-config/src/main/resources/config/stylesheets/serverMO.xsl

 opendj-config/src/main/resources/config/stylesheets/text-utilities.xsl

 opendj-config/src/main/resources/config/stylesheets/xml.xsd

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AESPasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessControlHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogFilteringCriteriaConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogPublisherConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccountStatusNotificationHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AlertHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AnonymousSASLMechanismHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeCleanupPluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeSyntaxConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AuthenticationPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackupBackendConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/Base64PasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlindTrustManagerProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlowfishPasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CancelExtendedOperationHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateAttributeSyntaxConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateMapperConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ChangeNumberControlPluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CharacterSetPasswordValidatorConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClearPasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClientConnectionMonitorProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollationMatchingRuleConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConfigFileHandlerBackendConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConnectionHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CountryStringAttributeSyntaxConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CramMD5SASLMechanismHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptPasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptoManagerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugLogPublisherConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DictionaryPasswordValidatorConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DigestMD5SASLMechanismHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DirectoryStringAttributeSyntaxConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DseeCompatAccessControlHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DynamicGroupImplementationConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntityTagVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheMonitorProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryDNVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDPluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogAccountStatusNotificationHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogPublisherConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExactMatchIdentityMapperConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExtendedOperationHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExtensionConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalChangelogDomainConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalSASLMechanismHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FIFOEntryCacheConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAccessLogPublisherConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAuditLogPublisherConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedErrorLogPublisherConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedHTTPAccessLogPublisherConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedKeyManagerProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedTrustManagerProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileCountLogRetentionPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileSystemEntryCacheConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FingerprintCertificateMapperConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FixedTimeLogRotationPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FractionalLDIFImportPluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FreeDiskSpaceLogRetentionPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GSSAPISASLMechanismHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetConnectionIdExtendedOperationHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GlobalConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GoverningStructureRuleVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GroupImplementationConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAccessLogPublisherConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPConnectionHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/HasSubordinatesVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/IdentityMapperConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/IsMemberOfVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXAlertHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXConnectionHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/JPEGAttributeSyntaxConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/KeyManagerProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPAttributeDescriptionListPluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPConnectionHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFBackendConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFConnectionHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LastModPluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LengthBasedPasswordValidatorConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalBackendWorkflowElementConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBIndexConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBVLVIndexConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogPublisherConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRetentionPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRotationPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MD5PasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MatchingRuleConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemberVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryBackendConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryUsageMonitorProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorBackendConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NetworkGroupConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NetworkGroupPluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NullBackendConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NumSubordinatesVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PBKDF2PasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PKCS11KeyManagerProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ParallelWorkQueueConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordExpirationTimeVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordGeneratorConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordModifyExtendedOperationHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyImportPluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicySubentryVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordValidatorConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PlainSASLMechanismHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginRootConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ProfilerPluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/QOSPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RC4PasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RandomPasswordGeneratorConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReferentialIntegrityPluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RegularExpressionIdentityMapperConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RepeatedCharactersPasswordValidatorConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationDomainConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationSynchronizationProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RequestFilteringQOSPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ResourceLimitsQOSPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNUserConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDSEBackendConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SASLMechanismHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SHA1PasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAlertHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SNMPConnectionHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedMD5PasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA1PasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA256PasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA384PasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA512PasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SambaPasswordPluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaBackendConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SevenBitCleanPluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SimilarityBasedPasswordValidatorConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRetentionPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRotationPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SoftReferenceEntryCacheConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StackTraceMonitorProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StartTLSExtendedOperationHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StaticGroupImplementationConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StructuralObjectClassVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectDNToUserAttributeCertificateMapperConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectEqualsDNCertificateMapperConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubschemaSubentryVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SynchronizationProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SystemInfoMonitorProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TaskBackendConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TelephoneNumberAttributeSyntaxConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TimeLimitLogRotationPolicyConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TraditionalWorkQueueConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TripleDESPasswordStorageSchemeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustManagerProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustStoreBackendConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueAttributePluginConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueCharactersPasswordValidatorConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/UserDefinedVirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/VersionMonitorProviderConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualAttributeConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualStaticGroupImplementationConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WhoAmIExtendedOperationHandlerConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkQueueConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkflowConfiguration.xml

 opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkflowElementConfiguration.xml

 opendj-config/src/test/java/org/forgerock/opendj/config/AbstractManagedObjectDefinitionTest.java

@@ -26,17 +26,12 @@

package org.forgerock.opendj.config;

import static org.fest.assertions.Assertions.*;
import static org.testng.Assert.*;
import static org.fest.assertions.Assertions.assertThat;
import static org.testng.Assert.assertEquals;

import java.util.Collection;
import java.util.Collections;

import org.forgerock.opendj.config.AbstractManagedObjectDefinition;
import org.forgerock.opendj.config.DefaultBehaviorProvider;
import org.forgerock.opendj.config.DefinedDefaultBehaviorProvider;
import org.forgerock.opendj.config.PropertyDefinition;
import org.forgerock.opendj.config.RelationDefinition;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;

 opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java

@@ -25,14 +25,15 @@
 */
package org.forgerock.opendj.config;

import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import org.forgerock.opendj.server.config.server.RootCfg;
import org.forgerock.opendj.config.server.ServerManagedObject;
import org.forgerock.opendj.config.server.ServerManagementContext;
import org.forgerock.opendj.config.server.spi.ConfigurationRepository;
import org.forgerock.opendj.ldap.Entry;
import org.forgerock.opendj.ldif.LDIF;
import org.forgerock.opendj.server.config.server.RootCfg;
import org.testng.annotations.Test;

/**

 opendj-config/src/test/java/org/forgerock/opendj/config/AggregationPropertyDefinitionTest.java

@@ -26,8 +26,6 @@

package org.forgerock.opendj.config;

import org.forgerock.opendj.config.AggregationPropertyDefinition;
import org.forgerock.opendj.config.ManagedObjectPath;
import org.forgerock.opendj.ldap.DN;
import org.testng.Assert;
import org.testng.annotations.AfterClass;

 opendj-config/src/test/java/org/forgerock/opendj/config/AttributeTypePropertyDefinitionTest.java

@@ -25,14 +25,11 @@
 */
package org.forgerock.opendj.config;

import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;

import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.forgerock.opendj.config.AttributeTypePropertyDefinition;
import org.forgerock.opendj.config.IllegalPropertyValueStringException;
import org.forgerock.opendj.config.PropertyDefinitionsOptions;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;


 opendj-config/src/test/java/org/forgerock/opendj/config/BooleanPropertyDefinitionTest.java

@@ -25,12 +25,9 @@
 */
package org.forgerock.opendj.config;

import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;

import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.forgerock.opendj.config.BooleanPropertyDefinition;
import org.forgerock.opendj.config.IllegalPropertyValueStringException;
import org.forgerock.opendj.config.PropertyDefinitionsOptions;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

 opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java

@@ -27,14 +27,13 @@

package org.forgerock.opendj.config;

import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;

import java.util.Comparator;
import java.util.List;

import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.forgerock.opendj.config.ClassPropertyDefinition;
import org.forgerock.opendj.config.IllegalPropertyValueException;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;


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

@@ -25,7 +25,7 @@
 */
package org.forgerock.opendj.config;

import static org.mockito.Mockito.*;
import static org.mockito.Mockito.mock;

import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
@@ -33,18 +33,6 @@
import java.util.SortedSet;
import java.util.TreeSet;

import org.forgerock.opendj.config.AbsoluteInheritedDefaultBehaviorProvider;
import org.forgerock.opendj.config.AliasDefaultBehaviorProvider;
import org.forgerock.opendj.config.Configuration;
import org.forgerock.opendj.config.DefaultBehaviorProvider;
import org.forgerock.opendj.config.DefaultBehaviorProviderVisitor;
import org.forgerock.opendj.config.DefinedDefaultBehaviorProvider;
import org.forgerock.opendj.config.ManagedObjectDefinition;
import org.forgerock.opendj.config.PropertyDefinition;
import org.forgerock.opendj.config.PropertyDefinitionsOptions;
import org.forgerock.opendj.config.PropertyOption;
import org.forgerock.opendj.config.RelativeInheritedDefaultBehaviorProvider;
import org.forgerock.opendj.config.UndefinedDefaultBehaviorProvider;
import org.mockito.invocation.InvocationOnMock;

/**

 opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMockTest.java

@@ -25,15 +25,15 @@
 */
package org.forgerock.opendj.config;

import static org.fest.assertions.Assertions.*;
import static org.forgerock.opendj.config.ConfigurationMock.*;
import static org.fest.assertions.Assertions.assertThat;
import static org.forgerock.opendj.config.ConfigurationMock.mockCfg;

import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.server.config.meta.PluginCfgDefn.PluginType;
import org.forgerock.opendj.server.config.server.AttributeCleanupPluginCfg;
import org.forgerock.opendj.server.config.server.CollectiveAttributeSubentriesVirtualAttributeCfg;
import org.forgerock.opendj.server.config.server.GoverningStructureRuleVirtualAttributeCfg;
import org.forgerock.opendj.server.config.server.LDAPConnectionHandlerCfg;
import org.forgerock.opendj.ldap.schema.Schema;
import org.testng.annotations.Test;

/**

 opendj-config/src/test/java/org/forgerock/opendj/config/DNPropertyDefinitionTest.java

@@ -28,12 +28,8 @@

import static org.testng.Assert.assertEquals;

import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.forgerock.opendj.config.DNPropertyDefinition;
import org.forgerock.opendj.config.IllegalPropertyValueException;
import org.forgerock.opendj.config.IllegalPropertyValueStringException;
import org.forgerock.opendj.config.PropertyDefinitionsOptions;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.opends.server.types.DirectoryException;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

 opendj-config/src/test/java/org/forgerock/opendj/config/DurationPropertyDefinitionTest.java

@@ -26,22 +26,11 @@

package org.forgerock.opendj.config;

import static org.fest.assertions.Assertions.*;
import static org.testng.Assert.*;
import static org.fest.assertions.Assertions.assertThat;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;

import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.forgerock.opendj.config.DefaultBehaviorProvider;
import org.forgerock.opendj.config.DefaultBehaviorProviderVisitor;
import org.forgerock.opendj.config.DefinedDefaultBehaviorProvider;
import org.forgerock.opendj.config.DurationPropertyDefinition;
import org.forgerock.opendj.config.DurationUnit;
import org.forgerock.opendj.config.IllegalPropertyValueException;
import org.forgerock.opendj.config.IllegalPropertyValueStringException;
import org.forgerock.opendj.config.PropertyDefinition;
import org.forgerock.opendj.config.PropertyDefinitionVisitor;
import org.forgerock.opendj.config.PropertyDefinitionsOptions;
import org.forgerock.opendj.config.PropertyOption;
import org.forgerock.opendj.config.UnknownPropertyDefinitionException;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;


 opendj-config/src/test/java/org/forgerock/opendj/config/DurationUnitTest.java

@@ -26,10 +26,15 @@

package org.forgerock.opendj.config;

import static org.forgerock.opendj.config.DurationUnit.*;
import static org.testng.Assert.*;
import static org.forgerock.opendj.config.DurationUnit.DAYS;
import static org.forgerock.opendj.config.DurationUnit.HOURS;
import static org.forgerock.opendj.config.DurationUnit.MILLI_SECONDS;
import static org.forgerock.opendj.config.DurationUnit.MINUTES;
import static org.forgerock.opendj.config.DurationUnit.SECONDS;
import static org.forgerock.opendj.config.DurationUnit.WEEKS;
import static org.forgerock.opendj.config.DurationUnit.getUnit;
import static org.testng.Assert.assertEquals;

import org.forgerock.opendj.config.DurationUnit;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;


 opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java

@@ -26,12 +26,10 @@

package org.forgerock.opendj.config;

import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;

import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.forgerock.opendj.config.EnumPropertyDefinition;
import org.forgerock.opendj.config.IllegalPropertyValueStringException;
import org.forgerock.opendj.config.PropertyDefinitionsOptions;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

 opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java

@@ -25,20 +25,10 @@
 */
package org.forgerock.opendj.config;

import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;

import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.forgerock.opendj.config.DefaultBehaviorProvider;
import org.forgerock.opendj.config.DefaultBehaviorProviderVisitor;
import org.forgerock.opendj.config.DefinedDefaultBehaviorProvider;
import org.forgerock.opendj.config.IllegalPropertyValueException;
import org.forgerock.opendj.config.IllegalPropertyValueStringException;
import org.forgerock.opendj.config.IntegerPropertyDefinition;
import org.forgerock.opendj.config.PropertyDefinition;
import org.forgerock.opendj.config.PropertyDefinitionVisitor;
import org.forgerock.opendj.config.PropertyDefinitionsOptions;
import org.forgerock.opendj.config.PropertyOption;
import org.forgerock.opendj.config.UnknownPropertyDefinitionException;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;


 opendj-config/src/test/java/org/forgerock/opendj/config/LDAPProfileTest.java

@@ -25,12 +25,11 @@
 */
package org.forgerock.opendj.config;

import static org.testng.Assert.*;
import static org.testng.Assert.assertTrue;

import java.util.List;

import org.forgerock.opendj.server.config.meta.GlobalCfgDefn;
import org.forgerock.opendj.config.LDAPProfile;
import org.testng.annotations.Test;

@SuppressWarnings("javadoc")

 opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResourceTest.java

@@ -25,12 +25,11 @@
 */
package org.forgerock.opendj.config;

import static org.testng.Assert.*;
import static org.testng.Assert.assertNotNull;

import java.util.Locale;

import org.forgerock.opendj.server.config.meta.GlobalCfgDefn;
import org.forgerock.opendj.config.ManagedObjectDefinitionI18NResource;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;


 opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectPathTest.java

@@ -25,8 +25,12 @@
 */
package org.forgerock.opendj.config;

import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;

import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.server.config.client.ConnectionHandlerCfgClient;
import org.forgerock.opendj.server.config.client.GlobalCfgClient;
import org.forgerock.opendj.server.config.client.LDAPConnectionHandlerCfgClient;
@@ -39,8 +43,6 @@
import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
import org.forgerock.opendj.server.config.server.GlobalCfg;
import org.forgerock.opendj.server.config.server.LDAPConnectionHandlerCfg;
import org.forgerock.opendj.config.ManagedObjectPath;
import org.forgerock.opendj.ldap.DN;
import org.testng.annotations.Test;

@SuppressWarnings("javadoc")

 opendj-config/src/test/java/org/forgerock/opendj/config/MockLDAPProfile.java

@@ -25,11 +25,6 @@
 */
package org.forgerock.opendj.config;

import org.forgerock.opendj.config.AbstractManagedObjectDefinition;
import org.forgerock.opendj.config.InstantiableRelationDefinition;
import org.forgerock.opendj.config.LDAPProfile;
import org.forgerock.opendj.config.PropertyDefinition;
import org.forgerock.opendj.config.RelationDefinition;

/**
 * A mock LDAP profile wrapper for testing purposes.

 opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java

@@ -26,15 +26,8 @@

package org.forgerock.opendj.config;

import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;

import org.forgerock.opendj.config.AbsoluteInheritedDefaultBehaviorProvider;
import org.forgerock.opendj.config.AliasDefaultBehaviorProvider;
import org.forgerock.opendj.config.DefaultBehaviorProviderVisitor;
import org.forgerock.opendj.config.DefinedDefaultBehaviorProvider;
import org.forgerock.opendj.config.ManagedObjectPath;
import org.forgerock.opendj.config.RelativeInheritedDefaultBehaviorProvider;
import org.forgerock.opendj.config.UndefinedDefaultBehaviorProvider;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;


 opendj-config/src/test/java/org/forgerock/opendj/config/SizePropertyDefinitionTest.java

@@ -25,20 +25,10 @@
 */
package org.forgerock.opendj.config;

import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;

import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.forgerock.opendj.config.DefaultBehaviorProvider;
import org.forgerock.opendj.config.DefaultBehaviorProviderVisitor;
import org.forgerock.opendj.config.DefinedDefaultBehaviorProvider;
import org.forgerock.opendj.config.IllegalPropertyValueException;
import org.forgerock.opendj.config.IllegalPropertyValueStringException;
import org.forgerock.opendj.config.PropertyDefinition;
import org.forgerock.opendj.config.PropertyDefinitionVisitor;
import org.forgerock.opendj.config.PropertyDefinitionsOptions;
import org.forgerock.opendj.config.PropertyOption;
import org.forgerock.opendj.config.SizePropertyDefinition;
import org.forgerock.opendj.config.UnknownPropertyDefinitionException;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;


 opendj-config/src/test/java/org/forgerock/opendj/config/SizeUnitTest.java

@@ -26,9 +26,8 @@

package org.forgerock.opendj.config;

import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;

import org.forgerock.opendj.config.SizeUnit;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;


 opendj-config/src/test/java/org/forgerock/opendj/config/StringPropertyDefinitionTest.java

@@ -25,13 +25,9 @@
 */
package org.forgerock.opendj.config;

import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;

import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.forgerock.opendj.config.IllegalPropertyValueException;
import org.forgerock.opendj.config.IllegalPropertyValueStringException;
import org.forgerock.opendj.config.PropertyDefinitionsOptions;
import org.forgerock.opendj.config.StringPropertyDefinition;
import org.testng.annotations.Test;

@SuppressWarnings("javadoc")

 opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java

@@ -28,14 +28,6 @@
import java.util.ResourceBundle;

import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.forgerock.opendj.config.AbstractManagedObjectDefinition;
import org.forgerock.opendj.config.Constraint;
import org.forgerock.opendj.config.InstantiableRelationDefinition;
import org.forgerock.opendj.config.LDAPProfile;
import org.forgerock.opendj.config.ManagedObjectDefinition;
import org.forgerock.opendj.config.ManagedObjectDefinitionI18NResource;
import org.forgerock.opendj.config.OptionalRelationDefinition;
import org.forgerock.opendj.config.PropertyDefinition;

/**
 * Common methods for hooking in the test components.

 opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfg.java

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

import java.util.SortedSet;

import org.forgerock.opendj.config.Configuration;
import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.schema.AttributeType;

 opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgClient.java

@@ -28,10 +28,6 @@
import java.util.Collection;
import java.util.SortedSet;

import org.forgerock.opendj.config.ConfigurationClient;
import org.forgerock.opendj.config.IllegalPropertyValueException;
import org.forgerock.opendj.config.ManagedObjectDefinition;
import org.forgerock.opendj.config.PropertyIsReadOnlyException;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.schema.AttributeType;


 opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgDefn.java

@@ -28,23 +28,6 @@
import java.util.Collection;
import java.util.SortedSet;

import org.forgerock.opendj.server.config.client.ConnectionHandlerCfgClient;
import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
import org.forgerock.opendj.config.AdministratorAction;
import org.forgerock.opendj.config.AggregationPropertyDefinition;
import org.forgerock.opendj.config.AttributeTypePropertyDefinition;
import org.forgerock.opendj.config.BooleanPropertyDefinition;
import org.forgerock.opendj.config.ClassPropertyDefinition;
import org.forgerock.opendj.config.DNPropertyDefinition;
import org.forgerock.opendj.config.DefaultBehaviorProvider;
import org.forgerock.opendj.config.DefinedDefaultBehaviorProvider;
import org.forgerock.opendj.config.ManagedObjectAlreadyExistsException;
import org.forgerock.opendj.config.ManagedObjectDefinition;
import org.forgerock.opendj.config.PropertyIsReadOnlyException;
import org.forgerock.opendj.config.PropertyOption;
import org.forgerock.opendj.config.PropertyProvider;
import org.forgerock.opendj.config.RelativeInheritedDefaultBehaviorProvider;
import org.forgerock.opendj.config.UndefinedDefaultBehaviorProvider;
import org.forgerock.opendj.config.client.ConcurrentModificationException;
import org.forgerock.opendj.config.client.ManagedObject;
import org.forgerock.opendj.config.client.MissingMandatoryPropertiesException;
@@ -54,6 +37,8 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ErrorResultException;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.server.config.client.ConnectionHandlerCfgClient;
import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;

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

 opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java

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

import java.util.SortedSet;

import org.forgerock.opendj.config.Configuration;
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.config.server.ConfigurationAddListener;
import org.forgerock.opendj.config.server.ConfigurationChangeListener;

 opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java

@@ -28,13 +28,6 @@
import java.util.Collection;
import java.util.SortedSet;

import org.forgerock.opendj.config.ConfigurationClient;
import org.forgerock.opendj.config.DefaultBehaviorException;
import org.forgerock.opendj.config.DefinitionDecodingException;
import org.forgerock.opendj.config.IllegalPropertyValueException;
import org.forgerock.opendj.config.ManagedObjectDefinition;
import org.forgerock.opendj.config.ManagedObjectNotFoundException;
import org.forgerock.opendj.config.PropertyIsReadOnlyException;
import org.forgerock.opendj.config.client.ConcurrentModificationException;
import org.forgerock.opendj.config.client.IllegalManagedObjectNameException;
import org.forgerock.opendj.config.client.ManagedObjectDecodingException;

 opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java

@@ -28,24 +28,6 @@
import java.util.Collection;
import java.util.SortedSet;

import org.forgerock.opendj.config.AdministratorAction;
import org.forgerock.opendj.config.AttributeTypePropertyDefinition;
import org.forgerock.opendj.config.BooleanPropertyDefinition;
import org.forgerock.opendj.config.ClassPropertyDefinition;
import org.forgerock.opendj.config.DNPropertyDefinition;
import org.forgerock.opendj.config.DefaultBehaviorException;
import org.forgerock.opendj.config.DefaultBehaviorProvider;
import org.forgerock.opendj.config.DefinedDefaultBehaviorProvider;
import org.forgerock.opendj.config.DefinitionDecodingException;
import org.forgerock.opendj.config.InstantiableRelationDefinition;
import org.forgerock.opendj.config.ManagedObjectAlreadyExistsException;
import org.forgerock.opendj.config.ManagedObjectDefinition;
import org.forgerock.opendj.config.ManagedObjectNotFoundException;
import org.forgerock.opendj.config.OptionalRelationDefinition;
import org.forgerock.opendj.config.PropertyIsReadOnlyException;
import org.forgerock.opendj.config.PropertyOption;
import org.forgerock.opendj.config.PropertyProvider;
import org.forgerock.opendj.config.UndefinedDefaultBehaviorProvider;
import org.forgerock.opendj.config.client.ConcurrentModificationException;
import org.forgerock.opendj.config.client.IllegalManagedObjectNameException;
import org.forgerock.opendj.config.client.ManagedObject;

 opendj-config/src/test/java/org/forgerock/opendj/config/TestTopCfgDefnTest.java

@@ -26,11 +26,13 @@

package org.forgerock.opendj.config;

import static org.fest.assertions.Assertions.*;
import static org.testng.Assert.*;
import static org.fest.assertions.Assertions.assertThat;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import static org.testng.Assert.assertTrue;

import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.forgerock.opendj.config.TopCfgDefn;
import org.testng.annotations.Test;



 opendj-config/src/test/java/org/forgerock/opendj/config/ValidateConfigDefinitionsTest.java

@@ -33,11 +33,6 @@
import java.util.List;
import java.util.Set;

import org.forgerock.opendj.config.AbstractManagedObjectDefinition;
import org.forgerock.opendj.config.LDAPProfile;
import org.forgerock.opendj.config.PropertyDefinition;
import org.forgerock.opendj.config.PropertyOption;
import org.forgerock.opendj.config.TopCfgDefn;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.forgerock.opendj.ldap.schema.Schema;

 opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java

@@ -31,7 +31,6 @@
import java.util.SortedSet;
import java.util.TreeSet;

import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.forgerock.opendj.config.AdminTestCase;
import org.forgerock.opendj.config.IllegalPropertyValueStringException;
import org.forgerock.opendj.config.LDAPProfile;
@@ -44,7 +43,7 @@
import org.forgerock.opendj.config.client.ManagedObject;
import org.forgerock.opendj.config.client.ManagedObjectDecodingException;
import org.forgerock.opendj.config.client.ManagementContext;
import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.opends.server.core.DirectoryServer;
import org.testng.Assert;
import org.testng.annotations.AfterClass;

 opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/LDAPClientTest.java

@@ -25,14 +25,13 @@
 */
package org.forgerock.opendj.config.client.ldap;

import static org.fest.assertions.Assertions.*;
import static org.fest.assertions.Assertions.assertThat;

import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.SortedSet;

import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.forgerock.opendj.config.AdminTestCase;
import org.forgerock.opendj.config.Constraint;
import org.forgerock.opendj.config.LDAPProfile;
@@ -47,12 +46,12 @@
import org.forgerock.opendj.config.client.ManagedObject;
import org.forgerock.opendj.config.client.ManagementContext;
import org.forgerock.opendj.config.client.OperationRejectedException;
import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.Entry;
import org.forgerock.opendj.ldap.ErrorResultException;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
import org.forgerock.opendj.server.config.client.RootCfgClient;
import org.opends.server.core.DirectoryServer;
import org.testng.Assert;
import org.testng.annotations.AfterClass;

 opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/MockLDAPConnection.java

@@ -25,8 +25,8 @@
 */
package org.forgerock.opendj.config.client.ldap;

import static org.fest.assertions.Assertions.*;
import static org.forgerock.opendj.ldif.LDIF.*;
import static org.fest.assertions.Assertions.assertThat;
import static org.forgerock.opendj.ldif.LDIF.makeEntries;

import java.util.Collection;
import java.util.HashMap;
@@ -34,7 +34,6 @@
import java.util.List;
import java.util.Map;

import org.forgerock.opendj.config.client.ldap.LDAPConnection;
import org.forgerock.opendj.ldap.Attribute;
import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.AttributeParser;

 opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/ModifyEntryMockLDAPConnection.java

@@ -35,9 +35,8 @@
import org.forgerock.opendj.ldap.ErrorResultException;
import org.forgerock.opendj.ldap.Modification;
import org.forgerock.opendj.ldap.requests.ModifyRequest;
import org.testng.Assert;

import org.forgerock.util.Reject;
import org.testng.Assert;

/**
 * A mock LDAP connection which is used to verify that a modify operation was

 opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java

@@ -25,7 +25,6 @@
 */
package org.forgerock.opendj.config.server;

import org.forgerock.opendj.server.config.meta.RootCfgDefn;
import org.forgerock.opendj.config.AbstractManagedObjectDefinition;
import org.forgerock.opendj.config.Configuration;
import org.forgerock.opendj.config.ConfigurationClient;
@@ -34,12 +33,8 @@
import org.forgerock.opendj.config.ManagedObjectPath;
import org.forgerock.opendj.config.RelationDefinition;
import org.forgerock.opendj.config.SingletonRelationDefinition;
import org.forgerock.opendj.config.server.ConfigExceptionFactory;
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.ldap.Entry;
import org.forgerock.opendj.server.config.meta.RootCfgDefn;

/**
 * This class defines some utility functions which can be used by test cases

 opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java

@@ -26,11 +26,12 @@
 */
package org.forgerock.opendj.config.server;

import static org.fest.assertions.Assertions.*;
import static org.forgerock.opendj.ldif.LDIF.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import static org.testng.Assert.*;
import static org.fest.assertions.Assertions.assertThat;
import static org.forgerock.opendj.ldif.LDIF.makeEntry;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;

import java.util.List;
import java.util.SortedSet;
@@ -38,8 +39,6 @@

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.opendj.server.config.client.ConnectionHandlerCfgClient;
import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
import org.forgerock.opendj.config.AdminTestCase;
import org.forgerock.opendj.config.AdministratorAction;
import org.forgerock.opendj.config.AggregationPropertyDefinition;
@@ -53,12 +52,6 @@
import org.forgerock.opendj.config.TestParentCfg;
import org.forgerock.opendj.config.UndefinedDefaultBehaviorProvider;
import org.forgerock.opendj.config.conditions.Conditions;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
import org.forgerock.opendj.config.server.ConstraintViolationException;
import org.forgerock.opendj.config.server.ServerManagedObjectDecodingException;
import org.forgerock.opendj.config.server.ServerManagementContext;
import org.forgerock.opendj.config.server.spi.ConfigChangeListener;
import org.forgerock.opendj.config.server.spi.ConfigDeleteListener;
import org.forgerock.opendj.config.server.spi.ConfigurationRepository;
@@ -66,6 +59,8 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldif.LDIF;
import org.forgerock.opendj.server.config.client.ConnectionHandlerCfgClient;
import org.forgerock.opendj.server.config.server.ConnectionHandlerCfg;
import org.mockito.ArgumentCaptor;
import org.testng.Assert;
import org.testng.annotations.AfterClass;

 opendj-config/src/test/java/org/forgerock/opendj/config/server/ConstraintTest.java

@@ -25,9 +25,9 @@
 */
package org.forgerock.opendj.config.server;

import static org.fest.assertions.Assertions.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import static org.fest.assertions.Assertions.assertThat;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;

import java.io.IOException;
import java.util.List;
@@ -40,12 +40,6 @@
import org.forgerock.opendj.config.TestChildCfg;
import org.forgerock.opendj.config.TestChildCfgDefn;
import org.forgerock.opendj.config.TestParentCfg;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigurationAddListener;
import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
import org.forgerock.opendj.config.server.ConstraintViolationException;
import org.forgerock.opendj.config.server.ServerManagementContext;
import org.forgerock.opendj.config.server.spi.ConfigAddListener;
import org.forgerock.opendj.config.server.spi.ConfigChangeListener;
import org.forgerock.opendj.config.server.spi.ConfigDeleteListener;

 opendj-config/src/test/java/org/forgerock/opendj/config/server/DNBuilderTest.java

@@ -25,7 +25,7 @@
 */
package org.forgerock.opendj.config.server;

import static org.testng.Assert.*;
import static org.testng.Assert.assertEquals;

import org.forgerock.opendj.config.AdminTestCase;
import org.forgerock.opendj.config.LDAPProfile;
@@ -37,7 +37,6 @@
import org.forgerock.opendj.config.TestChildCfgClient;
import org.forgerock.opendj.config.TestChildCfgDefn;
import org.forgerock.opendj.config.TestParentCfgDefn;
import org.forgerock.opendj.config.server.DNBuilder;
import org.forgerock.opendj.ldap.DN;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;

 opendj-config/src/test/java/org/forgerock/opendj/config/server/DefaultBehaviorTest.java

@@ -25,10 +25,10 @@
 */
package org.forgerock.opendj.config.server;

import static org.fest.assertions.Assertions.*;
import static org.forgerock.opendj.ldif.LDIF.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
import static org.fest.assertions.Assertions.assertThat;
import static org.forgerock.opendj.ldif.LDIF.makeEntry;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;

import java.io.IOException;
import java.util.ArrayList;
@@ -43,10 +43,6 @@
import org.forgerock.opendj.config.TestCfg;
import org.forgerock.opendj.config.TestChildCfg;
import org.forgerock.opendj.config.TestParentCfg;
import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.forgerock.opendj.config.server.ConfigurationAddListener;
import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.config.server.ServerManagementContext;
import org.forgerock.opendj.config.server.spi.ConfigAddListener;
import org.forgerock.opendj.config.server.spi.ConfigChangeListener;
import org.forgerock.opendj.config.server.spi.ConfigurationRepository;

 opendj-config/src/test/java/org/forgerock/opendj/config/server/ListenerTest.java

@@ -25,33 +25,28 @@
 */
package org.forgerock.opendj.config.server;

import static org.fest.assertions.Assertions.*;
import static org.forgerock.opendj.ldif.LDIF.*;
import static org.mockito.Mockito.*;
import static org.fest.assertions.Assertions.assertThat;
import static org.forgerock.opendj.ldif.LDIF.makeEntry;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
import static org.mockito.Matchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import java.util.Arrays;

import org.forgerock.opendj.server.config.server.RootCfg;
import org.forgerock.opendj.config.AdminTestCase;
import org.forgerock.opendj.config.PropertyDefinitionsOptions;
import org.forgerock.opendj.config.TestCfg;
import org.forgerock.opendj.config.TestParentCfg;
import org.forgerock.opendj.config.server.ConfigAddListenerAdaptor;
import org.forgerock.opendj.config.server.ConfigDeleteListenerAdaptor;
import org.forgerock.opendj.config.server.ConfigurationAddListener;
import org.forgerock.opendj.config.server.ConfigurationChangeListener;
import org.forgerock.opendj.config.server.ConfigurationDeleteListener;
import org.forgerock.opendj.config.server.DelayedConfigAddListener;
import org.forgerock.opendj.config.server.ServerManagedObject;
import org.forgerock.opendj.config.server.ServerManagedObjectAddListenerAdaptor;
import org.forgerock.opendj.config.server.ServerManagedObjectDeleteListenerAdaptor;
import org.forgerock.opendj.config.server.ServerManagementContext;
import org.forgerock.opendj.config.server.spi.ConfigAddListener;
import org.forgerock.opendj.config.server.spi.ConfigChangeListener;
import org.forgerock.opendj.config.server.spi.ConfigDeleteListener;
import org.forgerock.opendj.config.server.spi.ConfigurationRepository;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.Entry;
import org.forgerock.opendj.server.config.server.RootCfg;
import org.mockito.ArgumentCaptor;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;

 opendj-config/src/test/java/org/forgerock/opendj/config/server/MockConstraint.java

@@ -31,8 +31,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.Constraint;
import org.forgerock.opendj.config.client.ClientConstraintHandler;
import org.forgerock.opendj.config.server.ServerConstraintHandler;
import org.forgerock.opendj.config.server.ServerManagedObject;
import org.forgerock.opendj.config.server.spi.ConfigurationRepository;
import org.forgerock.opendj.ldap.DN;
import org.testng.Assert;