From 47d2767b9dcbe773d73a6532269b7eb0856897d1 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 13 Feb 2015 10:10:41 +0000
Subject: [PATCH] OPENDJ-1777 Add opendj-maven-plugin

---
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileCountLogRetentionPolicyConfiguration.xml                      |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNConfiguration.xml                                           |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetConnectionIdExtendedOperationHandlerConfiguration.xml          |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyConfiguration.xml                                   |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlowfishPasswordStorageSchemeConfiguration.xml                    |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordValidatorConfiguration.xml                                |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/serverMO.xsl                                                                                 |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DirectoryStringAttributeSyntaxConfiguration.xml                   |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/KeyManagerProviderConfiguration.xml                               |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SynchronizationProviderConfiguration.xml                          |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GroupImplementationConfiguration.xml                              |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/dn.xsl                                                                        |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TaskBackendConfiguration.xml                                      |    0 
 opendj-server-legacy/pom.xml                                                                                                                           |  148 +++++++++++++----------------
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ParallelWorkQueueConfiguration.xml                                |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/java-class.xsl                                                                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDSEBackendConfiguration.xml                                   |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedKeyManagerProviderConfiguration.xml                      |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaBackendConfiguration.xml                                    |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlindTrustManagerProviderConfiguration.xml                        |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogAccountStatusNotificationHandlerConfiguration.xml         |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedHTTPAccessLogPublisherConfiguration.xml                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CoreSchemaConfiguration.xml                                       |    0 
 opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/ConcatSchemaMojo.java                                                                     |    9 -
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessControlHandlerConfiguration.xml                             |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryUsageMonitorProviderConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RegularExpressionIdentityMapperConfiguration.xml                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedTrustManagerProviderConfiguration.xml                    |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LengthBasedPasswordValidatorConfiguration.xml                     |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogPublisherConfiguration.xml                                     |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StackTraceMonitorProviderConfiguration.xml                        |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootConfiguration.xml                                             |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StructuralObjectClassVirtualAttributeConfiguration.xml            |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml                                                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaProviderConfiguration.xml                                   |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/ldapMOProfile.xsl                                                                            |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RC4PasswordStorageSchemeConfiguration.xml                         |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptoManagerConfiguration.xml                                    |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl                                                                                 |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendIndexConfiguration.xml                                     |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA256PasswordStorageSchemeConfiguration.xml                |    0 
 pom.xml                                                                                                                                                |   11 -
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/attribute-type.xsl                                                            |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GoverningStructureRuleVirtualAttributeConfiguration.xml           |    0 
 opendj-maven-plugin/pom.xml                                                                                                                            |   36 +++---
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryBackendConfiguration.xml                                    |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CountryStringAttributeSyntaxConfiguration.xml                     |    0 
 opendj-config/pom.xml                                                                                                                                  |    6 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PersistitBackendConfiguration.xml                                 |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml    |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemberVirtualAttributeConfiguration.xml                           |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAccessLogPublisherConfiguration.xml                      |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateMapperConfiguration.xml                                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StartTLSExtendedOperationHandlerConfiguration.xml                 |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SevenBitCleanPluginConfiguration.xml                              |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PKCS11KeyManagerProviderConfiguration.xml                         |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluggableBackendConfiguration.xml                                 |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/package-info.xsl                                                                             |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRetentionPolicyConfiguration.xml                               |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SystemInfoMonitorProviderConfiguration.xml                        |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DictionaryPasswordValidatorConfiguration.xml                      |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeCleanupPluginConfiguration.xml                           |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HasSubordinatesVirtualAttributeConfiguration.xml                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StaticGroupImplementationConfiguration.xml                        |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/aci.xsl                                                                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SambaPasswordPluginConfiguration.xml                              |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkQueueConfiguration.xml                                        |    0 
 opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java                                                        |   15 +-
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PlainSASLMechanismHandlerConfiguration.xml                        |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryDNVirtualAttributeConfiguration.xml                          |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorBackendConfiguration.xml                                   |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/manifestMO.xsl                                                                               |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SASLMechanismHandlerConfiguration.xml                             |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/integer.xsl                                                                   |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CancelExtendedOperationHandlerConfiguration.xml                   |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/xml.xsd                                                                                      |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/admin-ldap.xsd                                                                               |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/size.xsl                                                                      |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFBackendConfiguration.xml                                      |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MD5PasswordStorageSchemeConfiguration.xml                         |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml                                      |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendConfiguration.xml                                          |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AlertHandlerConfiguration.xml                                     |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalChangelogDomainConfiguration.xml                          |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginConfiguration.xml                                           |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheMonitorProviderConfiguration.xml                        |    0 
 opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateMessageFileMojo.java                                                              |    7 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/IsMemberOfVirtualAttributeConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/java-utilities.xsl                                                                           |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SimilarityBasedPasswordValidatorConfiguration.xml                 |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAuditLogPublisherConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LastModPluginConfiguration.xml                                    |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptPasswordStorageSchemeConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/admin-preprocessor.xsd                                                                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FreeDiskSpaceLogRetentionPolicyConfiguration.xml                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubschemaSubentryVirtualAttributeConfiguration.xml                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntityTagVirtualAttributeConfiguration.xml                        |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VersionMonitorProviderConfiguration.xml                           |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AuthenticationPolicyConfiguration.xml                             |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GlobalConfiguration.xml                                           |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendVLVIndexConfiguration.xml                                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorProviderConfiguration.xml                                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugLogPublisherConfiguration.xml                                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPAttributeDescriptionListPluginConfiguration.xml               |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPConnectionHandlerConfiguration.xml                            |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/cliMOProfile.xsl                                                                             |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Base64PasswordStorageSchemeConfiguration.xml                      |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FixedTimeLogRotationPolicyConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/NumSubordinatesVirtualAttributeConfiguration.xml                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordGeneratorConfiguration.xml                                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordModifyExtendedOperationHandlerConfiguration.xml           |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UserDefinedVirtualAttributeConfiguration.xml                      |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/preprocessor.xsl                                                                             |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AESPasswordStorageSchemeConfiguration.xml                         |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/enumeration.xsl                                                               |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/ip-address.xsl                                                                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml      |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TimeLimitLogRotationPolicyConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustStoreBackendConfiguration.xml                                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBVLVIndexConfiguration.xml                                  |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types.xsl                                                                           |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/oid.xsl                                                                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml          |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClearPasswordStorageSchemeConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SNMPConnectionHandlerConfiguration.xml                            |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FIFOEntryCacheConfiguration.xml                                   |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml             |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DseeCompatAccessControlHandlerConfiguration.xml                   |    0 
 opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/package-info.java                                                                         |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/metaMO.xsl                                                                                   |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA1PasswordStorageSchemeConfiguration.xml                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JPEGAttributeSyntaxConfiguration.xml                              |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustManagerProviderConfiguration.xml                             |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExactMatchIdentityMapperConfiguration.xml                         |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA512PasswordStorageSchemeConfiguration.xml                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectEqualsDNCertificateMapperConfiguration.xml                 |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAccessLogPublisherConfiguration.xml                           |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectDNToUserAttributeCertificateMapperConfiguration.xml        |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SoftReferenceEntryCacheConfiguration.xml                          |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXAlertHandlerConfiguration.xml                                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXConnectionHandlerConfiguration.xml                             |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/extensible-matching-rule-type.xsl                                             |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/aggregation.xsl                                                               |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNUserConfiguration.xml                                       |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/duration.xsl                                                                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordStorageSchemeConfiguration.xml                            |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DigestMD5SASLMechanismHandlerConfiguration.xml                    |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/catalog.xml                                                                                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRotationPolicyConfiguration.xml                                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFConnectionHandlerConfiguration.xml                            |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl                                                                            |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml          |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueCharactersPasswordValidatorConfiguration.xml                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExtendedOperationHandlerConfiguration.xml                         |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicySubentryVirtualAttributeConfiguration.xml           |    0 
 opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java                                                                   |   24 +---
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AnonymousSASLMechanismHandlerConfiguration.xml                    |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogPublisherConfiguration.xml                                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SHA1PasswordStorageSchemeConfiguration.xml                        |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogFilteringCriteriaConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPConnectionHandlerConfiguration.xml                            |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginRootConfiguration.xml                                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalSASLMechanismHandlerConfiguration.xml                     |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRetentionPolicyConfiguration.xml                      |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateAttributeSyntaxConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml                                   |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueAttributePluginConfiguration.xml                            |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationSynchronizationProviderConfiguration.xml               |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/password.xsl                                                                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccountStatusNotificationHandlerConfiguration.xml                 |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RandomPasswordGeneratorConfiguration.xml                          |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReferentialIntegrityPluginConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA384PasswordStorageSchemeConfiguration.xml                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TelephoneNumberAttributeSyntaxConfiguration.xml                   |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationDomainConfiguration.xml                                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CharacterSetPasswordValidatorConfiguration.xml                    |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GSSAPISASLMechanismHandlerConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDVirtualAttributeConfiguration.xml                        |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordExpirationTimeVirtualAttributeConfiguration.xml           |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ProfilerPluginConfiguration.xml                                   |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/messagesMO.xsl                                                                               |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBIndexConfiguration.xml                                     |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/string.xsl                                                                    |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/admin.xsd                                                                                    |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TripleDESPasswordStorageSchemeConfiguration.xml                   |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MatchingRuleConfiguration.xml                                     |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollationMatchingRuleConfiguration.xml                            |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/NullBackendConfiguration.xml                                      |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogPublisherConfiguration.xml                               |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeSyntaxConfiguration.xml                                  |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ChangeNumberControlPluginConfiguration.xml                        |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheConfiguration.xml                                       |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/admin-cli.xsd                                                                                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedMD5PasswordStorageSchemeConfiguration.xml                   |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DynamicGroupImplementationConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/IdentityMapperConfiguration.xml                                   |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRotationPolicyConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConfigFileHandlerBackendConfiguration.xml                         |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDPluginConfiguration.xml                                  |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/text-utilities.xsl                                                                           |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualAttributeConfiguration.xml                                 |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TraditionalWorkQueueConfiguration.xml                             |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml                          |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PBKDF2PasswordStorageSchemeConfiguration.xml                      |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RepeatedCharactersPasswordValidatorConfiguration.xml              |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualStaticGroupImplementationConfiguration.xml                 |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/boolean.xsl                                                                   |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FractionalLDIFImportPluginConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedErrorLogPublisherConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/conditions.xsl                                                                               |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyImportPluginConfiguration.xml                       |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CramMD5SASLMechanismHandlerConfiguration.xml                      |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml                                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FingerprintCertificateMapperConfiguration.xml                     |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackupBackendConfiguration.xml                                    |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConnectionHandlerConfiguration.xml                                |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClientConnectionMonitorProviderConfiguration.xml                  |    0 
 opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/ip-address-mask.xsl                                                           |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAlertHandlerConfiguration.xml                                 |    0 
 /dev/null                                                                                                                                              |   31 ------
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml              |    0 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/WhoAmIExtendedOperationHandlerConfiguration.xml                   |    0 
 225 files changed, 114 insertions(+), 173 deletions(-)

diff --git a/opendj-concat-schema-maven-plugin/src/main/java/org/forgerock/maven/package-info.java b/opendj-concat-schema-maven-plugin/src/main/java/org/forgerock/maven/package-info.java
deleted file mode 100644
index 7840667..0000000
--- a/opendj-concat-schema-maven-plugin/src/main/java/org/forgerock/maven/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- *      Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- *      Copyright 2015 ForgeRock AS.
- */
-
-/** Classes implementing the maven plugin to create a base schema that may be used during the upgrade process. */
-package org.forgerock.maven;
-
diff --git a/opendj-config-maven-plugin/pom.xml b/opendj-config-maven-plugin/pom.xml
deleted file mode 100644
index 32cc9a7..0000000
--- a/opendj-config-maven-plugin/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ! CDDL HEADER START
-  !
-  ! The contents of this file are subject to the terms of the
-  ! Common Development and Distribution License, Version 1.0 only
-  ! (the "License").  You may not use this file except in compliance
-  ! with the License.
-  !
-  ! You can obtain a copy of the license at
-  ! trunk/opendj3/legal-notices/CDDLv1_0.txt
-  ! or http://forgerock.org/license/CDDLv1.0.html.
-  ! See the License for the specific language governing permissions
-  ! and limitations under the License.
-  !
-  ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opendj3/legal-notices/CDDLv1_0.txt.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
-  !      Portions Copyright [yyyy] [name of copyright owner]
-  !
-  ! CDDL HEADER END
-  !
-  !      Copyright 2014-2015 ForgeRock AS.
-  !
--->
-<project
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.forgerock.opendj</groupId>
-    <artifactId>opendj-project</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>opendj-config-maven-plugin</artifactId>
-  <name>OpenDJ Config Maven Plugin</name>
-  <description>
-    Generation of configuration classes, messages and profiles 
-    from xml definition files for opendj server.
-  </description>
-  <packaging>maven-plugin</packaging>
-
-  <properties>
-    <mavenVersion>3.0.4</mavenVersion>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>3.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>${mavenVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.2</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.twdata.maven</groupId>
-      <artifactId>mojo-executor</artifactId>
-      <version>2.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-resources-plugin</artifactId>
-      <version>2.6</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/opendj-config/pom.xml b/opendj-config/pom.xml
index 3ab4ca4..73d43c2 100644
--- a/opendj-config/pom.xml
+++ b/opendj-config/pom.xml
@@ -128,14 +128,14 @@
       <!-- Validate core components XML definition files and generate the components. -->
       <plugin>
         <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-config-maven-plugin</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
+        <artifactId>opendj-maven-plugin</artifactId>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <id>generate-config</id>
             <phase>generate-sources</phase>
             <goals>
-              <goal>generate</goal>
+              <goal>generate-config</goal>
             </goals>
             <configuration>
               <packageName>org.forgerock.opendj.server.config</packageName>
diff --git a/opendj-logref-doc-maven-plugin/pom.xml b/opendj-logref-doc-maven-plugin/pom.xml
deleted file mode 100644
index 4a74c29..0000000
--- a/opendj-logref-doc-maven-plugin/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ! CDDL HEADER START
-  !
-  ! The contents of this file are subject to the terms of the
-  ! Common Development and Distribution License, Version 1.0 only
-  ! (the "License").  You may not use this file except in compliance
-  ! with the License.
-  !
-  ! You can obtain a copy of the license at
-  ! trunk/opendj3/legal-notices/CDDLv1_0.txt
-  ! or http://forgerock.org/license/CDDLv1.0.html.
-  ! See the License for the specific language governing permissions
-  ! and limitations under the License.
-  !
-  ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opendj3/legal-notices/CDDLv1_0.txt.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
-  !      Portions Copyright [yyyy] [name of copyright owner]
-  !
-  ! CDDL HEADER END
-  !
-  !      Copyright 2015 ForgeRock AS.
-  !
--->
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>opendj-project</artifactId>
-		<groupId>org.forgerock.opendj</groupId>
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>opendj-logref-doc-maven-plugin</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<name>OpenDJ Documentation LogRef Maven Plugin</name>
-	<description>
-    Generation of log references for admin and intallation guides of OpenDJ project.
-  </description>
-	<packaging>maven-plugin</packaging>
-
-	<properties>
-		<mavenVersion>3.0.4</mavenVersion>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.forgerock.commons</groupId>
-			<artifactId>forgerock-util</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.twdata.maven</groupId>
-			<artifactId>mojo-executor</artifactId>
-			<version>2.2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugin-tools</groupId>
-			<artifactId>maven-plugin-annotations</artifactId>
-			<version>3.2</version>
-			<scope>provided</scope>
-		</dependency>
-
-	</dependencies>
-</project>
diff --git a/opendj-logref-doc-maven-plugin/src/main/java/org/forgerock/maven/package-info.java b/opendj-logref-doc-maven-plugin/src/main/java/org/forgerock/maven/package-info.java
deleted file mode 100644
index 8596f30..0000000
--- a/opendj-logref-doc-maven-plugin/src/main/java/org/forgerock/maven/package-info.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- *      Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- *      Copyright 2015 ForgeRock AS.
- */
-
-/** Classes implementing the maven plugin to create xml files from messages for documentation guides generation. */
-package org.forgerock.maven;
-
diff --git a/opendj-manifest-classpath-maven-plugin/pom.xml b/opendj-manifest-classpath-maven-plugin/pom.xml
deleted file mode 100644
index 3dfae52..0000000
--- a/opendj-manifest-classpath-maven-plugin/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ! CDDL HEADER START
-  !
-  ! The contents of this file are subject to the terms of the
-  ! Common Development and Distribution License, Version 1.0 only
-  ! (the "License").  You may not use this file except in compliance
-  ! with the License.
-  !
-  ! You can obtain a copy of the license at
-  ! trunk/opendj3/legal-notices/CDDLv1_0.txt
-  ! or http://forgerock.org/license/CDDLv1.0.html.
-  ! See the License for the specific language governing permissions
-  ! and limitations under the License.
-  !
-  ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at
-  ! trunk/opendj3/legal-notices/CDDLv1_0.txt.  If applicable,
-  ! add the following below this CDDL HEADER, with the fields enclosed
-  ! by brackets "[]" replaced with your own identifying information:
-  !      Portions Copyright [yyyy] [name of copyright owner]
-  !
-  ! CDDL HEADER END
-  !
-  !      Copyright 2015 ForgeRock AS.
-  !
--->
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>opendj-project</artifactId>
-		<groupId>org.forgerock.opendj</groupId>
-		<version>3.0.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>opendj-manifest-classpath-maven-plugin</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<name>OpenDJ Manifest Classpath Maven Plugin</name>
-	<description>
-    Generation of manifest classpath, with classpath customization.
-  </description>
-	<packaging>maven-plugin</packaging>
-
-	<properties>
-		<mavenVersion>3.0.4</mavenVersion>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.twdata.maven</groupId>
-			<artifactId>mojo-executor</artifactId>
-			<version>2.2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.maven.plugin-tools</groupId>
-			<artifactId>maven-plugin-annotations</artifactId>
-			<version>3.2</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
-</project>
diff --git a/opendj-manifest-classpath-maven-plugin/src/main/java/org/forgerock/maven/package-info.java b/opendj-manifest-classpath-maven-plugin/src/main/java/org/forgerock/maven/package-info.java
deleted file mode 100644
index 31af947..0000000
--- a/opendj-manifest-classpath-maven-plugin/src/main/java/org/forgerock/maven/package-info.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- *      Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- *      Copyright 2015 ForgeRock AS.
- */
-
-/**
- * Classes implementing the maven plugin for generation of jar manifest with flexible Class-Path header.
- */
-package org.forgerock.maven;
-
diff --git a/opendj-concat-schema-maven-plugin/pom.xml b/opendj-maven-plugin/pom.xml
similarity index 71%
rename from opendj-concat-schema-maven-plugin/pom.xml
rename to opendj-maven-plugin/pom.xml
index b59f150..64306c0 100644
--- a/opendj-concat-schema-maven-plugin/pom.xml
+++ b/opendj-maven-plugin/pom.xml
@@ -34,11 +34,10 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>opendj-concat-schema-maven-plugin</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>OpenDJ Concat Schema Maven Plugin</name>
+  <artifactId>opendj-maven-plugin</artifactId>
+  <name>OpenDJ Maven Plugin</name>
   <description>
-    Generation of schema file by concatenation of LDIF files.
+    Set of build tools for OpenDJ project.
   </description>
   <packaging>maven-plugin</packaging>
 
@@ -47,17 +46,20 @@
   </properties>
 
   <dependencies>
-	<dependency>
-		<groupId>org.twdata.maven</groupId>
-		<artifactId>mojo-executor</artifactId>
-		<version>2.2.0</version>
-	</dependency>
-	<dependency>
-		<groupId>org.apache.maven.plugin-tools</groupId>
-		<artifactId>maven-plugin-annotations</artifactId>
-		<version>3.2</version>
-		<scope>provided</scope>
-	</dependency>
+    <dependency>
+        <groupId>org.forgerock.commons</groupId>
+        <artifactId>forgerock-util</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.twdata.maven</groupId>
+        <artifactId>mojo-executor</artifactId>
+        <version>2.2.0</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.maven.plugin-tools</groupId>
+        <artifactId>maven-plugin-annotations</artifactId>
+        <version>3.2</version>
+        <scope>provided</scope>
+    </dependency>
   </dependencies>
- 
-</project>
+</project>
\ No newline at end of file
diff --git a/opendj-concat-schema-maven-plugin/src/main/java/org/forgerock/maven/ConcatSchemaMojo.java b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/ConcatSchemaMojo.java
similarity index 97%
rename from opendj-concat-schema-maven-plugin/src/main/java/org/forgerock/maven/ConcatSchemaMojo.java
rename to opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/ConcatSchemaMojo.java
index becc11a..9baa75c 100644
--- a/opendj-concat-schema-maven-plugin/src/main/java/org/forgerock/maven/ConcatSchemaMojo.java
+++ b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/ConcatSchemaMojo.java
@@ -23,7 +23,7 @@
  *
  *      Copyright 2015 ForgeRock AS.
  */
-package org.forgerock.maven;
+package org.forgerock.opendj.maven;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -44,13 +44,12 @@
 import org.apache.maven.project.MavenProject;
 
 /**
- * Concatenates the contents of the files in the schema directory to create a base schema that may be used during the
- * upgrade process. Each element will also include the X-SCHEMA-FILE extension to indicate the source schema file.
+ * Concatenates the contents of the files in the schema directory to create a
+ * base schema that may be used during the upgrade process. Each element will
+ * also include the X-SCHEMA-FILE extension to indicate the source schema file.
  * <p>
  * There is a single goal that generates the base schema.
  * <p>
- *
- * @Checkstyle:ignoreFor 3
  */
 @Mojo(name = "concat", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
 public final class ConcatSchemaMojo extends AbstractMojo {
diff --git a/opendj-config-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java
similarity index 97%
rename from opendj-config-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java
rename to opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java
index fbe6502..68c93a4 100644
--- a/opendj-config-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java
+++ b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateConfigMojo.java
@@ -25,6 +25,9 @@
  */
 package org.forgerock.opendj.maven;
 
+import static org.apache.maven.plugins.annotations.LifecyclePhase.*;
+import static org.apache.maven.plugins.annotations.ResolutionScope.*;
+
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileOutputStream;
@@ -55,6 +58,8 @@
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 
 /**
@@ -99,12 +104,8 @@
  * config.AbstractManagedObjectDefinition</td>
  * </tr>
  * </table>
- *
- * @Checkstyle:ignoreFor 3
- * @goal generate
- * @phase generate-sources
- * @requiresDependencyResolution compile+runtime
  */
+@Mojo(name = "generate-config", defaultPhase = GENERATE_SOURCES, requiresDependencyResolution = COMPILE_PLUS_RUNTIME)
 public final class GenerateConfigMojo extends AbstractMojo {
     private interface StreamSourceFactory {
         StreamSource newStreamSource() throws IOException;
@@ -112,11 +113,8 @@
 
     /**
      * The Maven Project.
-     *
-     * @parameter property="project"
-     * @required
-     * @readonly
      */
+    @Parameter(required = true, readonly = true, property = "project")
     private MavenProject project;
 
     /**
@@ -124,10 +122,8 @@
      * <p>
      * This relative path is used to locate xml definition files and to locate
      * generated artifacts.
-     *
-     * @parameter
-     * @required
      */
+    @Parameter(required = true)
     private String packageName;
 
     /**
@@ -135,10 +131,8 @@
      * <p>
      * This relative path is used to locate xml definition files and to locate
      * generated artifacts.
-     *
-     * @parameter default-value="true"
-     * @required
      */
+    @Parameter(required = true, defaultValue = "true")
     private Boolean isExtension;
 
     private final Map<String, StreamSourceFactory> componentDescriptors =
diff --git a/opendj-manifest-classpath-maven-plugin/src/main/java/org/forgerock/maven/GenerateManifestClassPathMojo.java b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java
similarity index 95%
rename from opendj-manifest-classpath-maven-plugin/src/main/java/org/forgerock/maven/GenerateManifestClassPathMojo.java
rename to opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java
index a51d837..60e6f3f 100644
--- a/opendj-manifest-classpath-maven-plugin/src/main/java/org/forgerock/maven/GenerateManifestClassPathMojo.java
+++ b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateManifestClassPathMojo.java
@@ -23,8 +23,7 @@
  *
  *      Copyright 2015 ForgeRock AS.
  */
-package org.forgerock.maven;
-
+package org.forgerock.opendj.maven;
 import static java.lang.String.*;
 
 import java.io.File;
@@ -45,15 +44,13 @@
 import org.apache.maven.project.MavenProject;
 
 /**
- * Generate a class path suitable for the Class-Path header of a Manifest file, allowing to filter on included jars,
- * using excludes/includes properties.
+ * Generate a class path suitable for the Class-Path header of a Manifest file,
+ * allowing to filter on included jars, using excludes/includes properties.
  * <p>
- * There is a single goal that generates a property given by 'classPathProperty' parameter, with the generated classpath
- * as the value.
- *
- * @Checkstyle:ignoreFor 3
+ * There is a single goal that generates a property given by 'classPathProperty'
+ * parameter, with the generated classpath as the value.
  */
-@Mojo(name = "generate", defaultPhase = LifecyclePhase.VALIDATE,
+@Mojo(name = "generate-manifest", defaultPhase = LifecyclePhase.VALIDATE,
     requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME)
 public final class GenerateManifestClassPathMojo extends AbstractMojo {
 
diff --git a/opendj-logref-doc-maven-plugin/src/main/java/org/forgerock/maven/GenerateMessageFileMojo.java b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateMessageFileMojo.java
similarity index 98%
rename from opendj-logref-doc-maven-plugin/src/main/java/org/forgerock/maven/GenerateMessageFileMojo.java
rename to opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateMessageFileMojo.java
index 492d4db..bb4a30c 100644
--- a/opendj-logref-doc-maven-plugin/src/main/java/org/forgerock/maven/GenerateMessageFileMojo.java
+++ b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/GenerateMessageFileMojo.java
@@ -24,7 +24,9 @@
  *      Copyright 2008-2010 Sun Microsystems, Inc.
  *      Portions Copyright 2011-2015 ForgeRock AS
  */
-package org.forgerock.maven;
+package org.forgerock.opendj.maven;
+
+import static org.apache.maven.plugins.annotations.LifecyclePhase.*;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -47,7 +49,6 @@
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
@@ -60,7 +61,7 @@
  * There is a single goal that generates xml files.
  * <p>
  */
-@Mojo(defaultPhase = LifecyclePhase.PRE_SITE, name = "generate-xml-messages-doc")
+@Mojo(name = "generate-xml-messages-doc", defaultPhase = PRE_SITE)
 public class GenerateMessageFileMojo extends AbstractMojo {
 
     /**
diff --git a/opendj-config-maven-plugin/src/main/java/org/forgerock/opendj/maven/package-info.java b/opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/package-info.java
similarity index 100%
rename from opendj-config-maven-plugin/src/main/java/org/forgerock/opendj/maven/package-info.java
rename to opendj-maven-plugin/src/main/java/org/forgerock/opendj/maven/package-info.java
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/admin-cli.xsd b/opendj-maven-plugin/src/main/resources/config/stylesheets/admin-cli.xsd
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/admin-cli.xsd
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/admin-cli.xsd
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/admin-ldap.xsd b/opendj-maven-plugin/src/main/resources/config/stylesheets/admin-ldap.xsd
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/admin-ldap.xsd
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/admin-ldap.xsd
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/admin-preprocessor.xsd b/opendj-maven-plugin/src/main/resources/config/stylesheets/admin-preprocessor.xsd
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/admin-preprocessor.xsd
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/admin-preprocessor.xsd
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/admin.xsd b/opendj-maven-plugin/src/main/resources/config/stylesheets/admin.xsd
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/admin.xsd
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/admin.xsd
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/catalog.xml b/opendj-maven-plugin/src/main/resources/config/stylesheets/catalog.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/catalog.xml
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/catalog.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/cliMOProfile.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/cliMOProfile.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/cliMOProfile.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/cliMOProfile.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/conditions.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/conditions.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/conditions.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/conditions.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/java-utilities.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/java-utilities.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/java-utilities.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/java-utilities.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/ldapMOProfile.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/ldapMOProfile.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/ldapMOProfile.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/ldapMOProfile.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/manifestMO.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/manifestMO.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/manifestMO.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/manifestMO.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/messagesMO.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/messagesMO.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/messagesMO.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/messagesMO.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/metaMO.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/metaMO.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/metaMO.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/metaMO.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/package-info.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/package-info.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/package-info.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/package-info.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/preprocessor.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/preprocessor.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/preprocessor.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/preprocessor.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/aci.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/aci.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/aci.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/aci.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/aggregation.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/aggregation.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/aggregation.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/aggregation.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/attribute-type.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/attribute-type.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/attribute-type.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/attribute-type.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/boolean.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/boolean.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/boolean.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/boolean.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/dn.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/dn.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/dn.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/dn.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/duration.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/duration.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/duration.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/duration.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/enumeration.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/enumeration.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/enumeration.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/enumeration.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/extensible-matching-rule-type.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/extensible-matching-rule-type.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/extensible-matching-rule-type.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/extensible-matching-rule-type.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/integer.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/integer.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/integer.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/integer.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/ip-address-mask.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/ip-address-mask.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/ip-address-mask.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/ip-address-mask.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/ip-address.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/ip-address.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/ip-address.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/ip-address.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/java-class.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/java-class.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/java-class.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/java-class.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/oid.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/oid.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/oid.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/oid.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/password.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/password.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/password.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/password.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/size.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/size.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/size.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/size.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/string.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/string.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/property-types/string.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/property-types/string.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/serverMO.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/serverMO.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/serverMO.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/serverMO.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/text-utilities.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/text-utilities.xsl
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/text-utilities.xsl
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/text-utilities.xsl
diff --git a/opendj-config-maven-plugin/src/main/resources/config/stylesheets/xml.xsd b/opendj-maven-plugin/src/main/resources/config/stylesheets/xml.xsd
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/stylesheets/xml.xsd
rename to opendj-maven-plugin/src/main/resources/config/stylesheets/xml.xsd
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AESPasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AESPasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AESPasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AESPasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessControlHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessControlHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessControlHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessControlHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogFilteringCriteriaConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogFilteringCriteriaConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogFilteringCriteriaConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogFilteringCriteriaConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogPublisherConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogPublisherConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccessLogPublisherConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccountStatusNotificationHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccountStatusNotificationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccountStatusNotificationHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AccountStatusNotificationHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AdministrationConnectorConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AlertHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AlertHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AlertHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AlertHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AnonymousSASLMechanismHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AnonymousSASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AnonymousSASLMechanismHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AnonymousSASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeCleanupPluginConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeCleanupPluginConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeCleanupPluginConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeCleanupPluginConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeSyntaxConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeSyntaxConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeSyntaxConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeTypeDescriptionAttributeSyntaxConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AttributeValuePasswordValidatorConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AuthenticationPolicyConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AuthenticationPolicyConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AuthenticationPolicyConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/AuthenticationPolicyConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendIndexConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendIndexConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendIndexConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendIndexConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendVLVIndexConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendVLVIndexConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendVLVIndexConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackendVLVIndexConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackupBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackupBackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackupBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BackupBackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Base64PasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Base64PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Base64PasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Base64PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlindTrustManagerProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlindTrustManagerProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlindTrustManagerProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlindTrustManagerProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlowfishPasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlowfishPasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlowfishPasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/BlowfishPasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CancelExtendedOperationHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CancelExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CancelExtendedOperationHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CancelExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateAttributeSyntaxConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateAttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateAttributeSyntaxConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateAttributeSyntaxConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateMapperConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateMapperConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateMapperConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateMapperConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ChangeNumberControlPluginConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ChangeNumberControlPluginConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ChangeNumberControlPluginConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ChangeNumberControlPluginConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CharacterSetPasswordValidatorConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CharacterSetPasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CharacterSetPasswordValidatorConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CharacterSetPasswordValidatorConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClearPasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClearPasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClearPasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClearPasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClientConnectionMonitorProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClientConnectionMonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClientConnectionMonitorProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ClientConnectionMonitorProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollationMatchingRuleConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollationMatchingRuleConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollationMatchingRuleConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollationMatchingRuleConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CollectiveAttributeSubentriesVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConfigFileHandlerBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConfigFileHandlerBackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConfigFileHandlerBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConfigFileHandlerBackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConnectionHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConnectionHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConnectionHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ConnectionHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CoreSchemaConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CoreSchemaConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CoreSchemaConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CoreSchemaConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CountryStringAttributeSyntaxConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CountryStringAttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CountryStringAttributeSyntaxConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CountryStringAttributeSyntaxConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CramMD5SASLMechanismHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CramMD5SASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CramMD5SASLMechanismHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CramMD5SASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptPasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptPasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptPasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptPasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptoManagerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptoManagerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptoManagerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CryptoManagerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugLogPublisherConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugLogPublisherConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugLogPublisherConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DebugTargetConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DictionaryPasswordValidatorConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DictionaryPasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DictionaryPasswordValidatorConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DictionaryPasswordValidatorConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DigestMD5SASLMechanismHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DigestMD5SASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DigestMD5SASLMechanismHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DigestMD5SASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DirectoryStringAttributeSyntaxConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DirectoryStringAttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DirectoryStringAttributeSyntaxConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DirectoryStringAttributeSyntaxConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DseeCompatAccessControlHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DseeCompatAccessControlHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DseeCompatAccessControlHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DseeCompatAccessControlHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DynamicGroupImplementationConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DynamicGroupImplementationConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DynamicGroupImplementationConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/DynamicGroupImplementationConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntityTagVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntityTagVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntityTagVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntityTagVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheMonitorProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheMonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheMonitorProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryCacheMonitorProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryDNVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryDNVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryDNVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryDNVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDPluginConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDPluginConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDPluginConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDPluginConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/EntryUUIDVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogAccountStatusNotificationHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogAccountStatusNotificationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogAccountStatusNotificationHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogAccountStatusNotificationHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogPublisherConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogPublisherConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ErrorLogPublisherConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExactMatchIdentityMapperConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExactMatchIdentityMapperConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExactMatchIdentityMapperConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExactMatchIdentityMapperConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExtendedOperationHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExtendedOperationHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalChangelogDomainConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalChangelogDomainConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalChangelogDomainConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalChangelogDomainConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalSASLMechanismHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalSASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalSASLMechanismHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalSASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FIFOEntryCacheConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FIFOEntryCacheConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FIFOEntryCacheConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FIFOEntryCacheConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAccessLogPublisherConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAccessLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAccessLogPublisherConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAccessLogPublisherConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAuditLogPublisherConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAuditLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAuditLogPublisherConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedAuditLogPublisherConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedDebugLogPublisherConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedErrorLogPublisherConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedErrorLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedErrorLogPublisherConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedErrorLogPublisherConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedHTTPAccessLogPublisherConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedHTTPAccessLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedHTTPAccessLogPublisherConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedHTTPAccessLogPublisherConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedKeyManagerProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedKeyManagerProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedKeyManagerProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedKeyManagerProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedTrustManagerProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedTrustManagerProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedTrustManagerProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileBasedTrustManagerProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileCountLogRetentionPolicyConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileCountLogRetentionPolicyConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileCountLogRetentionPolicyConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FileCountLogRetentionPolicyConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FingerprintCertificateMapperConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FingerprintCertificateMapperConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FingerprintCertificateMapperConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FingerprintCertificateMapperConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FixedTimeLogRotationPolicyConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FixedTimeLogRotationPolicyConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FixedTimeLogRotationPolicyConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FixedTimeLogRotationPolicyConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FractionalLDIFImportPluginConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FractionalLDIFImportPluginConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FractionalLDIFImportPluginConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FractionalLDIFImportPluginConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FreeDiskSpaceLogRetentionPolicyConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FreeDiskSpaceLogRetentionPolicyConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FreeDiskSpaceLogRetentionPolicyConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/FreeDiskSpaceLogRetentionPolicyConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GSSAPISASLMechanismHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GSSAPISASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GSSAPISASLMechanismHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GSSAPISASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetConnectionIdExtendedOperationHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetConnectionIdExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetConnectionIdExtendedOperationHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetConnectionIdExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GetSymmetricKeyExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GlobalConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GlobalConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GlobalConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GlobalConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GoverningStructureRuleVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GoverningStructureRuleVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GoverningStructureRuleVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GoverningStructureRuleVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GroupImplementationConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GroupImplementationConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GroupImplementationConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GroupImplementationConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAccessLogPublisherConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAccessLogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAccessLogPublisherConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPAccessLogPublisherConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPConnectionHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPConnectionHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPConnectionHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HTTPConnectionHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HasSubordinatesVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HasSubordinatesVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HasSubordinatesVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/HasSubordinatesVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/IdentityMapperConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/IdentityMapperConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/IdentityMapperConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/IdentityMapperConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/IsMemberOfVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/IsMemberOfVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/IsMemberOfVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/IsMemberOfVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXAlertHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXAlertHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXAlertHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXAlertHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXConnectionHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXConnectionHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXConnectionHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JMXConnectionHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JPEGAttributeSyntaxConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JPEGAttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JPEGAttributeSyntaxConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/JPEGAttributeSyntaxConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/KeyManagerProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/KeyManagerProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/KeyManagerProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/KeyManagerProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPAttributeDescriptionListPluginConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPAttributeDescriptionListPluginConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPAttributeDescriptionListPluginConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPAttributeDescriptionListPluginConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPConnectionHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPConnectionHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPConnectionHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPConnectionHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDAPPassThroughAuthenticationPolicyConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFBackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFBackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFConnectionHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFConnectionHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFConnectionHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LDIFConnectionHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LastModPluginConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LastModPluginConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LastModPluginConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LastModPluginConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LengthBasedPasswordValidatorConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LengthBasedPasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LengthBasedPasswordValidatorConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LengthBasedPasswordValidatorConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBBackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBIndexConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBIndexConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBIndexConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBIndexConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBVLVIndexConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBVLVIndexConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBVLVIndexConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LocalDBVLVIndexConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogPublisherConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogPublisherConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogPublisherConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogPublisherConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRetentionPolicyConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRetentionPolicyConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRetentionPolicyConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRetentionPolicyConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRotationPolicyConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRotationPolicyConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRotationPolicyConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/LogRotationPolicyConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MD5PasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MD5PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MD5PasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MD5PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MatchingRuleConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MatchingRuleConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MatchingRuleConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MatchingRuleConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemberVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemberVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemberVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemberVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryBackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryBackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryUsageMonitorProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryUsageMonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryUsageMonitorProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MemoryUsageMonitorProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorBackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorBackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/MonitorProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/NullBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/NullBackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/NullBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/NullBackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/NumSubordinatesVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/NumSubordinatesVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/NumSubordinatesVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/NumSubordinatesVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PBKDF2PasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PBKDF2PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PBKDF2PasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PBKDF2PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PKCS11KeyManagerProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PKCS11KeyManagerProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PKCS11KeyManagerProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PKCS11KeyManagerProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/Package.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ParallelWorkQueueConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ParallelWorkQueueConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ParallelWorkQueueConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ParallelWorkQueueConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordExpirationTimeVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordExpirationTimeVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordExpirationTimeVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordExpirationTimeVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordGeneratorConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordGeneratorConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordGeneratorConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordGeneratorConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordModifyExtendedOperationHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordModifyExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordModifyExtendedOperationHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordModifyExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyImportPluginConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyImportPluginConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyImportPluginConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyImportPluginConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicyStateExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicySubentryVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicySubentryVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicySubentryVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordPolicySubentryVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordValidatorConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordValidatorConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PasswordValidatorConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PersistitBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PersistitBackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PersistitBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PersistitBackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PlainSASLMechanismHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PlainSASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PlainSASLMechanismHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PlainSASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluggableBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluggableBackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluggableBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluggableBackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginRootConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginRootConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginRootConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/PluginRootConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ProfilerPluginConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ProfilerPluginConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ProfilerPluginConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ProfilerPluginConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RC4PasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RC4PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RC4PasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RC4PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RandomPasswordGeneratorConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RandomPasswordGeneratorConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RandomPasswordGeneratorConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RandomPasswordGeneratorConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReferentialIntegrityPluginConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReferentialIntegrityPluginConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReferentialIntegrityPluginConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReferentialIntegrityPluginConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RegularExpressionIdentityMapperConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RegularExpressionIdentityMapperConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RegularExpressionIdentityMapperConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RegularExpressionIdentityMapperConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RepeatedCharactersPasswordValidatorConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RepeatedCharactersPasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RepeatedCharactersPasswordValidatorConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RepeatedCharactersPasswordValidatorConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationDomainConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationDomainConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationDomainConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationDomainConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationServerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationSynchronizationProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationSynchronizationProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationSynchronizationProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReplicationSynchronizationProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNUserConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNUserConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNUserConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDNUserConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDSEBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDSEBackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDSEBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/RootDSEBackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SASLMechanismHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SASLMechanismHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SASLMechanismHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SASLMechanismHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SHA1PasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SHA1PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SHA1PasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SHA1PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAccountStatusNotificationHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAlertHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAlertHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAlertHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SMTPAlertHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SNMPConnectionHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SNMPConnectionHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SNMPConnectionHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SNMPConnectionHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedMD5PasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedMD5PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedMD5PasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedMD5PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA1PasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA1PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA1PasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA1PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA256PasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA256PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA256PasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA256PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA384PasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA384PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA384PasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA384PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA512PasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA512PasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA512PasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SaltedSHA512PasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SambaPasswordPluginConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SambaPasswordPluginConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SambaPasswordPluginConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SambaPasswordPluginConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaBackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaBackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SchemaProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SevenBitCleanPluginConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SevenBitCleanPluginConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SevenBitCleanPluginConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SevenBitCleanPluginConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SimilarityBasedPasswordValidatorConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SimilarityBasedPasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SimilarityBasedPasswordValidatorConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SimilarityBasedPasswordValidatorConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRetentionPolicyConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRetentionPolicyConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRetentionPolicyConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRetentionPolicyConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRotationPolicyConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRotationPolicyConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRotationPolicyConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SizeLimitLogRotationPolicyConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SoftReferenceEntryCacheConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SoftReferenceEntryCacheConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SoftReferenceEntryCacheConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SoftReferenceEntryCacheConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StackTraceMonitorProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StackTraceMonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StackTraceMonitorProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StackTraceMonitorProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StartTLSExtendedOperationHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StartTLSExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StartTLSExtendedOperationHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StartTLSExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StaticGroupImplementationConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StaticGroupImplementationConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StaticGroupImplementationConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StaticGroupImplementationConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StructuralObjectClassVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StructuralObjectClassVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StructuralObjectClassVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/StructuralObjectClassVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectAttributeToUserAttributeCertificateMapperConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectDNToUserAttributeCertificateMapperConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectDNToUserAttributeCertificateMapperConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectDNToUserAttributeCertificateMapperConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectDNToUserAttributeCertificateMapperConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectEqualsDNCertificateMapperConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectEqualsDNCertificateMapperConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectEqualsDNCertificateMapperConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubjectEqualsDNCertificateMapperConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubschemaSubentryVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubschemaSubentryVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubschemaSubentryVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SubschemaSubentryVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SynchronizationProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SynchronizationProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SynchronizationProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SynchronizationProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SystemInfoMonitorProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SystemInfoMonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SystemInfoMonitorProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/SystemInfoMonitorProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TaskBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TaskBackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TaskBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TaskBackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TelephoneNumberAttributeSyntaxConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TelephoneNumberAttributeSyntaxConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TelephoneNumberAttributeSyntaxConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TelephoneNumberAttributeSyntaxConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TimeLimitLogRotationPolicyConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TimeLimitLogRotationPolicyConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TimeLimitLogRotationPolicyConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TimeLimitLogRotationPolicyConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TraditionalWorkQueueConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TraditionalWorkQueueConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TraditionalWorkQueueConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TraditionalWorkQueueConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TripleDESPasswordStorageSchemeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TripleDESPasswordStorageSchemeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TripleDESPasswordStorageSchemeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TripleDESPasswordStorageSchemeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustManagerProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustManagerProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustManagerProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustManagerProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustStoreBackendConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustStoreBackendConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustStoreBackendConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/TrustStoreBackendConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueAttributePluginConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueAttributePluginConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueAttributePluginConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueAttributePluginConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueCharactersPasswordValidatorConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueCharactersPasswordValidatorConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueCharactersPasswordValidatorConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UniqueCharactersPasswordValidatorConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UserDefinedVirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UserDefinedVirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UserDefinedVirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/UserDefinedVirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VersionMonitorProviderConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VersionMonitorProviderConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VersionMonitorProviderConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VersionMonitorProviderConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualAttributeConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualAttributeConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualAttributeConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualAttributeConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualStaticGroupImplementationConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualStaticGroupImplementationConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualStaticGroupImplementationConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/VirtualStaticGroupImplementationConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/WhoAmIExtendedOperationHandlerConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/WhoAmIExtendedOperationHandlerConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/WhoAmIExtendedOperationHandlerConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/WhoAmIExtendedOperationHandlerConfiguration.xml
diff --git a/opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkQueueConfiguration.xml b/opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkQueueConfiguration.xml
similarity index 100%
rename from opendj-config-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkQueueConfiguration.xml
rename to opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/WorkQueueConfiguration.xml
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 8fd7722..a59d68b 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -372,15 +372,18 @@
           </execution>
         </executions>
       </plugin>
+      
+      <!-- OpenDJ maven plugin executions -->
       <plugin>
         <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-manifest-classpath-maven-plugin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>opendj-maven-plugin</artifactId>
+        <version>${project.version}</version>
         <executions>
+          <!-- Generates manifest classpath files -->
           <execution>
             <id>generate-bootstrap-manifest</id>
             <goals>
-              <goal>generate</goal>
+              <goal>generate-manifest</goal>
             </goals>
             <configuration>
               <classPathProperty>classpath.bootstrap</classPathProperty>
@@ -390,11 +393,11 @@
                 <exclude>org.slf4j:slf4j-jdk14</exclude>
               </excludes>
             </configuration>
-          </execution>
+          </execution>      
           <execution>
             <id>generate-bootstrap-client-manifest</id>
             <goals>
-              <goal>generate</goal>
+              <goal>generate-manifest</goal>
             </goals>
             <configuration>
               <classPathProperty>classpath.bootstrap-client</classPathProperty>
@@ -405,22 +408,15 @@
               </excludes>
             </configuration>
           </execution>
-        </executions>
-      </plugin>
-
-      <!-- Generate configuration classes from XML definitions -->
-      <!-- Leave default lifecycle phase once new config framework migration 
-        is done -->
-      <plugin>
-        <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-config-maven-plugin</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-        <executions>
+      
+	      <!-- Generate configuration classes from XML definitions -->
+	      <!-- Leave default lifecycle phase once new config framework migration 
+	        is done -->
           <execution>
             <id>generate-config</id>
             <phase>generate-sources</phase>
             <goals>
-              <goal>generate</goal>
+              <goal>generate-config</goal>
             </goals>
             <configuration>
               <phase>none</phase>
@@ -428,6 +424,58 @@
               <isExtension>false</isExtension>
             </configuration>
           </execution>
+          
+          <!-- Create consolidated schema file for use in upgrade -->
+          <execution>
+            <id>creates-base-schema-files</id>
+            <goals>
+              <goal>concat</goal>
+            </goals>
+            <configuration>
+              <schemaDirectory>${basedir}/resource/schema</schemaDirectory>
+              <outputDirectory>${project.build.directory}/upgrade</outputDirectory>
+              <outputFile>schema.ldif.${buildRevision}</outputFile>
+            </configuration>
+          </execution>
+          
+          <!-- Generates references from messages for documentation -->
+          <execution>
+            <goals>
+              <goal>generate-xml-messages-doc</goal>
+            </goals>
+            <configuration>
+              <messagesDirectory>${basedir}/src/messages/org/opends/messages</messagesDirectory>
+              <outputDirectory>${project.build.directory}/docgen/logref</outputDirectory>
+              <logMessageReferenceFilePath>${basedir}/resource/log-message-reference.xml</logMessageReferenceFilePath>
+              <messageFileNames>
+                <!-- for xxx_yyy.properties generates a log-ref-xxx-yyy.xml 
+                  file -->
+                <messageFileName>admin</messageFileName>
+                <messageFileName>backend</messageFileName>
+                <messageFileName>config</messageFileName>
+                <messageFileName>core</messageFileName>
+                <messageFileName>dsconfig</messageFileName>
+                <messageFileName>extension</messageFileName>
+                <messageFileName>jeb</messageFileName>
+                <messageFileName>logger</messageFileName>
+                <messageFileName>plugin</messageFileName>
+                <messageFileName>protocol</messageFileName>
+                <messageFileName>replication</messageFileName>
+                <messageFileName>schema</messageFileName>
+                <messageFileName>task</messageFileName>
+                <messageFileName>tool</messageFileName>
+                <messageFileName>utility</messageFileName>
+
+                <!-- Ignore following message files as we document only serious 
+                  errors. -->
+                <!-- <messageFileName>access_control</messageFileName> -->
+                <!-- <messageFileName>admin_tool</messageFileName> -->
+                <!-- <messageFileName>quicksetup.properties</messageFileName> -->
+                <!-- <messageFileName>runtime_information.properties</messageFileName> -->
+                <!-- <messageFileName>version.properties</messageFileName> -->
+              </messageFileNames>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
 
@@ -498,26 +546,6 @@
         </executions>
       </plugin>
 
-      <!-- Create consolidated schema file for use in upgrade -->
-      <plugin>
-        <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-concat-schema-maven-plugin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <id>creates-base-schema-files</id>
-            <goals>
-              <goal>concat</goal>
-            </goals>
-            <configuration>
-              <schemaDirectory>${basedir}/resource/schema</schemaDirectory>
-              <outputDirectory>${project.build.directory}/upgrade</outputDirectory>
-              <outputFile>schema.ldif.${buildRevision}</outputFile>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
       <!-- Compile unit tests -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -981,52 +1009,6 @@
         </executions>
       </plugin>
 
-      <!-- Generates log references for documentation -->
-      <plugin>
-        <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-logref-doc-maven-plugin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate-xml-messages-doc</goal>
-            </goals>
-            <configuration>
-              <messagesDirectory>${basedir}/src/messages/org/opends/messages</messagesDirectory>
-              <outputDirectory>${project.build.directory}/docgen/logref</outputDirectory>
-              <logMessageReferenceFilePath>${basedir}/resource/log-message-reference.xml</logMessageReferenceFilePath>
-              <messageFileNames>
-                <!-- for xxx_yyy.properties generates a log-ref-xxx-yyy.xml 
-                  file -->
-                <messageFileName>admin</messageFileName>
-                <messageFileName>backend</messageFileName>
-                <messageFileName>config</messageFileName>
-                <messageFileName>core</messageFileName>
-                <messageFileName>dsconfig</messageFileName>
-                <messageFileName>extension</messageFileName>
-                <messageFileName>jeb</messageFileName>
-                <messageFileName>logger</messageFileName>
-                <messageFileName>plugin</messageFileName>
-                <messageFileName>protocol</messageFileName>
-                <messageFileName>replication</messageFileName>
-                <messageFileName>schema</messageFileName>
-                <messageFileName>task</messageFileName>
-                <messageFileName>tool</messageFileName>
-                <messageFileName>utility</messageFileName>
-
-                <!-- Ignore following message files as we document only serious 
-                  errors. -->
-                <!-- <messageFileName>access_control</messageFileName> -->
-                <!-- <messageFileName>admin_tool</messageFileName> -->
-                <!-- <messageFileName>quicksetup.properties</messageFileName> -->
-                <!-- <messageFileName>runtime_information.properties</messageFileName> -->
-                <!-- <messageFileName>version.properties</messageFileName> -->
-              </messageFileNames>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
       <!-- Generate documentation (guide) -->
       <plugin>
         <groupId>org.forgerock.commons</groupId>
diff --git a/pom.xml b/pom.xml
index 7a5a3a6..2a4f794 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,10 +90,7 @@
     </site>
   </distributionManagement>
   <modules>
-    <module>opendj-config-maven-plugin</module>
-    <module>opendj-manifest-classpath-maven-plugin</module>
-    <module>opendj-logref-doc-maven-plugin</module>
-    <module>opendj-concat-schema-maven-plugin</module>
+    <module>opendj-maven-plugin</module>
     <module>opendj-svn-property-check-maven-plugin</module>
     <module>opendj-core</module>
     <module>opendj-grizzly</module>
@@ -334,10 +331,10 @@
                 <pluginExecution>
                   <pluginExecutionFilter>
                     <groupId>org.forgerock.opendj</groupId>
-                    <artifactId>opendj-config-maven-plugin</artifactId>
-                    <versionRange>[3.0.0-SNAPSHOT,)</versionRange>
+                    <artifactId>opendj-maven-plugin</artifactId>
+                    <versionRange>[1.0.0-SNAPSHOT,)</versionRange>
                     <goals>
-                      <goal>generate</goal>
+                      <goal>generate-config</goal>
                     </goals>
                   </pluginExecutionFilter>
                   <action>

--
Gitblit v1.10.0