From 44d9730b69143d1fd7cd8b382b557e2c9d65225e Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 10 Jan 2014 15:43:10 +0000
Subject: [PATCH] Minor changes:
---
opendj-config/src/main/resources/config/stylesheets/serverMO.xsl | 0
opendj-config/src/test/java/org/forgerock/opendj/config/AbstractManagedObjectDefinitionTest.java | 9 -
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualStaticGroupImplementationConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/property-types/ip-address.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DictionaryPasswordValidatorConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExactMatchIdentityMapperConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AlertHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SimilarityBasedPasswordValidatorConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/preprocessor.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationSynchronizationProviderConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/catalog.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedErrorLogPublisherConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/property-types/duration.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AESPasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NetworkGroupPluginConfiguration.xml | 0
opendj-config/src/main/java/org/forgerock/opendj/config/ClassLoaderProvider.java | 32 +--
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetConnectionIdExtendedOperationHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordModifyExtendedOperationHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryUsageMonitorProviderConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/property-types/oid.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalChangelogDomainConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/KeyManagerProviderConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java | 8 -
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntityTagVirtualAttributeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/QOSPolicyConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NullBackendConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/server/MockConstraint.java | 2
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java | 9 -
opendj-config/src/main/resources/config/stylesheets/conditions.xsl | 0
opendj-config/src/test/java/org/forgerock/opendj/config/server/DNBuilderTest.java | 3
opendj-config/src/test/java/org/forgerock/opendj/config/server/DefaultBehaviorTest.java | 12 -
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeCleanupPluginConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/JPEGAttributeSyntaxConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueCharactersPasswordValidatorConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/MockLDAPConnection.java | 5
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccountStatusNotificationHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CramMD5SASLMechanismHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NetworkGroupConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/HasSubordinatesVirtualAttributeConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/SizePropertyDefinitionTest.java | 14 -
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDPluginConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeSyntaxConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/cliMOProfile.xsl | 0
opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java | 1
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/UserDefinedVirtualAttributeConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java | 5
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateMapperConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java | 3
opendj-config/src/main/resources/config/stylesheets/property-types/password.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FIFOEntryCacheConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/property-types/extensible-matching-rule-type.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptPasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClearPasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBIndexConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TimeLimitLogRotationPolicyConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessControlHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/property-types/java-class.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA256PasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/clientMO.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalBackendWorkflowElementConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualAttributeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/Base64PasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordValidatorConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/DurationUnitTest.java | 11 +
opendj-config-maven-plugin/src/main/java/org/forgerock/opendj/maven/OpendjConfigMojo.java | 10
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RandomPasswordGeneratorConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA384PasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/package-info.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StackTraceMonitorProviderConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DynamicGroupImplementationConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FingerprintCertificateMapperConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordGeneratorConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDSEBackendConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/property-types/dn.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustStoreBackendConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA512PasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SNMPConnectionHandlerConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java | 6
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedKeyManagerProviderConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginRootConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRetentionPolicyConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConfigFileHandlerBackendConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/DNPropertyDefinitionTest.java | 6
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectDNToUserAttributeCertificateMapperConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/VersionMonitorProviderConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PBKDF2PasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/TestTopCfgDefnTest.java | 8
opendj-config/src/main/resources/config/stylesheets/metaMO.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAccessLogPublisherConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/messagesMO.xsl | 0
opendj-config/src/test/java/org/forgerock/opendj/config/SizeUnitTest.java | 3
opendj-config/src/test/java/org/forgerock/opendj/config/StringPropertyDefinitionTest.java | 6
opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgDefn.java | 19 --
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAuditLogPublisherConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DseeCompatAccessControlHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GlobalConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollationMatchingRuleConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CharacterSetPasswordValidatorConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/IsMemberOfVirtualAttributeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CancelExtendedOperationHandlerConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/ModifyEntryMockLDAPConnection.java | 3
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PKCS11KeyManagerProviderConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNUserConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFConnectionHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/property-types/integer.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ResourceLimitsQOSPolicyConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/text-utilities.xsl | 0
opendj-config/src/main/resources/config/stylesheets/property-types/enumeration.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StaticGroupImplementationConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MD5PasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SynchronizationProviderConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptoManagerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SystemInfoMonitorProviderConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogPublisherConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemberVirtualAttributeConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMockTest.java | 6
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RegularExpressionIdentityMapperConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXAlertHandlerConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgClient.java | 4
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRetentionPolicyConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugLogPublisherConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedTrustManagerProviderConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RC4PasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReferentialIntegrityPluginConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/admin-ldap.xsd | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileCountLogRetentionPolicyConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ParallelWorkQueueConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlowfishPasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RequestFilteringQOSPolicyConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PlainSASLMechanismHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateAttributeSyntaxConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ProfilerPluginConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CountryStringAttributeSyntaxConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkflowElementConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClientConnectionMonitorProviderConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GoverningStructureRuleVirtualAttributeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFBackendConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPAttributeDescriptionListPluginConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationDomainConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogFilteringCriteriaConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/property-types/string.xsl | 0
opendj-config/src/test/java/org/forgerock/opendj/config/ValidateConfigDefinitionsTest.java | 5
opendj-config/src/test/java/org/forgerock/opendj/config/server/ConstraintTest.java | 12 -
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExtensionConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectEqualsDNCertificateMapperConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaBackendConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SoftReferenceEntryCacheConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java | 14 -
opendj-config/src/test/java/org/forgerock/opendj/config/MockLDAPProfile.java | 5
opendj-config/src/test/java/org/forgerock/opendj/config/AttributeTypePropertyDefinitionTest.java | 7
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryBackendConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AuthenticationPolicyConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackupBackendConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/LDAPProfileTest.java | 3
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NumSubordinatesVirtualAttributeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogAccountStatusNotificationHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FractionalLDIFImportPluginConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustManagerProviderConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalSASLMechanismHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/xml.xsd | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SambaPasswordPluginConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/AggregationPropertyDefinitionTest.java | 2
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryDNVirtualAttributeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AnonymousSASLMechanismHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/IdentityMapperConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedMD5PasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/java-utilities.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SevenBitCleanPluginConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordExpirationTimeVirtualAttributeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TelephoneNumberAttributeSyntaxConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlindTrustManagerProviderConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXConnectionHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogPublisherConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/admin.xsd | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GroupImplementationConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPConnectionHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRotationPolicyConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MatchingRuleConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/manifestMO.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SASLMechanismHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StructuralObjectClassVirtualAttributeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FixedTimeLogRotationPolicyConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyImportPluginConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRotationPolicyConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResourceTest.java | 3
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicySubentryVirtualAttributeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/LDAPClientTest.java | 5
opendj-config/src/main/resources/config/stylesheets/admin-cli.xsd | 0
opendj-config/src/main/resources/config/stylesheets/admin-preprocessor.xsd | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheMonitorProviderConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/DurationPropertyDefinitionTest.java | 17 --
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExtendedOperationHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FreeDiskSpaceLogRetentionPolicyConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA1PasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WhoAmIExtendedOperationHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBVLVIndexConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkflowConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StartTLSExtendedOperationHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConnectionHandlerConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/BooleanPropertyDefinitionTest.java | 5
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/property-types/ip-address-mask.xsl | 0
opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfg.java | 1
opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectPathTest.java | 8
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LastModPluginConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java | 14 -
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDVirtualAttributeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GSSAPISASLMechanismHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedHTTPAccessLogPublisherConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAlertHandlerConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java | 21 +-
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorBackendConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubschemaSubentryVirtualAttributeConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java | 7
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueAttributePluginConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TaskBackendConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TripleDESPasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/property-types.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileSystemEntryCacheConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/server/ListenerTest.java | 23 +--
opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java | 7 -
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkQueueConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java | 18 --
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DigestMD5SASLMechanismHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/property-types/aci.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DirectoryStringAttributeSyntaxConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/property-types/boolean.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ChangeNumberControlPluginConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RepeatedCharactersPasswordValidatorConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/ldapMOProfile.xsl | 0
opendj-config/src/main/resources/config/stylesheets/property-types/size.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TraditionalWorkQueueConfiguration.xml | 0
opendj-config/src/main/resources/config/stylesheets/abbreviations.xsl | 0
opendj-config/src/main/resources/config/stylesheets/property-types/aggregation.xsl | 0
opendj-config/src/main/resources/config/stylesheets/property-types/attribute-type.xsl | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorProviderConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogPublisherConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPConnectionHandlerConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LengthBasedPasswordValidatorConfiguration.xml | 0
opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java | 5
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SHA1PasswordStorageSchemeConfiguration.xml | 0
opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAccessLogPublisherConfiguration.xml | 0
262 files changed, 98 insertions(+), 269 deletions(-)
diff --git a/opendj-config-maven-plugin/src/main/java/org/forgerock/opendj/maven/OpendjConfigMojo.java b/opendj-config-maven-plugin/src/main/java/org/forgerock/opendj/maven/OpendjConfigMojo.java
index 12e8809..e58bda1 100644
--- a/opendj-config-maven-plugin/src/main/java/org/forgerock/opendj/maven/OpendjConfigMojo.java
+++ b/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;
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/ClassLoaderProvider.java b/opendj-config/src/main/java/org/forgerock/opendj/config/ClassLoaderProvider.java
index c42c932..34ac3cb 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/ClassLoaderProvider.java
+++ b/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);
}
diff --git a/opendj-config/src/main/resources/stylesheets/abbreviations.xsl b/opendj-config/src/main/resources/config/stylesheets/abbreviations.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/abbreviations.xsl
rename to opendj-config/src/main/resources/config/stylesheets/abbreviations.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/admin-cli.xsd b/opendj-config/src/main/resources/config/stylesheets/admin-cli.xsd
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/admin-cli.xsd
rename to opendj-config/src/main/resources/config/stylesheets/admin-cli.xsd
diff --git a/opendj-config/src/main/resources/stylesheets/admin-ldap.xsd b/opendj-config/src/main/resources/config/stylesheets/admin-ldap.xsd
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/admin-ldap.xsd
rename to opendj-config/src/main/resources/config/stylesheets/admin-ldap.xsd
diff --git a/opendj-config/src/main/resources/stylesheets/admin-preprocessor.xsd b/opendj-config/src/main/resources/config/stylesheets/admin-preprocessor.xsd
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/admin-preprocessor.xsd
rename to opendj-config/src/main/resources/config/stylesheets/admin-preprocessor.xsd
diff --git a/opendj-config/src/main/resources/stylesheets/admin.xsd b/opendj-config/src/main/resources/config/stylesheets/admin.xsd
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/admin.xsd
rename to opendj-config/src/main/resources/config/stylesheets/admin.xsd
diff --git a/opendj-config/src/main/resources/stylesheets/catalog.xml b/opendj-config/src/main/resources/config/stylesheets/catalog.xml
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/catalog.xml
rename to opendj-config/src/main/resources/config/stylesheets/catalog.xml
diff --git a/opendj-config/src/main/resources/stylesheets/cliMOProfile.xsl b/opendj-config/src/main/resources/config/stylesheets/cliMOProfile.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/cliMOProfile.xsl
rename to opendj-config/src/main/resources/config/stylesheets/cliMOProfile.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/clientMO.xsl b/opendj-config/src/main/resources/config/stylesheets/clientMO.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/clientMO.xsl
rename to opendj-config/src/main/resources/config/stylesheets/clientMO.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/conditions.xsl b/opendj-config/src/main/resources/config/stylesheets/conditions.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/conditions.xsl
rename to opendj-config/src/main/resources/config/stylesheets/conditions.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/java-utilities.xsl b/opendj-config/src/main/resources/config/stylesheets/java-utilities.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/java-utilities.xsl
rename to opendj-config/src/main/resources/config/stylesheets/java-utilities.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/ldapMOProfile.xsl b/opendj-config/src/main/resources/config/stylesheets/ldapMOProfile.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/ldapMOProfile.xsl
rename to opendj-config/src/main/resources/config/stylesheets/ldapMOProfile.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/manifestMO.xsl b/opendj-config/src/main/resources/config/stylesheets/manifestMO.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/manifestMO.xsl
rename to opendj-config/src/main/resources/config/stylesheets/manifestMO.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/messagesMO.xsl b/opendj-config/src/main/resources/config/stylesheets/messagesMO.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/messagesMO.xsl
rename to opendj-config/src/main/resources/config/stylesheets/messagesMO.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/metaMO.xsl b/opendj-config/src/main/resources/config/stylesheets/metaMO.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/metaMO.xsl
rename to opendj-config/src/main/resources/config/stylesheets/metaMO.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/package-info.xsl b/opendj-config/src/main/resources/config/stylesheets/package-info.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/package-info.xsl
rename to opendj-config/src/main/resources/config/stylesheets/package-info.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/preprocessor.xsl b/opendj-config/src/main/resources/config/stylesheets/preprocessor.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/preprocessor.xsl
rename to opendj-config/src/main/resources/config/stylesheets/preprocessor.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/aci.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/aci.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/aci.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/aci.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/aggregation.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/aggregation.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/aggregation.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/aggregation.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/attribute-type.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/attribute-type.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/attribute-type.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/attribute-type.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/boolean.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/boolean.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/boolean.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/boolean.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/dn.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/dn.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/dn.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/dn.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/duration.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/duration.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/duration.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/duration.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/enumeration.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/enumeration.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/enumeration.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/enumeration.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/extensible-matching-rule-type.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/extensible-matching-rule-type.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/extensible-matching-rule-type.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/extensible-matching-rule-type.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/integer.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/integer.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/integer.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/integer.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/ip-address-mask.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/ip-address-mask.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/ip-address-mask.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/ip-address-mask.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/ip-address.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/ip-address.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/ip-address.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/ip-address.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/java-class.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/java-class.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/java-class.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/java-class.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/oid.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/oid.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/oid.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/oid.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/password.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/password.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/password.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/password.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/size.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/size.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/size.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/size.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/property-types/string.xsl b/opendj-config/src/main/resources/config/stylesheets/property-types/string.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/property-types/string.xsl
rename to opendj-config/src/main/resources/config/stylesheets/property-types/string.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/serverMO.xsl b/opendj-config/src/main/resources/config/stylesheets/serverMO.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/serverMO.xsl
rename to opendj-config/src/main/resources/config/stylesheets/serverMO.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/text-utilities.xsl b/opendj-config/src/main/resources/config/stylesheets/text-utilities.xsl
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/text-utilities.xsl
rename to opendj-config/src/main/resources/config/stylesheets/text-utilities.xsl
diff --git a/opendj-config/src/main/resources/stylesheets/xml.xsd b/opendj-config/src/main/resources/config/stylesheets/xml.xsd
similarity index 100%
rename from opendj-config/src/main/resources/stylesheets/xml.xsd
rename to opendj-config/src/main/resources/config/stylesheets/xml.xsd
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AESPasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AESPasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AESPasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AESPasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AccessControlHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessControlHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AccessControlHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessControlHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AccessLogFilteringCriteriaConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogFilteringCriteriaConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AccessLogFilteringCriteriaConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogFilteringCriteriaConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AccessLogPublisherConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AccessLogPublisherConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogPublisherConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AccountStatusNotificationHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccountStatusNotificationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AccountStatusNotificationHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccountStatusNotificationHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AlertHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AlertHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AlertHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AlertHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AnonymousSASLMechanismHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AnonymousSASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AnonymousSASLMechanismHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AnonymousSASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AttributeCleanupPluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeCleanupPluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AttributeCleanupPluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeCleanupPluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AttributeSyntaxConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AttributeSyntaxConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeSyntaxConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AuthenticationPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AuthenticationPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/AuthenticationPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/AuthenticationPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/BackendConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/BackendConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/BackupBackendConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackupBackendConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/BackupBackendConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackupBackendConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/Base64PasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/Base64PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/Base64PasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/Base64PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/BlindTrustManagerProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlindTrustManagerProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/BlindTrustManagerProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlindTrustManagerProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/BlowfishPasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlowfishPasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/BlowfishPasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlowfishPasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CancelExtendedOperationHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CancelExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CancelExtendedOperationHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CancelExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CertificateAttributeSyntaxConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateAttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CertificateAttributeSyntaxConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateAttributeSyntaxConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CertificateMapperConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateMapperConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CertificateMapperConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateMapperConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ChangeNumberControlPluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ChangeNumberControlPluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ChangeNumberControlPluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ChangeNumberControlPluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CharacterSetPasswordValidatorConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CharacterSetPasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CharacterSetPasswordValidatorConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CharacterSetPasswordValidatorConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ClearPasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClearPasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ClearPasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClearPasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ClientConnectionMonitorProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClientConnectionMonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ClientConnectionMonitorProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClientConnectionMonitorProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CollationMatchingRuleConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollationMatchingRuleConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CollationMatchingRuleConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollationMatchingRuleConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ConfigFileHandlerBackendConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConfigFileHandlerBackendConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ConfigFileHandlerBackendConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConfigFileHandlerBackendConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ConnectionHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConnectionHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ConnectionHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConnectionHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CountryStringAttributeSyntaxConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CountryStringAttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CountryStringAttributeSyntaxConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CountryStringAttributeSyntaxConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CramMD5SASLMechanismHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CramMD5SASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CramMD5SASLMechanismHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CramMD5SASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CryptPasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptPasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CryptPasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptPasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CryptoManagerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptoManagerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/CryptoManagerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptoManagerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DebugLogPublisherConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DebugLogPublisherConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugLogPublisherConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DictionaryPasswordValidatorConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DictionaryPasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DictionaryPasswordValidatorConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DictionaryPasswordValidatorConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DigestMD5SASLMechanismHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DigestMD5SASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DigestMD5SASLMechanismHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DigestMD5SASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DirectoryStringAttributeSyntaxConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DirectoryStringAttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DirectoryStringAttributeSyntaxConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DirectoryStringAttributeSyntaxConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DseeCompatAccessControlHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DseeCompatAccessControlHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DseeCompatAccessControlHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DseeCompatAccessControlHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DynamicGroupImplementationConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DynamicGroupImplementationConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/DynamicGroupImplementationConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/DynamicGroupImplementationConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/EntityTagVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntityTagVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/EntityTagVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntityTagVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/EntryCacheConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/EntryCacheConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/EntryCacheMonitorProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheMonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/EntryCacheMonitorProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheMonitorProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/EntryDNVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryDNVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/EntryDNVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryDNVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/EntryUUIDPluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDPluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/EntryUUIDPluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDPluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/EntryUUIDVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/EntryUUIDVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ErrorLogAccountStatusNotificationHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogAccountStatusNotificationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ErrorLogAccountStatusNotificationHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogAccountStatusNotificationHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ErrorLogPublisherConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ErrorLogPublisherConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogPublisherConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ExactMatchIdentityMapperConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExactMatchIdentityMapperConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ExactMatchIdentityMapperConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExactMatchIdentityMapperConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ExtendedOperationHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ExtendedOperationHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ExtensionConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExtensionConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ExtensionConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExtensionConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ExternalChangelogDomainConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalChangelogDomainConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ExternalChangelogDomainConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalChangelogDomainConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ExternalSASLMechanismHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalSASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ExternalSASLMechanismHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalSASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FIFOEntryCacheConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FIFOEntryCacheConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FIFOEntryCacheConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FIFOEntryCacheConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedAccessLogPublisherConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAccessLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedAccessLogPublisherConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAccessLogPublisherConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedAuditLogPublisherConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAuditLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedAuditLogPublisherConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAuditLogPublisherConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedErrorLogPublisherConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedErrorLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedErrorLogPublisherConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedErrorLogPublisherConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedHTTPAccessLogPublisherConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedHTTPAccessLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedHTTPAccessLogPublisherConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedHTTPAccessLogPublisherConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedKeyManagerProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedKeyManagerProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedKeyManagerProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedKeyManagerProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedTrustManagerProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedTrustManagerProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileBasedTrustManagerProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedTrustManagerProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileCountLogRetentionPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileCountLogRetentionPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileCountLogRetentionPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileCountLogRetentionPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileSystemEntryCacheConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileSystemEntryCacheConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FileSystemEntryCacheConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileSystemEntryCacheConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FingerprintCertificateMapperConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FingerprintCertificateMapperConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FingerprintCertificateMapperConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FingerprintCertificateMapperConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FixedTimeLogRotationPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FixedTimeLogRotationPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FixedTimeLogRotationPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FixedTimeLogRotationPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FractionalLDIFImportPluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FractionalLDIFImportPluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FractionalLDIFImportPluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FractionalLDIFImportPluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FreeDiskSpaceLogRetentionPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FreeDiskSpaceLogRetentionPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/FreeDiskSpaceLogRetentionPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/FreeDiskSpaceLogRetentionPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/GSSAPISASLMechanismHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GSSAPISASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/GSSAPISASLMechanismHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GSSAPISASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/GetConnectionIdExtendedOperationHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetConnectionIdExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/GetConnectionIdExtendedOperationHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetConnectionIdExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/GlobalConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GlobalConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/GlobalConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GlobalConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/GoverningStructureRuleVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GoverningStructureRuleVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/GoverningStructureRuleVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GoverningStructureRuleVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/GroupImplementationConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GroupImplementationConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/GroupImplementationConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/GroupImplementationConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/HTTPAccessLogPublisherConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAccessLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/HTTPAccessLogPublisherConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAccessLogPublisherConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/HTTPConnectionHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPConnectionHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/HTTPConnectionHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPConnectionHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/HasSubordinatesVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/HasSubordinatesVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/HasSubordinatesVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/HasSubordinatesVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/IdentityMapperConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/IdentityMapperConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/IdentityMapperConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/IdentityMapperConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/IsMemberOfVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/IsMemberOfVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/IsMemberOfVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/IsMemberOfVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/JMXAlertHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXAlertHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/JMXAlertHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXAlertHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/JMXConnectionHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXConnectionHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/JMXConnectionHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXConnectionHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/JPEGAttributeSyntaxConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/JPEGAttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/JPEGAttributeSyntaxConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/JPEGAttributeSyntaxConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/KeyManagerProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/KeyManagerProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/KeyManagerProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/KeyManagerProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LDAPAttributeDescriptionListPluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPAttributeDescriptionListPluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LDAPAttributeDescriptionListPluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPAttributeDescriptionListPluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LDAPConnectionHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPConnectionHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LDAPConnectionHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPConnectionHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LDIFBackendConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFBackendConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LDIFBackendConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFBackendConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LDIFConnectionHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFConnectionHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LDIFConnectionHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFConnectionHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LastModPluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LastModPluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LastModPluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LastModPluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LengthBasedPasswordValidatorConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LengthBasedPasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LengthBasedPasswordValidatorConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LengthBasedPasswordValidatorConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LocalBackendWorkflowElementConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalBackendWorkflowElementConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LocalBackendWorkflowElementConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalBackendWorkflowElementConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LocalDBIndexConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBIndexConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LocalDBIndexConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBIndexConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LocalDBVLVIndexConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBVLVIndexConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LocalDBVLVIndexConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBVLVIndexConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LogPublisherConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LogPublisherConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogPublisherConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LogRetentionPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRetentionPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LogRetentionPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRetentionPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LogRotationPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRotationPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/LogRotationPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRotationPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MD5PasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MD5PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MD5PasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MD5PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MatchingRuleConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MatchingRuleConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MatchingRuleConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MatchingRuleConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MemberVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemberVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MemberVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemberVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MemoryBackendConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryBackendConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MemoryBackendConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryBackendConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MemoryUsageMonitorProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryUsageMonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MemoryUsageMonitorProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryUsageMonitorProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MonitorBackendConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorBackendConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MonitorBackendConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorBackendConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MonitorProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/MonitorProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/NetworkGroupConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NetworkGroupConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/NetworkGroupConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NetworkGroupConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/NetworkGroupPluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NetworkGroupPluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/NetworkGroupPluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NetworkGroupPluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/NullBackendConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NullBackendConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/NullBackendConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NullBackendConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/NumSubordinatesVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NumSubordinatesVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/NumSubordinatesVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/NumSubordinatesVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PBKDF2PasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PBKDF2PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PBKDF2PasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PBKDF2PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PKCS11KeyManagerProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PKCS11KeyManagerProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PKCS11KeyManagerProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PKCS11KeyManagerProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/Package.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/Package.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ParallelWorkQueueConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ParallelWorkQueueConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ParallelWorkQueueConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ParallelWorkQueueConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordExpirationTimeVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordExpirationTimeVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordExpirationTimeVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordExpirationTimeVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordGeneratorConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordGeneratorConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordGeneratorConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordGeneratorConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordModifyExtendedOperationHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordModifyExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordModifyExtendedOperationHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordModifyExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordPolicyImportPluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyImportPluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordPolicyImportPluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyImportPluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordPolicySubentryVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicySubentryVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordPolicySubentryVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicySubentryVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordValidatorConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PasswordValidatorConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordValidatorConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PlainSASLMechanismHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PlainSASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PlainSASLMechanismHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PlainSASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PluginRootConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginRootConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/PluginRootConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginRootConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ProfilerPluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ProfilerPluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ProfilerPluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ProfilerPluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/QOSPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/QOSPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/QOSPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/QOSPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RC4PasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RC4PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RC4PasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RC4PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RandomPasswordGeneratorConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RandomPasswordGeneratorConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RandomPasswordGeneratorConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RandomPasswordGeneratorConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ReferentialIntegrityPluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReferentialIntegrityPluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ReferentialIntegrityPluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReferentialIntegrityPluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RegularExpressionIdentityMapperConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RegularExpressionIdentityMapperConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RegularExpressionIdentityMapperConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RegularExpressionIdentityMapperConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RepeatedCharactersPasswordValidatorConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RepeatedCharactersPasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RepeatedCharactersPasswordValidatorConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RepeatedCharactersPasswordValidatorConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ReplicationDomainConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationDomainConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ReplicationDomainConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationDomainConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ReplicationSynchronizationProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationSynchronizationProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ReplicationSynchronizationProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationSynchronizationProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RequestFilteringQOSPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RequestFilteringQOSPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RequestFilteringQOSPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RequestFilteringQOSPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ResourceLimitsQOSPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ResourceLimitsQOSPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/ResourceLimitsQOSPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/ResourceLimitsQOSPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RootConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RootConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RootDNConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RootDNConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RootDNUserConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNUserConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RootDNUserConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNUserConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RootDSEBackendConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDSEBackendConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/RootDSEBackendConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDSEBackendConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SASLMechanismHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SASLMechanismHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SHA1PasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SHA1PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SHA1PasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SHA1PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SMTPAlertHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAlertHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SMTPAlertHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAlertHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SNMPConnectionHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SNMPConnectionHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SNMPConnectionHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SNMPConnectionHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SaltedMD5PasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedMD5PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SaltedMD5PasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedMD5PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SaltedSHA1PasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA1PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SaltedSHA1PasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA1PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SaltedSHA256PasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA256PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SaltedSHA256PasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA256PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SaltedSHA384PasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA384PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SaltedSHA384PasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA384PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SaltedSHA512PasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA512PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SaltedSHA512PasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA512PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SambaPasswordPluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SambaPasswordPluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SambaPasswordPluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SambaPasswordPluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SchemaBackendConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaBackendConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SchemaBackendConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaBackendConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SevenBitCleanPluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SevenBitCleanPluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SevenBitCleanPluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SevenBitCleanPluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SimilarityBasedPasswordValidatorConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SimilarityBasedPasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SimilarityBasedPasswordValidatorConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SimilarityBasedPasswordValidatorConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SizeLimitLogRetentionPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRetentionPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SizeLimitLogRetentionPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRetentionPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SizeLimitLogRotationPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRotationPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SizeLimitLogRotationPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRotationPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SoftReferenceEntryCacheConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SoftReferenceEntryCacheConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SoftReferenceEntryCacheConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SoftReferenceEntryCacheConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/StackTraceMonitorProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StackTraceMonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/StackTraceMonitorProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StackTraceMonitorProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/StartTLSExtendedOperationHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StartTLSExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/StartTLSExtendedOperationHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StartTLSExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/StaticGroupImplementationConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StaticGroupImplementationConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/StaticGroupImplementationConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StaticGroupImplementationConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/StructuralObjectClassVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StructuralObjectClassVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/StructuralObjectClassVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/StructuralObjectClassVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SubjectDNToUserAttributeCertificateMapperConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectDNToUserAttributeCertificateMapperConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SubjectDNToUserAttributeCertificateMapperConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectDNToUserAttributeCertificateMapperConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SubjectEqualsDNCertificateMapperConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectEqualsDNCertificateMapperConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SubjectEqualsDNCertificateMapperConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectEqualsDNCertificateMapperConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SubschemaSubentryVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubschemaSubentryVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SubschemaSubentryVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubschemaSubentryVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SynchronizationProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SynchronizationProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SynchronizationProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SynchronizationProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SystemInfoMonitorProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SystemInfoMonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/SystemInfoMonitorProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/SystemInfoMonitorProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TaskBackendConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TaskBackendConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TaskBackendConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TaskBackendConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TelephoneNumberAttributeSyntaxConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TelephoneNumberAttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TelephoneNumberAttributeSyntaxConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TelephoneNumberAttributeSyntaxConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TimeLimitLogRotationPolicyConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TimeLimitLogRotationPolicyConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TimeLimitLogRotationPolicyConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TimeLimitLogRotationPolicyConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TraditionalWorkQueueConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TraditionalWorkQueueConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TraditionalWorkQueueConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TraditionalWorkQueueConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TripleDESPasswordStorageSchemeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TripleDESPasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TripleDESPasswordStorageSchemeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TripleDESPasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TrustManagerProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustManagerProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TrustManagerProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustManagerProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TrustStoreBackendConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustStoreBackendConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/TrustStoreBackendConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustStoreBackendConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/UniqueAttributePluginConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueAttributePluginConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/UniqueAttributePluginConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueAttributePluginConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/UniqueCharactersPasswordValidatorConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueCharactersPasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/UniqueCharactersPasswordValidatorConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueCharactersPasswordValidatorConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/UserDefinedVirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/UserDefinedVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/UserDefinedVirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/UserDefinedVirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/VersionMonitorProviderConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/VersionMonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/VersionMonitorProviderConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/VersionMonitorProviderConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/VirtualAttributeConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/VirtualAttributeConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualAttributeConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/VirtualStaticGroupImplementationConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualStaticGroupImplementationConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/VirtualStaticGroupImplementationConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualStaticGroupImplementationConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/WhoAmIExtendedOperationHandlerConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WhoAmIExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/WhoAmIExtendedOperationHandlerConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WhoAmIExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/WorkQueueConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkQueueConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/WorkQueueConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkQueueConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/WorkflowConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkflowConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/WorkflowConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkflowConfiguration.xml
diff --git a/opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/WorkflowElementConfiguration.xml b/opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkflowElementConfiguration.xml
similarity index 100%
rename from opendj-config/src/main/resources/definitions/org/forgerock/opendj/server/config/WorkflowElementConfiguration.xml
rename to opendj-config/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkflowElementConfiguration.xml
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/AbstractManagedObjectDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/AbstractManagedObjectDefinitionTest.java
index 47c053a..da384e8 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/AbstractManagedObjectDefinitionTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java b/opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java
index c2797aa..b9eba52 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/AdminTestCase.java
+++ b/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;
/**
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/AggregationPropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/AggregationPropertyDefinitionTest.java
index bd36637..9cd4c83 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/AggregationPropertyDefinitionTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/AttributeTypePropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/AttributeTypePropertyDefinitionTest.java
index d401087..5b4db81 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/AttributeTypePropertyDefinitionTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/BooleanPropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/BooleanPropertyDefinitionTest.java
index 62f0bf8..be998a2 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/BooleanPropertyDefinitionTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java
index c08caec..50f3f54 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
index f255f9a..1c27e00 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
+++ b/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;
/**
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMockTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMockTest.java
index b34e62f..bd0eed2 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/ConfigurationMockTest.java
+++ b/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;
/**
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/DNPropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/DNPropertyDefinitionTest.java
index 711ecde..3c50465 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/DNPropertyDefinitionTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/DurationPropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/DurationPropertyDefinitionTest.java
index 49220d3..97a7796 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/DurationPropertyDefinitionTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/DurationUnitTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/DurationUnitTest.java
index a9fc959..bc95abc 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/DurationUnitTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java
index bf2edd2..b35ecab 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/EnumPropertyDefinitionTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java
index ac6eda3..0ad3c1d 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/IntegerPropertyDefinitionTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/LDAPProfileTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/LDAPProfileTest.java
index dd4f5a3..bcfd343 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/LDAPProfileTest.java
+++ b/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")
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResourceTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResourceTest.java
index f608877..d36243c 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectDefinitionI18NResourceTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectPathTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectPathTest.java
index 657086b..787afed 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/ManagedObjectPathTest.java
+++ b/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")
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/MockLDAPProfile.java b/opendj-config/src/test/java/org/forgerock/opendj/config/MockLDAPProfile.java
index b3a5b3f..30afa19 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/MockLDAPProfile.java
+++ b/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.
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java
index c1efeef..64a0010 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/RelativeInheritedDefaultBehaviorProviderTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/SizePropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/SizePropertyDefinitionTest.java
index 2048b33..864e0a7 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/SizePropertyDefinitionTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/SizeUnitTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/SizeUnitTest.java
index 79e09a9..718a7cf 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/SizeUnitTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/StringPropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/StringPropertyDefinitionTest.java
index 2ba1a09..26cadbe 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/StringPropertyDefinitionTest.java
+++ b/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")
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java
index bc1ea1d..8f29f68 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestCfg.java
+++ b/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.
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfg.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfg.java
index 68b96f8..6a4f927 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfg.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgClient.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgClient.java
index 29aa392..4d33ae6 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgClient.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgDefn.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgDefn.java
index 0bc288b..c406bba 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestChildCfgDefn.java
+++ b/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
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java
index e971ae4..8015dd3 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java
index 38552a5..e1739d2 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java
index 6ce4e8d..2d29dcc 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgDefn.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestTopCfgDefnTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestTopCfgDefnTest.java
index af21b91..3093031 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestTopCfgDefnTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ValidateConfigDefinitionsTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ValidateConfigDefinitionsTest.java
index 3cec3b8..37fa0ce 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/ValidateConfigDefinitionsTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java
index 6ea7032..5ddbf3a 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/AggregationClientTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/LDAPClientTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/LDAPClientTest.java
index 15d4287..70b0d43 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/LDAPClientTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/MockLDAPConnection.java b/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/MockLDAPConnection.java
index 7e34700..ab089e2 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/MockLDAPConnection.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/ModifyEntryMockLDAPConnection.java b/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/ModifyEntryMockLDAPConnection.java
index b6a3aee..e7c0f56 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/ModifyEntryMockLDAPConnection.java
+++ b/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
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
index cb0c636..27ae3d8 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/AdminTestCaseUtils.java
+++ b/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
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
index 7a96b6e0..ba2116f 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/ConstraintTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/ConstraintTest.java
index a6c75f0..73be5bb 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/ConstraintTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/DNBuilderTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/DNBuilderTest.java
index 489ca3b..d9b38eb 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/DNBuilderTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/DefaultBehaviorTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/DefaultBehaviorTest.java
index 82f720f..a3f9d60 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/DefaultBehaviorTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/ListenerTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/ListenerTest.java
index 3f5b936..40b963e 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/ListenerTest.java
+++ b/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;
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/MockConstraint.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/MockConstraint.java
index 2df1526..b82abc2 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/MockConstraint.java
+++ b/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;
--
Gitblit v1.10.0