From 8a7d994e004ad0ec1a192dbadd348e041a2e3de2 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 24 May 2016 13:02:12 +0000
Subject: [PATCH] ObjectClassTestCase.java: renamed test case and local variable

---
 opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java                                   |    8 
 opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java                                                        |    4 
 opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java                                |    6 
 opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java                                       |    2 
 opendj-maven-plugin/src/main/resources/config/stylesheets/serverMO.xsl                                                             |    3 
 opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java                                            |    2 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java                                                         |    2 
 opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java                                                |    2 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java                                                        |    4 
 opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java                                               |    2 
 opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java                                                            |    2 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java                                                           |    2 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java                                               |    3 
 opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java                                                |    2 
 opendj-server-legacy/src/admin/messages/ExternalChangelogDomainCfgDefn.properties                                                  |    2 
 opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionUsageBuilder.java                                        |    2 
 opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java                                               |    2 
 opendj-server-legacy/src/admin/messages/CountryStringAttributeSyntaxCfgDefn.properties                                             |    2 
 opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java                                              |    2 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CoreSchemaConfiguration.xml                   |    4 
 opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java                                                    |    6 
 opendj-server-legacy/src/test/java/org/opends/server/types/LDAPURLTestCase.java                                                    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java                                                    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java                                                |    2 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java                                         |    2 
 opendj-config/src/main/java/org/forgerock/opendj/config/client/ClientConstraintHandler.java                                        |    6 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendStat.java                                           |    4 
 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java                                                       |    2 
 opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/classes/opendj-rest2ldap-config.json                                              |    2 
 opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValuePrinter.java                                         |    2 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java                   |    2 
 opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java                                                     |    2 
 opendj-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl                                                             |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/OperationConfig.java                                                    |   16 
 opendj-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl                                                        |    5 
 opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java                                              |    5 
 opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagedObject.java                                                  |   12 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java                                                               |    4 
 opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java                                      |   15 
 opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskState.java                                                  |    4 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java                                                  |    4 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CountryStringAttributeSyntaxConfiguration.xml |    4 
 opendj-server-legacy/src/admin/messages/CertificateAttributeSyntaxCfgDefn.properties                                               |    2 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java                                                      |   10 
 opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java                                                              |    3 
 opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerConstraintHandler.java                                        |    4 
 opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java                                                     |    2 
 opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java                                        |    2 
 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java                                                 |    6 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java                                                   |    4 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java                                                     |    6 
 opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java                                                         |    2 
 opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java                                                             |   14 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/CertificateAttributeSyntaxConfiguration.xml   |    4 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java                                                           |    2 
 opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java                                                    |    4 
 opendj-server-legacy/src/main/java/org/opends/server/api/SubentryChangeListener.java                                               |    4 
 opendj-server-legacy/src/admin/messages/CoreSchemaCfgDefn.properties                                                               |    2 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java                                                      |    4 
 opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java                                                               |    4 
 opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java                                       |    2 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java                                                   |    4 
 opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java                                                           |    6 
 opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java                                            |    2 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java                                                           |    8 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ReferentialIntegrityPluginConfiguration.xml   |    6 
 opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java                                                    |    2 
 opendj-config/src/main/java/org/forgerock/opendj/config/DefinitionResolver.java                                                    |    3 
 opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java                                             |    2 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java                                                                |    4 
 opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java                                      |    2 
 opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java                                      |    2 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java                                                             |   16 
 opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java                                                           |    4 
 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/WritabilityPolicy.java                                               |    8 
 opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java                                                      |    4 
 opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java                                                            |    4 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java                                                    |    4 
 opendj-config/src/main/java/org/forgerock/opendj/config/AbstractManagedObjectDefinition.java                                       |   11 
 opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java                                                     |    2 
 opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java                                       |   37 --
 opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java                                         |   12 
 opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassTestCase.java                                                |   12 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java                                                                |    2 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java                                         |    4 
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java                                      |    4 
 opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java                                               |    2 
 opendj-maven-plugin/src/main/resources/config/stylesheets/admin.xsd                                                                |   53 +-
 opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java                                    |    2 
 opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagedObject.java                                         |    2 
 opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java                                            |    4 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java                                            |    4 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java                                                    |    4 
 opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Property.java                                                   |   11 
 opendj-server-legacy/src/admin/messages/ReferentialIntegrityPluginCfgDefn.properties                                               |    4 
 opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java                                                    |    2 
 opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties                                                        |    4 
 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java                                     |    4 
 opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/ExternalChangelogDomainConfiguration.xml      |    4 
 opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java                                                  |    2 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java                                                       |    2 
 opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java                                                       |    7 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java                                                             |   18 
 opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProvider.java                                                     |    4 
 opendj-config/src/main/java/org/forgerock/opendj/config/client/MissingMandatoryPropertiesException.java                            |    2 
 opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java                                   |    2 
 opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java                                          |    5 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java                                                          |    2 
 opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java                                                          |   14 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java                                                            |    4 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java                                                    |    8 
 opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java                                                         |    5 
 opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java                                                                  |    4 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java                                                       |    4 
 opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java                                                   |    2 
 opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java                                         |    2 
 opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java                                                |    4 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java                                                          |    8 
 opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderID.java                                                   |   15 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java                                                                     |    4 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java                                                           |    2 
 opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java                                                     |    4 
 opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java                                                     |    4 
 opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java                                          |   14 
 opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java                                        |    2 
 opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java                                           |    4 
 opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java                                                                 |    3 
 opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java                 |    4 
 opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java                                 |    4 
 /dev/null                                                                                                                          |  146 ---------
 opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java                                                                 |    4 
 opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java                                                            |    2 
 opendj-server-legacy/resource/schema/03-rfc3712.ldif                                                                               |    3 
 opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java                                 |    2 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java                                                      |   11 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java                                                     |   20 -
 opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java                                                    |    4 
 137 files changed, 322 insertions(+), 544 deletions(-)

diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java
index 96e570d..2977bb7 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java
@@ -1280,8 +1280,7 @@
     }
 
     /**
-     * Indicates whether or not argument group description headers should be
-     * printed.
+     * Indicates whether argument group description headers should be printed.
      *
      * @return boolean where true means print the descriptions
      */
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java
index 3e22ef7..2e5881f 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java
@@ -112,7 +112,7 @@
     }
 
     /**
-     * Indicates whether or not the user has requested interactive behavior. The default implementation returns
+     * Indicates whether the user has requested interactive behavior. The default implementation returns
      * {@code true}.
      *
      * @return {@code true} if the user has requested interactive behavior.
@@ -122,7 +122,7 @@
     }
 
     /**
-     * Indicates whether or not the user has requested quiet output. The default implementation returns {@code false}.
+     * Indicates whether the user has requested quiet output. The default implementation returns {@code false}.
      *
      * @return {@code true} if the user has requested quiet output.
      */
@@ -131,7 +131,7 @@
     }
 
     /**
-     * Indicates whether or not the user has requested script-friendly output. The default implementation returns
+     * Indicates whether the user has requested script-friendly output. The default implementation returns
      * {@code false}.
      *
      * @return {@code true} if the user has requested script-friendly output.
@@ -141,7 +141,7 @@
     }
 
     /**
-     * Indicates whether or not the user has requested verbose output. The default implementation returns {@code false}.
+     * Indicates whether the user has requested verbose output. The default implementation returns {@code false}.
      *
      * @return {@code true} if the user has requested verbose output.
      */
@@ -150,7 +150,7 @@
     }
 
     /**
-     * Indicates whether or not the user has requested advanced mode.
+     * Indicates whether the user has requested advanced mode.
      *
      * @return Returns <code>true</code> if the user has requested advanced mode.
      */
@@ -159,8 +159,8 @@
     }
 
     /**
-     * Indicates whether or not this console application is running in its menu-driven mode. This can be used to dictate
-     * whether output should go to the error stream or not. In addition, it may also dictate whether or not sub-menus
+     * Indicates whether this console application is running in its menu-driven mode. This can be used to dictate
+     * whether output should go to the error stream or not. In addition, it may also dictate whether sub-menus
      * should display a cancel option as well as a quit option.
      *
      * @return Returns <code>true</code> if this console application is running in its menu-driven mode.
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java
index 07b3ce7..ec7e16b 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java
@@ -473,11 +473,11 @@
     }
 
     /**
-     * Sets the flag which indicates whether or not the menu will permit multiple numeric options to be selected at
+     * Sets the flag which indicates whether the menu will permit multiple numeric options to be selected at
      * once. Users specify multiple choices by separating them with a comma. The default is <code>false</code>.
      *
      * @param allowMultiSelect
-     *            Indicates whether or not the menu will permit multiple numeric options to be selected at once.
+     *            Indicates whether the menu will permit multiple numeric options to be selected at once.
      */
     public void setAllowMultiSelect(boolean allowMultiSelect) {
         this.allowMultiSelect = allowMultiSelect;
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java
index ed42532..5789cfc 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java
@@ -93,7 +93,7 @@
         }
     }
 
-    /** Indicates whether or not the headings should be output. */
+    /** Indicates whether the headings should be output. */
     private boolean displayHeadings;
 
     /** The output destination. */
@@ -121,7 +121,7 @@
     }
 
     /**
-     * Specify whether or not table headings should be displayed.
+     * Specify whether table headings should be displayed.
      *
      * @param displayHeadings
      *            <code>true</code> if table headings should be displayed.
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java
index f7fce40..a6bccc0 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java
@@ -279,10 +279,10 @@
      */
     private String columnSeparator = DEFAULT_COLUMN_SEPARATOR;
 
-    /** Indicates whether or not the headings should be output. */
+    /** Indicates whether the headings should be output. */
     private boolean displayHeadings = true;
 
-    /** Table indicating whether or not a column is fixed width. */
+    /** Table indicating whether a column is fixed width. */
     private final Map<Integer, Integer> fixedColumns = new HashMap<>();
 
     /** The number of characters the table should be indented. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/AbstractManagedObjectDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/AbstractManagedObjectDefinition.java
index 41d2e5c..8ae01e9 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/AbstractManagedObjectDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/AbstractManagedObjectDefinition.java
@@ -617,7 +617,7 @@
     }
 
     /**
-     * Determines whether or not this managed object definition has the
+     * Determines whether this managed object definition has the
      * specified option.
      *
      * @param option
@@ -630,7 +630,7 @@
     }
 
     /**
-     * Determines whether or not this managed object definition has the
+     * Determines whether this managed object definition has the
      * specified tag.
      *
      * @param t
@@ -643,7 +643,7 @@
     }
 
     /**
-     * Determines whether or not this managed object definition is a sub-type of
+     * Determines whether this managed object definition is a sub-type of
      * the provided managed object definition. This managed object definition is
      * a sub-type of the provided managed object definition if they are both the
      * same or if the provided managed object definition can be obtained by
@@ -665,7 +665,7 @@
     }
 
     /**
-     * Determines whether or not this managed object definition is a super-type
+     * Determines whether this managed object definition is a super-type
      * of the provided managed object definition. This managed object definition
      * is a super-type of the provided managed object definition if they are
      * both the same or if the provided managed object definition is a member of
@@ -681,8 +681,7 @@
     }
 
     /**
-     * Determines whether or not this managed object definition is the
-     * {@link TopCfgDefn}.
+     * Determines whether this managed object definition is the {@link TopCfgDefn}.
      *
      * @return Returns <code>true</code> if this managed object definition is
      *         the {@link TopCfgDefn}.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java
index 834b673..2c41d7e 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/AggregationPropertyDefinition.java
@@ -122,7 +122,7 @@
         private Condition targetIsEnabledCondition = Conditions.TRUE;
 
         /**
-         * The condition which is used to determine whether or not
+         * The condition which is used to determine whether
          * referenced managed objects need to be enabled.
          */
         private Condition targetNeedsEnablingCondition = Conditions.TRUE;
@@ -174,12 +174,12 @@
         }
 
         /**
-         * Sets the condition which is used to determine whether or not
+         * Sets the condition which is used to determine whether
          * referenced managed objects need to be enabled. By default referenced
          * managed objects must always be enabled.
          *
          * @param condition
-         *            The condition which is used to determine whether or not
+         *            The condition which is used to determine whether
          *            referenced managed objects need to be enabled.
          */
         public final void setTargetNeedsEnablingCondition(Condition condition) {
@@ -694,7 +694,7 @@
     private final Condition targetIsEnabledCondition;
 
     /**
-     * The condition which is used to determine whether or not
+     * The condition which is used to determine whether
      * referenced managed objects need to be enabled.
      */
     private final Condition targetNeedsEnablingCondition;
@@ -858,10 +858,10 @@
     }
 
     /**
-     * Gets the condition which is used to determine whether or not referenced
+     * Gets the condition which is used to determine whether referenced
      * managed objects need to be enabled.
      *
-     * @return Returns the condition which is used to determine whether or not
+     * @return Returns the condition which is used to determine whether
      *         referenced managed objects need to be enabled.
      */
     public final Condition getTargetNeedsEnablingCondition() {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java b/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java
index 6c88621..2fddb4c 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/ConfigurationFramework.java
@@ -367,7 +367,7 @@
     }
 
     /**
-     * Specifies whether or not the configuration framework is being used within
+     * Specifies whether the configuration framework is being used within
      * a client application. Client applications will perform less property
      * value validation than server applications because they do not have
      * resources available such as the server schema.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/DefinitionResolver.java b/opendj-config/src/main/java/org/forgerock/opendj/config/DefinitionResolver.java
index 60777be..98cb5bf 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/DefinitionResolver.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/DefinitionResolver.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 package org.forgerock.opendj.config;
 
@@ -44,7 +45,7 @@
 public interface DefinitionResolver {
 
     /**
-     * Determines whether or not the provided managed object definition matches
+     * Determines whether the provided managed object definition matches
      * this resolver's criteria.
      *
      * @param d
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java
index 3f02709..1f89a6f 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/DurationPropertyDefinition.java
@@ -258,7 +258,7 @@
         }
 
         /**
-         * Specify whether or not this property definition will allow unlimited
+         * Specify whether this property definition will allow unlimited
          * values (default is false).
          *
          * @param allowUnlimited
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java
index 192c8a6..a993af1 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/IntegerPropertyDefinition.java
@@ -108,7 +108,7 @@
         }
 
         /**
-         * Specify whether or not this property definition will allow unlimited
+         * Specify whether this property definition will allow unlimited
          * values (default is false).
          *
          * @param allowUnlimited
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java b/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java
index 18a1ce5..1e812b7 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPath.java
@@ -935,7 +935,7 @@
     }
 
     /**
-     * Determine whether or not this path contains any path elements.
+     * Determine whether this path contains any path elements.
      *
      * @return Returns <code>true</code> if this path does not contain any path
      *         elements.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionUsageBuilder.java b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionUsageBuilder.java
index 9c73bbd..9ee8820 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionUsageBuilder.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/PropertyDefinitionUsageBuilder.java
@@ -251,7 +251,7 @@
      * Creates a new property usage builder.
      *
      * @param isDetailed
-     *            Indicates whether or not the generated usage should contain
+     *            Indicates whether the generated usage should contain
      *            detailed information such as constraints.
      */
     public PropertyDefinitionUsageBuilder(boolean isDetailed) {
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java b/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java
index 5d17f8e..d7f4409 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/SizePropertyDefinition.java
@@ -136,7 +136,7 @@
         }
 
         /**
-         * Specify whether or not this property definition will allow unlimited
+         * Specify whether this property definition will allow unlimited
          * values (default is false).
          *
          * @param allowUnlimited
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ClientConstraintHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ClientConstraintHandler.java
index d457f67..e62b24e 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ClientConstraintHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ClientConstraintHandler.java
@@ -42,7 +42,7 @@
     }
 
     /**
-     * Determines whether or not the newly created managed object which is about
+     * Determines whether the newly created managed object which is about
      * to be added to the server configuration satisfies this constraint.
      * <p>
      * If the constraint is not satisfied, the implementation must return
@@ -68,7 +68,7 @@
     }
 
     /**
-     * Determines whether or not the changes to an existing managed object which
+     * Determines whether the changes to an existing managed object which
      * are about to be committed to the server configuration satisfies this
      * constraint.
      * <p>
@@ -95,7 +95,7 @@
     }
 
     /**
-     * Determines whether or not the existing managed object which is about to
+     * Determines whether the existing managed object which is about to
      * be deleted from the server configuration satisfies this constraint.
      * <p>
      * If the constraint is not satisfied, the implementation must return
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagedObject.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagedObject.java
index af44640..e819dbf 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagedObject.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagedObject.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.config.client;
@@ -76,7 +76,7 @@
 
     /**
      * Adds this managed object to the server or commits any changes made to it
-     * depending on whether or not the managed object already exists on the
+     * depending on whether the managed object already exists on the
      * server. Pending property values will be committed to the managed object.
      * If successful, the pending values will become active values.
      * <p>
@@ -105,8 +105,8 @@
             ConcurrentModificationException, OperationRejectedException, LdapException;
 
     /**
-     * Determines whether or not this managed object has been modified since it
-     * was constructed. In other words, whether or not the set of pending values
+     * Determines whether this managed object has been modified since it
+     * was constructed. In other words, whether the set of pending values
      * differs from the set of active values.
      *
      * @return Returns <code>true</code> if this managed object has been
@@ -442,7 +442,7 @@
     <P> SortedSet<P> getPropertyValues(PropertyDefinition<P> pd);
 
     /**
-     * Determines whether or not the specified property is set. If the property
+     * Determines whether the specified property is set. If the property
      * is unset, then any default behavior associated with the property applies.
      *
      * @param pd
@@ -457,7 +457,7 @@
     boolean isPropertyPresent(PropertyDefinition<?> pd);
 
     /**
-     * Determines whether or not the optional managed object associated with the
+     * Determines whether the optional managed object associated with the
      * specified optional relations exists.
      *
      * @param <C>
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java
index 746cbdc..86dcead 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java
@@ -326,7 +326,7 @@
             ManagedObjectNotFoundException, LdapException;
 
     /**
-     * Determines whether or not the named managed object exists.
+     * Determines whether the named managed object exists.
      *
      * @param path
      *            The path of the named managed object.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/MissingMandatoryPropertiesException.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/MissingMandatoryPropertiesException.java
index b727e11..926f445 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/MissingMandatoryPropertiesException.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/MissingMandatoryPropertiesException.java
@@ -124,7 +124,7 @@
     }
 
     /**
-     * Indicates whether or not this exception was thrown during managed object
+     * Indicates whether this exception was thrown during managed object
      * creation or during modification.
      *
      * @return Returns <code>true</code> if this exception was thrown during
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagedObject.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagedObject.java
index 9a476dd..fcc4b90 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagedObject.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/LDAPManagedObject.java
@@ -101,7 +101,7 @@
      * @param properties
      *            The managed object's properties.
      * @param existsOnServer
-     *            Indicates whether or not the managed object already exists.
+     *            Indicates whether the managed object already exists.
      * @param namingPropertyDefinition
      *            The managed object's naming property definition if there is
      *            one.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java
index f502405..ea8aebb 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/AbstractManagedObject.java
@@ -183,9 +183,8 @@
     private final ManagedObjectDefinition<T, ? extends Configuration> definition;
 
     /**
-     * Indicates whether or not this managed object exists on the server
-     * (false means the managed object is new and has not been
-     * committed).
+     * Indicates whether this managed object exists on the server
+     * (false means the managed object is new and has not been committed).
      */
     private boolean existsOnServer;
 
@@ -208,9 +207,8 @@
      * @param properties
      *            The managed object's properties.
      * @param existsOnServer
-     *            Indicates whether or not the managed object exists on the
-     *            server (false means the managed object is new and has not been
-     *            committed).
+     *            Indicates whether the managed object exists on the server
+     *            (false means the managed object is new and has not been committed).
      * @param namingPropertyDefinition
      *            Optional naming property definition.
      */
@@ -670,9 +668,8 @@
      * @param properties
      *            The managed object's properties.
      * @param existsOnServer
-     *            Indicates whether or not the managed object exists on the
-     *            server (false means the managed object is new and has not been
-     *            committed).
+     *            Indicates whether the managed object exists on the server
+     *            (false means the managed object is new and has not been committed).
      * @param namingPropertyDefinition
      *            Optional naming property definition.
      * @return Returns the new managed object.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java
index 57da00b..b175130 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java
@@ -484,7 +484,7 @@
         LdapException;
 
     /**
-     * Determines whether or not the named managed object exists.
+     * Determines whether the named managed object exists.
      * <p>
      * Implementations should always return <code>true</code> when the provided
      * path is empty.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Property.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Property.java
index 230e7d0..d72c1b3 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Property.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Property.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.config.client.spi;
@@ -27,7 +28,7 @@
  * The property stores the values in a sorted set in which values are compared
  * using the comparator defined by the property definition.
  * <p>
- * The property keeps track of whether or not its pending set of values differs
+ * The property keeps track of whether its pending set of values differs
  * from its active values.
  *
  * @param <T>
@@ -80,7 +81,7 @@
     PropertyDefinition<T> getPropertyDefinition();
 
     /**
-     * Determines whether or not this property contains any pending values.
+     * Determines whether this property contains any pending values.
      *
      * @return Returns <code>true</code> if this property does not contain any
      *         pending values.
@@ -88,8 +89,8 @@
     boolean isEmpty();
 
     /**
-     * Determines whether or not this property has been modified since it was
-     * constructed. In other words, whether or not the set of pending values
+     * Determines whether this property has been modified since it was
+     * constructed. In other words, whether the set of pending values
      * differs from the set of active values.
      *
      * @return Returns <code>true</code> if this property has been modified
@@ -98,7 +99,7 @@
     boolean isModified();
 
     /**
-     * Determines whether or not this property contains any active values.
+     * Determines whether this property contains any active values.
      *
      * @return Returns <code>true</code> if this property does not contain any
      *         active values.
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
index 1cdd691..18c608d 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
@@ -803,14 +803,14 @@
     /** The factory which the application should use to retrieve its management context. */
     private LDAPManagementContextFactory factory;
 
-    /** Flag indicating whether or not the global arguments have already been initialized. */
+    /** Flag indicating whether the global arguments have already been initialized. */
     private boolean globalArgumentsInitialized;
 
     /** The sub-command handler factory. */
     private SubCommandHandlerFactory handlerFactory;
     /** Mapping of sub-commands to their implementations. */
     private final Map<SubCommand, SubCommandHandler> handlers = new HashMap<>();
-    /** Indicates whether or not a sub-command was provided. */
+    /** Indicates whether a sub-command was provided. */
     private boolean hasSubCommand = true;
 
     /** The command-line argument parser. */
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
index d965ac7..32efebf 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
@@ -259,7 +259,7 @@
         }
 
         /**
-         * Determines whether or not the default behavior is alias.
+         * Determines whether the default behavior is alias.
          *
          * @return Returns <code>true</code> if the default behavior is alias.
          */
@@ -268,7 +268,7 @@
         }
 
         /**
-         * Determines whether or not the default behavior is defined.
+         * Determines whether the default behavior is defined.
          *
          * @return Returns <code>true</code> if the default behavior is defined.
          */
@@ -277,7 +277,7 @@
         }
 
         /**
-         * Determines whether or not the default behavior is inherited.
+         * Determines whether the default behavior is inherited.
          *
          * @return Returns <code>true</code> if the default behavior is inherited.
          */
@@ -286,7 +286,7 @@
         }
 
         /**
-         * Determines whether or not the default behavior is undefined.
+         * Determines whether the default behavior is undefined.
          *
          * @return Returns <code>true</code> if the default behavior is undefined.
          */
@@ -921,7 +921,7 @@
         }
 
         /**
-         * Generate an appropriate menu option for a property which asks the user whether or not they want to keep the
+         * Generate an appropriate menu option for a property which asks the user whether they want to keep the
          * property's current settings.
          */
         private <T> LocalizableMessage getKeepDefaultValuesMenuOption(PropertyDefinition<T> pd,
@@ -1527,7 +1527,7 @@
         }
 
         /**
-         * Generate an appropriate menu option for a property which asks the user whether or not they want to keep the
+         * Generate an appropriate menu option for a property which asks the user whether they want to keep the
          * property's current settings.
          */
         private <T> LocalizableMessage getKeepDefaultValuesMenuOption(PropertyDefinition<T> pd) {
@@ -1860,7 +1860,7 @@
      * @param c
      *            The collection of properties which can be edited.
      * @param isCreate
-     *            Flag indicating whether or not the managed object is being created. If it is then read-only properties
+     *            Flag indicating whether the managed object is being created. If it is then read-only properties
      *            will be modifiable.
      * @return Returns {@code MenuResult.success()} if the changes made to the managed object should be applied, or
      *         {@code MenuResult.cancel()} if the user to chose to cancel any changes, or {@code MenuResult.quit()} if
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValuePrinter.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValuePrinter.java
index 6cf7949..cb64414 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValuePrinter.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValuePrinter.java
@@ -42,7 +42,7 @@
         private final SizeUnit sizeUnit;
         /** The requested time unit (null if the property's unit should be used). */
         private final DurationUnit timeUnit;
-        /** Whether or not values should be displayed in a script-friendly manner. */
+        /** Whether values should be displayed in a script-friendly manner. */
         private final boolean isScriptFriendly;
         /** The formatter to use for numeric values. */
         private final NumberFormat numberFormat;
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerConstraintHandler.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerConstraintHandler.java
index 006da25..0e64380 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerConstraintHandler.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerConstraintHandler.java
@@ -46,7 +46,7 @@
     }
 
     /**
-     * Determines whether or not the existing managed object can be deleted from
+     * Determines whether the existing managed object can be deleted from
      * the server's configuration. For example, an implementation might enforce
      * referential integrity by preventing referenced managed objects from being
      * deleted.
@@ -74,7 +74,7 @@
     }
 
     /**
-     * Determines whether or not the provided managed object can be used by the
+     * Determines whether the provided managed object can be used by the
      * server. This method is invoked each time a managed object is decoded by
      * the administration framework: when an attempt is made to add a new
      * configuration, modify an existing configuration, or during server
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
index 5a7da06..fa28331 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
@@ -581,7 +581,7 @@
     }
 
     /**
-     * Determines whether or not the optional managed object associated with the
+     * Determines whether the optional managed object associated with the
      * specified optional relations exists.
      *
      * @param d
@@ -973,7 +973,7 @@
     }
 
     /**
-     * Determines whether or not this managed object can be used by the server.
+     * Determines whether this managed object can be used by the server.
      *
      * @throws ConstraintViolationException
      *             If one or more constraints determined that this managed
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
index e70ad2f..2cd302d 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagementContext.java
@@ -533,7 +533,7 @@
     }
 
     /**
-     * Determines whether or not the named managed object exists.
+     * Determines whether the named managed object exists.
      *
      * @param path
      *            The path of the named managed object.
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java
index ed98f59..891e1ef 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfg.java
@@ -151,7 +151,7 @@
     void removeTestChildDeleteListener(ConfigurationDeleteListener<TestChildCfg> listener);
 
     /**
-     * Determines whether or not the Optional Test Child exists.
+     * Determines whether the Optional Test Child exists.
      *
      * @return Returns <true> if the Optional Test Child exists.
      */
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java
index 36594aa..6f7001d 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/TestParentCfgClient.java
@@ -218,7 +218,7 @@
             ConcurrentModificationException, LdapException;
 
     /**
-     * Determines whether or not the Optional Test Child exists.
+     * Determines whether the Optional Test Child exists.
      *
      * @return Returns <true> if the Optional Test Child exists.
      * @throws ConcurrentModificationException
diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java b/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java
index 3a6bf67..fc8816b 100644
--- a/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java
+++ b/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java
@@ -19,7 +19,7 @@
 
 /**
  * A {@code ASCIICharProp} provides fast access to ASCII character properties.
- * In particular, the ability to query whether or not a character is a letter, a
+ * In particular, the ability to query whether a character is a letter, a
  * digit, hexadecimal character, as well as various methods for performing
  * character conversions.
  * <p>
@@ -208,7 +208,7 @@
     }
 
     /**
-     * Indicates whether or not the char value associated with this
+     * Indicates whether the char value associated with this
      * {@code ASCIICharProp} is a decimal digit.
      *
      * @return {@code true} if the char value associated with this
@@ -219,7 +219,7 @@
     }
 
     /**
-     * Indicates whether or not the char value associated with this
+     * Indicates whether the char value associated with this
      * {@code ASCIICharProp} is a hexadecimal digit.
      *
      * @return {@code true} if the char value associated with this
@@ -230,7 +230,7 @@
     }
 
     /**
-     * Indicates whether or not the char value associated with this
+     * Indicates whether the char value associated with this
      * {@code ASCIICharProp} is a {@code keychar} as defined in RFC 4512. A
      * {@code keychar} is a letter, a digit, or a hyphen. When
      * {@code allowCompatChars} is {@code true} the following illegal characters
@@ -254,7 +254,7 @@
     }
 
     /**
-     * Indicates whether or not the char value associated with this
+     * Indicates whether the char value associated with this
      * {@code ASCIICharProp} is a letter.
      *
      * @return {@code true} if the char value associated with this
@@ -265,7 +265,7 @@
     }
 
     /**
-     * Indicates whether or not the char value associated with this
+     * Indicates whether the char value associated with this
      * {@code ASCIICharProp} is a lower-case character.
      *
      * @return {@code true} if the char value associated with this
@@ -276,7 +276,7 @@
     }
 
     /**
-     * Indicates whether or not the char value associated with this
+     * Indicates whether the char value associated with this
      * {@code ASCIICharProp} is an upper-case character.
      *
      * @return {@code true} if the char value associated with this
diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java b/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java
index 9cdda2f..152e7cf 100644
--- a/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java
+++ b/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package com.forgerock.opendj.util;
@@ -29,7 +30,7 @@
  */
 public interface Predicate<M, P> {
     /**
-     * Indicates whether or not this predicate matches the provided input value
+     * Indicates whether this predicate matches the provided input value
      * of type {@code M}.
      *
      * @param value
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java
index 447455e..a10f805 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java
@@ -43,7 +43,7 @@
     void close() throws IOException;
 
     /**
-     * Indicates whether or not the next element can be read without blocking.
+     * Indicates whether the next element can be read without blocking.
      *
      * @return {@code true} if a complete element is available or {@code false}
      *         otherwise.
@@ -55,7 +55,7 @@
     boolean elementAvailable() throws DecodeException, IOException;
 
     /**
-     * Indicates whether or not the current stream, sequence, or set contains
+     * Indicates whether the current stream, sequence, or set contains
      * another element. Note that this method may return {@code true} even if a
      * previous call to {@link #elementAvailable} returned {@code false},
      * indicating that the current set or sequence contains another element but
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java
index 93a69c6..e5af0ab 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java
@@ -1089,8 +1089,7 @@
     }
 
     /**
-     * Indicates whether or not this attribute description contains the provided
-     * option.
+     * Indicates whether this attribute description contains the provided option.
      *
      * @param option
      *            The option for which to make the determination.
@@ -1177,7 +1176,7 @@
     }
 
     /**
-     * Indicates whether or not this attribute description has any options.
+     * Indicates whether this attribute description has any options.
      *
      * @return {@code true} if this attribute description has any options, or
      *         {@code false} if not.
@@ -1187,7 +1186,7 @@
     }
 
     /**
-     * Indicates whether or not this attribute description is the
+     * Indicates whether this attribute description is the
      * {@code objectClass} attribute description with no options.
      *
      * @return {@code true} if this attribute description is the
@@ -1219,7 +1218,7 @@
     }
 
     /**
-     * Indicates whether or not this attribute description is a sub-type of the
+     * Indicates whether this attribute description is a sub-type of the
      * provided attribute description as defined in RFC 4512 section 2.5.
      * Specifically, this method will return {@code true} if and only if the
      * following conditions are both {@code true}:
@@ -1246,7 +1245,7 @@
     }
 
     /**
-     * Indicates whether or not this attribute description is a super-type of
+     * Indicates whether this attribute description is a super-type of
      * the provided attribute description as defined in RFC 4512 section 2.5.
      * Specifically, this method will return {@code true} if and only if the
      * following conditions are both {@code true}:
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java
index 0fa2109..12a2f8b 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java
@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
- * Copyright 2013-2015 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldap;
@@ -258,7 +258,7 @@
     }
 
     /**
-     * Specifies whether or not all operational attributes should be included in
+     * Specifies whether all operational attributes should be included in
      * filtered entries. By default operational attributes are not included.
      *
      * @param include
@@ -272,7 +272,7 @@
     }
 
     /**
-     * Specifies whether or not all user attributes should be included in
+     * Specifies whether all user attributes should be included in
      * filtered entries. By default user attributes are included.
      *
      * @param include
@@ -384,7 +384,7 @@
     }
 
     /**
-     * Specifies whether or not filtered attributes are to contain both
+     * Specifies whether filtered attributes are to contain both
      * attribute descriptions and values, or just attribute descriptions.
      *
      * @param typesOnly
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java
index 9336052..dfca653 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldap;
@@ -833,7 +833,7 @@
         IntermediateResponseHandler intermediateResponseHandler);
 
     /**
-     * Indicates whether or not this connection has been explicitly closed by
+     * Indicates whether this connection has been explicitly closed by
      * calling {@code close}. This method will not return {@code true} if a
      * fatal error has occurred on the connection unless {@code close} has been
      * called.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java
index 547cfff..ef5656e 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java
@@ -671,7 +671,7 @@
      * <p>
      * When processing requests, {@link RequestHandler} implementations are
      * passed a {@link RequestContext} as the first parameter which may be used
-     * for detecting whether or not the request should be aborted due to
+     * for detecting whether the request should be aborted due to
      * cancellation requests or other events, such as connection failure.
      * <p>
      * The returned factory maintains state information which includes a table
@@ -706,7 +706,7 @@
      * <p>
      * When processing requests, {@link RequestHandler} implementations are
      * passed a {@link RequestContext} as the first parameter which may be used
-     * for detecting whether or not the request should be aborted due to
+     * for detecting whether the request should be aborted due to
      * cancellation requests or other events, such as connection failure.
      * <p>
      * The returned factory maintains state information which includes a table
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java
index 2aadaae..a0fab9f 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java
@@ -98,7 +98,7 @@
     }
 
     /**
-     * Indicates whether or not the error was fatal and the associated input
+     * Indicates whether the error was fatal and the associated input
      * source can no longer be used.
      *
      * @return {@code true} if the error was fatal and the associated input
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java
index 7a4a588..f5eec4c 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java
@@ -22,8 +22,8 @@
 
 /**
  * A Search operation alias dereferencing policy as defined in RFC 4511 section
- * 4.5.1.3 is used to indicate whether or not alias entries (as defined in RFC
- * 4512) are to be dereferenced during stages of a Search operation. The act of
+ * 4.5.1.3 is used to indicate whether alias entries (as defined in RFC 4512)
+ * are to be dereferenced during stages of a Search operation. The act of
  * dereferencing an alias includes recursively dereferencing aliases that refer
  * to aliases.
  *
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java
index f355959..dc67596 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java
@@ -31,8 +31,8 @@
  * for any other purpose. In particular, an {@code Entry} may contain attributes
  * which have been decoded using different schemas.
  * <p>
- * When determining whether or not an entry already contains a particular
- * attribute, attribute descriptions will be compared using
+ * When determining whether an entry already contains a particular attribute,
+ * attribute descriptions will be compared using
  * {@link AttributeDescription#matches}.
  * <p>
  * Full LDAP modify semantics are provided via the {@link #addAttribute},
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java
index cbcdb46..3aea414 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java
@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
- * Copyright 2011-2012 ForgeRock AS.
+ * Copyright 2011-2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldap;
@@ -19,7 +19,7 @@
 /**
  * The context associated with a request currently being processed by a request
  * handler. A request context can be used to query state information about the
- * request, such as whether or not it has been cancelled, as well as registering
+ * request, such as whether it has been cancelled, as well as registering
  * to be notified if the request has been cancelled. Implementations may provide
  * additional information, such as the associated schema, time-stamp
  * information, etc.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java
index f60c5ea..b37c1b1 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java
@@ -967,7 +967,7 @@
     }
 
     /**
-     * Indicates whether or not this result code represents an error result.
+     * Indicates whether this result code represents an error result.
      * <p>
      * The following result codes are NOT interpreted as error results:
      * <ul>
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java
index e0fe8eb..3adee2e 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java
@@ -180,13 +180,13 @@
      *            without applying the semantics of this control, or
      *            {@code false} if it can be ignored
      * @param changesOnly
-     *            Indicates whether or not only updated entries should be
+     *            Indicates whether only updated entries should be
      *            returned (added, modified, deleted, or subject to a modifyDN
      *            operation). If this parameter is {@code false} then the search
      *            will initially return all the existing entries which match the
      *            filter.
      * @param returnECs
-     *            Indicates whether or not the entry change notification control
+     *            Indicates whether the entry change notification control
      *            should be included in updated entries that match the
      *            associated search criteria.
      * @param changeTypes
@@ -216,13 +216,13 @@
      *            without applying the semantics of this control, or
      *            {@code false} if it can be ignored
      * @param changesOnly
-     *            Indicates whether or not only updated entries should be
+     *            Indicates whether only updated entries should be
      *            returned (added, modified, deleted, or subject to a modifyDN
      *            operation). If this parameter is {@code false} then the search
      *            will initially return all the existing entries which match the
      *            filter.
      * @param returnECs
-     *            Indicates whether or not the entry change notification control
+     *            Indicates whether the entry change notification control
      *            should be included in updated entries that match the
      *            associated search criteria.
      * @param changeTypes
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java
index 2e75358..6672725 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java
@@ -191,7 +191,7 @@
     }
 
     /**
-     * Returns a boolean indicating whether or not sub-entries should be
+     * Returns a boolean indicating whether sub-entries should be
      * included in the search results.
      *
      * @return {@code true} if sub-entries should be included in the search
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java
index 94f4814..164d69b 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldap.requests;
@@ -452,7 +452,7 @@
     DigestMD5SASLBindRequest setRealm(String realm);
 
     /**
-     * Specifies whether or not the server must authenticate to the client. The
+     * Specifies whether the server must authenticate to the client. The
      * default is {@code false}.
      *
      * @param serverAuth
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java
index 58df417..fcc1dcf 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldap.requests;
@@ -402,7 +402,7 @@
     GSSAPISASLBindRequest setRealm(String realm);
 
     /**
-     * Specifies whether or not the server must authenticate to the client. The
+     * Specifies whether the server must authenticate to the client. The
      * default is {@code false}.
      *
      * @param serverAuth
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java
index 6bef41d..473cf60 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2012-2013 ForgeRock AS.
+ * Portions copyright 2012-2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldap.requests;
@@ -93,7 +93,7 @@
     List<Control> getControls();
 
     /**
-     * Returns an indication as to whether or not alias entries are to be
+     * Returns an indication as to whether alias entries are to be
      * dereferenced during the search.
      *
      * @return The alias dereferencing policy.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java
index ded8f50..7f13f62 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldap.responses;
@@ -88,7 +88,7 @@
     boolean isReferral();
 
     /**
-     * Indicates whether or not the server requires the client to send a new
+     * Indicates whether the server requires the client to send a new
      * SASL Bind request with the same SASL mechanism in order to continue the
      * authentication process. This typically occurs during multi-stage
      * (challenge response) authentication.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java
index 2dabbac..54e4065 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2016 ForgeRock AS.
  */
 package org.forgerock.opendj.ldap.responses;
 
@@ -85,7 +85,7 @@
     boolean isSuccess();
 
     /**
-     * Indicates whether or not the attribute value assertion in the Compare
+     * Indicates whether the attribute value assertion in the Compare
      * request matched a value of the attribute or sub-type according to the
      * attribute's equality matching rule.
      * <p>
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java
index 2fe9875..02c78f7 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldap.responses;
@@ -31,7 +31,7 @@
  * <ul>
  * <li>The <b>result code</b> can be retrieved using the method
  * {@link #getResultCode}. This indicates the overall outcome of the operation.
- * In particular, whether or not it succeeded which is indicated using a value
+ * In particular, whether it succeeded which is indicated using a value
  * of {@link ResultCode#SUCCESS}.
  * <li>The optional <b>diagnostic message</b> can be retrieved using the method
  * {@link #getDiagnosticMessage}. At the server's discretion, a diagnostic
@@ -114,7 +114,7 @@
     ResultCode getResultCode();
 
     /**
-     * Indicates whether or not a referral needs to be chased in order to
+     * Indicates whether a referral needs to be chased in order to
      * complete the operation.
      * <p>
      * Specifically, this method returns {@code true} if the result code is
@@ -126,7 +126,7 @@
     boolean isReferral();
 
     /**
-     * Indicates whether or not the request succeeded or not. This method will
+     * Indicates whether the request succeeded or not. This method will
      * return {code true} for all non-error responses.
      *
      * @return {@code true} if the request succeeded, otherwise {@code false}.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
index 4165286..23cae5d 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
@@ -408,10 +408,10 @@
     /** The syntax for this attribute type. */
     private Syntax syntax;
 
-    /** Indicates whether or not validation has been performed. */
+    /** Indicates whether validation has been performed. */
     private boolean needsValidating = true;
 
-    /** The indicates whether or not validation failed. */
+    /** The indicates whether validation failed. */
     private boolean isValid;
 
     private AttributeType(Builder builder) {
@@ -710,7 +710,7 @@
     }
 
     /**
-     * Indicates whether or not this attribute type is the {@code objectClass}
+     * Indicates whether this attribute type is the {@code objectClass}
      * attribute type having the OID 2.5.4.0.
      *
      * @return {@code true} if this attribute type is the {@code objectClass}
@@ -772,7 +772,7 @@
     }
 
     /**
-     * Indicates whether or not this attribute type is a sub-type of the
+     * Indicates whether this attribute type is a sub-type of the
      * provided attribute type.
      *
      * @param type
@@ -794,7 +794,7 @@
     }
 
     /**
-     * Indicates whether or not this attribute type is a super-type of the
+     * Indicates whether this attribute type is a super-type of the
      * provided attribute type.
      *
      * @param type
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java
index f373198..175eed9 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java
@@ -12,6 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldap.schema;
@@ -24,22 +25,15 @@
  *      Directory Access Protocol (v3): Attribute Syntax Definitions</a>
  */
 public enum AttributeUsage {
-    /**
-     * The attribute usage intended for user-defined attribute types.
-     */
+    /** The attribute usage intended for user-defined attribute types. */
     USER_APPLICATIONS("userApplications", false),
-
-    /**
-     * The attribute usage intended for standard operational attributes.
-     */
+    /** The attribute usage intended for standard operational attributes. */
     DIRECTORY_OPERATION("directoryOperation", true),
-
     /**
      * The attribute usage intended for non-standard operational attributes
      * shared among multiple DSAs.
      */
     DISTRIBUTED_OPERATION("distributedOperation", true),
-
     /**
      * The attribute usage intended for non-standard operational attributes used
      * by a single DSA.
@@ -49,10 +43,7 @@
     /** The string representation of this attribute usage. */
     private final String usageString;
 
-    /**
-     * Flag indicating whether or not the usage should be categorized as
-     * operational.
-     */
+    /** Flag indicating whether the usage should be categorized as operational. */
     private final boolean isOperational;
 
     /**
@@ -70,8 +61,7 @@
     }
 
     /**
-     * Determine whether or not attributes having this attribute usage are
-     * operational.
+     * Determine whether attributes having this attribute usage are operational.
      *
      * @return Returns <code>true</code> if attributes having this attribute
      *         usage are operational, or <code>false</code> otherwise.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java
index 2d81de9..51b24ce 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java
@@ -273,10 +273,10 @@
     private NameForm nameForm;
     private Set<DITStructureRule> superiorRules = Collections.emptySet();
 
-    /** Indicates whether or not validation has been performed. */
+    /** Indicates whether validation has been performed. */
     private boolean needsValidating = true;
 
-    /** The indicates whether or not validation failed. */
+    /** The indicates whether validation failed. */
     private boolean isValid;
 
     DITStructureRule(final Builder builder) {
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
index 161e0d5..ec1e1b3 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
@@ -146,7 +146,7 @@
         }
 
         /**
-         * Specifies whether or not this schema element is obsolete.
+         * Specifies whether this schema element is obsolete.
          *
          * @param isObsolete
          *            {@code true} if this schema element is obsolete (default is {@code false}).
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
index e7c659d..b98fb2b 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
@@ -141,7 +141,7 @@
         }
 
         /**
-         * Specifies whether or not this schema element is obsolete.
+         * Specifies whether this schema element is obsolete.
          *
          * @param isObsolete
          *            {@code true} if this schema element is obsolete (default
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
index 1b9e3df..8bedae3 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
@@ -394,10 +394,10 @@
     private Set<AttributeType> declaredOptionalAttributes = emptySet();
     private Set<AttributeType> optionalAttributes = emptySet();
 
-    /** Indicates whether or not validation has been performed. */
+    /** Indicates whether validation has been performed. */
     private boolean needsValidating = true;
 
-    /** Indicates whether or not validation failed. */
+    /** Indicates whether validation failed. */
     private boolean isValid;
 
     /** Indicates whether this object class is the extensibleObject class. */
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java
index 6f64e92..ed15c90 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java
@@ -1542,7 +1542,7 @@
     }
 
     /**
-     * Indicates whether or not this schema contains an attribute type with the
+     * Indicates whether this schema contains an attribute type with the
      * specified name or numeric OID.
      *
      * @param nameOrOid
@@ -1555,7 +1555,7 @@
     }
 
     /**
-     * Indicates whether or not this schema contains a DIT content rule with the
+     * Indicates whether this schema contains a DIT content rule with the
      * specified name or numeric OID.
      *
      * @param nameOrOid
@@ -1568,7 +1568,7 @@
     }
 
     /**
-     * Indicates whether or not this schema contains a DIT structure rule with
+     * Indicates whether this schema contains a DIT structure rule with
      * the specified rule ID.
      *
      * @param ruleID
@@ -1581,7 +1581,7 @@
     }
 
     /**
-     * Indicates whether or not this schema contains a matching rule with the
+     * Indicates whether this schema contains a matching rule with the
      * specified name or numeric OID.
      *
      * @param nameOrOid
@@ -1594,7 +1594,7 @@
     }
 
     /**
-     * Indicates whether or not this schema contains a matching rule use with
+     * Indicates whether this schema contains a matching rule use with
      * the specified name or numeric OID.
      *
      * @param nameOrOid
@@ -1607,7 +1607,7 @@
     }
 
     /**
-     * Indicates whether or not this schema contains a name form with the
+     * Indicates whether this schema contains a name form with the
      * specified name or numeric OID.
      *
      * @param nameOrOid
@@ -1620,7 +1620,7 @@
     }
 
     /**
-     * Indicates whether or not this schema contains an object class with the
+     * Indicates whether this schema contains an object class with the
      * specified name or numeric OID.
      *
      * @param nameOrOid
@@ -1633,7 +1633,7 @@
     }
 
     /**
-     * Indicates whether or not this schema contains a syntax with the specified
+     * Indicates whether this schema contains a syntax with the specified
      * numeric OID.
      *
      * @param numericOID
@@ -1646,7 +1646,7 @@
     }
 
     /**
-     * Indicates whether or not this schema is strict.
+     * Indicates whether this schema is strict.
      * <p>
      * Attribute type queries against non-strict schema always succeed: if the
      * requested attribute type is not found then a temporary attribute type is
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java
index cec68d9..d24977f 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java
@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
- * Copyright 2013-2015 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
  */
 package org.forgerock.opendj.ldap.spi;
 
@@ -286,7 +286,7 @@
     }
 
     /**
-     * Indicates whether or not this connection has been explicitly closed by
+     * Indicates whether this connection has been explicitly closed by
      * calling {@code close}. This method will not return {@code true} if a
      * fatal error has occurred on the connection unless {@code close} has been
      * called.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java
index 43ddff6..5fa6b6c 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java
@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
- * Copyright 2015 ForgeRock AS.
+ * Copyright 2015-2016 ForgeRock AS.
  */
 package org.forgerock.opendj.ldap.spi;
 
@@ -216,7 +216,7 @@
             ExtendedRequest<R> request, IntermediateResponseHandler intermediateResponseHandler);
 
     /**
-     * Indicates whether or not this connection has been explicitly closed by calling {@code close}. This method will
+     * Indicates whether this connection has been explicitly closed by calling {@code close}. This method will
      * not return {@code true} if a fatal error has occurred on the connection unless {@code close} has been called.
      *
      * @return {@code true} if this connection has been explicitly closed by calling {@code close}, or {@code false}
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java
index 628b7c4..7f031fe 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldif;
@@ -27,7 +27,7 @@
  * <p>
  * Implementations must specify the following:
  * <ul>
- * <li>Whether or not it is possible for the implementation to encounter
+ * <li>Whether it is possible for the implementation to encounter
  * malformed change records and, if it is possible, how they are handled.
  * <li>Any synchronization limitations.
  * </ul>
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java
index a78eff2..c23e494 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java
@@ -221,7 +221,7 @@
      * The default is {@code true}.
      *
      * @param generateBranches
-     *              Indicates whether or not the branches DN entries has to be generated.
+     *              Indicates whether the branches DN entries has to be generated.
      * @return A reference to this {@code EntryGenerator}.
      */
     public EntryGenerator setGenerateBranches(boolean generateBranches) {
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java
index e4ed1c1..b85e3e0 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldif;
@@ -28,7 +28,7 @@
  * <p>
  * Implementations must specify the following:
  * <ul>
- * <li>Whether or not it is possible for the implementation to encounter
+ * <li>Whether it is possible for the implementation to encounter
  * malformed change records and, if it is possible, how they are handled.
  * <li>Any synchronization limitations.
  * </ul>
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
index ed435b9..58fe0ba 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java
@@ -222,7 +222,7 @@
     }
 
     /**
-     * Specifies whether or not all operational attributes should be excluded
+     * Specifies whether all operational attributes should be excluded
      * from any change records that are read from LDIF. The default is
      * {@code false}.
      *
@@ -238,7 +238,7 @@
     }
 
     /**
-     * Specifies whether or not all user attributes should be excluded from any
+     * Specifies whether all user attributes should be excluded from any
      * change records that are read from LDIF. The default is {@code false}.
      *
      * @param excludeUserAttributes
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java
index 33d0431..a4bd0de 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java
@@ -123,7 +123,7 @@
     }
 
     /**
-     * Specifies whether or not user-friendly comments should be added whenever
+     * Specifies whether user-friendly comments should be added whenever
      * distinguished names or UTF-8 attribute values are encountered which
      * contained non-ASCII characters. The default is {@code false}.
      *
@@ -138,7 +138,7 @@
     }
 
     /**
-     * Specifies whether or not all operational attributes should be excluded
+     * Specifies whether all operational attributes should be excluded
      * from any change records that are written to LDIF. The default is
      * {@code false}.
      *
@@ -154,7 +154,7 @@
     }
 
     /**
-     * Specifies whether or not all user attributes should be excluded from any
+     * Specifies whether all user attributes should be excluded from any
      * change records that are written to LDIF. The default is {@code false}.
      *
      * @param excludeUserAttributes
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java
index 5834c27..fca8633 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java
@@ -181,7 +181,7 @@
     }
 
     /**
-     * Specifies whether or not all operational attributes should be excluded
+     * Specifies whether all operational attributes should be excluded
      * from any entries that are read from LDIF. The default is {@code false}.
      *
      * @param excludeOperationalAttributes
@@ -196,7 +196,7 @@
     }
 
     /**
-     * Specifies whether or not all user attributes should be excluded from any
+     * Specifies whether all user attributes should be excluded from any
      * entries that are read from LDIF. The default is {@code false}.
      *
      * @param excludeUserAttributes
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java
index 87cac56..2f15423 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java
@@ -102,7 +102,7 @@
     }
 
     /**
-     * Specifies whether or not user-friendly comments should be added whenever
+     * Specifies whether user-friendly comments should be added whenever
      * distinguished names or UTF-8 attribute values are encountered which
      * contained non-ASCII characters. The default is {@code false}.
      *
@@ -117,7 +117,7 @@
     }
 
     /**
-     * Specifies whether or not all operational attributes should be excluded
+     * Specifies whether all operational attributes should be excluded
      * from any entries that are written to LDIF. The default is {@code false}.
      *
      * @param excludeOperationalAttributes
@@ -132,7 +132,7 @@
     }
 
     /**
-     * Specifies whether or not all user attributes should be excluded from any
+     * Specifies whether all user attributes should be excluded from any
      * entries that are written to LDIF. The default is {@code false}.
      *
      * @param excludeUserAttributes
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassTestCase.java
index 7bf6eb5..06cf204 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassTestCase.java
@@ -29,15 +29,15 @@
         Schema schema = getCoreSchema();
         ObjectClass extensibleObject = schema.getObjectClass(EXTENSIBLE_OBJECT_OBJECTCLASS_OID);
 
-        AttributeType attributeType = schema.getAttributeType("dummy");
-        assertThat(attributeType.isPlaceHolder()).isTrue();
-        assertThat(extensibleObject.isRequired(attributeType)).isFalse();
-        assertThat(extensibleObject.isOptional(attributeType)).isFalse();
-        assertThat(extensibleObject.isRequiredOrOptional(attributeType)).isFalse();
+        AttributeType dummy = schema.getAttributeType("dummy");
+        assertThat(dummy.isPlaceHolder()).isTrue();
+        assertThat(extensibleObject.isRequired(dummy)).isFalse();
+        assertThat(extensibleObject.isOptional(dummy)).isFalse();
+        assertThat(extensibleObject.isRequiredOrOptional(dummy)).isFalse();
     }
 
     @Test
-    public void extensibleObjectShouldAcceptAnyValidAttribute() {
+    public void extensibleObjectShouldAcceptAnyAttributeInTheSchema() {
         Schema schema = getCoreSchema();
         ObjectClass extensibleObject = schema.getObjectClass(EXTENSIBLE_OBJECT_OBJECTCLASS_OID);
 
diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
index a584232..42c33de 100644
--- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
+++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
@@ -744,7 +744,7 @@
     }
 
     /**
-     * Indicates whether or not TLS is enabled on this connection.
+     * Indicates whether TLS is enabled on this connection.
      *
      * @return {@code true} if TLS is enabled on this connection, otherwise
      *         {@code false}.
diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java
index faa4cbb..fc3fa12 100644
--- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java
+++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java
@@ -414,7 +414,7 @@
         }
 
         /**
-         * Indicates whether or not TLS is enabled this provided connection.
+         * Indicates whether TLS is enabled this provided connection.
          *
          * @return {@code true} if TLS is enabled on this connection, otherwise
          *         {@code false}.
diff --git a/opendj-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl
index 728ab21..58d33cc 100644
--- a/opendj-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl
+++ b/opendj-maven-plugin/src/main/resources/config/stylesheets/abbreviations.xsl
@@ -12,7 +12,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2008-2009 Sun Microsystems, Inc.
-  Portions copyright 2011-2015 ForgeRock AS.
+  Portions copyright 2011-2016 ForgeRock AS.
   ! -->
 <xsl:stylesheet version="1.0"
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -21,8 +21,7 @@
     be converted to upper-case when used in applications (e.g. as Java names).
   -->
   <!--
-    Determines whether or not the provided word is a known abbreviation or
-    acronym.
+    Determines whether the provided word is a known abbreviation or acronym.
 
     @param value The word.
 
diff --git a/opendj-maven-plugin/src/main/resources/config/stylesheets/admin.xsd b/opendj-maven-plugin/src/main/resources/config/stylesheets/admin.xsd
index c764442..2e73e96 100644
--- a/opendj-maven-plugin/src/main/resources/config/stylesheets/admin.xsd
+++ b/opendj-maven-plugin/src/main/resources/config/stylesheets/admin.xsd
@@ -403,8 +403,8 @@
       default="false">
       <xsd:annotation>
         <xsd:documentation>
-          Indicates whether or not this property is multi-valued. By
-          default, properties are single-valued.
+          Indicates whether this property is multi-valued.
+          By default, properties are single-valued.
         </xsd:documentation>
       </xsd:annotation>
     </xsd:attribute>
@@ -412,8 +412,8 @@
       default="false">
       <xsd:annotation>
         <xsd:documentation>
-          Indicates whether or not this property is read-only. By
-          default, properties are not read-only. Read-only properties
+          Indicates whether this property is read-only.
+          By default, properties are not read-only. Read-only properties
           can only be initialized during construction of the associated
           managed object and cannot be modified once the managed object
           has been created.
@@ -424,7 +424,7 @@
       default="false">
       <xsd:annotation>
         <xsd:documentation>
-          Indicates whether or not this property is read-only and
+          Indicates whether this property is read-only and
           generated automatically by the server as monitoring
           information. By default, properties are not for monitoring.
           Monitoring properties are always read-only because their
@@ -437,7 +437,7 @@
       default="false">
       <xsd:annotation>
         <xsd:documentation>
-          Indicates whether or not this property is mandatory. Mandatory
+          Indicates whether this property is mandatory. Mandatory
           properties are usually those properties which have no sensible
           default behavior and must, therefore, be specified by
           administrators. If a mandatory property has default values
@@ -450,7 +450,7 @@
       default="false">
       <xsd:annotation>
         <xsd:documentation>
-          Indicates whether or not this property should be hidden from
+          Indicates whether this property should be hidden from
           client applications. Hidden properties should rarely be used
           but are sometimes required in order to provide functionality
           that needs to be exposed in management APIs but not in
@@ -462,7 +462,7 @@
       default="false">
       <xsd:annotation>
         <xsd:documentation>
-          Indicates whether or not this property should be treated as an
+          Indicates whether this property should be treated as an
           advanced property and hidden by default in client
           applications. Advanced properties should either be optional
           (i.e. not mandatory) or be mandatory with default values. This
@@ -584,7 +584,7 @@
       <xsd:annotation>
         <xsd:documentation>
           Optionally override the advanced option defined in the
-          overridden property definition. Indicates whether or not this
+          overridden property definition. Indicates whether this
           property should be treated as an advanced property and hidden
           by default in client applications. Advanced properties should
           either be optional (i.e. not mandatory) or be mandatory with
@@ -797,9 +797,9 @@
               use="optional" default="false">
               <xsd:annotation>
                 <xsd:documentation>
-                  Indicates whether or not this relation contains
-                  unique members. If set to true then each
-                  referenced managed object must have a distinct type.
+                  Indicates whether this relation contains unique members.
+                  If set to true then each referenced managed object must
+                  have a distinct type.
                   In other words, there must not be more than one
                   referenced managed object having the same type. By
                   default, properties are single-valued.
@@ -888,7 +888,7 @@
       default="false">
       <xsd:annotation>
         <xsd:documentation>
-          Indicates whether or not managed objects referenced by this
+          Indicates whether managed objects referenced by this
           relation should be treated as advanced and be hidden by
           default in client applications.
         </xsd:documentation>
@@ -898,7 +898,7 @@
       default="false">
       <xsd:annotation>
         <xsd:documentation>
-          Indicates whether or not this relation should be hidden from
+          Indicates whether this relation should be hidden from
           client applications. Hidden relations should rarely be used
           but are sometimes required in order to provide functionality
           that needs to be exposed in management APIs but not in
@@ -1265,7 +1265,7 @@
                     minOccurs="0">
                     <xsd:annotation>
                       <xsd:documentation>
-                        A condition which indicates whether or not
+                        A condition which indicates whether
                         referenced managed objects must be enabled. The
                         default behavior is that all referenced managed
                         objects must be enabled.
@@ -1281,7 +1281,7 @@
                     minOccurs="0">
                     <xsd:annotation>
                       <xsd:documentation>
-                        A condition which indicates whether or not
+                        A condition which indicates whether
                         referenced managed objects are enabled. Managed
                         objects are assumed to be enabled by default.
                       </xsd:documentation>
@@ -1456,7 +1456,7 @@
             use="optional" default="true">
             <xsd:annotation>
               <xsd:documentation>
-                Indicates whether or not this property supports a
+                Indicates whether this property supports a
                 special value representing infinity. This is useful
                 where properties are used to constrain some behavior and
                 the administrator wishes to remove the constraint (e.g.
@@ -1519,7 +1519,7 @@
             use="optional" default="false">
             <xsd:annotation>
               <xsd:documentation>
-                Indicates whether or not this property supports a
+                Indicates whether this property supports a
                 special value representing infinity. This is useful
                 where properties are used to constrain some behavior and
                 the administrator wishes to remove the constraint (e.g.
@@ -1597,7 +1597,7 @@
             use="optional" default="false">
             <xsd:annotation>
               <xsd:documentation>
-                Indicates whether or not this property supports a
+                Indicates whether this property supports a
                 special value representing infinity. This is useful
                 where properties are used to constrain some behavior and
                 the administrator wishes to remove the constraint (e.g.
@@ -1754,7 +1754,7 @@
             use="optional" default="true">
             <xsd:annotation>
               <xsd:documentation>
-                Indicates whether or not values of this property should
+                Indicates whether values of this property should
                 be treated in a case-insensitive manner.
               </xsd:documentation>
             </xsd:annotation>
@@ -2008,10 +2008,9 @@
             use="optional" default="false">
             <xsd:annotation>
               <xsd:documentation>
-                Indicates whether or not this managed object is
-                abstract. Abstract managed objects cannot be
-                instantiated directly and are intended for use as base
-                definitions for inheritance.
+                Indicates whether this managed object is abstract.
+                Abstract managed objects cannot be instantiated directly
+                and are intended for use as base definitions for inheritance.
               </xsd:documentation>
             </xsd:annotation>
           </xsd:attribute>
@@ -2019,7 +2018,7 @@
             use="optional" default="false">
             <xsd:annotation>
               <xsd:documentation>
-                Indicates whether or not this managed object should be
+                Indicates whether this managed object should be
                 treated as advanced and therefore should be hidden by
                 default in client applications. This feature is not
                 inherited by child managed objects.
@@ -2030,7 +2029,7 @@
             default="false">
             <xsd:annotation>
               <xsd:documentation>
-                Indicates whether or not this managed object should be
+                Indicates whether this managed object should be
                 hidden from client applications. Hidden managed objects
                 should rarely be used but are sometimes required in
                 order to provide functionality that needs to be exposed
@@ -2042,7 +2041,7 @@
             use="optional">
             <xsd:annotation>
               <xsd:documentation>
-                Indicates whether or not this managed object inherits
+                Indicates whether this managed object inherits
                 from a parent managed object and, if so, the name of the
                 parent. If specified, this managed object will inherit
                 all of the properties and relations defined in the
diff --git a/opendj-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl
index c2f9db4..d9100c6 100644
--- a/opendj-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl
+++ b/opendj-maven-plugin/src/main/resources/config/stylesheets/clientMO.xsl
@@ -12,7 +12,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2008-2009 Sun Microsystems, Inc.
-  Portions Copyright 2014 ForgeRock AS.
+  Portions Copyright 2014-2016 ForgeRock AS.
   ! -->
 <xsl:stylesheet version="1.0" xmlns:adm="http://opendj.forgerock.org/admin"
   xmlns:admpp="http://opendj.forgerock.org/admin-preprocessor"
@@ -115,7 +115,7 @@
         <xsl:call-template name="add-java-comment2">
           <xsl:with-param name="indent" select="2" />
           <xsl:with-param name="content"
-            select="concat('Determines whether or not the ', $ufn,' exists.&#xa;',
+            select="concat('Determines whether the ', $ufn,' exists.&#xa;',
                        '&#xa;',
                        '@return Returns &lt;true&gt; if the ', $ufn,' exists.&#xa;',
                        '@throws ConcurrentModificationException&#xa;',
diff --git a/opendj-maven-plugin/src/main/resources/config/stylesheets/serverMO.xsl b/opendj-maven-plugin/src/main/resources/config/stylesheets/serverMO.xsl
index b85d37d..820a6c9 100644
--- a/opendj-maven-plugin/src/main/resources/config/stylesheets/serverMO.xsl
+++ b/opendj-maven-plugin/src/main/resources/config/stylesheets/serverMO.xsl
@@ -12,6 +12,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2007-2008 Sun Microsystems, Inc.
+  Portions Copyright 2016 ForgeRock AS.
   ! -->
 <xsl:stylesheet version="1.0" xmlns:adm="http://opendj.forgerock.org/admin"
   xmlns:admpp="http://opendj.forgerock.org/admin-preprocessor"
@@ -132,7 +133,7 @@
       <xsl:when test="adm:one-to-zero-or-one">
         <xsl:value-of
           select="concat('  /**&#xa;',
-                       '   * Determines whether or not the ', $ufn,' exists.&#xa;',
+                       '   * Determines whether the ', $ufn,' exists.&#xa;',
                        '   *&#xa;',
                        '   * @return Returns &lt;true&gt; if the ', $ufn,' exists.&#xa;',
                        '   */&#xa;')" />
diff --git a/opendj-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
index 7602903..b9ef92b 100644
--- a/opendj-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
@@ -12,7 +12,7 @@
   Header, with the fields enclosed by brackets [] replaced by your own identifying
   information: "Portions Copyright [year] [name of copyright owner]".
 
-  Copyright 2012 ForgeRock AS.
+  Copyright 2012-2016 ForgeRock AS.
   ! -->
 <adm:managed-object name="certificate-attribute-syntax"
   plural-name="certificate-attribute-syntaxes"
@@ -40,7 +40,7 @@
   </adm:property-override>
   <adm:property name="strict-format" advanced="true">
     <adm:synopsis>
-      Indicates whether or not X.509 Certificate values are required to
+      Indicates whether X.509 Certificate values are required to
       strictly comply with the standard definition for this syntax.
     </adm:synopsis>
     <adm:description>
diff --git a/opendj-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
index 3ad583e..764e1fd 100644
--- a/opendj-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
@@ -12,7 +12,7 @@
   Header, with the fields enclosed by brackets [] replaced by your own identifying
   information: "Portions Copyright [year] [name of copyright owner]".
 
-  Copyright 2014 ForgeRock AS.
+  Copyright 2014-2016 ForgeRock AS.
   ! -->
 <adm:managed-object name="core-schema" plural-name="core-schemas"
   extends="schema-provider"
@@ -131,7 +131,7 @@
   </adm:property>
   <adm:property name="strict-format-country-string" advanced="true">
     <adm:synopsis>
-      Indicates whether or not country code values are required to
+      Indicates whether country code values are required to
       strictly comply with the standard definition for this syntax.
     </adm:synopsis>
     <adm:description>
diff --git a/opendj-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
index 2407d2a..d1a1de1 100644
--- a/opendj-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
@@ -12,7 +12,7 @@
   Header, with the fields enclosed by brackets [] replaced by your own identifying
   information: "Portions Copyright [year] [name of copyright owner]".
 
-  Copyright 2012 ForgeRock AS.
+  Copyright 2012-2016 ForgeRock AS.
   Portions Copyright 2012 Manuel Gaupp
   ! -->
 <adm:managed-object name="country-string-attribute-syntax"
@@ -41,7 +41,7 @@
   </adm:property-override>
   <adm:property name="strict-format" advanced="true">
     <adm:synopsis>
-      Indicates whether or not country code values are required to
+      Indicates whether country code values are required to
       strictly comply with the standard definition for this syntax.
     </adm:synopsis>
     <adm:description>
diff --git a/opendj-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
index 1f7a71c..9c8d7f9 100644
--- a/opendj-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
@@ -13,7 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2009 Sun Microsystems, Inc.
-  Portions copyright 2011-2015 ForgeRock AS.
+  Portions copyright 2011-2016 ForgeRock AS.
   ! -->
 <adm:managed-object name="external-changelog-domain"
   plural-name="external-changelog-domains"
@@ -50,7 +50,7 @@
   <adm:property name="ecl-include" multi-valued="true" mandatory="false">
     <adm:synopsis>
       Specifies a list of attributes which should be published with every
-      change log entry, regardless of whether or not the attribute itself
+      change log entry, regardless of whether the attribute itself
       has changed.
     </adm:synopsis>
     <adm:description>
diff --git a/opendj-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
index 0f1d227..1f93883 100644
--- a/opendj-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
@@ -14,6 +14,7 @@
 
   Copyright 2007-2010 Sun Microsystems, Inc.
   Portions copyright 2011 profiq s.r.o.
+  Portions Copyright 2016 ForgeRock AS.
   ! -->
 <adm:managed-object name="referential-integrity-plugin"
   plural-name="referential-integrity-plugins"
@@ -162,8 +163,7 @@
   </adm:property>
   <adm:property name="check-references">
     <adm:synopsis>
-      Specifies whether or not reference attributes must refer to existing
-      entries.
+      Specifies whether reference attributes must refer to existing entries.
     </adm:synopsis>
     <adm:description>
       When this property is set to true, this plugin will ensure that any new
@@ -216,7 +216,7 @@
   </adm:property>
   <adm:property name="check-references-scope-criteria">
     <adm:synopsis>
-      Specifies whether or not referenced entries must reside within the same
+      Specifies whether referenced entries must reside within the same
       naming context as the entry containing the reference.
     </adm:synopsis>
     <adm:description>
diff --git a/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/classes/opendj-rest2ldap-config.json b/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/classes/opendj-rest2ldap-config.json
index 54d9927..e352407 100644
--- a/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/classes/opendj-rest2ldap-config.json
+++ b/opendj-rest2ldap-servlet/src/main/webapp/WEB-INF/classes/opendj-rest2ldap-config.json
@@ -4,7 +4,7 @@
     "ldapConnectionFactories" : {
         // Unauthenticated connections used for performing bind requests.
         "bind" : {
-            // Indicates whether or not LDAP connections should be secured using
+            // Indicates whether LDAP connections should be secured using
             // SSL or StartTLS. Acceptable values are:
             //
             // "none"     - use plain LDAP connections (default)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java
index a59546a..547dac0 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/AbstractLDAPAttributeMapper.java
@@ -83,8 +83,8 @@
     }
 
     /**
-     * Indicates whether or not the LDAP attribute supports updates. The default
-     * is {@link WritabilityPolicy#READ_WRITE}.
+     * Indicates whether the LDAP attribute supports updates.
+     * The default is {@link WritabilityPolicy#READ_WRITE}.
      *
      * @param policy
      *            The writability policy.
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
index 3f0a2ed..32fba74 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
@@ -77,7 +77,7 @@
 
 /** Provides core factory methods and builders for constructing LDAP resource collections. */
 public final class Rest2LDAP {
-    /** Indicates whether or not LDAP client connections should use SSL or StartTLS. */
+    /** Indicates whether LDAP client connections should use SSL or StartTLS. */
     private enum ConnectionSecurity {
         NONE, SSL, STARTTLS
     }
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/WritabilityPolicy.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/WritabilityPolicy.java
index d300b62..4b46b45 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/WritabilityPolicy.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/WritabilityPolicy.java
@@ -11,17 +11,13 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2013 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
  */
-
 package org.forgerock.opendj.rest2ldap;
 
 import org.forgerock.opendj.ldap.AttributeDescription;
 
-/**
- * The writability policy determines whether or not an attribute supports
- * updates.
- */
+/** The writability policy determines whether an attribute supports updates. */
 public enum WritabilityPolicy {
     // @formatter:off
     /**
diff --git a/opendj-server-legacy/resource/admin/abbreviations.xsl b/opendj-server-legacy/resource/admin/abbreviations.xsl
deleted file mode 100644
index 728ab21..0000000
--- a/opendj-server-legacy/resource/admin/abbreviations.xsl
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008-2009 Sun Microsystems, Inc.
-  Portions copyright 2011-2015 ForgeRock AS.
-  ! -->
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!--
-    This XSLT file contains a list of acronyms and abbreviations which should
-    be converted to upper-case when used in applications (e.g. as Java names).
-  -->
-  <!--
-    Determines whether or not the provided word is a known abbreviation or
-    acronym.
-
-    @param value The word.
-
-    @return Returns the string "true" if the word is an abbreviation.
-  -->
-  <xsl:template name="is-abbreviation">
-    <xsl:param name="value" select="/.." />
-    <xsl:value-of
-      select="$value = 'aci' or $value = 'ip' or $value = 'ssl'
-              or $value = 'dn' or $value = 'rdn' or $value = 'jmx'
-              or $value = 'smtp' or $value = 'http'  or $value = 'https'
-              or $value = 'ldap' or $value = 'ldaps' or $value = 'ldif'
-              or $value = 'jdbc' or $value = 'tcp' or $value = 'tls'
-              or $value = 'pkcs11' or $value = 'sasl' or $value = 'gssapi'
-              or $value = 'md5' or $value = 'je' or $value = 'dse'
-              or $value = 'fifo' or $value = 'vlv' or $value = 'uuid'
-              or $value = 'md5' or $value = 'sha1' or $value = 'sha256'
-              or $value = 'sha384' or $value = 'sha512' or $value = 'tls'
-              or $value = 'des' or $value = 'aes' or $value = 'rc4'
-              or $value = 'db' or $value = 'snmp' or $value = 'qos'
-              or $value = 'ecl' or $value = 'ttl' or $value = 'jpeg'
-              or $value = 'pbkdf2' or $value = 'pkcs5s2' or $value = 'pdb'
-             "/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/admin-cli.xsd b/opendj-server-legacy/resource/admin/admin-cli.xsd
deleted file mode 100644
index f9f2d55..0000000
--- a/opendj-server-legacy/resource/admin/admin-cli.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.opends.org/admin-cli"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  elementFormDefault="qualified" xmlns:adm="http://www.opends.org/admin"
-  xmlns:tns="http://www.opends.org/admin-cli">
-  <xsd:import namespace="http://www.opends.org/admin"
-    schemaLocation="admin.xsd" />
-  <xsd:annotation>
-    <xsd:documentation>
-      This schema defines the elements and attributes of the "cli"
-      profile. This profile provides the ability to annotate managed
-      object definitions, properties, and relations with additional
-      information which the CLI can use to provide a better user
-      experience.
-    </xsd:documentation>
-  </xsd:annotation>
-  <xsd:element name="managed-object">
-    <xsd:annotation>
-      <xsd:documentation>
-        Defines CLI annotations for use with managed object definitions.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:attribute name="custom" default="false" type="xsd:boolean">
-        <xsd:annotation>
-          <xsd:documentation>
-            Indicates whether the CLI should refer to this managed
-            object type as "custom" as opposed to "generic". Custom
-            managed object types generally are the top-level type of
-            component (e.g. connection-handler but not
-            ldap-connection-handler) having a non-advanced java-class
-            property. Users create this type of component with a custom
-            implementation class. It is better to refer to these as
-            "custom" since the term "generic" can mislead users (e.g.
-            many users confuse a generic backend as being a JE backend).
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:attribute>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="relation">
-    <xsd:annotation>
-      <xsd:documentation>
-        Defines CLI annotations for use with relation definitions.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="default-property" minOccurs="0"
-          maxOccurs="unbounded">
-          <xsd:annotation>
-            <xsd:documentation>
-              The name of a property in the referenced managed object
-              (or one of its sub-types) which will be displayed by
-              default in list-xxx sub-commands.
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:complexType>
-            <xsd:attribute name="name" type="adm:name-type"
-              use="required">
-              <xsd:annotation>
-                <xsd:documentation>
-                  The name of a property in the referenced managed
-                  object (or one of its sub-types) which will be
-                  displayed by default in list-xxx sub-commands.
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:attribute>
-          </xsd:complexType>
-        </xsd:element>
-      </xsd:sequence>
-      <xsd:attribute name="naming-argument-override"
-        type="adm:name-type" use="optional">
-        <xsd:annotation>
-          <xsd:documentation>
-            A command-line argument name which should be used to
-            override the default argument name used to identify managed
-            objects referenced by this relation. By default the
-            command-line argument name is derived by taking the last
-            word in the relation name and appending "-name". For
-            example, the relation "certificate-mapper" becomes
-            "mapper-name".
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:attribute>
-    </xsd:complexType>
-  </xsd:element>
-</xsd:schema>
diff --git a/opendj-server-legacy/resource/admin/admin-ldap.xsd b/opendj-server-legacy/resource/admin/admin-ldap.xsd
deleted file mode 100644
index 7bebcb7..0000000
--- a/opendj-server-legacy/resource/admin/admin-ldap.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.opends.org/admin-ldap"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  elementFormDefault="qualified"
-  xmlns:tns="http://www.opends.org/admin-ldap">
-  <xsd:annotation>
-    <xsd:documentation>
-      This schema defines the elements and attributes of the "ldap"
-      profile. This profile specifies the relationship between managed
-      objects and their representation in LDAP. For example, each
-      managed object is associated with an LDAP object class and each
-      property is associated with an LDAP attribute. Using this profile
-      it should also be possible to generate the LDAP configuration
-      schema.
-    </xsd:documentation>
-  </xsd:annotation>
-  <xsd:simpleType name="name-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A LDAP attribute type or object class name.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="[a-zA-Z][a-zA-Z0-9\-_]*" />
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:element name="object-class">
-    <xsd:annotation>
-      <xsd:documentation>
-        Defines which LDAP object class a managed object should be
-        mapped to.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="name" type="tns:name-type">
-          <xsd:annotation>
-            <xsd:documentation>
-              The name of the LDAP object class.
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="superior" type="tns:name-type">
-          <xsd:annotation>
-            <xsd:documentation>
-              The name of the parent LDAP object class.
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="attribute">
-    <xsd:annotation>
-      <xsd:documentation>
-        Defines which LDAP attribute a managed object property should be
-        mapped to.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="name" type="tns:name-type">
-          <xsd:annotation>
-            <xsd:documentation>
-              The name of the LDAP attribute.
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-      </xsd:sequence>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="naming-attribute" type="tns:name-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        Defines which LDAP attribute should be used to name child
-        managed objects referenced by a relation. When not specified,
-        "cn" is used by default. When the relation uses a naming
-        property this element is not required, instead the LDAP
-        attribute associated with the naming property will be used.
-      </xsd:documentation>
-    </xsd:annotation>
-  </xsd:element>
-  <xsd:element name="rdn-sequence" type="xsd:token">
-    <xsd:annotation>
-      <xsd:documentation>A sequence of RDNs.</xsd:documentation>
-    </xsd:annotation>
-  </xsd:element>
-</xsd:schema>
diff --git a/opendj-server-legacy/resource/admin/admin-preprocessor.xsd b/opendj-server-legacy/resource/admin/admin-preprocessor.xsd
deleted file mode 100644
index 1049f00..0000000
--- a/opendj-server-legacy/resource/admin/admin-preprocessor.xsd
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.opends.org/admin-preprocessor"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:admin="http://www.opends.org/admin"
-  elementFormDefault="qualified"
-  xmlns:tns="http://www.opends.org/admin-preprocessor">
-  <xsd:import namespace="http://www.opends.org/admin"
-    schemaLocation="admin.xsd" />
-  <xsd:annotation>
-    <xsd:documentation>
-      This schema defines the elements and attributes which are added to
-      managed object definitions and property definitions in the
-      "preprocessor" profile.
-    </xsd:documentation>
-    <xsd:documentation>
-      Managed object definitions are annotated by listing the parent
-      managed objects which the definition inherits from. This can be
-      used to enforce a simple managed object naming scheme where
-      sub-definitions use the uppermost definition's name as a suffix.
-      For example, "ldap-connection-handler" is derived from
-      "connection-handler", and therefore has the suffix
-      "-connection-handler". Applications can take advantage of this
-      naming schema to shorten sub-definition names where appropriate.
-      For example, a CLI which supports creation of connection handlers,
-      can use remove the suffix from "ldap-connection-handler" in order
-      to derive a "type", in this case "ldap".
-    </xsd:documentation>
-    <xsd:documentation>
-      Each property definition is annotated as follows: firstly a
-      "managed-object" element is added defining the name and package of
-      the managed object which defines the property (i.e. this will be a
-      parent managed object for inherited properties). Secondly, if the
-      property is referenced from a Property.xml file, an additional
-      "package" element is appended identifying the referenced package.
-    </xsd:documentation>
-  </xsd:annotation>
-  <xsd:element name="last-defined-in">
-    <xsd:annotation>
-      <xsd:documentation>
-        Specifies the name and package of the last managed object
-        definition which defined or overrides this property definition.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:attribute name="name" type="admin:name-type"
-        use="required">
-        <xsd:annotation>
-          <xsd:documentation>
-            The name of the managed object.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:attribute>
-      <xsd:attribute name="package" type="admin:package-type"
-        use="required">
-        <xsd:annotation>
-          <xsd:documentation>
-            The name of the package containing the managed object.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:attribute>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="first-defined-in">
-    <xsd:annotation>
-      <xsd:documentation>
-        This optional element specifies the location where the property
-        was first defined. This may be in a referenced Package.xml
-        definition, or in an overridden parent definition. This element
-        is only present when the package/name attributes would differ
-        from those specified in the last-defined-in element.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:attribute name="name" type="admin:name-type"
-        use="optional">
-        <xsd:annotation>
-          <xsd:documentation>
-            The name of the managed object if applicable.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:attribute>
-      <xsd:attribute name="package" type="admin:package-type"
-        use="required">
-        <xsd:annotation>
-          <xsd:documentation>
-            The name of the package.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:attribute>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="parent-managed-object">
-    <xsd:annotation>
-      <xsd:documentation>
-        Specifies the name and package of a parent managed object
-        definition. Elements are order such that the immediate parent is
-        the first node in document order and the last element represents
-        the uppermost definition in the inheritance hierarchy.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:attribute name="name" type="admin:name-type"
-        use="required">
-        <xsd:annotation>
-          <xsd:documentation>
-            The name of the parent managed object.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:attribute>
-      <xsd:attribute name="package" type="admin:package-type"
-        use="required">
-        <xsd:annotation>
-          <xsd:documentation>
-            The name of the package containing the parent managed
-            object.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:attribute>
-    </xsd:complexType>
-  </xsd:element>
-</xsd:schema>
\ No newline at end of file
diff --git a/opendj-server-legacy/resource/admin/admin.xsd b/opendj-server-legacy/resource/admin/admin.xsd
deleted file mode 100644
index 7eef037..0000000
--- a/opendj-server-legacy/resource/admin/admin.xsd
+++ /dev/null
@@ -1,2243 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.opends.org/admin"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  elementFormDefault="qualified"
-  xmlns:tns="http://www.opends.org/admin">
-  <xsd:import namespace="http://www.opends.org/admin-ldap"
-    schemaLocation="admin-ldap.xsd" />
-  <xsd:import namespace="http://www.opends.org/admin-preprocessor"
-    schemaLocation="admin-preprocessor.xsd" />
-  <xsd:annotation>
-    <xsd:documentation>
-      This schema defines the XML schema elements and attributes which
-      should be used to specify the server's configuration model.
-      Broadly speaking, there are three main components to this schema:
-      managed objects, properties, and relations. Using these components
-      it is possible to model the server's configuration based on its
-      configurable components (managed objects), their configurable
-      attributes (properties), and their relationships with other
-      configurable components (relations).
-    </xsd:documentation>
-  </xsd:annotation>
-  <xsd:complexType name="managed-object-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        Defines the structure of a configurable component within the
-        configuration. A managed object comprises of zero or more
-        properties, and zero or more relations with other managed
-        objects. A managed object can be abstract, indicating that it
-        cannot be instantiated directly, and that it is intended as a
-        base definition from which other child managed objects inherit
-        their behavior. Conversely, a managed object can be derived from
-        a parent managed object definition. In this case, the managed
-        object will inherit the properties and relations defined by the
-        parent. Multiple levels of inheritance are supported, but
-        multiple inheritance is not.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="TODO" minOccurs="0" type="xsd:string"
-        maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-            An annotation specifying remaining work or unsolved problems
-            relating to this managed object definition. Its use is
-            primarily for development purposes and should not be
-            processed by applications.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="user-friendly-name" minOccurs="0"
-        type="tns:description-type">
-        <xsd:annotation>
-          <xsd:documentation>
-            The user friendly name of this managed object. This element
-            is optional and by default the user friendly name is derived
-            from the definition's name attribute.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="user-friendly-plural-name" minOccurs="0"
-        type="tns:description-type">
-        <xsd:annotation>
-          <xsd:documentation>
-            The user friendly plural name of this managed object. This
-            element is optional and by default the user friendly plural
-            name is derived from the definition's plural-name attribute.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="synopsis" type="tns:rich-description-type">
-        <xsd:annotation>
-          <xsd:documentation>
-            A brief description of this managed object. The description
-            should describe, preferably in one sentence, the purpose of
-            this managed object. The synopsis should be suitable for use
-            in applications such as tool-tips, CLI help, and the summary
-            description in Javadoc. It is possible to embed rich content
-            including XHTML markup (this will only be used where
-            supported).
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="description" minOccurs="0"
-        type="tns:rich-description-type">
-        <xsd:annotation>
-          <xsd:documentation>
-            A detailed description of this managed object. The
-            description should describe in detail the purpose of this
-            managed object. The description should be suitable for use
-            in applications such as manual pages or detailed help. It
-            does not need to repeat anything described in the synopsis
-            as applications should normally display the two together. It
-            is possible to embed rich content including XHTML markup
-            (this will only be used where supported).
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="tag" minOccurs="0" maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-            The name of a tag defined in the root configuration
-            definition. Tags can be used to group related managed object
-            definitions together. For example, all managed objects that
-            are associated with password management might be tagged with
-            "password" (assuming that there is a "password" tag defined
-            in the root configuration). Tags are inherited by derived
-            managed object definitions.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:attribute name="name" type="tns:name-type"
-            use="required">
-            <xsd:annotation>
-              <xsd:documentation>
-                The name of the referenced tag. There must be an
-                accompanying tag definition in the root configuration
-                definition.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="constraint" minOccurs="0"
-        maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-            A constraint on the properties of this managed object. A
-            constraint comprises of a condition which must always
-            evaluate to true before a modification is permitted.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="synopsis"
-              type="tns:rich-description-type">
-              <xsd:annotation>
-                <xsd:documentation>
-                  A brief description of this constraint. The
-                  description should describe, preferably in one
-                  sentence, the purpose the condition associated with
-                  this constraint. The synopsis should be suitable for
-                  use in applications such as tool-tips, CLI help, and
-                  the summary description in Javadoc. It is possible to
-                  embed rich content including XHTML markup (this will
-                  only be used where supported).
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="condition">
-              <xsd:annotation>
-                <xsd:documentation>
-                  The condition associated with this constraint. The
-                  condition must evaluate to true before modifications
-                  are permitted.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:group ref="tns:condition-group" />
-                </xsd:sequence>
-              </xsd:complexType>
-            </xsd:element>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="profile" type="tns:profile-type" minOccurs="0"
-        maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-            An annotation relating to this managed object. Annotations
-            can define additional information which cannot be directly
-            represented using this XML schema. The additional
-            information can relate to specific applications such as LDAP
-            (e.g. LDAP object classes), CLIs (e.g. sub-command name),
-            GUIs (e.g. how properties should be arranged and grouped in
-            a window).
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="relation" maxOccurs="unbounded" minOccurs="0"
-        type="tns:relation-type">
-        <xsd:annotation>
-          <xsd:documentation>
-            Specifies a composition relationship between this managed
-            object and other "child" managed objects. The relationship
-            can be a singleton relationship (i.e. one to one), an
-            optional relationship (i.e. one to zero or one), or a one to
-            many relationship.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-        <xsd:element name="property" type="tns:property-type">
-          <xsd:annotation>
-            <xsd:documentation>
-              Defines a configurable property of this managed object. A
-              property's value or values affects the behavior of this
-              managed object. Various different types of properties are
-              supported, for example, strings, integers, etc. A property
-              definition must not override a property defined elsewhere
-              in this managed object or property inherited from a parent
-              definition.
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="property-override"
-          type="tns:property-override-type">
-          <xsd:annotation>
-            <xsd:documentation>
-              Overrides a property definition inherited from a parent
-              managed object definition. Using a property override it is
-              possible to modify the behavior of an inherited property
-              definition in a non-critical way. For example, a managed
-              object definition might override the default behavior of
-              an inherited Java implementation class property so that
-              new instances are created with the correct default
-              implementation class.
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="property-reference"
-          type="tns:property-reference-type">
-          <xsd:annotation>
-            <xsd:documentation>
-              A reference to a common property definition defined in a
-              package, which should be part of this managed object's
-              definition.
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-      </xsd:choice>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="rich-description-type" mixed="true">
-    <xsd:annotation>
-      <xsd:documentation>
-        An internationalized description string which can contain XHTML
-        markup.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:any namespace="http://www.w3.org/1999/xhtml"
-        processContents="lax" />
-      <xsd:element name="product-name">
-        <xsd:annotation>
-          <xsd:documentation>
-            The name of the product associated with this definition.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType />
-      </xsd:element>
-      <xsd:element name="user-friendly-name">
-        <xsd:annotation>
-          <xsd:documentation>
-            The name of the managed object associated with this
-            definition.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType />
-      </xsd:element>
-      <xsd:element name="user-friendly-plural-name">
-        <xsd:annotation>
-          <xsd:documentation>
-            The plural name of the managed object associated with this
-            definition.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType />
-      </xsd:element>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:complexType name="description-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        An internationalized description string which cannot contain
-        XHTML markup.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:token" />
-    </xsd:simpleContent>
-  </xsd:complexType>
-  <xsd:complexType name="property-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        Defines a configurable property of a managed object. A
-        property's value or values affects the behavior of the
-        associated managed object. Various different types of properties
-        are supported, for example, strings, integers, etc. A property
-        definition must not override a property defined elsewhere in the
-        managed object or property inherited from a parent managed
-        object.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="TODO" minOccurs="0" type="xsd:string"
-        maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-            An annotation specifying remaining work or unsolved problems
-            relating to this property definition. Its use is primarily
-            for development purposes and should not be processed by
-            applications.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="synopsis" type="tns:rich-description-type">
-        <xsd:annotation>
-          <xsd:documentation>
-            A brief description of this property. The description should
-            describe, preferably in one sentence, the purpose of this
-            property. It does not need to provide details regarding
-            default behavior, syntax, nor how changes take effect (e.g.
-            immediately, post-restart, etc). The synopsis should be
-            suitable for use in applications such as tool-tips, CLI
-            help, and the summary description in Javadoc. It is possible
-            to embed rich content including XHTML markup (this will only
-            be used where supported).
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="description" minOccurs="0"
-        type="tns:rich-description-type">
-        <xsd:annotation>
-          <xsd:documentation>
-            A detailed description of this property. The description
-            should describe in detail the purpose of this property. The
-            description should be suitable for use in applications such
-            as manual pages or detailed help. It does not need to repeat
-            anything described in the synopsis as applications should
-            normally display the two together. In addition, it does not
-            need to provide details regarding default behavior, syntax,
-            nor how changes take effect (e.g. immediately, post-restart,
-            etc). It is possible to embed rich content including XHTML
-            markup (this will only be used where supported).
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="requires-admin-action"
-        type="tns:admin-action-type" minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            Defines an optional action which administators must perform
-            after they have modified this property. By default
-            modifications to properties are assumed to take effect
-            immediately and require no additional administrative action.
-            Developers should be aware that, where feasible, they should
-            implement components such that property modifications
-            require no additional administrative action. This is
-            required in order to minimize server downtime during
-            administration and provide a more user-friendly experience.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="default-behavior" type="tns:default-type"
-        minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            Defines a default behavior for the property when it has no
-            values specified. All properties must have a default
-            behavior defined unless they are mandatory.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="syntax" type="tns:syntax-type">
-        <xsd:annotation>
-          <xsd:documentation>
-            Defines the syntax of this property. This includes the data
-            type used for the property and additional constraints (e.g.
-            upper/lower bounds).
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="profile" type="tns:profile-type" minOccurs="0"
-        maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-            An annotation relating to this property. Annotations can
-            define additional information which cannot be directly
-            represented using this XML schema. The additional
-            information can relate to specific applications such as LDAP
-            (e.g. LDAP attributes), CLIs (e.g. operand name), GUIs (e.g.
-            how properties should be arranged and grouped in a window).
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="tns:name-type" use="required">
-      <xsd:annotation>
-        <xsd:documentation>
-          The name of this property. The name should describe as
-          concisely as possible the purpose of this property and should
-          be suitable for use in Java method names (e.g. getters and
-          setters). The property name should be a string comprising of
-          short lower-case words joined with hyphens "-". For example,
-          "use-ssl".
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="multi-valued" type="xsd:boolean" use="optional"
-      default="false">
-      <xsd:annotation>
-        <xsd:documentation>
-          Indicates whether or not this property is multi-valued. By
-          default, properties are single-valued.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="read-only" type="xsd:boolean" use="optional"
-      default="false">
-      <xsd:annotation>
-        <xsd:documentation>
-          Indicates whether or not this property is read-only. By
-          default, properties are not read-only. Read-only properties
-          can only be initialized during construction of the associated
-          managed object and cannot be modified once the managed object
-          has been created.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="monitoring" type="xsd:boolean" use="optional"
-      default="false">
-      <xsd:annotation>
-        <xsd:documentation>
-          Indicates whether or not this property is read-only and
-          generated automatically by the server as monitoring
-          information. By default, properties are not for monitoring.
-          Monitoring properties are always read-only because their
-          values are generated by the server. During construction of a
-          managed object their values are undefined.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="mandatory" type="xsd:boolean" use="optional"
-      default="false">
-      <xsd:annotation>
-        <xsd:documentation>
-          Indicates whether or not this property is mandatory. Mandatory
-          properties are usually those properties which have no sensible
-          default behavior and must, therefore, be specified by
-          administrators. If a mandatory property has default values
-          these will be used as the values for the property if none are
-          specified by the user.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="hidden" type="xsd:boolean" use="optional"
-      default="false">
-      <xsd:annotation>
-        <xsd:documentation>
-          Indicates whether or not this property should be hidden from
-          client applications. Hidden properties should rarely be used
-          but are sometimes required in order to provide functionality
-          that needs to be exposed in management APIs but not in
-          front-ends such as CLIs.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="advanced" type="xsd:boolean" use="optional"
-      default="false">
-      <xsd:annotation>
-        <xsd:documentation>
-          Indicates whether or not this property should be treated as an
-          advanced property and hidden by default in client
-          applications. Advanced properties should either be optional
-          (i.e. not mandatory) or be mandatory with default values. This
-          constraint is required so that users do not have to specify
-          values for advanced properties.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-  </xsd:complexType>
-  <xsd:complexType name="property-reference-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A reference to a common property definition defined in a
-        package, which should be part of a managed object's definition.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="requires-admin-action"
-        type="tns:admin-action-type" minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            Optionally override the administrative action defined in the
-            referenced property definition. An administrative action
-            defines an optional action which administators must perform
-            after they have modified this property. By default
-            modifications to properties are assumed to take effect
-            immediately and require no additional administrative action.
-            Developers should be aware that, where feasible, they should
-            implement components such that property modifications
-            require no additional administrative action. This is
-            required in order to minimize server downtime during
-            administration and provide a more user-friendly experience.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="default-behavior" type="tns:default-type"
-        minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            Optionally override the default behavior defined in the
-            referenced property definition. The default behavior is
-            applicable when the property has no values specified. All
-            properties must have a default behavior defined unless they
-            are mandatory.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="tns:name-type" use="required">
-      <xsd:annotation>
-        <xsd:documentation>
-          The name of the referenced property.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="package" type="tns:package-type">
-      <xsd:annotation>
-        <xsd:documentation>
-          The package containing the referenced property. By default,
-          the package in which this managed object is defined will be
-          used.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-  </xsd:complexType>
-  <xsd:complexType name="property-override-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        Overrides a property definition inherited from a parent managed
-        object definition. Using a property override it is possible to
-        modify the behavior of an inherited property definition in a
-        non-critical way. For example, a managed object definition might
-        override the default behavior of an inherited Java
-        implementation class property so that new instances are created
-        with the correct default implementation class.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="requires-admin-action"
-        type="tns:admin-action-type" minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            Optionally override the administrative action defined in the
-            overridden property definition. An administrative action
-            defines an optional action which administators must perform
-            after they have modified this property. By default
-            modifications to properties are assumed to take effect
-            immediately and require no additional administrative action.
-            Developers should be aware that, where feasible, they should
-            implement components such that property modifications
-            require no additional administrative action. This is
-            required in order to minimize server downtime during
-            administration and provide a more user-friendly experience.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="default-behavior" type="tns:default-type"
-        minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            Optionally override the default behavior defined in the
-            overridden property definition. The default behavior is
-            applicable when the property has no values specified. All
-            properties must have a default behavior defined unless they
-            are mandatory.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="tns:name-type" use="required">
-      <xsd:annotation>
-        <xsd:documentation>
-          The name of the overridden property.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="advanced" type="xsd:boolean" use="optional"
-      default="false">
-      <xsd:annotation>
-        <xsd:documentation>
-          Optionally override the advanced option defined in the
-          overridden property definition. Indicates whether or not this
-          property should be treated as an advanced property and hidden
-          by default in client applications. Advanced properties should
-          either be optional (i.e. not mandatory) or be mandatory with
-          default values. This constraint is required so that users do
-          not have to specify values for advanced properties.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-  </xsd:complexType>
-  <xsd:complexType name="default-managed-object-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        Specifies the configuration of a default managed object which
-        should be created when a parent managed object is created. For
-        example, creation of a back-end could result in default indexes
-        being created.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="property" minOccurs="0"
-        maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-            Specifies one or more initial values for a property in the
-            default managed object.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="value" minOccurs="1"
-              maxOccurs="unbounded" type="xsd:string">
-              <xsd:annotation>
-                <xsd:documentation>
-                  The string representation of a value of this property.
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-          </xsd:sequence>
-          <xsd:attribute name="name" type="tns:name-type"
-            use="required">
-            <xsd:annotation>
-              <xsd:documentation>
-                The name of the property.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="managed-object-name" type="tns:name-type"
-      use="optional">
-      <xsd:annotation>
-        <xsd:documentation>
-          The type of default managed object to be created. This must be
-          either the type of the managed object referenced by this
-          relation (this is the default behavior) or a sub-type.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="managed-object-package" type="tns:package-type"
-      use="optional">
-      <xsd:annotation>
-        <xsd:documentation>
-          The package containing the default managed object definition
-          if it is not the same as this managed object's package.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-  </xsd:complexType>
-  <xsd:complexType name="relation-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        Specifies a relationship between a managed object and other
-        managed objects. The relationship can be a singleton
-        relationship (i.e. one to one), an optional relationship (i.e.
-        one to zero or one), or a one to many relationship. Both
-        compositions (the default) and aggregations are supported.
-        Aggregations are defined by specifying the path to the
-        referenced managed objects in the aggregation attribute.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="TODO" minOccurs="0" type="xsd:string"
-        maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-            An annotation specifying remaining work or unsolved problems
-            relating to this relation definition. Its use is primarily
-            for development purposes and should not be processed by
-            applications.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="synopsis" type="tns:rich-description-type"
-        minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            An optional brief description of this relation. The
-            description should describe, preferably in one sentence, the
-            purpose of this relation. If a synopsis is not defined this
-            relation will inherit the synopsis of the referenced managed
-            object. If present, the synopsis should be suitable for use
-            in applications such as tool-tips, CLI help, and the summary
-            description in Javadoc. It is possible to embed rich content
-            including XHTML markup (this will only be used where
-            supported).
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="description" minOccurs="0"
-        type="tns:rich-description-type">
-        <xsd:annotation>
-          <xsd:documentation>
-            An optional detailed description of this relation. The
-            description should describe in detail the purpose of this
-            relation. The description should be suitable for use in
-            applications such as manual pages or detailed help. It does
-            not need to repeat anything described in the synopsis as
-            applications should normally display the two together. If a
-            description is not defined this relation will inherit the
-            description of the referenced managed object. It is possible
-            to embed rich content including XHTML markup (this will only
-            be used where supported).
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:choice>
-        <xsd:element name="one-to-one">
-          <xsd:annotation>
-            <xsd:documentation>
-              Specifies a one to one (singleton) relationship with
-              another type of managed object.
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:complexType>
-            <xsd:sequence>
-              <xsd:element name="default-managed-object"
-                type="tns:default-managed-object-type" minOccurs="0">
-                <xsd:annotation>
-                  <xsd:documentation>
-                    Defines a default managed object configuration which
-                    should be automatically created when the parent
-                    managed object is created.
-                  </xsd:documentation>
-                </xsd:annotation>
-              </xsd:element>
-            </xsd:sequence>
-          </xsd:complexType>
-        </xsd:element>
-        <xsd:element name="one-to-zero-or-one">
-          <xsd:annotation>
-            <xsd:documentation>
-              Specifies a one to zero or one (optional) relationship
-              with another type of managed object.
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:complexType>
-            <xsd:sequence>
-              <xsd:element name="default-managed-object"
-                type="tns:default-managed-object-type" minOccurs="0">
-                <xsd:annotation>
-                  <xsd:documentation>
-                    Defines a default managed object configuration which
-                    should be automatically created when the parent
-                    managed object is created.
-                  </xsd:documentation>
-                </xsd:annotation>
-              </xsd:element>
-            </xsd:sequence>
-          </xsd:complexType>
-        </xsd:element>
-        <xsd:element name="one-to-many">
-          <xsd:annotation>
-            <xsd:documentation>
-              Specifies a one to many (instantiable) relationship with
-              another type of managed object.
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:complexType>
-            <xsd:sequence>
-              <xsd:element name="default-managed-object" minOccurs="0"
-                maxOccurs="unbounded">
-                <xsd:annotation>
-                  <xsd:documentation>
-                    Defines one or more default managed object
-                    configurations which should be automatically created
-                    when the parent managed object is created.
-                  </xsd:documentation>
-                </xsd:annotation>
-                <xsd:complexType>
-                  <xsd:complexContent>
-                    <xsd:extension
-                      base="tns:default-managed-object-type">
-                      <xsd:attribute name="name" type="xsd:string"
-                        use="required">
-                        <xsd:annotation>
-                          <xsd:documentation>
-                            Specifies the name that should be used to
-                            identify this default managed object
-                            instance.
-                          </xsd:documentation>
-                        </xsd:annotation>
-                      </xsd:attribute>
-                    </xsd:extension>
-                  </xsd:complexContent>
-                </xsd:complexType>
-              </xsd:element>
-            </xsd:sequence>
-            <xsd:attribute name="unique" type="xsd:boolean"
-              use="optional" default="false">
-              <xsd:annotation>
-                <xsd:documentation>
-                  Indicates whether or not this relation contains
-                  unique members. If set to true then each
-                  referenced managed object must have a distinct type.
-                  In other words, there must not be more than one
-                  referenced managed object having the same type. By
-                  default, properties are single-valued.
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="plural-name" type="tns:name-type"
-              use="optional">
-              <xsd:annotation>
-                <xsd:documentation>
-                  Specifies the plural name of this relation if
-                  different from the plural name of the referenced
-                  managed object type.
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:attribute>
-            <xsd:attribute name="naming-property" type="tns:name-type"
-              use="optional">
-              <xsd:annotation>
-                <xsd:documentation>
-                  Specifies the name of a property in the referenced
-                  managed object which should be used for naming
-                  instances. For example, an attribute index managed
-                  object could be named according to the attribute that
-                  it indexes. If present, the naming property must
-                  reference a single-valued, mandatory, read-only
-                  property. If it is not present, the administration
-                  framework will use the default naming mechanism.
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:attribute>
-          </xsd:complexType>
-        </xsd:element>
-      </xsd:choice>
-      <xsd:sequence>
-        <xsd:element name="profile" type="tns:profile-type"
-          minOccurs="0" maxOccurs="unbounded">
-          <xsd:annotation>
-            <xsd:documentation>
-              An annotation relating to this relation. Annotations can
-              define additional information which cannot be directly
-              represented using this XML schema. The additional
-              information can relate to specific applications such as
-              LDAP (e.g. an LDAP RDN representing the entry beneath
-              which managed objects should be located).
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-      </xsd:sequence>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="tns:name-type" use="required">
-      <xsd:annotation>
-        <xsd:documentation>
-          The name of this relation. The name should describe as
-          concisely as possible the purpose of this relation and should
-          be suitable for use in Java method names (e.g. getters and
-          setters). The property name should be a string comprising of
-          short lower-case words joined with hyphens "-". For example,
-          "key-manager-provider". Usually the name will correspond to
-          the name of the referenced type of managed object. If it this
-          is not the case, then the type of referenced managed object
-          should be specified using the "managed-object-name" attribute.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="managed-object-name" type="tns:name-type"
-      use="optional">
-      <xsd:annotation>
-        <xsd:documentation>
-          The type of managed object referenced by this relation if
-          different from this relation's name.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="managed-object-package" type="tns:package-type"
-      use="optional">
-      <xsd:annotation>
-        <xsd:documentation>
-          The package containing the referenced managed object
-          definition if it is not the same as this managed object's
-          package.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="advanced" type="xsd:boolean" use="optional"
-      default="false">
-      <xsd:annotation>
-        <xsd:documentation>
-          Indicates whether or not managed objects referenced by this
-          relation should be treated as advanced and be hidden by
-          default in client applications.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="hidden" type="xsd:boolean" use="optional"
-      default="false">
-      <xsd:annotation>
-        <xsd:documentation>
-          Indicates whether or not this relation should be hidden from
-          client applications. Hidden relations should rarely be used
-          but are sometimes required in order to provide functionality
-          that needs to be exposed in management APIs but not in
-          front-ends such as CLIs.
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-  </xsd:complexType>
-  <xsd:complexType name="admin-action-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        Defines an optional action which administators must perform
-        after they have modified a property. By default modifications to
-        properties are assumed to take effect immediately and require no
-        additional administrative action. Developers should be aware
-        that, where feasible, they should implement components such that
-        property modifications require no additional administrative
-        action. This is required in order to minimize server downtime
-        during administration and provide a more user-friendly
-        experience.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice>
-      <xsd:element name="none">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used when modifications to a property take effect
-            immediately, and no additional administrator action is
-            required.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="synopsis"
-              type="tns:rich-description-type" minOccurs="0">
-              <xsd:annotation>
-                <xsd:documentation>
-                  An optional description which can be used to describe
-                  how changes to the modified property will take effect.
-                  If present, the synopsis should be suitable for use in
-                  applications such as tool-tips, CLI help, and the
-                  summary description in Javadoc. It is possible to
-                  embed rich content including XHTML markup (this will
-                  only be used where supported).
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="server-restart">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used when modifications to a property require a server
-            restart in order to take effect.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="synopsis"
-              type="tns:rich-description-type" minOccurs="0">
-              <xsd:annotation>
-                <xsd:documentation>
-                  An optional description of this required
-                  administrative action. The description should
-                  describe, preferably in one sentence, what additional
-                  administrator action is required when the server is
-                  restarted. If present, the synopsis should be suitable
-                  for use in applications such as tool-tips, CLI help,
-                  and the summary description in Javadoc. It is possible
-                  to embed rich content including XHTML markup (this
-                  will only be used where supported).
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="component-restart">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used when modifications to a property require a component
-            restart in order to take effect (usually by disabling and
-            re-enabling the component).
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="synopsis"
-              type="tns:rich-description-type" minOccurs="0">
-              <xsd:annotation>
-                <xsd:documentation>
-                  An optional description of this required
-                  administrative action. The description should
-                  describe, preferably in one sentence, what additional
-                  administrator action is required when the component is
-                  restarted. If present, the synopsis should be suitable
-                  for use in applications such as tool-tips, CLI help,
-                  and the summary description in Javadoc. It is possible
-                  to embed rich content including XHTML markup (this
-                  will only be used where supported).
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="other">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used when modifications to a property require an additional
-            administrative action in order to take effect. This should
-            be used when neither a server restart nor a component
-            restart are applicable.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="synopsis"
-              type="tns:rich-description-type">
-              <xsd:annotation>
-                <xsd:documentation>
-                  A brief description of this required administrative
-                  action. The description should describe, preferably in
-                  one sentence, what additional administrator action is
-                  required when this property is modified. If present,
-                  the synopsis should be suitable for use in
-                  applications such as tool-tips, CLI help, and the
-                  summary description in Javadoc. It is possible to
-                  embed rich content including XHTML markup (this will
-                  only be used where supported).
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:complexType name="default-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        Defines a default behavior for a property when it has no values
-        specified. All properties must have a default behavior defined
-        unless they are mandatory.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice>
-      <xsd:element name="undefined">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used when a property has no tangible default behavior - its
-            default behavior is undefined.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType />
-      </xsd:element>
-      <xsd:element name="alias">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used when a property defaults to some special behavior that
-            cannot be represented using property values.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="synopsis"
-              type="tns:rich-description-type">
-              <xsd:annotation>
-                <xsd:documentation>
-                  A brief description of this default behavior. The
-                  description should describe, preferably in one
-                  sentence, the default behavior. If present, the
-                  synopsis should be suitable for use in applications
-                  such as tool-tips, CLI help, and the summary
-                  description in Javadoc. It is possible to embed rich
-                  content including XHTML markup (this will only be used
-                  where supported).
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="profile" type="tns:profile-type"
-              minOccurs="0" maxOccurs="unbounded">
-              <xsd:annotation>
-                <xsd:documentation>
-                  An annotation relating to this default behavior.
-                  Annotations can define additional information which
-                  cannot be directly represented using this XML schema.
-                  The additional information can relate to specific
-                  applications.
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="defined">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used when a property defaults to one or more real values of
-            the property.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="value" minOccurs="1"
-              maxOccurs="unbounded" type="xsd:string">
-              <xsd:annotation>
-                <xsd:documentation>
-                  The string representation of a value of this property.
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="inherited">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used when a property defaults one or more values taken from
-            a property in another managed object.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:choice>
-            <xsd:element name="relative">
-              <xsd:annotation>
-                <xsd:documentation>
-                  Used when the managed object providing the default
-                  values is located relative to this managed object.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:attribute name="offset" use="required">
-                  <xsd:annotation>
-                    <xsd:documentation>
-                      The relative location of the managed object (where
-                      0 is this managed object, 1 is the parent, and 2
-                      is the grand-parent).
-                    </xsd:documentation>
-                  </xsd:annotation>
-                  <xsd:simpleType>
-                    <xsd:restriction base="xsd:integer">
-                      <xsd:minInclusive value="0" />
-                    </xsd:restriction>
-                  </xsd:simpleType>
-                </xsd:attribute>
-                <xsd:attribute name="managed-object-name"
-                  type="tns:name-type" use="required">
-                  <xsd:annotation>
-                    <xsd:documentation>
-                      The type of managed object providing the default
-                      values.
-                    </xsd:documentation>
-                  </xsd:annotation>
-                </xsd:attribute>
-                <xsd:attribute name="managed-object-package"
-                  type="tns:package-type" use="optional">
-                  <xsd:annotation>
-                    <xsd:documentation>
-                      The package containing the managed object
-                      definition if it is not the same as this managed
-                      object's package.
-                    </xsd:documentation>
-                  </xsd:annotation>
-                </xsd:attribute>
-                <xsd:attribute name="property-name" type="tns:name-type"
-                  use="required">
-                  <xsd:annotation>
-                    <xsd:documentation>
-                      The name of the property containing the default
-                      values.
-                    </xsd:documentation>
-                  </xsd:annotation>
-                </xsd:attribute>
-              </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="absolute">
-              <xsd:annotation>
-                <xsd:documentation>
-                  Used when the managed object providing the default
-                  values is in a known absolute location.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:attribute name="path" type="tns:path-type"
-                  use="required">
-                  <xsd:annotation>
-                    <xsd:documentation>
-                      The location of the managed object containing the
-                      default values.
-                    </xsd:documentation>
-                  </xsd:annotation>
-                </xsd:attribute>
-                <xsd:attribute name="property-name" type="tns:name-type"
-                  use="required">
-                  <xsd:annotation>
-                    <xsd:documentation>
-                      The name of the property containing the default
-                      values.
-                    </xsd:documentation>
-                  </xsd:annotation>
-                </xsd:attribute>
-              </xsd:complexType>
-            </xsd:element>
-          </xsd:choice>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:complexType name="syntax-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        Defines the syntax of a property. This includes the data type
-        used for the property and additional constraints on the values
-        it contains (e.g. upper/lower bounds).
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice>
-      <xsd:element name="aggregation">
-        <xsd:annotation>
-          <xsd:documentation>
-            An aggregation property names one or more managed objects
-            which are required by the managed object associated with
-            this property. An aggregation property definition takes care
-            to perform referential integrity checks: referenced managed
-            objects cannot be deleted. Nor can an aggregation reference
-            non-existent managed objects. Referential integrity checks
-            are not performed during value validation. Instead they are
-            performed when changes to the managed object are committed.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="constraint" minOccurs="0">
-              <xsd:annotation>
-                <xsd:documentation>
-                  An optional constraint on the relationship between
-                  this managed object and referenced managed objects.
-                  The constraint specifies when and how referenced
-                  managed objects must be enabled.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:element name="synopsis"
-                    type="tns:rich-description-type">
-                    <xsd:annotation>
-                      <xsd:documentation>
-                        A brief description of the constraints
-                        applicable to referenced managed objects. The
-                        description should describe, preferably in one
-                        sentence, when referenced should be enabled and
-                        how they should be enabled. The synopsis should
-                        be suitable for use in applications such as
-                        tool-tips, CLI help, and the summary description
-                        in Javadoc. It is possible to embed rich content
-                        including XHTML markup (this will only be used
-                        where supported).
-                      </xsd:documentation>
-                    </xsd:annotation>
-                  </xsd:element>
-                  <xsd:element name="target-needs-enabling-condition"
-                    minOccurs="0">
-                    <xsd:annotation>
-                      <xsd:documentation>
-                        A condition which indicates whether or not
-                        referenced managed objects must be enabled. The
-                        default behavior is that all referenced managed
-                        objects must be enabled.
-                      </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:complexType>
-                      <xsd:sequence>
-                        <xsd:group ref="tns:condition-group" />
-                      </xsd:sequence>
-                    </xsd:complexType>
-                  </xsd:element>
-                  <xsd:element name="target-is-enabled-condition"
-                    minOccurs="0">
-                    <xsd:annotation>
-                      <xsd:documentation>
-                        A condition which indicates whether or not
-                        referenced managed objects are enabled. Managed
-                        objects are assumed to be enabled by default.
-                      </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:complexType>
-                      <xsd:sequence>
-                        <xsd:sequence>
-                          <xsd:group ref="tns:condition-group" />
-                        </xsd:sequence>
-                      </xsd:sequence>
-                    </xsd:complexType>
-                  </xsd:element>
-                </xsd:sequence>
-              </xsd:complexType>
-            </xsd:element>
-          </xsd:sequence>
-          <xsd:attribute name="parent-path" type="tns:path-type"
-            use="required">
-            <xsd:annotation>
-              <xsd:documentation>
-                The name of the managed object which is the parent of
-                the aggregated managed objects.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="relation-name" type="tns:name-type"
-            use="required">
-            <xsd:annotation>
-              <xsd:documentation>
-                The relation in the parent managed object which contains
-                the aggregated managed objects.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="managed-object-name" type="tns:name-type"
-            use="optional">
-            <xsd:annotation>
-              <xsd:documentation>
-                The type of managed object referenced by this
-                aggregation if different from this relation's name.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="managed-object-package"
-            type="tns:package-type" use="optional">
-            <xsd:annotation>
-              <xsd:documentation>
-                The package containing the referenced managed object
-                definition if it is not the same as this managed
-                object's package.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="attribute-type">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which contain LDAP attribute type names.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType />
-      </xsd:element>
-      <xsd:element name="extensible-matching-rule-type">
-       <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which contain Extensible matching rule type names.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType />
-      </xsd:element>
-      <xsd:element name="boolean">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which are best represented using boolean
-            on/off type values.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType />
-      </xsd:element>
-      <xsd:element name="dn">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which contain LDAP distinguished names.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="base" minOccurs="0" type="xsd:string">
-              <xsd:annotation>
-                <xsd:documentation>
-                  Indicates that values of this property must be
-                  immediately subordinate to the specified base DN.
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="aci">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which contain dseecompat ACIs.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType />
-      </xsd:element>
-      <xsd:element name="java-class">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which reference a Java class. These are
-            typically used in plugins where the java class property
-            identifies a class implementing the plugin's functionality.
-            It is possible to restrict the values of this property using
-            the instance-of attribute. Note that it is only possible to
-            validate values on the server, since client applications
-            don't necessarily have the same classes on their class-path.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="instance-of" minOccurs="0"
-              maxOccurs="unbounded">
-              <xsd:annotation>
-                <xsd:documentation>
-                  Indicates that values of this property must implement
-                  the specified Java interface. Note that it is only
-                  possible to perform validation on the server, since
-                  client applications don't necessarily have the same
-                  classes on their class-path.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:simpleType>
-                <xsd:restriction base="xsd:string">
-                  <xsd:whiteSpace value="collapse" />
-                  <xsd:pattern
-                    value="([A-Za-z][A-Za-z0-9_]*\.)*[A-Za-z][A-Za-z0-9_]*" />
-                </xsd:restriction>
-              </xsd:simpleType>
-            </xsd:element>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="integer">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which contain integer values. Where
-            appropriate it is possible to provide a description of the
-            units for values of this property (e.g. "number of
-            threads").
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="unit-synopsis" minOccurs="0"
-              type="tns:rich-description-type">
-              <xsd:annotation>
-                <xsd:documentation>
-                  An optional description of the units for this value of
-                  this property (e.g. "number of threads"). The
-                  description should describe the unit, preferably in
-                  one sentence. If present, the description should be
-                  suitable for use in applications such as tool-tips,
-                  CLI help, and the summary description in Javadoc. It
-                  is possible to embed rich content including XHTML
-                  markup (this will only be used where supported).
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:element>
-          </xsd:sequence>
-          <xsd:attribute name="allow-unlimited" type="xsd:boolean"
-            use="optional" default="true">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates whether or not this property supports a
-                special value representing infinity. This is useful
-                where properties are used to constrain some behavior and
-                the administrator wishes to remove the constraint (e.g.
-                number of simultaneous client connections).
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="lower-limit" type="xsd:integer"
-            use="optional" default="0">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates a lower limit for this integer property.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="upper-limit" type="xsd:integer"
-            use="optional">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates an upper limit for this integer property.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="ip-address">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which contain IP addresses. IPv4 and
-            IPv6 address forms are supported. In addition name
-            resolution is performed when non-numeric addresses are
-            specified.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType />
-      </xsd:element>
-      <xsd:element name="ip-address-mask">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which contain IP address masks. IPv4 and
-            IPv6 address mask forms are supported.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType />
-      </xsd:element>
-      <xsd:element name="size">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which represent a computer storage size.
-            Sizes can be specified using both decimal and binary units.
-            For example, "1kb" represents 1000 bytes, and "1kib"
-            represents 1024 bytes. Values must always specify the unit
-            and can include a fractional part (e.g. 1.5mb). Both short
-            and long unit names are supported (e.g. "kb" and
-            "kilobytes").
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:attribute name="allow-unlimited" type="xsd:boolean"
-            use="optional" default="false">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates whether or not this property supports a
-                special value representing infinity. This is useful
-                where properties are used to constrain some behavior and
-                the administrator wishes to remove the constraint (e.g.
-                maximum log size).
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="lower-limit" type="xsd:string"
-            use="optional" default="0">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates a lower limit for this size property.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="upper-limit" type="xsd:string"
-            use="optional">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates an upper limit for this size property.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="duration">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which contain a time duration.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:attribute name="base-unit" use="optional" default="s">
-            <xsd:annotation>
-              <xsd:documentation>
-                Specifies the minimum granularity which can be used to
-                specify duration property values. For example, if the
-                base unit is in seconds then values represented in
-                milliseconds will not be permitted. The default base
-                unit is seconds.
-              </xsd:documentation>
-            </xsd:annotation>
-            <xsd:simpleType>
-              <xsd:restriction base="xsd:string">
-                <xsd:enumeration value="ms" />
-                <xsd:enumeration value="s" />
-                <xsd:enumeration value="m" />
-                <xsd:enumeration value="h" />
-                <xsd:enumeration value="d" />
-                <xsd:enumeration value="w" />
-              </xsd:restriction>
-            </xsd:simpleType>
-          </xsd:attribute>
-          <xsd:attribute name="maximum-unit" use="optional">
-            <xsd:annotation>
-              <xsd:documentation>
-                Specifies the biggest duration unit which can be used to
-                specify duration property values. Values presented in
-                units greater than this unit will not be permitted.
-                There is no default maximum unit.
-              </xsd:documentation>
-            </xsd:annotation>
-            <xsd:simpleType>
-              <xsd:restriction base="xsd:string">
-                <xsd:enumeration value="ms" />
-                <xsd:enumeration value="s" />
-                <xsd:enumeration value="m" />
-                <xsd:enumeration value="h" />
-                <xsd:enumeration value="d" />
-                <xsd:enumeration value="w" />
-              </xsd:restriction>
-            </xsd:simpleType>
-          </xsd:attribute>
-          <xsd:attribute name="allow-unlimited" type="xsd:boolean"
-            use="optional" default="false">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates whether or not this property supports a
-                special value representing infinity. This is useful
-                where properties are used to constrain some behavior and
-                the administrator wishes to remove the constraint (e.g.
-                connection time-out).
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="lower-limit" type="xsd:string"
-            use="optional" default="0">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates a lower limit for this duration property.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="upper-limit" type="xsd:string"
-            use="optional">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates an upper limit for this duration property.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="password">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which contain passwords. Values will be
-            represented using strings which are then encrypted.
-            Typically password properties are write-only and should
-            never be displayed in client applications (even during
-            creation).
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType />
-      </xsd:element>
-      <xsd:element name="enumeration">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which contain values taken from a finite
-            set of values. There must be at least one possible value
-            defined.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="value" minOccurs="1"
-              maxOccurs="unbounded">
-              <xsd:annotation>
-                <xsd:documentation>
-                  Defines one of the possible values that this property
-                  can contain.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:element name="synopsis"
-                    type="tns:rich-description-type">
-                    <xsd:annotation>
-                      <xsd:documentation>
-                        A description of this enumeration value. The
-                        description should describe the behavior
-                        indicated by the value preferably in one
-                        sentence. The description should be suitable for
-                        use in applications such as tool-tips, CLI help,
-                        and the summary description in Javadoc. It is
-                        possible to embed rich content including XHTML
-                        markup (this will only be used where supported).
-                      </xsd:documentation>
-                    </xsd:annotation>
-                  </xsd:element>
-                </xsd:sequence>
-                <xsd:attribute name="name" use="required"
-                  type="tns:name-type">
-                  <xsd:annotation>
-                    <xsd:documentation>
-                      The name of this enumeration value. The name
-                      should describe as concisely as possible the
-                      behavior indicated by this value and should be
-                      suitable for use in Java source code (e.g.
-                      enumerations). The enumeration value name should
-                      be a string comprising of short lower-case words
-                      joined with hyphens "-". For example, "optional".
-                    </xsd:documentation>
-                  </xsd:annotation>
-                </xsd:attribute>
-              </xsd:complexType>
-            </xsd:element>
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="string">
-        <xsd:annotation>
-          <xsd:documentation>
-            Used for properties which contain string values. It is
-            possible to contrain the permitted set of values using a
-            regular expression.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:element name="pattern" minOccurs="0">
-              <xsd:annotation>
-                <xsd:documentation>
-                  Constrains the permitted set of values using a regular
-                  expression. All values of this property must match the
-                  provided regular expression.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:element name="regex" type="xsd:string">
-                    <xsd:annotation>
-                      <xsd:documentation>
-                        The regular expression conforming to the syntax
-                        supported by the Java "java.util.regex.Pattern"
-                        class.
-                      </xsd:documentation>
-                    </xsd:annotation>
-                  </xsd:element>
-                  <xsd:element name="usage" type="xsd:string">
-                    <xsd:annotation>
-                      <xsd:documentation>
-                        The usage string which should be displayed in
-                        help relating to this string based property. For
-                        example, a pattern which is used to match a
-                        host/port string could have the usage HOST:PORT.
-                      </xsd:documentation>
-                    </xsd:annotation>
-                  </xsd:element>
-                  <xsd:element name="synopsis"
-                    type="tns:rich-description-type">
-                    <xsd:annotation>
-                      <xsd:documentation>
-                        An description of the regular expression (e.g.
-                        "email address"). The description should
-                        describe the type of string represented by the
-                        regular expression, preferably in one sentence.
-                        If present, the description should be suitable
-                        for use in applications such as tool-tips, CLI
-                        help, and the summary description in Javadoc. It
-                        is possible to embed rich content including
-                        XHTML markup (this will only be used where
-                        supported).
-                      </xsd:documentation>
-                    </xsd:annotation>
-                  </xsd:element>
-                </xsd:sequence>
-              </xsd:complexType>
-            </xsd:element>
-          </xsd:sequence>
-          <xsd:attribute name="case-insensitive" type="xsd:boolean"
-            use="optional" default="true">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates whether or not values of this property should
-                be treated in a case-insensitive manner.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:choice>
-  </xsd:complexType>
-  <xsd:simpleType name="name-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        An identifier name comprising of a 1 or more sequences of lower
-        case letters or digits separated by a single hyphen '-'. The
-        first sequence must begin with a letter.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="[a-z][a-z0-9]*(-[a-z0-9]+)*" />
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="package-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        An identifier name comprising of a 1 or more sequences of lower
-        case letters or digits separated by a single dot '.'. The first
-        sequence must begin with a letter.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="[a-z][a-z0-9]*(\.[a-z0-9]+)*" />
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="path-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        A managed object path which can be used to specify the location
-        of referenced managed objects. A managed object path has a
-        similar syntax to unix file system paths, and comprises of zero
-        or more path elements separated by a forward slash "/". The root
-        configuration is referenced using the path "/". Subsequent path
-        elements identify subordinate managed objects. Each path element
-        is comprised of the relation name, an optional definition name,
-        and the name of the managed object instance if the relation is
-        one-to-many. The path "/relation=connection-handler+name=my
-        handler" identifies a connection handler called "my handler"
-        where "my handler" can be any type of connection handler. If "my
-        handler" must be an LDAP connection handler then the type needs
-        to be specified in the path:
-        "/relation=connection-handler+type=ldap-connection-handler+name=my
-        handler". The global configuration is identified by the path
-        "/relation=global-configuration" (no name is required because
-        the relation is one-to-one).
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern
-        value="/|(/relation=[^/+]+(\+type=[^/+]+)?(\+name=[^/]+)?)+">
-      </xsd:pattern>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="profile-type">
-    <xsd:annotation>
-      <xsd:documentation>
-        An annotation relating to the associated element. Annotations
-        can define additional information which cannot be directly
-        represented using this XML schema. The additional information
-        can relate to specific applications such as CLIs, GUIs, etc.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:any processContents="strict" maxOccurs="unbounded" />
-    </xsd:sequence>
-    <xsd:attribute name="name" type="tns:name-type" use="required">
-      <xsd:annotation>
-        <xsd:documentation>
-          The name of this profile e.g. "ldap".
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-  </xsd:complexType>
-  <xsd:element name="root-managed-object">
-    <xsd:annotation>
-      <xsd:documentation>
-        Defines the root managed object and its relationships with
-        top-level managed objects. The root managed object serves as a
-        single point of access to the rest of the configuration. It is
-        essentially a virtual managed object and has no properties of
-        its own, just relationships. There can only be a single root
-        managed object defined per configuration model.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:complexContent>
-        <xsd:extension base="tns:managed-object-type">
-          <xsd:sequence>
-            <xsd:element name="product-name">
-              <xsd:annotation>
-                <xsd:documentation>
-                  The name of the product associated with this
-                  configuration model.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:simpleType>
-                <xsd:restriction base="xsd:string">
-                  <xsd:whiteSpace value="collapse" />
-                </xsd:restriction>
-              </xsd:simpleType>
-            </xsd:element>
-            <xsd:element name="tag-definition" minOccurs="0"
-              maxOccurs="unbounded">
-              <xsd:annotation>
-                <xsd:documentation>
-                  Defines a tag which can be used to group related types
-                  of managed object. Administration tools can take
-                  advantage of managed object tags to make it easier for
-                  users to discover related components.
-                </xsd:documentation>
-              </xsd:annotation>
-              <xsd:complexType>
-                <xsd:sequence>
-                  <xsd:element name="synopsis">
-                    <xsd:annotation>
-                      <xsd:documentation>
-                        A brief description of this tag. The description
-                        should describe, preferably in one sentence, the
-                        types of managed object that this tag applies
-                        to. The synopsis should be suitable for use in
-                        applications such as tool-tips, CLI help, and
-                        the summary description in Javadoc. It is
-                        possible to embed rich content including XHTML
-                        markup (this will only be used where supported).
-                      </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:complexType mixed="true">
-                      <xsd:choice minOccurs="0" maxOccurs="unbounded">
-                        <xsd:any
-                          namespace="http://www.w3.org/1999/xhtml"
-                          processContents="lax" />
-                        <xsd:element name="product-name">
-                          <xsd:annotation>
-                            <xsd:documentation>
-                              The name of the product associated with
-                              this definition.
-                            </xsd:documentation>
-                          </xsd:annotation>
-                          <xsd:complexType />
-                        </xsd:element>
-                      </xsd:choice>
-                    </xsd:complexType>
-                  </xsd:element>
-                </xsd:sequence>
-                <xsd:attribute name="name" type="tns:name-type"
-                  use="required">
-                  <xsd:annotation>
-                    <xsd:documentation>
-                      The name of this tag. The name should describe as
-                      concisely as possible the purpose of this tag and
-                      should be suitable for use in Java method names
-                      (e.g. getters and setters). The property name
-                      should be a string comprising of short lower-case
-                      words joined with hyphens "-". For example,
-                      "security".
-                    </xsd:documentation>
-                  </xsd:annotation>
-                </xsd:attribute>
-              </xsd:complexType>
-            </xsd:element>
-          </xsd:sequence>
-          <xsd:attribute name="name" type="tns:name-type"
-            fixed="root">
-            <xsd:annotation>
-              <xsd:documentation>
-                The name of this root managed object, which is always
-                "root".
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="package" type="tns:package-type"
-            fixed="org.opends.server.admin.std">
-            <xsd:annotation>
-              <xsd:documentation>
-                The package containing this root managed object, which
-                is always "org.opends.server.admin.std".
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-        </xsd:extension>
-      </xsd:complexContent>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="managed-object">
-    <xsd:annotation>
-      <xsd:documentation>
-        Defines the structure of a configurable component within the
-        configuration. A managed object comprises of zero or more
-        properties, and zero or more relations with other managed
-        objects. A managed object can be abstract, indicating that it
-        cannot be instantiated directly, and that it is intended as a
-        base definition from which other child managed objects inherit
-        their behavior. Conversely, a managed object can be derived from
-        a parent managed object definition. In this case, the managed
-        object will inherit the properties and relations defined by the
-        parent. Multiple levels of inheritance are supported, but
-        multiple inheritance is not.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:complexContent>
-        <xsd:extension base="tns:managed-object-type">
-          <xsd:attribute name="name" type="tns:name-type"
-            use="required">
-            <xsd:annotation>
-              <xsd:documentation>
-                The name of this managed object. The name should
-                describe as concisely as possible the role of this
-                managed object and should be suitable for use in Java
-                method names (e.g. class names). The managed object name
-                should be a string comprising of short lower-case words
-                joined with hyphens "-". For example,
-                "ldap-connection-handler". NOTE: a managed object name
-                must end in the name of the definition's uppermost
-                super-type. For example, "ldap-connection-handler" is a
-                sub-type of "connection-handler" and therefore ends in
-                "-connection-handler".
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="plural-name" type="tns:name-type"
-            use="required">
-            <xsd:annotation>
-              <xsd:documentation>
-                The plural name of this managed object. The plural name
-                should correspond to the singular name defined in the
-                "name" attribute and it should be suitable for use in
-                Java method names (e.g. getters). The managed object
-                plural name should be a string comprising of short
-                lower-case words joined with hyphens "-". For example,
-                "ldap-connection-handlers".
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="package" type="tns:package-type"
-            use="required">
-            <xsd:annotation>
-              <xsd:documentation>
-                The package containing this managed object.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="abstract" type="xsd:boolean"
-            use="optional" default="false">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates whether or not this managed object is
-                abstract. Abstract managed objects cannot be
-                instantiated directly and are intended for use as base
-                definitions for inheritance.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="advanced" type="xsd:boolean"
-            use="optional" default="false">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates whether or not this managed object should be
-                treated as advanced and therefore should be hidden by
-                default in client applications. This feature is not
-                inherited by child managed objects.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="hidden" type="xsd:boolean" use="optional"
-            default="false">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates whether or not this managed object should be
-                hidden from client applications. Hidden managed objects
-                should rarely be used but are sometimes required in
-                order to provide functionality that needs to be exposed
-                in management APIs but not in front-ends such as CLIs.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="extends" type="tns:name-type"
-            use="optional">
-            <xsd:annotation>
-              <xsd:documentation>
-                Indicates whether or not this managed object inherits
-                from a parent managed object and, if so, the name of the
-                parent. If specified, this managed object will inherit
-                all of the properties and relations defined in the
-                parent managed object.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="parent-package" type="tns:package-type"
-            use="optional">
-            <xsd:annotation>
-              <xsd:documentation>
-                The package containing the parent managed object. By
-                default, the package in which this managed object is
-                defined will be used.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-        </xsd:extension>
-      </xsd:complexContent>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:element name="package">
-    <xsd:annotation>
-      <xsd:documentation>
-        Defines a common information associated with all managed objects
-        defined in the containing package. A package definition
-        comprises of a description of the package together with common
-        property definitions which can be referenced from within managed
-        objects using "property-reference" elements. Sharing property
-        definitions in this way makes maintenance easier in situations
-        where the property definition needs modifying, since all
-        referencing managed objects will automatically inherit the
-        changes.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="TODO" minOccurs="0" type="xsd:string"
-          maxOccurs="unbounded">
-          <xsd:annotation>
-            <xsd:documentation>
-              An annotation specifying remaining work or unsolved
-              problems relating to this package definition. Its use is
-              primarily for development purposes and should not be
-              processed by applications.
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="synopsis" type="tns:rich-description-type">
-          <xsd:annotation>
-            <xsd:documentation>
-              A brief description of this package. The description
-              should describe, preferably in one sentence, the purpose
-              of this package, for example, the type of managed objects
-              it defines. The synopsis should be suitable for use in
-              applications such as tool-tips, CLI help, and the summary
-              description in Javadoc. It is possible to embed rich
-              content including XHTML markup (this will only be used
-              where supported).
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="description" minOccurs="0"
-          type="tns:rich-description-type">
-          <xsd:annotation>
-            <xsd:documentation>
-              A detailed description of this package. The description
-              should describe in detail the purpose of this package. The
-              description should be suitable for use in applications
-              such as manual pages or detailed help. It does not need to
-              repeat anything described in the synopsis as applications
-              should normally display the two together. It is possible
-              to embed rich content including XHTML markup (this will
-              only be used where supported).
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="property" minOccurs="0" maxOccurs="unbounded"
-          type="tns:property-type">
-          <xsd:annotation>
-            <xsd:documentation>
-              Defines a common configurable property for this package.
-              Managed objects can inherit this property definition by
-              referencing it using a "property-reference" element.
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-      </xsd:sequence>
-      <xsd:attribute name="name" type="tns:package-type"
-        use="required">
-        <xsd:annotation>
-          <xsd:documentation>
-            The package containing this package definition.
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:attribute>
-    </xsd:complexType>
-  </xsd:element>
-  <xsd:group name="condition-group">
-    <xsd:choice>
-      <xsd:element name="not">
-        <xsd:annotation>
-          <xsd:documentation>
-            A condition which evaluates to true if the sub-condition is
-            false, or false if the sub-condition is true.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:group ref="tns:condition-group" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="and">
-        <xsd:annotation>
-          <xsd:documentation>
-            A condition which evaluates to true if and only if all of
-            its sub-conditions are true.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:group ref="tns:condition-group" maxOccurs="unbounded" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="or">
-        <xsd:annotation>
-          <xsd:documentation>
-            A condition which evaluates to false if and only if none of
-            its sub-conditions are true.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:group ref="tns:condition-group" maxOccurs="unbounded" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="implies">
-        <xsd:annotation>
-          <xsd:documentation>
-            Creates a condition which evaluates to false if and only if
-            the first sub-condition evaluates to true and the second
-            sub-condition evaluates to false. This can be used to
-            represent if-then relationships.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:sequence>
-            <xsd:group ref="tns:condition-group" />
-            <xsd:group ref="tns:condition-group" />
-          </xsd:sequence>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="contains">
-        <xsd:annotation>
-          <xsd:documentation>
-            A condition which evaluates to true if and only if a
-            property contains a particular value.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:attribute name="property" type="tns:name-type"
-            use="required">
-            <xsd:annotation>
-              <xsd:documentation>
-                The name of the property to be tested.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-          <xsd:attribute name="value" type="xsd:string"
-            use="required">
-            <xsd:annotation>
-              <xsd:documentation>The property value.</xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-        </xsd:complexType>
-      </xsd:element>
-      <xsd:element name="is-present">
-        <xsd:annotation>
-          <xsd:documentation>
-            Creates a condition which evaluates to true if and only if a
-            particular property has any values specified.
-          </xsd:documentation>
-        </xsd:annotation>
-        <xsd:complexType>
-          <xsd:attribute name="property" type="tns:name-type"
-            use="required">
-            <xsd:annotation>
-              <xsd:documentation>
-                The name of the property to be tested.
-              </xsd:documentation>
-            </xsd:annotation>
-          </xsd:attribute>
-        </xsd:complexType>
-      </xsd:element>
-    </xsd:choice>
-  </xsd:group>
-</xsd:schema>
diff --git a/opendj-server-legacy/resource/admin/cliMOProfile.xsl b/opendj-server-legacy/resource/admin/cliMOProfile.xsl
deleted file mode 100644
index 4cb3b26..0000000
--- a/opendj-server-legacy/resource/admin/cliMOProfile.xsl
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:adm="http://www.opends.org/admin"
-  xmlns:cli="http://www.opends.org/admin-cli">
-  <xsl:import href="preprocessor.xsl" />
-  <xsl:output method="text" encoding="us-ascii" />
-  <!--
-    Document parsing.
-  -->
-  <xsl:template match="/">
-    <!--
-      Determine if the managed object is for customization.
-    -->
-    <xsl:choose>
-      <xsl:when
-        test="$this/adm:profile[@name='cli']/cli:managed-object/@custom='true'">
-        <xsl:value-of select="'is-for-customization=true&#xa;'" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="'is-for-customization=false&#xa;'" />
-      </xsl:otherwise>
-    </xsl:choose>
-    <!--
-      Process each relation definition.
-    -->
-    <xsl:for-each select="$this-all-relations">
-      <xsl:sort select="@name" />
-      <!--
-        Generate the naming argument override if present
-      -->
-      <xsl:value-of
-        select="concat('relation.', @name,
-                       '.naming-argument-override=',
-                       adm:profile[@name='cli']/cli:relation/@naming-argument-override,
-                       '&#xa;')" />
-      <!--
-        Generate list of properties which should be displayed by default in list-xxx operations.
-      -->
-      <xsl:value-of
-        select="concat('relation.', @name, '.list-properties=')" />
-      <xsl:for-each
-        select="adm:profile[@name='cli']/cli:relation/cli:default-property">
-        <xsl:value-of select="@name" />
-        <xsl:if test="current() != last()">
-          <xsl:value-of select="','" />
-        </xsl:if>
-      </xsl:for-each>
-      <xsl:value-of select="'&#xa;'" />
-    </xsl:for-each>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/clientMO.xsl b/opendj-server-legacy/resource/admin/clientMO.xsl
deleted file mode 100644
index 8ab9db3..0000000
--- a/opendj-server-legacy/resource/admin/clientMO.xsl
+++ /dev/null
@@ -1,500 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008-2009 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:admpp="http://www.opends.org/admin-preprocessor"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="java-utilities.xsl" />
-  <xsl:import href="preprocessor.xsl" />
-  <xsl:import href="property-types.xsl" />
-  <xsl:output method="text" encoding="us-ascii" />
-  <!-- 
-    Template for generating the interface declaration.
-  -->
-  <xsl:template name="generate-interface-declaration">
-    <xsl:value-of select="'/**&#xa;'" />
-    <xsl:call-template name="add-java-comment">
-      <xsl:with-param name="indent-text" select="' *'" />
-      <xsl:with-param name="content"
-        select="concat('A client-side interface for reading and modifying ',
-                       $this-ufn, ' settings.')" />
-    </xsl:call-template>
-    <xsl:value-of select="' * &lt;p&gt;&#xa;'" />
-    <xsl:call-template name="add-java-comment">
-      <xsl:with-param name="indent-text" select="' *'" />
-      <xsl:with-param name="content" select="$this/adm:synopsis" />
-    </xsl:call-template>
-    <xsl:value-of select="' */&#xa;'" />
-    <xsl:value-of
-      select="concat('public interface ',
-                     $this-java-class,
-                     'CfgClient extends ')" />
-    <xsl:choose>
-      <xsl:when test="boolean($this/@extends)">
-        <xsl:value-of select="concat($parent-java-class,'CfgClient ')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="'ConfigurationClient '" />
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>{&#xa;</xsl:text>
-  </xsl:template>
-  <!-- 
-    Template for generating the configuration definition getter.
-  -->
-  <xsl:template name="generate-configuration-definition-getter">
-    <xsl:value-of
-      select="concat('  /**&#xa;',
-                       '   * Get the configuration definition associated with this ', $this-ufn, '.&#xa;',
-                       '   *&#xa;',
-                       '   * @return Returns the configuration definition associated with this ', $this-ufn, '.&#xa;',
-                       '   */&#xa;')" />
-    <xsl:value-of
-      select="concat('  ManagedObjectDefinition&lt;? extends ', $this-java-class,'CfgClient, ? extends ', $this-java-class,'Cfg&gt; definition();&#xa;')" />
-  </xsl:template>
-  <!--
-    Template for generating the relation getter declarations.
-  -->
-  <xsl:template name="generate-relation-declarations">
-    <xsl:variable name="name" select="@name" />
-    <xsl:variable name="ufn">
-      <xsl:call-template name="name-to-ufn">
-        <xsl:with-param name="value" select="$name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="java-relation-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="$name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="java-class-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="@managed-object-name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="adm:one-to-one">
-        <xsl:call-template name="add-java-comment2">
-          <xsl:with-param name="indent" select="2" />
-          <xsl:with-param name="content"
-            select="concat(
-                       'Gets the ', $ufn,'.&#xa;',
-                       '&#xa;',
-                       '@return Returns the ', $ufn,'.&#xa;',
-                       '@throws DefinitionDecodingException&#xa;',
-                       '          If the ', $ufn, ' was found but its type could not be determined.&#xa;',
-                       '@throws ManagedObjectDecodingException&#xa;',
-                       '          If the ', $ufn, ' was found but one or more of its properties could not be decoded.&#xa;',
-                       '@throws ManagedObjectNotFoundException&#xa;',
-                       '          If the ', $ufn, ' could not be found on the server.&#xa;',
-                       '@throws ConcurrentModificationException&#xa;',
-                       '          If this ', $this-ufn, ' has been removed from the server by another client.&#xa;',
-                       '@throws AuthorizationException&#xa;',
-                       '          If the server refuses to retrieve the ', $ufn, ' because the client does not have the correct privileges.&#xa;',
-                       '@throws CommunicationException&#xa;',
-                       '          If the client cannot contact the server due to an underlying communication problem.')" />
-        </xsl:call-template>
-        <xsl:value-of
-          select="concat('  ', $java-class-name, 'CfgClient get', $java-relation-name, '()&#xa;',
-                       '      throws DefinitionDecodingException, ManagedObjectDecodingException,&#xa;',
-                       '      ManagedObjectNotFoundException, ConcurrentModificationException,&#xa;',
-                       '      AuthorizationException, CommunicationException;&#xa;')" />
-      </xsl:when>
-      <xsl:when test="adm:one-to-zero-or-one">
-        <xsl:call-template name="add-java-comment2">
-          <xsl:with-param name="indent" select="2" />
-          <xsl:with-param name="content"
-            select="concat('Determines whether or not the ', $ufn,' exists.&#xa;',
-                       '&#xa;',
-                       '@return Returns &lt;true&gt; if the ', $ufn,' exists.&#xa;',
-                       '@throws ConcurrentModificationException&#xa;',
-                       '          If this ', $this-ufn, ' has been removed from the server by another client.&#xa;',
-                       '@throws AuthorizationException&#xa;',
-                       '          If the server refuses to make the determination because the client does not have the correct privileges.&#xa;',
-                       '@throws CommunicationException&#xa;',
-                       '          If the client cannot contact the server due to an underlying communication problem.')" />
-        </xsl:call-template>
-        <xsl:value-of
-          select="concat('  boolean has',
-                       $java-relation-name, '() throws ConcurrentModificationException,&#xa;',
-                       '      AuthorizationException, CommunicationException;&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:call-template name="add-java-comment2">
-          <xsl:with-param name="indent" select="2" />
-          <xsl:with-param name="content"
-            select="concat(
-                       'Gets the ', $ufn,' if it is present.&#xa;',
-                       '&#xa;',
-                       '@return Returns the ', $ufn, ' if it is present.&#xa;',
-                       '@throws DefinitionDecodingException&#xa;',
-                       '          If the ', $ufn, ' was found but its type could not be determined.&#xa;',
-                       '@throws ManagedObjectDecodingException&#xa;',
-                       '          If the ', $ufn, ' was found but one or more of its properties could not be decoded.&#xa;',
-                       '@throws ManagedObjectNotFoundException&#xa;',
-                       '          If the ', $ufn, ' is not present.&#xa;',
-                       '@throws ConcurrentModificationException&#xa;',
-                       '          If this ', $this-ufn, ' has been removed from the server by another client.&#xa;',
-                       '@throws AuthorizationException&#xa;',
-                       '          If the server refuses to retrieve the ', $ufn, ' because the client does not have the correct privileges.&#xa;',
-                       '@throws CommunicationException&#xa;',
-                       '          If the client cannot contact the server due to an underlying communication problem.')" />
-        </xsl:call-template>
-        <xsl:value-of
-          select="concat('  ', $java-class-name, 'CfgClient get', $java-relation-name, '()&#xa;',
-                       '      throws DefinitionDecodingException, ManagedObjectDecodingException,&#xa;',
-                       '      ManagedObjectNotFoundException, ConcurrentModificationException,&#xa;',
-                       '      AuthorizationException, CommunicationException;&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:call-template name="add-java-comment2">
-          <xsl:with-param name="indent" select="2" />
-          <xsl:with-param name="content"
-            select="concat(
-                       'Creates a new ', $ufn,'. The new ', $ufn,' will initially ',
-                       'not contain any property values (including mandatory ',
-                       'properties). Once the ', $ufn,' has been configured it ',
-                       'can be added to the server using the {@link #commit()} ',
-                       'method.&#xa;',
-                       '&#xa;',
-                       '@param &lt;C&gt;&#xa;',
-                       '         The type of the ', $ufn,' being created.&#xa;',
-                       '@param d&#xa;',
-                       '         The definition of the ', $ufn,' to be created.&#xa;',
-                       '@param exceptions&#xa;',
-                       '         An optional collection in which to place any ',
-                       '{@link PropertyException}s that occurred whilst ',
-                       'attempting to determine the default values of the ', $ufn,
-                       '. This argument can be &lt;code&gt;null&lt;code&gt;.&#xa;',
-                       '@return Returns a new ', $ufn,' configuration instance.&#xa;')" />
-        </xsl:call-template>
-        <xsl:value-of
-          select="concat('  &lt;C extends ', $java-class-name,'CfgClient&gt; C create', $java-relation-name, '(&#xa;',
-                           '      ManagedObjectDefinition&lt;C, ? extends ', $java-class-name,'Cfg&gt; d, Collection&lt;PropertyException&gt; exceptions);&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:call-template name="add-java-comment2">
-          <xsl:with-param name="indent" select="2" />
-          <xsl:with-param name="content"
-            select="concat(
-                       'Removes the ', $ufn,' if it exists.&#xa;',
-                       '&#xa;',
-                       '@throws ManagedObjectNotFoundException&#xa;',
-                       '          If the ', $ufn, ' does not exist.&#xa;',
-                       '@throws OperationRejectedException&#xa;',
-                       '          If the server refuses to remove the ', $ufn, ' due to some server-side constraint which cannot be satisfied (for example, if it is referenced by another managed object).&#xa;',
-                       '@throws ConcurrentModificationException&#xa;',
-                       '          If this ', $this-ufn, ' has been removed from the server by another client.&#xa;',
-                       '@throws AuthorizationException&#xa;',
-                       '          If the server refuses to remove the ', $ufn, ' because the client does not have the correct privileges.&#xa;',
-                       '@throws CommunicationException&#xa;',
-                       '          If the client cannot contact the server due to an underlying communication problem.')" />
-        </xsl:call-template>
-        <xsl:value-of
-          select="concat('  void remove', $java-relation-name, '()&#xa;',
-                         '      throws ManagedObjectNotFoundException, OperationRejectedException,&#xa;',
-                         '      ConcurrentModificationException, AuthorizationException,&#xa;',
-                         '      CommunicationException;&#xa;')" />
-      </xsl:when>
-      <xsl:when test="adm:one-to-many">
-        <xsl:variable name="plural-name"
-          select="adm:one-to-many/@plural-name" />
-        <xsl:variable name="ufpn">
-          <xsl:call-template name="name-to-ufn">
-            <xsl:with-param name="value" select="$plural-name" />
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="java-relation-plural-name">
-          <xsl:call-template name="name-to-java">
-            <xsl:with-param name="value" select="$plural-name" />
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:call-template name="add-java-comment2">
-          <xsl:with-param name="indent" select="2" />
-          <xsl:with-param name="content"
-            select="concat('Lists the ', $ufpn,'.&#xa;',
-                       '&#xa;',
-                       '@return Returns an array containing the names of the ', $ufpn,'.&#xa;',
-                       '@throws ConcurrentModificationException&#xa;',
-                       '          If this ', $this-ufn, ' has been removed from the server by another client.&#xa;',
-                       '@throws AuthorizationException&#xa;',
-                       '          If the server refuses to list the ', $ufpn, ' because the client does not have the correct privileges.&#xa;',
-                       '@throws CommunicationException&#xa;',
-                       '          If the client cannot contact the server due to an underlying communication problem.')" />
-        </xsl:call-template>
-        <xsl:value-of
-          select="concat('  String[] list',
-                       $java-relation-plural-name, '() throws ConcurrentModificationException,&#xa;',
-                       '      AuthorizationException, CommunicationException;&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:call-template name="add-java-comment2">
-          <xsl:with-param name="indent" select="2" />
-          <xsl:with-param name="content"
-            select="concat(
-                       'Gets the named ', $ufn, '.&#xa;',
-                       '&#xa;',
-                       '@param name&#xa;',
-                       '          The name of the ', $ufn,' to retrieve.&#xa;',
-                       '@return Returns the named ', $ufn, '.&#xa;',
-                       '@throws DefinitionDecodingException&#xa;',
-                       '          If the named ', $ufn, ' was found but its type could not be determined.&#xa;',
-                       '@throws ManagedObjectDecodingException&#xa;',
-                       '          If the named ', $ufn, ' was found but one or more of its properties could not be decoded.&#xa;',
-                       '@throws ManagedObjectNotFoundException&#xa;',
-                       '          If the named ', $ufn, ' was not found on the server.&#xa;',
-                       '@throws ConcurrentModificationException&#xa;',
-                       '          If this ', $this-ufn, ' has been removed from the server by another client.&#xa;',
-                       '@throws AuthorizationException&#xa;',
-                       '          If the server refuses to retrieve the named ', $ufn, ' because the client does not have the correct privileges.&#xa;',
-                       '@throws CommunicationException&#xa;',
-                       '          If the client cannot contact the server due to an underlying communication problem.')" />
-        </xsl:call-template>
-        <xsl:value-of
-          select="concat('  ', $java-class-name, 'CfgClient get', $java-relation-name, '(String name)&#xa;',
-                       '      throws DefinitionDecodingException, ManagedObjectDecodingException,&#xa;',
-                       '      ManagedObjectNotFoundException, ConcurrentModificationException,&#xa;',
-                       '      AuthorizationException, CommunicationException;&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:choose>
-          <xsl:when test="string(adm:one-to-many/@unique) != 'true'">
-            <xsl:call-template name="add-java-comment2">
-              <xsl:with-param name="indent" select="2" />
-              <xsl:with-param name="content"
-                select="concat(
-                           'Creates a new ', $ufn,'. The new ', $ufn,' will initially ',
-                           'not contain any property values (including mandatory ',
-                           'properties). Once the ', $ufn,' has been configured it ',
-                           'can be added to the server using the {@link #commit()} ',
-                           'method.&#xa;',
-                           '&#xa;',
-                           '@param &lt;C&gt;&#xa;',
-                           '         The type of the ', $ufn,' being created.&#xa;',
-                           '@param d&#xa;',
-                           '         The definition of the ', $ufn,' to be created.&#xa;',
-                           '@param name&#xa;',
-                           '         The name of the new ', $ufn,'.&#xa;',
-                           '@param exceptions&#xa;',
-                           '         An optional collection in which to place any ',
-                           '{@link PropertyException}s that occurred whilst ',
-                           'attempting to determine the default values of the ', $ufn,
-                           '. This argument can be &lt;code&gt;null&lt;code&gt;.&#xa;',
-                           '@return Returns a new ', $ufn,' configuration instance.&#xa;',
-                           '@throws IllegalManagedObjectNameException&#xa;',
-                           '         If the name of the new ', $ufn,' is invalid.&#xa;')" />
-            </xsl:call-template>
-            <xsl:value-of
-              select="concat('  &lt;C extends ', $java-class-name,'CfgClient&gt; C create', $java-relation-name, '(&#xa;',
-                               '      ManagedObjectDefinition&lt;C, ? extends ', $java-class-name,'Cfg&gt; d, String name, Collection&lt;PropertyException&gt; exceptions) throws IllegalManagedObjectNameException;&#xa;')" />
-          </xsl:when>
-          <xsl:when test="string(adm:one-to-many/@unique) = 'true'">
-            <xsl:call-template name="add-java-comment2">
-              <xsl:with-param name="indent" select="2" />
-              <xsl:with-param name="content"
-                select="concat(
-                           'Creates a new ', $ufn,'. The new ', $ufn,' will initially ',
-                           'not contain any property values (including mandatory ',
-                           'properties). Once the ', $ufn,' has been configured it ',
-                           'can be added to the server using the {@link #commit()} ',
-                           'method.&#xa;',
-                           '&#xa;',
-                           '@param &lt;C&gt;&#xa;',
-                           '         The type of the ', $ufn,' being created.&#xa;',
-                           '@param d&#xa;',
-                           '         The definition of the ', $ufn,' to be created.&#xa;',
-                           '@param exceptions&#xa;',
-                           '         An optional collection in which to place any ',
-                           '{@link PropertyException}s that occurred whilst ',
-                           'attempting to determine the default values of the ', $ufn,
-                           '. This argument can be &lt;code&gt;null&lt;code&gt;.&#xa;',
-                           '@return Returns a new ', $ufn,' configuration instance.&#xa;')" />
-            </xsl:call-template>
-            <xsl:value-of
-              select="concat('  &lt;C extends ', $java-class-name,'CfgClient&gt; C create', $java-relation-name, '(&#xa;',
-                               '      ManagedObjectDefinition&lt;C, ? extends ', $java-class-name,'Cfg&gt; d, Collection&lt;PropertyException&gt; exceptions);&#xa;')" />
-          </xsl:when>
-        </xsl:choose>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:call-template name="add-java-comment2">
-          <xsl:with-param name="indent" select="2" />
-          <xsl:with-param name="content"
-            select="concat(
-                       'Removes the named ', $ufn,'.&#xa;',
-                       '&#xa;',
-                       '@param name&#xa;',
-                       '         The name of the ', $ufn,' to remove.&#xa;',
-                       '@throws ManagedObjectNotFoundException&#xa;',
-                       '          If the ', $ufn, ' does not exist.&#xa;',
-                       '@throws OperationRejectedException&#xa;',
-                       '          If the server refuses to remove the ', $ufn, ' due to some server-side constraint which cannot be satisfied (for example, if it is referenced by another managed object).&#xa;',
-                       '@throws ConcurrentModificationException&#xa;',
-                       '          If this ', $this-ufn, ' has been removed from the server by another client.&#xa;',
-                       '@throws AuthorizationException&#xa;',
-                       '          If the server refuses to remove the ', $ufn, ' because the client does not have the correct privileges.&#xa;',
-                       '@throws CommunicationException&#xa;',
-                       '          If the client cannot contact the server due to an underlying communication problem.')" />
-        </xsl:call-template>
-        <xsl:value-of
-          select="concat('  void remove', $java-relation-name, '(String name)&#xa;',
-                         '      throws ManagedObjectNotFoundException, OperationRejectedException,&#xa;',
-                         '      ConcurrentModificationException, AuthorizationException,&#xa;',
-                         '      CommunicationException;&#xa;')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('Unknown relation type &quot;', local-name(*), '&quot; in relation &quot;', $name, '&quot;.')" />
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!-- 
-    Main document parsing template.
-  -->
-  <xsl:template match="/">
-    <xsl:call-template name="copyright-notice" />
-    <xsl:value-of
-      select="concat('package ', $this-package, '.client;&#xa;')" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:call-template name="generate-import-statements">
-      <xsl:with-param name="imports">
-        <xsl:for-each select="$this-local-properties">
-          <xsl:call-template name="get-property-java-imports">
-            <xsl:with-param name="interface" select="'client'" />
-          </xsl:call-template>
-        </xsl:for-each>
-        <xsl:if test="$this-local-properties[@multi-valued='true']">
-          <import>java.util.Collection</import>
-          <import>java.util.SortedSet</import>
-        </xsl:if>
-        <xsl:if
-          test="$this-local-properties[not(@monitoring='true')]">
-          <import>
-            org.opends.server.admin.PropertyException
-          </import>
-        </xsl:if>
-        <xsl:if test="$this-local-properties[@read-only='true']">
-          <import>
-            org.opends.server.admin.PropertyException
-          </import>
-        </xsl:if>
-        <xsl:if test="$this-local-relations">
-          <import>
-            org.opends.server.admin.DefinitionDecodingException
-          </import>
-          <import>
-            org.opends.server.admin.ManagedObjectNotFoundException
-          </import>
-          <import>
-            org.opends.server.admin.client.ManagedObjectDecodingException
-          </import>
-          <import>
-            org.opends.server.admin.client.ConcurrentModificationException
-          </import>
-          <import>
-            org.opends.server.admin.client.AuthorizationException
-          </import>
-          <import>
-            org.opends.server.admin.client.CommunicationException
-          </import>
-        </xsl:if>
-        <xsl:for-each
-          select="$this-local-relations[adm:one-to-zero-or-one]|$this-local-relations[adm:one-to-many]">
-          <xsl:variable name="java-class-name">
-            <xsl:call-template name="name-to-java">
-              <xsl:with-param name="value"
-                select="@managed-object-name" />
-            </xsl:call-template>
-          </xsl:variable>
-          <xsl:element name="import">
-            <xsl:value-of
-              select="concat(@managed-object-package, '.server.', $java-class-name, 'Cfg')" />
-          </xsl:element>
-        </xsl:for-each>
-        <xsl:if
-          test="$this-local-relations/adm:one-to-zero-or-one|$this-local-relations/adm:one-to-many">
-          <import>java.util.Collection</import>
-          <import>
-            org.opends.server.admin.PropertyException
-          </import>
-          <import>
-            org.opends.server.admin.client.OperationRejectedException
-          </import>
-        </xsl:if>
-        <xsl:if test="$this-local-relations/adm:one-to-many[not(@unique = 'true')]">
-          <import>
-            org.opends.server.admin.client.IllegalManagedObjectNameException
-          </import>
-        </xsl:if>
-        <xsl:choose>
-          <xsl:when test="$this/@extends">
-            <xsl:if test="$parent-package != $this-package">
-              <xsl:element name="import">
-                <xsl:value-of
-                  select="concat($parent-package, '.client.', $parent-java-class, 'CfgClient')" />
-              </xsl:element>
-            </xsl:if>
-          </xsl:when>
-          <xsl:otherwise>
-            <import>org.opends.server.admin.ConfigurationClient</import>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:element name="import">
-          <xsl:value-of
-            select="concat($this-package, '.server.', $this-java-class, 'Cfg')" />
-        </xsl:element>
-        <import>org.opends.server.admin.ManagedObjectDefinition</import>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:call-template name="generate-interface-declaration" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:call-template name="generate-configuration-definition-getter" />
-    <xsl:for-each select="$this-local-properties">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-property-getter-declaration">
-        <xsl:with-param name="interface" select="'client'" />
-      </xsl:call-template>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-property-setter-declaration" />
-    </xsl:for-each>
-    <xsl:for-each select="$this-local-relations">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-relation-declarations" />
-    </xsl:for-each>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>}&#xa;</xsl:text>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/conditions.xsl b/opendj-server-legacy/resource/admin/conditions.xsl
deleted file mode 100644
index 25093c6..0000000
--- a/opendj-server-legacy/resource/admin/conditions.xsl
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!--
-    
-    
-    
-    Rules for compiling conditions from their XML definition.
-    
-    
-    
-  -->
-  <!--
-    and condition
-  -->
-  <xsl:template match="adm:and" mode="compile-condition">
-    <xsl:value-of select="'Conditions.and('" />
-    <xsl:for-each select="*">
-      <xsl:apply-templates select="." mode="compile-condition" />
-      <xsl:if test="position() != last()">
-        <xsl:value-of select="', '" />
-      </xsl:if>
-    </xsl:for-each>
-    <xsl:value-of select="')'" />
-  </xsl:template>
-  <!--
-    or condition
-  -->
-  <xsl:template match="adm:or" mode="compile-condition">
-    <xsl:value-of select="'Conditions.or('" />
-    <xsl:for-each select="*">
-      <xsl:apply-templates select="." mode="compile-condition" />
-      <xsl:if test="position() != last()">
-        <xsl:value-of select="', '" />
-      </xsl:if>
-    </xsl:for-each>
-    <xsl:value-of select="')'" />
-  </xsl:template>
-  <!--
-    not condition
-  -->
-  <xsl:template match="adm:not" mode="compile-condition">
-    <xsl:value-of select="'Conditions.not('" />
-    <xsl:apply-templates select="*[1]" mode="compile-condition" />
-    <xsl:value-of select="')'" />
-  </xsl:template>
-  <!--
-    implies condition
-  -->
-  <xsl:template match="adm:implies" mode="compile-condition">
-    <xsl:value-of select="'Conditions.implies('" />
-    <xsl:apply-templates select="*[1]" mode="compile-condition" />
-    <xsl:value-of select="', '" />
-    <xsl:apply-templates select="*[2]" mode="compile-condition" />
-    <xsl:value-of select="')'" />
-  </xsl:template>
-  <!--
-    contains condition
-  -->
-  <xsl:template match="adm:contains" mode="compile-condition">
-    <xsl:value-of
-      select="concat('Conditions.contains(&quot;', @property, '&quot;, &quot;', @value, '&quot;)')" />
-  </xsl:template>
-  <!--
-    is-present condition
-  -->
-  <xsl:template match="adm:is-present" mode="compile-condition">
-    <xsl:value-of
-      select="concat('Conditions.isPresent(&quot;', @property, '&quot;)')" />
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/java-utilities.xsl b/opendj-server-legacy/resource/admin/java-utilities.xsl
deleted file mode 100644
index 7c1a4aa..0000000
--- a/opendj-server-legacy/resource/admin/java-utilities.xsl
+++ /dev/null
@@ -1,356 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:exsl="http://exslt.org/common">
-  <!--
-    This XSLT file contains utility templates which can be used for any
-    generating Java code.
-  -->
-  <xsl:import href="text-utilities.xsl" />
-  <xsl:output method="text" encoding="us-ascii" />
-  <!--
-    Add a copyright notice to the top of a Java source file.
-    
-    TODO: it would be nice to generate the copyright year automatically.
-  -->
-  <xsl:template name="copyright-notice">
-    <xsl:value-of
-      select="concat('/*&#xa;',
-                     ' * The contents of this file are subject to the terms of the Common Development and&#xa;',
-                     ' * Distribution License (the License). You may not use this file except in compliance with the&#xa;',
-                     ' * License.&#xa;',
-                     ' *&#xa;',
-                     ' * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the&#xa;',
-                     ' * specific language governing permission and limitations under the License.&#xa;',
-                     ' *&#xa;',
-                     ' * When distributing Covered Software, include this CDDL Header Notice in each file and include&#xa;',
-                     ' * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL&#xa;',
-                     ' * Header, with the fields enclosed by brackets [] replaced by your own identifying&#xa;',
-                     ' * information: &quot;Portions Copyright [year] [name of copyright owner]&quot;.&#xa;',
-                     ' *&#xa;',
-                     ' * Copyright 2008 Sun Microsystems, Inc.&#xa;',
-                     ' */&#xa;')" />
-  </xsl:template>
-  <!--
-    Convert an entity or property ID to a Java mixed-cased name.
-    For example, the string "my-string-value" will be converted to
-    the string "myStringValue".
-    
-    @param value
-    The ID string to be converted to a Java name.
-  -->
-  <xsl:template name="name-to-java">
-    <xsl:param name="value" />
-    <xsl:if test="string-length($value)">
-      <xsl:choose>
-        <xsl:when test="contains($value, '-')">
-          <xsl:variable name="head"
-            select="substring-before($value, '-')" />
-          <xsl:variable name="tail"
-            select="substring-after($value, '-')" />
-          <xsl:call-template name="to-title-case">
-            <xsl:with-param name="value" select="$head" />
-          </xsl:call-template>
-          <xsl:call-template name="name-to-java">
-            <xsl:with-param name="value" select="$tail" />
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="to-title-case">
-            <xsl:with-param name="value" select="$value" />
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-  <!--
-    Convert an entity or property ID to a Java constant name.
-    For example, the string "my-string-value" will be converted to
-    the string "MY_STRING_VALUE".
-    
-    @param value
-    The ID string to be converted to a Java constant.
-  -->
-  <xsl:template name="name-to-java-constant">
-    <xsl:param name="value" />
-    <xsl:value-of
-      select="translate($value,
-                        'abcdefghijklmnopqrstuvwxyz-',
-                        'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')" />
-  </xsl:template>
-  <!--
-    Add a Java comment. This template handles two levels of
-    indentation: the indentation string for the first line, and a
-    second indentation string used for subsequent lines. The template
-    will output the content wrapping at the nearest word boundary to
-    column 70.
-    
-    @param indent-text
-    The indentation text used for the first line.
-    
-    @param indent-text2
-    The indentation text used for all lines except
-    the first - defaults to the value of indent-text.
-    
-    @param content
-    The content to be output in the comment.
-  -->
-  <xsl:template name="add-java-comment">
-    <xsl:param name="indent-text" />
-    <xsl:param name="indent-text2" select="$indent-text" />
-    <xsl:param name="content" />
-    <xsl:call-template name="format-text">
-      <xsl:with-param name="indent-text" select="$indent-text" />
-      <xsl:with-param name="indent-text2" select="$indent-text2" />
-      <xsl:with-param name="wrap-column" select="'70'" />
-      <xsl:with-param name="content" select="$content" />
-    </xsl:call-template>
-  </xsl:template>
-  <!--
-    Add a Java comment at the specified indentation.
-    
-    This template handles embedded newline characters
-    and will also indent individual lines according to
-    the number of leading spaces they contain.
-    
-    @param indent
-    The indentation column for the comment.
-    
-    @param content
-    The content to be output in the comment.
-  -->
-  <xsl:template name="add-java-comment2">
-    <xsl:param name="indent" select="/.." />
-    <xsl:param name="content" select="/.." />
-    <!--  Compute the indentation string. -->
-    <xsl:variable name="indent-text">
-      <xsl:call-template name="add-indent">
-        <xsl:with-param name="indent" select="$indent + 1" />
-      </xsl:call-template>
-      <xsl:value-of select="'*'" />
-    </xsl:variable>
-    <!--  Output the comment header. -->
-    <xsl:call-template name="add-indent">
-      <xsl:with-param name="indent" select="$indent" />
-    </xsl:call-template>
-    <xsl:value-of select="'/**&#xa;'" />
-    <!--  Output the comment contents. -->
-    <xsl:call-template name="add-java-comment-line">
-      <xsl:with-param name="indent-text" select="$indent-text" />
-      <xsl:with-param name="content" select="$content" />
-    </xsl:call-template>
-    <!--  Output the header trailer. -->
-    <xsl:value-of select="concat($indent-text, '/&#xa;')" />
-  </xsl:template>
-  <!-- Creates a padding string of the required length. -->
-  <xsl:template name="add-indent">
-    <xsl:param name="indent" select="/.." />
-    <xsl:if test="$indent > 0">
-      <xsl:value-of select="' '" />
-      <xsl:call-template name="add-indent">
-        <xsl:with-param name="indent" select="$indent - 1" />
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template name="add-java-comment-line">
-    <xsl:param name="indent-text" select="/.." />
-    <xsl:param name="content" select="/.." />
-    <!--  Get the next line. -->
-    <xsl:variable name="head"
-      select="substring-before($content, '&#xa;')" />
-    <xsl:variable name="tail"
-      select="substring-after($content, '&#xa;')" />
-    <!--
-      Case #1 - content is empty
-      Case #2 - no newline
-      Case #3 - contains a new line
-      Case #3.1 - begins with newline
-      Case #3.2 - ends with newline
-    -->
-    <xsl:choose>
-      <xsl:when test="string-length($content) = 0">
-        <!-- Do nothing. -->
-      </xsl:when>
-      <xsl:when test="not(contains($content, '&#xa;'))">
-        <!-- Single line of text. -->
-        <xsl:call-template name="java-format-line">
-          <xsl:with-param name="indent-text" select="$indent-text" />
-          <xsl:with-param name="line" select="$content" />
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- Output the first line and repeat for remaining lines. -->
-        <xsl:call-template name="java-format-line">
-          <xsl:with-param name="indent-text" select="$indent-text" />
-          <xsl:with-param name="line" select="$head" />
-        </xsl:call-template>
-        <xsl:call-template name="add-java-comment-line">
-          <xsl:with-param name="indent-text" select="$indent-text" />
-          <xsl:with-param name="content" select="$tail" />
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!-- Formats a line of comment text. -->
-  <xsl:template name="java-format-line">
-    <xsl:param name="indent-text" select="/.." />
-    <xsl:param name="line" select="/.." />
-    <!--  First count the number of leading spaces to determine the indent. -->
-    <xsl:variable name="leading-spaces">
-      <xsl:call-template name="java-format-line-help">
-        <xsl:with-param name="line" select="$line" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="content"
-      select="substring($line, $leading-spaces + 1)" />
-    <xsl:variable name="padding1">
-      <xsl:value-of select="$indent-text" />
-      <xsl:call-template name="add-indent">
-        <xsl:with-param name="indent" select="$leading-spaces" />
-      </xsl:call-template>
-    </xsl:variable>
-    <!-- We need to use indent2 for certain javadoc keywords. -->
-    <xsl:variable name="padding2">
-      <xsl:choose>
-        <xsl:when test="starts-with($content, '@return')">
-          <xsl:value-of select="concat($padding1, '        ')" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$padding1" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <!-- Now output the line, wrapping as necessary. -->
-    <xsl:call-template name="format-text">
-      <xsl:with-param name="indent-text" select="$padding1" />
-      <xsl:with-param name="indent-text2" select="$padding2" />
-      <xsl:with-param name="wrap-column" select="'70'" />
-      <xsl:with-param name="content" select="$content" />
-    </xsl:call-template>
-  </xsl:template>
-  <!--  Determines the number of leading spaces in the provided string. -->
-  <xsl:template name="java-format-line-help">
-    <xsl:param name="line" select="/.." />
-    <xsl:param name="count" select="0" />
-    <xsl:choose>
-      <xsl:when test="starts-with($line, ' ')">
-        <xsl:call-template name="java-format-line-help">
-          <xsl:with-param name="line"
-            select="substring-after($line, ' ')" />
-          <xsl:with-param name="count" select="$count + 1" />
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$count" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!--
-    Utility template for removing duplicate values from a node-set.
-    
-    This template is based on the version published on the XSLT site.
-    It is not capable of normalizing nodes - so they must be
-    pre-normalized before this template is called.
-    
-    @param nodes A node-set containing the duplicate nodes.
-  -->
-  <xsl:template name="set-distinct">
-    <xsl:param name="nodes" select="/.." />
-    <xsl:call-template name="_set-distinct">
-      <xsl:with-param name="nodes" select="$nodes" />
-    </xsl:call-template>
-  </xsl:template>
-  <!-- set-distinct helper template -->
-  <xsl:template name="_set-distinct">
-    <xsl:param name="nodes" select="/.." />
-    <xsl:param name="distinct" select="/.." />
-    <xsl:choose>
-      <xsl:when test="$nodes">
-        <xsl:variable name="value" select="$nodes[1]" />
-        <xsl:choose>
-          <xsl:when test="$distinct[. = $value]">
-            <xsl:call-template name="_set-distinct">
-              <xsl:with-param name="distinct" select="$distinct" />
-              <xsl:with-param name="nodes"
-                select="$nodes[position() > 1]" />
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="_set-distinct">
-              <xsl:with-param name="distinct"
-                select="$distinct | $nodes[1]" />
-              <xsl:with-param name="nodes"
-                select="$nodes[position() > 1]" />
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="$distinct" mode="set-distinct" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!-- set-distinct helper template -->
-  <xsl:template match="node()|@*" mode="set-distinct">
-    <xsl:copy-of select="." />
-  </xsl:template>
-  <!-- 
-    Generate a set of import statements.
-    
-    This template takes a result tree fragment as a parameter
-    containing elements of the form:
-    
-    <import>java.net.InetAddress</import>
-    <import>...</import>
-    
-    This template will normalize each element and remove duplicates
-    before generating the output.
-    
-    @param imports The result tree fragment containing the import elements.
-  -->
-  <xsl:template name="generate-import-statements">
-    <xsl:param name="imports" select="/.." />
-    <!-- 
-      Normalize the import elements since the set-distinct
-      template cannot handle additional whitespace
-    -->
-    <xsl:variable name="normalized-imports">
-      <xsl:for-each select="exsl:node-set($imports)/import">
-        <xsl:element name="import">
-          <xsl:value-of select="normalize-space()" />
-        </xsl:element>
-      </xsl:for-each>
-    </xsl:variable>
-    <!--
-      Now remove the duplicates
-    -->
-    <xsl:variable name="unique">
-      <xsl:call-template name="set-distinct">
-        <xsl:with-param name="nodes"
-          select="exsl:node-set($normalized-imports)/import" />
-      </xsl:call-template>
-    </xsl:variable>
-    <!--
-      Now output the import statements
-    -->
-    <xsl:for-each select="exsl:node-set($unique)/import">
-      <xsl:sort select="normalize-space()" />
-      <xsl:value-of
-        select="concat('import ', normalize-space(),';&#xa;')" />
-    </xsl:for-each>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/ldapMOProfile.xsl b/opendj-server-legacy/resource/admin/ldapMOProfile.xsl
deleted file mode 100644
index 5451580..0000000
--- a/opendj-server-legacy/resource/admin/ldapMOProfile.xsl
+++ /dev/null
@@ -1,102 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:adm="http://www.opends.org/admin"
-  xmlns:ldap="http://www.opends.org/admin-ldap">
-  <xsl:import href="java-utilities.xsl" />
-  <xsl:import href="preprocessor.xsl" />
-  <xsl:import href="property-types.xsl" />
-  <xsl:output method="text" encoding="us-ascii" />
-  <!--
-    Document parsing.
-  -->
-  <xsl:template match="/">
-    <xsl:if
-      test="not($this/adm:profile[@name='ldap']/ldap:object-class/ldap:name) and not($this-is-root)">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('No object class found for managed object definition ', $this-name)" />
-      </xsl:message>
-    </xsl:if>
-    <xsl:value-of
-      select="concat('objectclass=',
-                     normalize-space($this/adm:profile[@name='ldap']/ldap:object-class/ldap:name),
-                     '&#xa;')" />
-    <xsl:for-each select="$this-all-properties">
-      <xsl:sort select="@name" />
-      <xsl:if
-        test="not(adm:profile[@name='ldap']/ldap:attribute/ldap:name)">
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('No attribute type found for property ', @name, ' in managed object definition ', $this-name)" />
-        </xsl:message>
-      </xsl:if>
-      <xsl:value-of
-        select="concat('attribute.',
-                       normalize-space(@name),
-                       '=',
-                       normalize-space(adm:profile[@name='ldap']/ldap:attribute/ldap:name),
-                       '&#xa;')" />
-    </xsl:for-each>
-    <xsl:for-each select="$this-all-relations">
-      <xsl:sort select="@name" />
-      <xsl:if test="not(adm:profile[@name='ldap']/ldap:rdn-sequence)">
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('No RDN sequence found for relation ', @name, ' in managed object definition ', $this-name)" />
-        </xsl:message>
-      </xsl:if>
-      <xsl:value-of
-        select="concat('rdn.',
-                       normalize-space(@name),
-                       '=',
-                       normalize-space(adm:profile[@name='ldap']/ldap:rdn-sequence),
-                       '&#xa;')" />
-      <xsl:choose>
-        <xsl:when
-          test="adm:profile[@name='ldap']/ldap:naming-attribute">
-          <xsl:if test="not(adm:one-to-many)">
-            <xsl:message terminate="yes">
-              <xsl:value-of
-                select="concat('Naming attribute specified for relation ',
-                               @name, ' in managed object definition ',
-                               $this-name, ' which is not a one-to-many relation.')" />
-            </xsl:message>
-          </xsl:if>
-          <xsl:if test="adm:one-to-many/@naming-property">
-            <xsl:message terminate="yes">
-              <xsl:value-of
-                select="concat('Naming attribute specified for one-to-many relation ',
-                               @name, ' in managed object definition ',
-                               $this-name, ' which uses a naming property.')" />
-            </xsl:message>
-          </xsl:if>
-          <xsl:value-of
-            select="concat('naming-attribute.',
-                       normalize-space(@name),
-                       '=',
-                       normalize-space(adm:profile[@name='ldap']/ldap:naming-attribute),
-                       '&#xa;')" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of
-            select="concat('naming-attribute.', normalize-space(@name), '=cn&#xa;')" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/manifestMO.xsl b/opendj-server-legacy/resource/admin/manifestMO.xsl
deleted file mode 100644
index d943268..0000000
--- a/opendj-server-legacy/resource/admin/manifestMO.xsl
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="java-utilities.xsl" />
-  <xsl:output method="text" encoding="us-ascii" />
-  <!-- 
-    Main document parsing template.
-  -->
-  <xsl:template match="/">
-    <xsl:choose>
-      <xsl:when test="adm:root-managed-object">
-        <xsl:value-of
-          select="'org.opends.server.admin.std.meta.RootCfgDefn&#xa;'" />
-      </xsl:when>
-      <xsl:when test="adm:managed-object">
-        <xsl:value-of
-          select="normalize-space(adm:managed-object/@package)" />
-        <xsl:value-of select="'.meta.'" />
-        <xsl:call-template name="name-to-java">
-          <xsl:with-param name="value"
-            select="normalize-space(adm:managed-object/@name)" />
-        </xsl:call-template>
-        <xsl:value-of select="'CfgDefn&#xa;'" />
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/messagesMO.xsl b/opendj-server-legacy/resource/admin/messagesMO.xsl
deleted file mode 100644
index 44189c5..0000000
--- a/opendj-server-legacy/resource/admin/messagesMO.xsl
+++ /dev/null
@@ -1,214 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2007-2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:adm="http://www.opends.org/admin"
-  xmlns:ldap="http://www.opends.org/admin-ldap">
-  <xsl:import href="java-utilities.xsl" />
-  <xsl:import href="preprocessor.xsl" />
-  <xsl:import href="property-types.xsl" />
-  <xsl:output method="text" encoding="us-ascii" />
-  <!--
-    Document parsing.
-  -->
-  <xsl:template match="/">
-    <!--
-      Generate user friendly names.
-    -->
-    <xsl:value-of
-      select="concat('user-friendly-name=', $this-ufn, '&#xa;')" />
-    <xsl:value-of
-      select="concat('user-friendly-plural-name=', $this-ufpn, '&#xa;')" />
-    <!--
-      Pull out the managed object synopsis (mandatory).
-    -->
-    <xsl:if test="not($this/adm:synopsis)">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('No synopsis found for managed object definition ', $this-name)" />
-      </xsl:message>
-    </xsl:if>
-    <xsl:value-of
-      select="concat('synopsis=', normalize-space($this/adm:synopsis), '&#xa;')" />
-    <!--
-      Pull out the managed object description (optional).
-    -->
-    <xsl:if test="$this/adm:description">
-      <xsl:value-of
-        select="concat('description=', normalize-space($this/adm:description), '&#xa;')" />
-    </xsl:if>
-    <!--
-      Process tag definitions if this is the root configuration.
-    -->
-    <xsl:if test="$this-is-root">
-      <xsl:for-each select="$this/adm:tag-definition">
-        <xsl:sort select="@name" />
-        <xsl:value-of
-          select="concat('tag.', @name, '.synopsis=', normalize-space(adm:synopsis), '&#xa;')" />
-      </xsl:for-each>
-    </xsl:if>
-    <!--
-      Process any constraints associated with this managed object definition.
-    -->
-    <xsl:if test="$this/adm:constraint">
-      <xsl:for-each select="$this/adm:constraint">
-        <xsl:value-of
-          select="concat('constraint.', position(), '.synopsis=', normalize-space(adm:synopsis), '&#xa;')" />
-      </xsl:for-each>
-    </xsl:if>
-    <!--
-      Process each property definition.
-    -->
-    <xsl:for-each select="$this-all-properties">
-      <xsl:sort select="@name" />
-      <!--
-        Pull out the property definition synopsis (mandatory).
-      -->
-      <xsl:if test="not(adm:synopsis)">
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('No synopsis found for property ', @name, ' in managed object definition ', $this-name)" />
-        </xsl:message>
-      </xsl:if>
-      <xsl:value-of
-        select="concat('property.', normalize-space(@name), '.synopsis=', normalize-space(adm:synopsis), '&#xa;')" />
-      <!--
-        Pull out the property definition description (optional).
-      -->
-      <xsl:if test="adm:description">
-        <xsl:value-of
-          select="concat('property.', normalize-space(@name), '.description=', normalize-space(adm:description), '&#xa;')" />
-      </xsl:if>
-      <!--
-        Process alias default behavior synopsis.
-      -->
-      <xsl:if test="adm:default-behavior/adm:alias">
-        <xsl:if
-          test="not(adm:default-behavior/adm:alias/adm:synopsis)">
-          <xsl:message terminate="yes">
-            <xsl:value-of
-              select="concat('No alias default behavior synopsis found for property ', @name, ' in managed object definition ', $this-name)" />
-          </xsl:message>
-        </xsl:if>
-        <xsl:value-of
-          select="concat('property.', normalize-space(@name), '.default-behavior.alias.synopsis=', normalize-space(adm:default-behavior/adm:alias/adm:synopsis), '&#xa;')" />
-      </xsl:if>
-      <!--
-        Process requires admin action synopsis if present.
-      -->
-      <xsl:if test="adm:requires-admin-action/*/adm:synopsis">
-        <xsl:value-of
-          select="concat('property.', normalize-space(@name), '.requires-admin-action.synopsis=', normalize-space(adm:requires-admin-action/*/adm:synopsis), '&#xa;')" />
-      </xsl:if>
-      <!--
-        Process syntax related descriptions.
-      -->
-      <xsl:choose>
-        <xsl:when test="adm:syntax/adm:aggregation">
-          <!--
-            Process aggregation constraint synopsis (optional).
-          -->
-          <xsl:if
-            test="adm:syntax/adm:aggregation/adm:constraint/adm:synopsis">
-            <xsl:value-of
-              select="concat('property.', normalize-space(@name), '.syntax.aggregation.constraint-synopsis=', normalize-space(adm:syntax/adm:aggregation/adm:constraint/adm:synopsis), '&#xa;')" />
-          </xsl:if>
-        </xsl:when>
-        <xsl:when test="adm:syntax/adm:integer">
-          <!--
-            Process integer syntax unit synopsis (optional).
-          -->
-          <xsl:if test="adm:syntax/adm:integer/adm:synopsis">
-            <xsl:value-of
-              select="concat('property.', normalize-space(@name), '.syntax.integer.unit-synopsis=', normalize-space(adm:syntax/adm:integer/adm:synopsis), '&#xa;')" />
-          </xsl:if>
-        </xsl:when>
-        <xsl:when test="adm:syntax/adm:string/adm:pattern">
-          <!--
-            Process string syntax pattern synopsis (mandatory if pattern defined).
-          -->
-          <xsl:if
-            test="not(adm:syntax/adm:string/adm:pattern/adm:synopsis)">
-            <xsl:message terminate="yes">
-              <xsl:value-of
-                select="concat('No string pattern synopsis found for property ', @name, ' in managed object definition ', $this-name)" />
-            </xsl:message>
-          </xsl:if>
-          <xsl:value-of
-            select="concat('property.', normalize-space(@name), '.syntax.string.pattern.synopsis=', normalize-space(adm:syntax/adm:string/adm:pattern/adm:synopsis), '&#xa;')" />
-        </xsl:when>
-        <xsl:when test="adm:syntax/adm:enumeration">
-          <!--
-            Process enumeration value synopsis (mandatory).
-          -->
-          <xsl:for-each select="adm:syntax/adm:enumeration/adm:value">
-            <xsl:sort select="@name" />
-            <xsl:if test="not(adm:synopsis)">
-              <xsl:message terminate="yes">
-                <xsl:value-of
-                  select="concat('No synopsis found for enumeration value ', @name, ' for property ', ../../../@name, ' in managed object definition ', $this-name)" />
-              </xsl:message>
-            </xsl:if>
-            <xsl:value-of
-              select="concat('property.', normalize-space(../../../@name), '.syntax.enumeration.value.', @name,'.synopsis=', normalize-space(adm:synopsis), '&#xa;')" />
-          </xsl:for-each>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:for-each>
-    <!--
-      Process each relation definition.
-    -->
-    <xsl:for-each select="$this-all-relations">
-      <xsl:sort select="@name" />
-      <!--
-        Generate user friendly names.
-      -->
-      <xsl:value-of
-        select="concat('relation.', normalize-space(@name), '.user-friendly-name=')" />
-      <xsl:call-template name="name-to-ufn">
-        <xsl:with-param name="value" select="@name" />
-      </xsl:call-template>
-      <xsl:value-of select="'&#xa;'" />
-      <xsl:if test="adm:one-to-many">
-        <xsl:value-of
-          select="concat('relation.', normalize-space(@name), '.user-friendly-plural-name=')" />
-        <xsl:call-template name="name-to-ufn">
-          <xsl:with-param name="value"
-            select="adm:one-to-many/@plural-name" />
-        </xsl:call-template>
-        <xsl:value-of select="'&#xa;'" />
-      </xsl:if>
-      <!--
-        Pull out the relation definition synopsis (mandatory).
-      -->
-      <xsl:if test="not(adm:synopsis)">
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('No synopsis found for relation ', @name, ' in managed object definition ', $this-name)" />
-        </xsl:message>
-      </xsl:if>
-      <xsl:value-of
-        select="concat('relation.', normalize-space(@name), '.synopsis=', normalize-space(adm:synopsis), '&#xa;')" />
-      <!--
-        Pull out the relation definition description (optional).
-      -->
-      <xsl:if test="adm:description">
-        <xsl:value-of
-          select="concat('relation.', normalize-space(@name), '.description=', normalize-space(adm:description), '&#xa;')" />
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/metaMO.xsl b/opendj-server-legacy/resource/admin/metaMO.xsl
deleted file mode 100644
index d41ca7f..0000000
--- a/opendj-server-legacy/resource/admin/metaMO.xsl
+++ /dev/null
@@ -1,2028 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2007-2010 Sun Microsystems, Inc.
-  Portions copyright 2011-2016 ForgeRock AS.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:admpp="http://www.opends.org/admin-preprocessor"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:exsl="http://exslt.org/common">
-  <xsl:import href="java-utilities.xsl" />
-  <xsl:import href="preprocessor.xsl" />
-  <xsl:import href="property-types.xsl" />
-  <xsl:output method="text" encoding="us-ascii" />
-  <!--
-    Template for generating the class declaration.
-  -->
-  <xsl:template name="generate-meta-class-declaration">
-    <xsl:value-of select="'/**&#xa;'" />
-    <xsl:call-template name="add-java-comment">
-      <xsl:with-param name="indent-text" select="' *'" />
-      <xsl:with-param name="content"
-        select="concat('An interface for querying the ', $this-ufn,
-                       ' managed object definition meta information.')" />
-    </xsl:call-template>
-    <xsl:value-of select="' * &lt;p&gt;&#xa;'" />
-    <xsl:call-template name="add-java-comment">
-      <xsl:with-param name="indent-text" select="' *'" />
-      <xsl:with-param name="content" select="$this/adm:synopsis" />
-    </xsl:call-template>
-    <xsl:value-of select="' */&#xa;'" />
-    <xsl:value-of
-      select="concat('public final class ',
-                     $this-java-class,
-                     'CfgDefn extends ')" />
-    <xsl:choose>
-      <xsl:when test="$this-is-abstract">
-        <xsl:value-of
-          select="concat('AbstractManagedObjectDefinition&lt;',
-                         $this-java-class, 'CfgClient, ',
-                         $this-java-class, 'Cfg&gt; {&#xa;')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of
-          select="concat('ManagedObjectDefinition&lt;',
-                         $this-java-class, 'CfgClient, ',
-                         $this-java-class, 'Cfg&gt; {&#xa;')" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!--
-    Template for generating the meta class body.
-  -->
-  <xsl:template name="generate-meta-class-body">
-    <!--
-      Singleton configuration definition instance.
-    -->
-    <xsl:value-of
-      select="concat('  // The singleton configuration definition instance.&#xa;',
-                     '  private static final ',
-                     $this-java-class ,
-                     'CfgDefn INSTANCE = new ', $this-java-class, 'CfgDefn();&#xa;')" />
-    <!--
-      Generate enumerations defined by this managed object..
-    -->
-    <xsl:for-each
-      select="$this-local-properties[adm:syntax/adm:enumeration and not(adm:profile[@name='preprocessor']/adm:first-defined-in)]">
-      <xsl:sort select="@name" />
-      <xsl:if
-        test="not(adm:profile[@name='preprocessor']/admpp:first-defined-in)">
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:call-template name="generate-enumeration" />
-      </xsl:if>
-    </xsl:for-each>
-    <!--
-      Define application tags if this is the root configuration.
-    -->
-    <xsl:if test="$this-is-root">
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:value-of select="'  // Define managed object tags.&#xa;'" />
-      <xsl:value-of select="'  static {&#xa;'" />
-      <xsl:for-each select="$this/adm:tag-definition">
-        <xsl:sort select="@name" />
-        <xsl:value-of
-          select="concat('    Tag.define(&quot;', @name, '&quot;);&#xa;')" />
-      </xsl:for-each>
-      <xsl:value-of select="'  }&#xa;'" />
-    </xsl:if>
-    <!--
-      Generate declarations for properties defined or
-      overridden by this managed object.
-    -->
-    <xsl:for-each select="$this-local-properties">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-property-declaration" />
-    </xsl:for-each>
-    <!--
-      Generate declarations for relations.
-    -->
-    <xsl:for-each select="$this-local-relations">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-relation-declaration" />
-    </xsl:for-each>
-    <!--
-      Generate constructors for properties defined or
-      overridden by this managed object.
-    -->
-    <xsl:for-each select="$this-local-properties">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-property-constructor" />
-    </xsl:for-each>
-    <!--
-      Generate constructors for relations.
-    -->
-    <xsl:for-each select="$this-local-relations">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-relation-constructor" />
-    </xsl:for-each>
-    <!--
-      Register any optins associated with this managed object definition.
-    -->
-    <xsl:if test="$this-is-advanced or $this-is-hidden">
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:value-of
-        select="'  // Register the options associated with this managed object definition.&#xa;'" />
-      <xsl:value-of select="'  static {&#xa;'" />
-      <xsl:if test="$this-is-advanced">
-        <xsl:value-of
-          select="'    INSTANCE.registerOption(ManagedObjectOption.ADVANCED);&#xa;'" />
-      </xsl:if>
-      <xsl:if test="$this-is-hidden">
-        <xsl:value-of
-          select="'    INSTANCE.registerOption(ManagedObjectOption.HIDDEN);&#xa;'" />
-      </xsl:if>
-      <xsl:value-of select="'  }&#xa;'" />
-    </xsl:if>
-    <!--
-      Register any tags associated with this managed object definition.
-    -->
-    <xsl:if test="$this/adm:tag">
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:value-of
-        select="'  // Register the tags associated with this managed object definition.&#xa;'" />
-      <xsl:value-of select="'  static {&#xa;'" />
-      <xsl:for-each select="$this/adm:tag">
-        <xsl:sort select="@name" />
-        <xsl:value-of
-          select="concat('    INSTANCE.registerTag(Tag.valueOf(&quot;', @name, '&quot;));&#xa;')" />
-      </xsl:for-each>
-      <xsl:value-of select="'  }&#xa;'" />
-    </xsl:if>
-    <!--
-      Register any constraints associated with this managed object definition.
-    -->
-    <xsl:if test="$this/adm:constraint">
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:value-of
-        select="'  // Register the constraints associated with this managed object definition.&#xa;'" />
-      <xsl:value-of select="'  static {&#xa;'" />
-      <xsl:for-each select="$this/adm:constraint">
-        <xsl:value-of
-          select="concat('    INSTANCE.registerConstraint(new GenericConstraint(INSTANCE, ', position(), ', ')" />
-        <xsl:apply-templates select="adm:condition/*"
-          mode="compile-condition" />
-        <xsl:value-of select="'));&#xa;'" />
-      </xsl:for-each>
-      <xsl:value-of select="'  }&#xa;'" />
-    </xsl:if>
-    <!--
-      Configuration definition singleton getter.
-    -->
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of select="'  /**&#xa;'" />
-    <xsl:call-template name="add-java-comment">
-      <xsl:with-param name="indent-text" select="'   *'" />
-      <xsl:with-param name="content"
-        select="concat('Get the ', $this-ufn,' configuration definition singleton.')" />
-    </xsl:call-template>
-    <xsl:value-of select="'   *&#xa;'" />
-    <xsl:call-template name="add-java-comment">
-      <xsl:with-param name="indent-text" select="'   *'" />
-      <xsl:with-param name="indent-text2" select="'   *        '" />
-      <xsl:with-param name="content"
-        select="concat('@return Returns the ', $this-ufn,
-                     ' configuration definition singleton.')" />
-    </xsl:call-template>
-    <xsl:value-of select="'   */&#xa;'" />
-    <xsl:value-of
-      select="concat('  public static ',
-                     $this-java-class ,
-                     'CfgDefn getInstance() {&#xa;',
-                     '    return INSTANCE;&#xa;',
-                     '  }&#xa;')" />
-    <!--
-      Private constructor.
-    -->
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of
-      select="concat('  /**&#xa;',
-                     '   * Private constructor.&#xa;',
-                     '   */&#xa;',
-                     '  private ',
-                     $this-java-class ,
-                     'CfgDefn() {&#xa;')" />
-    <xsl:choose>
-      <xsl:when test="boolean($this/@extends)">
-        <xsl:value-of
-          select="concat('    super(&quot;',
-                         $this/@name,
-                         '&quot;, ',
-                         $parent-java-class,
-                         'CfgDefn.getInstance());&#xa;')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of
-          select="concat('    super(&quot;',
-                         $this/@name,
-                         '&quot;, TopCfgDefn.getInstance());&#xa;')" />
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:value-of select="'  }&#xa;'" />
-    <!--
-      Create configuration view factory methods for non-abstract definitions
-    -->
-    <xsl:if test="not($this-is-abstract)">
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <!--
-        Generate configuration client factory method.
-      -->
-      <xsl:value-of
-        select="concat('  /**&#xa;',
-                       '   * {@inheritDoc}&#xa;',
-                       '   */&#xa;',
-                       '  public ',
-                       $this-java-class,
-                       'CfgClient createClientConfiguration(&#xa;',
-                       '      ManagedObject&lt;? extends ',
-                       $this-java-class,
-                       'CfgClient&gt; impl) {&#xa;',
-                       '    return new ',
-                       $this-java-class ,
-                       'CfgClientImpl(impl);&#xa;',
-                       '  }&#xa;')" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <!--
-        Generate configuration server factory method.
-      -->
-      <xsl:value-of
-        select="concat('  /**&#xa;',
-                       '   * {@inheritDoc}&#xa;',
-                       '   */&#xa;',
-                       '  public ',
-                       $this-java-class,
-                       'Cfg createServerConfiguration(&#xa;',
-                       '      ServerManagedObject&lt;? extends ',$this-java-class,'Cfg&gt; impl) {&#xa;',
-                       '    return new ',
-                       $this-java-class ,
-                       'CfgServerImpl(impl);&#xa;',
-                       '  }&#xa;')" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <!--
-        Generate configuration server class getter..
-      -->
-      <xsl:value-of
-        select="concat('  /**&#xa;',
-                       '   * {@inheritDoc}&#xa;',
-                       '   */&#xa;',
-                       '  public Class&lt;',
-                       $this-java-class,
-                       'Cfg&gt; getServerConfigurationClass() {&#xa;',
-                       '    return ',
-                       $this-java-class ,
-                       'Cfg.class;&#xa;',
-                       '  }&#xa;')" />
-    </xsl:if>
-    <!--
-      Generate property definition getters for all properties.
-    -->
-    <xsl:for-each select="$this-all-properties">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-property-definition-getter" />
-    </xsl:for-each>
-    <!--
-      Generate relation definition getters for all relations.
-    -->
-    <xsl:for-each select="$this-all-relations">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-relation-definition-getter" />
-    </xsl:for-each>
-    <!--
-      Managed object class implementations.
-    -->
-    <xsl:if test="not($this-is-abstract)">
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-client-impl-class" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-server-impl-class" />
-    </xsl:if>
-  </xsl:template>
-  <!--
-    Generate managed object client class implementation.
-  -->
-  <xsl:template name="generate-client-impl-class">
-    <!--
-      Declaration.
-    -->
-    <xsl:value-of
-      select="concat('  /**&#xa;',
-                     '   * Managed object client implementation.&#xa;',
-                     '   */&#xa;',
-                     '  private static class ',
-                     $this-java-class ,
-                     'CfgClientImpl implements&#xa;    ',
-                     $this-java-class ,
-                     'CfgClient {&#xa;')" />
-    <xsl:text>&#xa;</xsl:text>
-    <!--
-      Private instance.
-    -->
-    <xsl:value-of
-      select="concat('    // Private implementation.&#xa;',
-                     '    private ManagedObject&lt;? extends ',
-                     $this-java-class,
-                     'CfgClient&gt; impl;&#xa;')" />
-    <!--
-      Private constructor.
-    -->
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of
-      select="concat('    // Private constructor.&#xa;',
-                     '    private ',
-                     $this-java-class,
-                     'CfgClientImpl(&#xa;',
-                     '        ManagedObject&lt;? extends ',
-                     $this-java-class,
-                     'CfgClient&gt; impl) {&#xa;',
-                     '      this.impl = impl;&#xa;',
-                     '    }&#xa;')" />
-    <!--
-      Getters/Setters for all properties.
-    -->
-    <xsl:for-each select="$this-all-properties">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template
-        name="generate-property-getter-implementation">
-        <xsl:with-param name="interface" select="'client'" />
-      </xsl:call-template>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-property-setter-implementation" />
-    </xsl:for-each>
-    <!--
-      Relation methods.
-    -->
-    <xsl:for-each select="$this-all-relations">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-client-relation-methods" />
-    </xsl:for-each>
-    <!--
-      Managed object definition getter.
-    -->
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of
-      select="concat('    /**&#xa;',
-                     '     * {@inheritDoc}&#xa;',
-                     '     */&#xa;',
-                     '    public ManagedObjectDefinition&lt;? extends ', $this-java-class,'CfgClient, ? extends ', $this-java-class,'Cfg&gt; definition() {&#xa;',
-                     '      return INSTANCE;&#xa;',
-                     '    }&#xa;')" />
-    <!--
-      Property provider view.
-    -->
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of
-      select="concat('    /**&#xa;',
-                     '     * {@inheritDoc}&#xa;',
-                     '     */&#xa;',
-                     '    public PropertyProvider properties() {&#xa;',
-                     '      return impl;&#xa;',
-                     '    }&#xa;')" />
-    <!--
-      Commit method.
-    -->
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of
-      select="concat('    /**&#xa;',
-                     '     * {@inheritDoc}&#xa;',
-                     '     */&#xa;',
-                     '    public void commit() throws ManagedObjectAlreadyExistsException,&#xa;',
-                     '        MissingMandatoryPropertiesException, ConcurrentModificationException,&#xa;',
-                     '        OperationRejectedException, AuthorizationException,&#xa;',
-                     '        CommunicationException {&#xa;',
-                     '      impl.commit();&#xa;',
-                     '    }&#xa;')" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>    /** {@inheritDoc} */&#xa;</xsl:text>
-    <xsl:text>    public String toString() {&#xa;</xsl:text>
-    <xsl:text>      return impl.toString();&#xa;</xsl:text>
-    <xsl:text>    }&#xa;</xsl:text>
-    <xsl:text>  }&#xa;</xsl:text>
-  </xsl:template>
-  <!--
-    Generate managed object server class implementation.
-  -->
-  <xsl:template name="generate-server-impl-class">
-    <!--
-      Declaration.
-    -->
-    <xsl:value-of
-      select="concat('  /**&#xa;',
-                     '   * Managed object server implementation.&#xa;',
-                     '   */&#xa;',
-                     '  private static class ',
-                     $this-java-class ,
-                     'CfgServerImpl implements&#xa;    ',
-                     $this-java-class ,
-                     'Cfg {&#xa;')" />
-    <xsl:text>&#xa;</xsl:text>
-    <!--
-      Private instance.
-    -->
-    <xsl:value-of
-      select="concat('    // Private implementation.&#xa;',
-                     '    private ServerManagedObject&lt;? extends ', $this-java-class, 'Cfg&gt; impl;&#xa;')" />
-    <!--
-      Private members for each property.
-    -->
-    <xsl:for-each select="$this-all-properties">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:value-of
-        select="concat('    // The value of the &quot;', @name, '&quot; property.&#xa;')" />
-      <xsl:value-of select="'    private final '" />
-      <xsl:choose>
-        <xsl:when test="string(@multi-valued) != 'true'">
-          <xsl:choose>
-            <xsl:when test="adm:default-behavior/adm:defined">
-              <!--
-                The property is guaranteed to contain a value since there is a
-                well-defined default value.
-              -->
-              <xsl:call-template
-                name="get-property-java-primitive-type" />
-            </xsl:when>
-            <xsl:when test="@mandatory = 'true'">
-              <!--
-                The property is guaranteed to contain a value in the server interface.
-              -->
-              <xsl:call-template
-                name="get-property-java-primitive-type" />
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:call-template name="get-property-java-type" />
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="'SortedSet&lt;'" />
-          <xsl:call-template name="get-property-java-type" />
-          <xsl:value-of select="'&gt;'" />
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:value-of select="' p'" />
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="@name" />
-      </xsl:call-template>
-      <xsl:value-of select="';&#xa;'" />
-    </xsl:for-each>
-    <!--
-      Private constructor.
-    -->
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of
-      select="concat('    // Private constructor.&#xa;',
-                     '    private ',
-                     $this-java-class,
-                     'CfgServerImpl(ServerManagedObject&lt;? extends ', $this-java-class, 'Cfg&gt; impl) {&#xa;',
-                     '      this.impl = impl;&#xa;')" />
-    <xsl:for-each select="$this-all-properties">
-      <xsl:sort select="@name" />
-      <xsl:variable name="java-prop-name">
-        <xsl:call-template name="name-to-java">
-          <xsl:with-param name="value" select="@name" />
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of
-        select="concat('      this.p', $java-prop-name, ' = ')" />
-      <xsl:choose>
-        <xsl:when test="string(@multi-valued) != 'true'">
-          <xsl:value-of
-            select="concat('impl.getPropertyValue(INSTANCE.get', $java-prop-name , 'PropertyDefinition());&#xa;')" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of
-            select="concat('impl.getPropertyValues(INSTANCE.get', $java-prop-name , 'PropertyDefinition());&#xa;')" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:value-of select="'    }&#xa;'" />
-    <!--
-      Generate all the change listener methods - one for each managed
-      object in the hierarchy.
-    -->
-    <xsl:if test="not($this-is-root)">
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-change-listener" />
-    </xsl:if>
-    <!--
-      Getters for all properties.
-    -->
-    <xsl:for-each select="$this-all-properties">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template
-        name="generate-property-getter-implementation">
-        <xsl:with-param name="interface" select="'server'" />
-      </xsl:call-template>
-    </xsl:for-each>
-    <!--
-      Relation methods.
-    -->
-    <xsl:for-each select="$this-all-relations">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-server-relation-methods" />
-    </xsl:for-each>
-    <!--
-      Configuration class getter.
-    -->
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of
-      select="concat('    /**&#xa;',
-                     '     * {@inheritDoc}&#xa;',
-                     '     */&#xa;',
-                     '    public Class&lt;? extends ', $this-java-class,'Cfg&gt; configurationClass() {&#xa;',
-                     '      return ', $this-java-class, 'Cfg.class;&#xa;',
-                     '    }&#xa;')" />
-    <!--
-      Configuration entry DN getter.
-    -->
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of
-      select="concat('    /**&#xa;',
-                     '     * {@inheritDoc}&#xa;',
-                     '     */&#xa;',
-                     '    public DN dn() {&#xa;',
-                     '      return impl.getDN();&#xa;',
-                     '    }&#xa;')" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>    /** {@inheritDoc} */&#xa;</xsl:text>
-    <xsl:text>    public String toString() {&#xa;</xsl:text>
-    <xsl:text>      return impl.toString();&#xa;</xsl:text>
-    <xsl:text>    }&#xa;</xsl:text>
-    <xsl:text>  }&#xa;</xsl:text>
-  </xsl:template>
-  <!--
-    Generate a property definition constructor.
-  -->
-  <xsl:template name="generate-property-declaration">
-    <xsl:variable name="java-prop-name">
-      <xsl:call-template name="name-to-java-constant">
-        <xsl:with-param name="value" select="@name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="type">
-      <xsl:call-template name="get-property-definition-type" />
-    </xsl:variable>
-    <xsl:variable name="generic-type">
-      <xsl:call-template name="get-property-definition-generic-type" />
-    </xsl:variable>
-    <xsl:variable name="pdtype">
-      <xsl:choose>
-        <xsl:when test="string-length($generic-type) != 0">
-          <xsl:value-of
-            select="concat($type, '&lt;', $generic-type, '&gt;')" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$type" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:value-of
-      select="concat('  // The &quot;',
-                     @name,
-                     '&quot; property definition.&#xa;',
-                     '  private static final ', $pdtype, ' PD_', $java-prop-name, ';&#xa;')" />
-  </xsl:template>
-  <!--
-    Generate a property definition constructor.
-  -->
-  <xsl:template name="generate-property-constructor">
-    <xsl:variable name="java-prop-name">
-      <xsl:call-template name="name-to-java-constant">
-        <xsl:with-param name="value" select="@name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="type">
-      <xsl:call-template name="get-property-definition-type" />
-    </xsl:variable>
-    <xsl:variable name="generic-type">
-      <xsl:call-template name="get-property-definition-generic-type" />
-    </xsl:variable>
-    <xsl:variable name="value-type">
-      <xsl:call-template name="get-property-java-type" />
-    </xsl:variable>
-    <xsl:value-of
-      select="concat('  // Build the &quot;', @name, '&quot; property definition.&#xa;',
-                                 '  static {&#xa;')" />
-    <xsl:choose>
-      <xsl:when test="string-length($generic-type) != 0">
-        <xsl:value-of
-          select="concat('      ', $type, '.Builder&lt;', $generic-type, '&gt; builder = ', $type, '.createBuilder(INSTANCE, &quot;',@name, '&quot;);&#xa;')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of
-          select="concat('      ', $type, '.Builder builder = ', $type, '.createBuilder(INSTANCE, &quot;',@name, '&quot;);&#xa;')" />
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:if test="@multi-valued='true'">
-      <xsl:value-of
-        select="'      builder.setOption(PropertyOption.MULTI_VALUED);&#xa;'" />
-    </xsl:if>
-    <xsl:if test="@read-only='true'">
-      <xsl:value-of
-        select="'      builder.setOption(PropertyOption.READ_ONLY);&#xa;'" />
-    </xsl:if>
-    <xsl:if test="@monitoring='true'">
-      <xsl:value-of
-        select="'      builder.setOption(PropertyOption.MONITORING);&#xa;'" />
-    </xsl:if>
-    <xsl:if test="@mandatory='true'">
-      <xsl:value-of
-        select="'      builder.setOption(PropertyOption.MANDATORY);&#xa;'" />
-    </xsl:if>
-    <xsl:if test="@hidden='true'">
-      <xsl:value-of
-        select="'      builder.setOption(PropertyOption.HIDDEN);&#xa;'" />
-    </xsl:if>
-    <xsl:if test="@advanced='true'">
-      <xsl:value-of
-        select="'      builder.setOption(PropertyOption.ADVANCED);&#xa;'" />
-    </xsl:if>
-    <xsl:variable name="action-type">
-      <xsl:choose>
-        <xsl:when test="adm:requires-admin-action">
-          <xsl:call-template name="name-to-java-constant">
-            <xsl:with-param name="value"
-              select="local-name(adm:requires-admin-action/*)" />
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="'NONE'" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:value-of
-      select="concat('      builder.setAdministratorAction(new AdministratorAction(AdministratorAction.Type.', $action-type, ', INSTANCE, &quot;', @name, '&quot;));&#xa;')" />
-    <xsl:choose>
-      <xsl:when
-        test="not(adm:default-behavior) or adm:default-behavior/adm:undefined">
-        <xsl:value-of
-          select="concat('      builder.setDefaultBehaviorProvider(new UndefinedDefaultBehaviorProvider&lt;', $value-type,'&gt;());&#xa;')" />
-      </xsl:when>
-      <xsl:when test="adm:default-behavior/adm:alias">
-        <xsl:value-of
-          select="concat('      builder.setDefaultBehaviorProvider(new AliasDefaultBehaviorProvider&lt;', $value-type,'&gt;(INSTANCE, &quot;', @name, '&quot;));&#xa;')" />
-      </xsl:when>
-      <xsl:when test="adm:default-behavior/adm:defined">
-        <xsl:value-of
-          select="concat('      DefaultBehaviorProvider&lt;', $value-type,'&gt; provider = ',
-                             'new DefinedDefaultBehaviorProvider&lt;', $value-type,'&gt;(')" />
-        <xsl:for-each
-          select="adm:default-behavior/adm:defined/adm:value">
-          <xsl:value-of
-            select="concat('&quot;', normalize-space(), '&quot;')" />
-          <xsl:if test="position() != last()">
-            <xsl:value-of select="', '" />
-          </xsl:if>
-        </xsl:for-each>
-        <xsl:value-of select="');&#xa;'" />
-        <xsl:value-of
-          select="'      builder.setDefaultBehaviorProvider(provider);&#xa;'" />
-      </xsl:when>
-      <xsl:when
-        test="adm:default-behavior/adm:inherited/adm:relative">
-        <xsl:value-of
-          select="concat('      DefaultBehaviorProvider&lt;', $value-type,'&gt; provider = ',
-                             'new RelativeInheritedDefaultBehaviorProvider&lt;', $value-type,'&gt;(')" />
-        <xsl:variable name="managed-object-name">
-          <xsl:call-template name="name-to-java">
-            <xsl:with-param name="value"
-              select="adm:default-behavior/adm:inherited/adm:relative/@managed-object-name" />
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="property-name"
-          select="adm:default-behavior/adm:inherited/adm:relative/@property-name" />
-        <xsl:variable name="offset"
-          select="adm:default-behavior/adm:inherited/adm:relative/@offset" />
-        <xsl:value-of
-          select="concat($managed-object-name, 'CfgDefn.getInstance(), &quot;', $property-name, '&quot;, ', $offset, ');&#xa;')" />
-        <xsl:value-of
-          select="'      builder.setDefaultBehaviorProvider(provider);&#xa;'" />
-      </xsl:when>
-      <xsl:when
-        test="adm:default-behavior/adm:inherited/adm:absolute">
-        <xsl:value-of
-          select="concat('      DefaultBehaviorProvider&lt;', $value-type,'&gt; provider = ',
-                             'new AbsoluteInheritedDefaultBehaviorProvider&lt;', $value-type,'&gt;(')" />
-        <xsl:variable name="property-name"
-          select="adm:default-behavior/adm:inherited/adm:absolute/@property-name" />
-        <xsl:variable name="path"
-          select="adm:default-behavior/adm:inherited/adm:absolute/@path" />
-        <xsl:value-of
-          select="concat('&quot;', $path, '&quot;, &quot;', $property-name, '&quot;);&#xa;')" />
-        <xsl:value-of
-          select="'      builder.setDefaultBehaviorProvider(provider);&#xa;'" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('Unrecognized default behavior type for property &quot;', @name,
-                         '&quot;.')" />
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:call-template name="get-property-definition-ctor" />
-    <xsl:value-of
-      select="concat('      PD_', $java-prop-name, ' = builder.getInstance();&#xa;')" />
-    <xsl:value-of
-      select="concat('      INSTANCE.registerPropertyDefinition(PD_', $java-prop-name, ');&#xa;')" />
-    <xsl:call-template name="get-property-definition-post-ctor" />
-    <xsl:value-of select="'  }&#xa;'" />
-  </xsl:template>
-  <!--
-    Generate a relation definition declaration.
-  -->
-  <xsl:template name="generate-relation-declaration">
-    <xsl:variable name="relation-name">
-      <xsl:choose>
-        <xsl:when test="adm:one-to-many">
-          <xsl:value-of select="adm:one-to-many/@plural-name" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@name" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="java-relation-name">
-      <xsl:call-template name="name-to-java-constant">
-        <xsl:with-param name="value" select="$relation-name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="java-managed-object-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="@managed-object-name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:value-of
-      select="concat('  // The &quot;',
-                     $relation-name,
-                     '&quot; relation definition.&#xa;',
-                     '  private static final ')" />
-    <xsl:choose>
-      <xsl:when test="adm:one-to-one">
-        <xsl:text>SingletonRelationDefinition&lt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="adm:one-to-zero-or-one">
-        <xsl:text>OptionalRelationDefinition&lt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="string(adm:one-to-many/@unique) != 'true'">
-        <xsl:text>InstantiableRelationDefinition&lt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="string(adm:one-to-many/@unique) = 'true'">
-        <xsl:text>SetRelationDefinition&lt;</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('Unknown relation type &quot;', local-name(*), '&quot; in relation &quot;', @name, '&quot;.')" />
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:value-of
-      select="concat($java-managed-object-name, 'CfgClient, ', $java-managed-object-name, 'Cfg&gt; RD_', $java-relation-name, ';&#xa;')" />
-  </xsl:template>
-  <!--
-    Generate a relation definition constructor.
-  -->
-  <xsl:template name="generate-relation-constructor">
-    <xsl:variable name="relation-name">
-      <xsl:choose>
-        <xsl:when test="adm:one-to-many">
-          <xsl:value-of select="adm:one-to-many/@plural-name" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@name" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="java-relation-name">
-      <xsl:call-template name="name-to-java-constant">
-        <xsl:with-param name="value" select="$relation-name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="java-managed-object-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="@managed-object-name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="java-relation-builder-type">
-      <xsl:choose>
-        <xsl:when test="adm:one-to-one">
-          <xsl:text>SingletonRelationDefinition</xsl:text>
-        </xsl:when>
-        <xsl:when test="adm:one-to-zero-or-one">
-          <xsl:text>OptionalRelationDefinition</xsl:text>
-        </xsl:when>
-        <xsl:when test="string(adm:one-to-many/@unique) != 'true'">
-          <xsl:text>InstantiableRelationDefinition</xsl:text>
-        </xsl:when>
-        <xsl:when test="string(adm:one-to-many/@unique) = 'true'">
-          <xsl:text>SetRelationDefinition</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message terminate="yes">
-            <xsl:value-of
-              select="concat('Unknown relation type &quot;', local-name(*), '&quot; in relation &quot;', @name, '&quot;.')" />
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:value-of
-        select="concat('.Builder&lt;', $java-managed-object-name, 'CfgClient, ', $java-managed-object-name, 'Cfg&gt;')" />
-    </xsl:variable>
-    <xsl:value-of
-      select="concat('  // Build the &quot;', $relation-name, '&quot; relation definition.&#xa;',
-                     '  static {&#xa;',
-                     '    ', $java-relation-builder-type, ' builder =&#xa;',
-                     '      new ', $java-relation-builder-type, '(INSTANCE, &quot;', @name, '&quot;, ')" />
-    <xsl:if test="adm:one-to-many">
-      <xsl:value-of
-        select="concat('&quot;', adm:one-to-many/@plural-name, '&quot;, ')" />
-    </xsl:if>
-    <xsl:value-of
-      select="concat($java-managed-object-name, 'CfgDefn.getInstance());&#xa;')" />
-    <xsl:if test="adm:one-to-many/@naming-property">
-      <xsl:if test="string(adm:one-to-many/@unique) = 'true'">
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('Naming properties found in unique one-to-many relation &quot;', @name, '&quot;.')" />
-        </xsl:message>
-      </xsl:if>
-      <xsl:variable name="java-property-name">
-        <xsl:call-template name="name-to-java">
-          <xsl:with-param name="value"
-            select="adm:one-to-many/@naming-property" />
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of
-        select="concat('    builder.setNamingProperty(',
-                           $java-managed-object-name,
-                           'CfgDefn.getInstance().get',
-                           $java-property-name, 'PropertyDefinition());&#xa;')" />
-    </xsl:if>
-    <xsl:for-each select="*/adm:default-managed-object">
-      <xsl:variable name="dmo-java-name">
-        <xsl:call-template name="name-to-java">
-          <xsl:with-param name="value" select="@managed-object-name" />
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="'    {&#xa;'" />
-      <xsl:value-of
-        select="concat('      DefaultManagedObject.Builder&lt;',
-                                   $dmo-java-name, 'CfgClient, ',
-                                   $dmo-java-name, 'Cfg&gt; dmoBuilder = new DefaultManagedObject.Builder&lt;',
-                                   $dmo-java-name, 'CfgClient, ',
-                                   $dmo-java-name, 'Cfg&gt;(',
-                                   $dmo-java-name, 'CfgDefn.getInstance());&#xa;')" />
-      <xsl:for-each select="adm:property">
-        <xsl:value-of
-          select="concat('      dmoBuilder.setPropertyValues(&quot;', @name, '&quot;')" />
-        <xsl:for-each select="adm:value">
-          <xsl:value-of
-            select="concat(', &quot;', normalize-space(), '&quot;')" />
-        </xsl:for-each>
-        <xsl:value-of select="');&#xa;'" />
-      </xsl:for-each>
-      <xsl:choose>
-        <xsl:when test="@name">
-          <xsl:value-of
-            select="concat('      builder.setDefaultManagedObject(&quot;', @name, '&quot;, dmoBuilder.getInstance());&#xa;')" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of
-            select="'      builder.setDefaultManagedObject(dmoBuilder.getInstance());&#xa;'" />
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:value-of select="'    }&#xa;'" />
-    </xsl:for-each>
-    <xsl:if test="@advanced='true'">
-      <xsl:value-of
-        select="'    builder.setOption(RelationOption.ADVANCED);&#xa;'" />
-    </xsl:if>
-    <xsl:if test="@hidden='true'">
-      <xsl:value-of
-        select="'    builder.setOption(RelationOption.HIDDEN);&#xa;'" />
-    </xsl:if>
-    <xsl:value-of
-      select="concat('    RD_', $java-relation-name, ' = builder.getInstance();&#xa;')" />
-    <xsl:value-of
-      select="concat('    INSTANCE.registerRelationDefinition(RD_', $java-relation-name,');&#xa;')" />
-    <xsl:value-of select="'  }&#xa;'" />
-  </xsl:template>
-  <!--
-    Generate a property definition getter for a locally defined
-    or overriden property.
-  -->
-  <xsl:template name="generate-property-definition-getter">
-    <xsl:variable name="java-prop-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="@name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="java-prop-name-constant">
-      <xsl:call-template name="name-to-java-constant">
-        <xsl:with-param name="value" select="@name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="type">
-      <xsl:call-template name="get-property-definition-type" />
-    </xsl:variable>
-    <xsl:variable name="generic-type">
-      <xsl:call-template name="get-property-definition-generic-type" />
-    </xsl:variable>
-    <xsl:variable name="pdtype">
-      <xsl:choose>
-        <xsl:when test="string-length($generic-type) != 0">
-          <xsl:value-of
-            select="concat($type, '&lt;', $generic-type, '&gt;')" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$type" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:value-of
-      select="concat('  /**&#xa;',
-                     '   * Get the &quot;',
-                     @name,
-                     '&quot; property definition.&#xa;')" />
-    <xsl:if test="adm:synopsis">
-      <xsl:value-of select="'   * &lt;p&gt;&#xa;'" />
-      <xsl:call-template name="add-java-comment">
-        <xsl:with-param name="indent-text" select="'   *'" />
-        <xsl:with-param name="content" select="adm:synopsis" />
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:if test="adm:description">
-      <xsl:value-of select="'   * &lt;p&gt;&#xa;'" />
-      <xsl:call-template name="add-java-comment">
-        <xsl:with-param name="indent-text" select="'   *'" />
-        <xsl:with-param name="content" select="adm:description" />
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when
-        test="adm:profile[@name='preprocessor']/admpp:last-defined-in[@name=$this-name and @package=$this-package]">
-        <xsl:value-of
-          select="concat('   *&#xa;',
-                     '   * @return Returns the &quot;',
-                     @name,
-                     '&quot; property definition.&#xa;',
-                     '   */&#xa;',
-                     '  public ',
-                     $pdtype,
-                     ' get',
-                     $java-prop-name,
-                     'PropertyDefinition() {&#xa;' ,
-                     '    return PD_',
-                     $java-prop-name-constant ,
-                     ';&#xa;' ,
-                     '  }&#xa;')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of
-          select="concat('   *&#xa;',
-                     '   * @return Returns the &quot;',
-                     @name,
-                     '&quot; property definition.&#xa;',
-                     '   */&#xa;',
-                     '  public ',
-                     $pdtype,
-                     ' get',
-                     $java-prop-name,
-                     'PropertyDefinition() {&#xa;' ,
-                     '    return ',
-                     $parent-java-class, 'CfgDefn.getInstance().get',
-                     $java-prop-name,
-                     'PropertyDefinition();&#xa;',
-                     '  }&#xa;')" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!--
-    Generate a relation definition getter.
-  -->
-  <xsl:template name="generate-relation-definition-getter">
-    <xsl:variable name="relation-name">
-      <xsl:choose>
-        <xsl:when test="adm:one-to-many">
-          <xsl:value-of select="adm:one-to-many/@plural-name" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@name" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="java-relation-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="$relation-name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="java-relation-name-constant">
-      <xsl:call-template name="name-to-java-constant">
-        <xsl:with-param name="value" select="$relation-name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:value-of
-      select="concat('  /**&#xa;',
-                     '   * Get the &quot;',
-                     $relation-name,
-                     '&quot; relation definition.&#xa;',
-                     '   *&#xa;',
-                     '   * @return Returns the &quot;',
-                     $relation-name,
-                     '&quot; relation definition.&#xa;',
-                     '   */&#xa;',
-                     '  public ')" />
-    <xsl:choose>
-      <xsl:when test="adm:one-to-one">
-        <xsl:text>SingletonRelationDefinition&lt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="adm:one-to-zero-or-one">
-        <xsl:text>OptionalRelationDefinition&lt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="string(adm:one-to-many/@unique) != 'true'">
-        <xsl:text>InstantiableRelationDefinition&lt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="string(adm:one-to-many/@unique) = 'true'">
-        <xsl:text>SetRelationDefinition&lt;</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('Unknown relation type &quot;', local-name(*), '&quot; in relation &quot;', @name, '&quot;.')" />
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:variable name="java-managed-object-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="@managed-object-name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when
-        test="adm:profile[@name='preprocessor']/admpp:last-defined-in[@name=$this-name and @package=$this-package]">
-        <xsl:value-of
-          select="concat($java-managed-object-name, 'CfgClient,',
-                     $java-managed-object-name, 'Cfg&gt; get',
-                     $java-relation-name,
-                     'RelationDefinition() {&#xa;' ,
-                     '    return RD_',
-                     $java-relation-name-constant,
-                     ';&#xa;' ,
-                     '  }&#xa;')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of
-          select="concat($java-managed-object-name, 'CfgClient,',
-                     $java-managed-object-name, 'Cfg&gt; get',
-                     $java-relation-name,
-                     'RelationDefinition() {&#xa;' ,
-                     '    return ',
-                     $parent-java-class, 'CfgDefn.getInstance().get',
-                     $java-relation-name,
-                     'RelationDefinition();&#xa;',
-                     '  }&#xa;')" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!--
-    Generate client relation methods.
-  -->
-  <xsl:template name="generate-client-relation-methods">
-    <xsl:variable name="name" select="@name" />
-    <xsl:variable name="java-relation-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="$name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="java-class-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="@managed-object-name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="adm:one-to-one">
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public ', $java-class-name, 'CfgClient get', $java-relation-name, '()&#xa;',
-                         '        throws DefinitionDecodingException, ManagedObjectDecodingException,&#xa;',
-                         '        ManagedObjectNotFoundException, ConcurrentModificationException,&#xa;',
-                         '        AuthorizationException, CommunicationException {&#xa;',
-                         '      return impl.getChild(INSTANCE.get', $java-relation-name,'RelationDefinition()).getConfiguration();&#xa;',
-                         '    }&#xa;')" />
-      </xsl:when>
-      <xsl:when test="adm:one-to-zero-or-one">
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public boolean has', $java-relation-name, '() throws ConcurrentModificationException,&#xa;',
-                         '        AuthorizationException, CommunicationException {&#xa;',
-                         '      return impl.hasChild(INSTANCE.get', $java-relation-name,'RelationDefinition());&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public ', $java-class-name, 'CfgClient get', $java-relation-name, '()&#xa;',
-                         '        throws DefinitionDecodingException, ManagedObjectDecodingException,&#xa;',
-                         '        ManagedObjectNotFoundException, ConcurrentModificationException,&#xa;',
-                         '        AuthorizationException, CommunicationException {&#xa;',
-                         '      return impl.getChild(INSTANCE.get', $java-relation-name,'RelationDefinition()).getConfiguration();&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public &lt;M extends ', $java-class-name, 'CfgClient&gt; M create', $java-relation-name, '(&#xa;',
-                         '        ManagedObjectDefinition&lt;M, ? extends ', $java-class-name,'Cfg&gt; d, Collection&lt;PropertyException&gt; exceptions) {&#xa;',
-                         '      return impl.createChild(INSTANCE.get', $java-relation-name,'RelationDefinition(), d, exceptions).getConfiguration();&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public void remove', $java-relation-name, '()&#xa;',
-                         '        throws ManagedObjectNotFoundException, ConcurrentModificationException,&#xa;',
-                         '        OperationRejectedException, AuthorizationException, CommunicationException {&#xa;',
-                         '      impl.removeChild(INSTANCE.get', $java-relation-name,'RelationDefinition());&#xa;',
-                         '    }&#xa;')" />
-      </xsl:when>
-      <xsl:when test="adm:one-to-many">
-        <xsl:variable name="plural-name"
-          select="adm:one-to-many/@plural-name" />
-        <xsl:variable name="java-relation-plural-name">
-          <xsl:call-template name="name-to-java">
-            <xsl:with-param name="value" select="$plural-name" />
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public String[] list', $java-relation-plural-name, '() throws ConcurrentModificationException,&#xa;',
-                         '        AuthorizationException, CommunicationException {&#xa;',
-                         '      return impl.listChildren(INSTANCE.get', $java-relation-plural-name,'RelationDefinition());&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public ', $java-class-name, 'CfgClient get', $java-relation-name, '(String name)&#xa;',
-                         '        throws DefinitionDecodingException, ManagedObjectDecodingException,&#xa;',
-                         '        ManagedObjectNotFoundException, ConcurrentModificationException,&#xa;',
-                         '        AuthorizationException, CommunicationException {&#xa;',
-                         '      return impl.getChild(INSTANCE.get', $java-relation-plural-name,'RelationDefinition(), name).getConfiguration();&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:choose>
-          <xsl:when test="string(adm:one-to-many/@unique) != 'true'">
-            <xsl:value-of
-              select="concat('    /**&#xa;',
-                             '     * {@inheritDoc}&#xa;',
-                             '     */&#xa;',
-                             '    public &lt;M extends ', $java-class-name, 'CfgClient&gt; M create', $java-relation-name, '(&#xa;',
-                             '        ManagedObjectDefinition&lt;M, ? extends ', $java-class-name,'Cfg&gt; d, String name, Collection&lt;PropertyException&gt; exceptions) throws IllegalManagedObjectNameException {&#xa;',
-                             '      return impl.createChild(INSTANCE.get', $java-relation-plural-name,'RelationDefinition(), d, name, exceptions).getConfiguration();&#xa;',
-                             '    }&#xa;')" />
-          </xsl:when>
-          <xsl:when test="string(adm:one-to-many/@unique) = 'true'">
-            <!--  Unique one-to-many children are named implicitly by their definition -->
-            <xsl:value-of
-              select="concat('    /**&#xa;',
-                             '     * {@inheritDoc}&#xa;',
-                             '     */&#xa;',
-                             '    public &lt;M extends ', $java-class-name, 'CfgClient&gt; M create', $java-relation-name, '(&#xa;',
-                             '        ManagedObjectDefinition&lt;M, ? extends ', $java-class-name,'Cfg&gt; d, Collection&lt;PropertyException&gt; exceptions) {&#xa;',
-                             '      return impl.createChild(INSTANCE.get', $java-relation-plural-name,'RelationDefinition(), d, exceptions).getConfiguration();&#xa;',
-                             '    }&#xa;')" />
-          </xsl:when>
-        </xsl:choose>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public void remove', $java-relation-name, '(String name)&#xa;',
-                         '        throws ManagedObjectNotFoundException, ConcurrentModificationException,&#xa;',
-                         '        OperationRejectedException, AuthorizationException, CommunicationException {&#xa;',
-                         '      impl.removeChild(INSTANCE.get', $java-relation-plural-name,'RelationDefinition(), name);&#xa;',
-                         '    }&#xa;')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('Unknown relation type &quot;', local-name(*), '&quot; in relation &quot;', $name, '&quot;.')" />
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!--
-    Generate server relation methods.
-  -->
-  <xsl:template name="generate-server-relation-methods">
-    <xsl:variable name="name" select="@name" />
-    <xsl:variable name="java-relation-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="$name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="java-class-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="@managed-object-name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="adm:one-to-one">
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public ', $java-class-name, 'Cfg get',
-                         $java-relation-name, '() throws ConfigException {&#xa;',
-                         '      return impl.getChild(INSTANCE.get', $java-relation-name, 'RelationDefinition()).getConfiguration();&#xa;',
-                         '    }&#xa;')" />
-      </xsl:when>
-      <xsl:when test="adm:one-to-zero-or-one">
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public boolean has',
-                         $java-relation-name, '() {&#xa;',
-                         '      return impl.hasChild(INSTANCE.get', $java-relation-name, 'RelationDefinition());&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public ', $java-class-name, 'Cfg get',
-                         $java-relation-name, '() throws ConfigException {&#xa;',
-                         '      return impl.getChild(INSTANCE.get', $java-relation-name, 'RelationDefinition()).getConfiguration();&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public void add', $java-relation-name, 'AddListener(&#xa;',
-                         '        ConfigurationAddListener&lt;', $java-class-name,'Cfg&gt; listener) throws ConfigException {&#xa;',
-                         '      impl.registerAddListener(INSTANCE.get', $java-relation-name, 'RelationDefinition(), listener);&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public void remove', $java-relation-name, 'AddListener(&#xa;',
-                         '        ConfigurationAddListener&lt;', $java-class-name,'Cfg&gt; listener) {&#xa;',
-                         '      impl.deregisterAddListener(INSTANCE.get', $java-relation-name, 'RelationDefinition(), listener);&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public void add', $java-relation-name, 'DeleteListener(&#xa;',
-                         '        ConfigurationDeleteListener&lt;', $java-class-name,'Cfg&gt; listener) throws ConfigException {&#xa;',
-                         '      impl.registerDeleteListener(INSTANCE.get', $java-relation-name, 'RelationDefinition(), listener);&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public void remove', $java-relation-name, 'DeleteListener(&#xa;',
-                         '        ConfigurationDeleteListener&lt;', $java-class-name,'Cfg&gt; listener) {&#xa;',
-                         '      impl.deregisterDeleteListener(INSTANCE.get', $java-relation-name, 'RelationDefinition(), listener);&#xa;',
-                         '    }&#xa;')" />
-      </xsl:when>
-      <xsl:when test="adm:one-to-many">
-        <xsl:variable name="plural-name"
-          select="adm:one-to-many/@plural-name" />
-        <xsl:variable name="java-relation-plural-name">
-          <xsl:call-template name="name-to-java">
-            <xsl:with-param name="value" select="$plural-name" />
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public String[] list',
-                         $java-relation-plural-name, '() {&#xa;',
-                         '      return impl.listChildren(INSTANCE.get', $java-relation-plural-name,'RelationDefinition());&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public ', $java-class-name, 'Cfg get',
-                         $java-relation-name, '(String name) throws ConfigException {&#xa;',
-                         '      return impl.getChild(INSTANCE.get', $java-relation-plural-name, 'RelationDefinition(), name).getConfiguration();&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public void add', $java-relation-name, 'AddListener(&#xa;',
-                         '        ConfigurationAddListener&lt;', $java-class-name,'Cfg&gt; listener) throws ConfigException {&#xa;',
-                         '      impl.registerAddListener(INSTANCE.get', $java-relation-plural-name, 'RelationDefinition(), listener);&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public void remove', $java-relation-name, 'AddListener(&#xa;',
-                         '        ConfigurationAddListener&lt;', $java-class-name,'Cfg&gt; listener) {&#xa;',
-                         '      impl.deregisterAddListener(INSTANCE.get', $java-relation-plural-name, 'RelationDefinition(), listener);&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public void add', $java-relation-name, 'DeleteListener(&#xa;',
-                         '        ConfigurationDeleteListener&lt;', $java-class-name,'Cfg&gt; listener) throws ConfigException {&#xa;',
-                         '      impl.registerDeleteListener(INSTANCE.get', $java-relation-plural-name, 'RelationDefinition(), listener);&#xa;',
-                         '    }&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('    /**&#xa;',
-                         '     * {@inheritDoc}&#xa;',
-                         '     */&#xa;',
-                         '    public void remove', $java-relation-name, 'DeleteListener(&#xa;',
-                         '        ConfigurationDeleteListener&lt;', $java-class-name,'Cfg&gt; listener) {&#xa;',
-                         '      impl.deregisterDeleteListener(INSTANCE.get', $java-relation-plural-name, 'RelationDefinition(), listener);&#xa;',
-                         '    }&#xa;')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('Unknown relation type &quot;', local-name(*), '&quot; in relation &quot;', $name, '&quot;.')" />
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!--
-    Generate change listener registration methods.
-  -->
-  <xsl:template name="generate-change-listener">
-    <!--
-      Process this managed object.
-    -->
-    <xsl:variable name="top-name"
-      select="$this/adm:profile[@name='preprocessor']/admpp:parent-managed-object[last()]/@name" />
-    <xsl:call-template name="generate-change-listener-help">
-      <xsl:with-param name="top-name" select="$top-name" />
-      <xsl:with-param name="name" select="$this-name" />
-    </xsl:call-template>
-    <!--
-      Process parent hierarchy.
-    -->
-    <xsl:for-each
-      select="$this/adm:profile[@name='preprocessor']/admpp:parent-managed-object">
-      <xsl:call-template name="generate-change-listener-help">
-        <xsl:with-param name="top-name" select="$top-name" />
-        <xsl:with-param name="name" select="@name" />
-      </xsl:call-template>
-    </xsl:for-each>
-  </xsl:template>
-  <!--
-    Generate a single set of change listener registration methods.
-  -->
-  <xsl:template name="generate-change-listener-help">
-    <xsl:param name="top-name" select="/.." />
-    <xsl:param name="name" select="/.." />
-
-    <xsl:variable name="_top-length" select="string-length($top-name)" />
-    <xsl:variable name="_length" select="string-length($name)" />
-    <xsl:variable name="_diff"   select="$_length - $_top-length" />
-    <xsl:variable name="_start"  select="substring($name, 1, $_diff - 1)" />
-    <xsl:variable name="_middle" select="substring($name, $_diff, 1)" />
-    <xsl:variable name="_end"
-      select="substring($name, $_diff + 1, $_top-length)" />
-
-    <xsl:variable name="short-name">
-      <xsl:choose>
-        <xsl:when test="not($top-name) or $top-name = $name">
-          <xsl:value-of select="''" />
-        </xsl:when>
-        <xsl:when test="$_middle != '-' or $_end != $_top-name">
-          <xsl:value-of select="$name" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$_start" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:variable name="java-class">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="$name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="short-java-class">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="$short-name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:value-of
-      select="concat('    /**&#xa;',
-                     '     * {@inheritDoc}&#xa;',
-                     '     */&#xa;')" />
-    <xsl:value-of
-      select="concat('    public void add', $short-java-class, 'ChangeListener(&#xa;',
-                     '        ConfigurationChangeListener&lt;',$java-class,'Cfg&gt; listener) {&#xa;',
-                     '      impl.registerChangeListener(listener);&#xa;',
-                     '    }&#xa;')" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of
-      select="concat('    /**&#xa;',
-                     '     * {@inheritDoc}&#xa;',
-                     '     */&#xa;')" />
-    <xsl:value-of
-      select="concat('    public void remove', $short-java-class, 'ChangeListener(&#xa;',
-                     '        ConfigurationChangeListener&lt;',$java-class,'Cfg&gt; listener) {&#xa;',
-                     '      impl.deregisterChangeListener(listener);&#xa;',
-                     '    }&#xa;')" />
-  </xsl:template>
-  <!--
-    Generate import statements for change-listener
-  -->
-  <xsl:template name="generate-change-listener-import-statements">
-    <!--
-      Process this managed object.
-    -->
-    <xsl:element name="import">
-      <xsl:value-of
-        select="concat($this-package, '.server.', $this-java-class, 'Cfg')" />
-    </xsl:element>
-    <!--
-      Process parent hierarchy.
-    -->
-    <xsl:for-each
-      select="$this/adm:profile[@name='preprocessor']/admpp:parent-managed-object">
-      <xsl:variable name="java-class">
-        <xsl:call-template name="name-to-java">
-          <xsl:with-param name="value" select="@name" />
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:element name="import">
-        <xsl:value-of
-          select="concat(@package, '.server.', $java-class, 'Cfg')" />
-      </xsl:element>
-    </xsl:for-each>
-  </xsl:template>
-  <!--
-    Generate an enumeration for a locally defined enumerated property.
-  -->
-  <xsl:template name="generate-enumeration">
-    <xsl:value-of
-      select="concat('  /**&#xa;',
-                     '   * Defines the set of permissable values for the &quot;', @name, '&quot; property.&#xa;')" />
-    <xsl:if test="adm:synopsis">
-      <xsl:value-of select="'   * &lt;p&gt;&#xa;'" />
-      <xsl:call-template name="add-java-comment">
-        <xsl:with-param name="indent-text" select="'   *'" />
-        <xsl:with-param name="content" select="adm:synopsis" />
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:if test="adm:description">
-      <xsl:value-of select="'   * &lt;p&gt;&#xa;'" />
-      <xsl:call-template name="add-java-comment">
-        <xsl:with-param name="indent-text" select="'   *'" />
-        <xsl:with-param name="content" select="adm:description" />
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:value-of
-      select="concat('   */&#xa;',
-                     '  public static enum ')" />
-    <xsl:call-template name="name-to-java">
-      <xsl:with-param name="value" select="@name" />
-    </xsl:call-template>
-    <xsl:value-of select="' {&#xa;'" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:for-each select="adm:syntax/adm:enumeration/adm:value">
-      <xsl:sort select="@name" />
-      <xsl:value-of select="'    /**&#xa;'" />
-      <xsl:call-template name="add-java-comment">
-        <xsl:with-param name="indent-text" select="'     *'" />
-        <xsl:with-param name="content" select="adm:synopsis" />
-      </xsl:call-template>
-      <xsl:value-of select="'     */&#xa;'" />
-      <xsl:value-of select="'    '" />
-      <xsl:call-template name="name-to-java-constant">
-        <xsl:with-param name="value" select="@name" />
-      </xsl:call-template>
-      <xsl:value-of select="concat('(&quot;', @name, '&quot;)')" />
-      <xsl:choose>
-        <xsl:when test="position() != last()">
-          <xsl:value-of select="',&#xa;'" />
-          <xsl:text>&#xa;</xsl:text>
-          <xsl:text>&#xa;</xsl:text>
-          <xsl:text>&#xa;</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="';&#xa;'" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of
-      select="'    // String representation of the value.&#xa;'" />
-    <xsl:value-of select="'    private final String name;&#xa;'" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of select="'    // Private constructor.&#xa;'" />
-    <xsl:value-of select="'    private '" />
-    <xsl:call-template name="name-to-java">
-      <xsl:with-param name="value" select="@name" />
-    </xsl:call-template>
-    <xsl:value-of
-      select="concat('(String name) { this.name = name; }&#xa;',
-                     '&#xa;',
-                     '&#xa;',
-                     '&#xa;',
-                     '    /**&#xa;',
-                     '     * {@inheritDoc}&#xa;',
-                     '     */&#xa;',
-                     '    public String toString() { return name; }&#xa;')" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of select="'  }&#xa;'" />
-  </xsl:template>
-  <!--
-    Main document parsing template.
-  -->
-  <xsl:template match="/">
-    <!--  Perform some initial validation.
-    -->
-    <xsl:for-each select="$this-all-properties">
-      <!--
-        Check that all non-mandatory properties have a default behavior.
-      -->
-      <xsl:if
-        test="not(@mandatory='true') and not(adm:default-behavior)">
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('No default behavior defined for non-mandatory property &quot;', @name,
-                         '&quot;.')" />
-        </xsl:message>
-      </xsl:if>
-      <!--
-        Check that all advanced properties conform to one of
-        the following rules:
-
-        * is mandatory and has a defined default value(s)
-        * is mandatory and is part of an advanced managed object
-        * is mandatory and is part of an abstract managed object
-        * is not mandatory
-      -->
-      <xsl:choose>
-        <xsl:when test="$this-is-advanced">
-          <!--  OK  -->
-        </xsl:when>
-        <xsl:when test="$this-is-abstract">
-          <!--  OK  -->
-        </xsl:when>
-        <xsl:when test="@advanced='true' and @mandatory='true'">
-          <xsl:choose>
-            <xsl:when test="adm:default-behavior/adm:defined">
-              <!--  OK  -->
-            </xsl:when>
-            <xsl:when test="adm:default-behavior/adm:inherited">
-              <!--  OK  -->
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message terminate="yes">
-                <xsl:value-of
-                  select="concat('Advanced property &quot;', @name,
-                         '&quot; must have defined or inherited default values.')" />
-              </xsl:message>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:for-each>
-    <!--
-      Now generate the definition.
-    -->
-    <xsl:call-template name="copyright-notice" />
-    <xsl:value-of
-      select="concat('package ', $this-package, '.meta;&#xa;')" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:call-template name="generate-import-statements">
-      <xsl:with-param name="imports">
-        <xsl:if test="not(boolean($this/@extends))">
-          <import>org.opends.server.admin.TopCfgDefn</import>
-        </xsl:if>
-        <xsl:if test="$this/adm:constraint">
-          <import>org.opends.server.admin.GenericConstraint</import>
-          <import>org.opends.server.admin.condition.Conditions</import>
-        </xsl:if>
-        <xsl:if
-          test="$this-local-properties[@multi-valued='true' or
-                                       @read-only='true' or
-                                       @monitoring='true' or
-                                       @hidden='true' or
-                                       @advanced='true' or
-                                       @mandatory='true']">
-          <import>org.opends.server.admin.PropertyOption</import>
-        </xsl:if>
-        <xsl:if test="$this-local-properties">
-          <import>org.opends.server.admin.AdministratorAction</import>
-        </xsl:if>
-        <xsl:if test="$this/adm:tag-definition or $this/adm:tag">
-          <import>org.opends.server.admin.Tag</import>
-        </xsl:if>
-        <xsl:if
-          test="$this-local-properties[adm:default-behavior/adm:undefined or not(adm:default-behavior)]">
-          <import>
-            org.opends.server.admin.UndefinedDefaultBehaviorProvider
-          </import>
-        </xsl:if>
-        <xsl:if
-          test="$this-local-properties/adm:default-behavior/adm:alias">
-          <import>
-            org.opends.server.admin.AliasDefaultBehaviorProvider
-          </import>
-        </xsl:if>
-        <xsl:if
-          test="$this-local-properties/adm:default-behavior/adm:inherited/adm:absolute">
-          <import>
-            org.opends.server.admin.AbsoluteInheritedDefaultBehaviorProvider
-          </import>
-          <import>
-            org.opends.server.admin.DefaultBehaviorProvider
-          </import>
-        </xsl:if>
-        <xsl:if
-          test="$this-local-properties/adm:default-behavior/adm:inherited/adm:relative">
-          <import>
-            org.opends.server.admin.RelativeInheritedDefaultBehaviorProvider
-          </import>
-          <import>
-            org.opends.server.admin.DefaultBehaviorProvider
-          </import>
-          <xsl:for-each
-            select="$this-local-properties/adm:default-behavior/adm:inherited/adm:relative">
-            <xsl:if test="@managed-object-package != $this-package">
-              <xsl:variable name="java-class-name">
-                <xsl:call-template name="name-to-java">
-                  <xsl:with-param name="value"
-                    select="@managed-object-name" />
-                </xsl:call-template>
-              </xsl:variable>
-              <xsl:element name="import">
-                <xsl:value-of
-                  select="concat(@managed-object-package, '.meta.', $java-class-name, 'CfgDefn')" />
-              </xsl:element>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:if>
-        <xsl:if
-          test="$this-local-properties/adm:default-behavior/adm:defined">
-          <import>
-            org.opends.server.admin.DefinedDefaultBehaviorProvider
-          </import>
-          <import>
-            org.opends.server.admin.DefaultBehaviorProvider
-          </import>
-        </xsl:if>
-        <xsl:element name="import">
-          <xsl:value-of
-            select="concat($this-package, '.client.', $this-java-class, 'CfgClient')" />
-        </xsl:element>
-        <xsl:element name="import">
-          <xsl:value-of
-            select="concat($this-package, '.server.', $this-java-class, 'Cfg')" />
-        </xsl:element>
-        <xsl:for-each select="$this-inherited-properties">
-          <xsl:call-template name="get-property-java-imports">
-            <xsl:with-param name="interface" select="'server'" />
-          </xsl:call-template>
-        </xsl:for-each>
-        <xsl:for-each select="$this-all-properties">
-          <xsl:call-template
-            name="get-property-definition-java-imports" />
-        </xsl:for-each>
-        <xsl:for-each select="$this-all-relations">
-          <xsl:variable name="java-class-name">
-            <xsl:call-template name="name-to-java">
-              <xsl:with-param name="value"
-                select="@managed-object-name" />
-            </xsl:call-template>
-          </xsl:variable>
-          <xsl:element name="import">
-            <xsl:value-of
-              select="concat(@managed-object-package, '.client.', $java-class-name, 'CfgClient')" />
-          </xsl:element>
-          <xsl:element name="import">
-            <xsl:value-of
-              select="concat(@managed-object-package, '.server.', $java-class-name, 'Cfg')" />
-          </xsl:element>
-        </xsl:for-each>
-        <xsl:if
-          test="$this-local-relations/*/adm:default-managed-object">
-          <import>org.opends.server.admin.DefaultManagedObject</import>
-        </xsl:if>
-        <xsl:for-each
-          select="$this-local-relations/*/adm:default-managed-object">
-          <xsl:variable name="java-class-name">
-            <xsl:call-template name="name-to-java">
-              <xsl:with-param name="value"
-                select="@managed-object-name" />
-            </xsl:call-template>
-          </xsl:variable>
-          <xsl:element name="import">
-            <xsl:value-of
-              select="concat(@managed-object-package, '.client.', $java-class-name, 'CfgClient')" />
-          </xsl:element>
-          <xsl:element name="import">
-            <xsl:value-of
-              select="concat(@managed-object-package, '.server.', $java-class-name, 'Cfg')" />
-          </xsl:element>
-          <xsl:element name="import">
-            <xsl:value-of
-              select="concat(@managed-object-package, '.meta.', $java-class-name, 'CfgDefn')" />
-          </xsl:element>
-        </xsl:for-each>
-        <xsl:if
-          test="$this-local-relations[@advanced='true' or @hidden='true']">
-          <import>org.opends.server.admin.RelationOption</import>
-        </xsl:if>
-        <xsl:if test="$this-is-hidden or $this-is-advanced">
-          <import>org.opends.server.admin.ManagedObjectOption</import>
-        </xsl:if>
-        <xsl:if test="$this-all-relations/adm:one-to-many[not(@unique = 'true')]">
-          <import>
-            org.opends.server.admin.InstantiableRelationDefinition
-          </import>
-        </xsl:if>
-        <xsl:if test="$this-all-relations/adm:one-to-many[@unique = 'true']">
-          <import>
-            org.opends.server.admin.SetRelationDefinition
-          </import>
-        </xsl:if>
-        <xsl:if test="$this-all-relations/adm:one-to-zero-or-one">
-          <import>
-            org.opends.server.admin.OptionalRelationDefinition
-          </import>
-        </xsl:if>
-        <xsl:if test="$this-all-relations/adm:one-to-one">
-          <import>
-            org.opends.server.admin.SingletonRelationDefinition
-          </import>
-        </xsl:if>
-        <xsl:choose>
-          <xsl:when test="$this-is-abstract">
-            <import>
-              org.opends.server.admin.AbstractManagedObjectDefinition
-            </import>
-          </xsl:when>
-          <xsl:otherwise>
-            <import>
-              org.opends.server.admin.ManagedObjectDefinition
-            </import>
-            <import>org.opends.server.admin.PropertyProvider</import>
-            <import>
-              org.opends.server.admin.client.MissingMandatoryPropertiesException
-            </import>
-            <import>
-              org.opends.server.admin.ManagedObjectAlreadyExistsException
-            </import>
-            <import>
-              org.opends.server.admin.client.AuthorizationException
-            </import>
-            <import>
-              org.opends.server.admin.client.CommunicationException
-            </import>
-            <import>
-              org.opends.server.admin.client.ConcurrentModificationException
-            </import>
-            <import>
-              org.opends.server.admin.client.OperationRejectedException
-            </import>
-            <import>
-              org.opends.server.admin.client.ManagedObject
-            </import>
-            <import>
-              org.opends.server.admin.server.ServerManagedObject
-            </import>
-            <xsl:if test="not($this-is-root)">
-              <import>
-                org.opends.server.admin.server.ConfigurationChangeListener
-              </import>
-              <xsl:call-template
-                name="generate-change-listener-import-statements" />
-            </xsl:if>
-            <import>org.forgerock.opendj.ldap.DN</import>
-            <xsl:if test="$this-all-relations">
-              <import>
-                org.opends.server.admin.DefinitionDecodingException
-              </import>
-              <import>
-                org.opends.server.admin.ManagedObjectNotFoundException
-              </import>
-              <import>
-                org.opends.server.admin.client.ManagedObjectDecodingException
-              </import>
-            </xsl:if>
-            <xsl:if test="$this-all-relations/adm:one-to-many">
-              <import>java.util.Collection</import>
-              <xsl:if test="$this-all-relations/adm:one-to-many[not(@unique = 'true')]">
-                <import>
-                  org.opends.server.admin.client.IllegalManagedObjectNameException
-                </import>
-              </xsl:if>
-              <import>
-                org.opends.server.admin.PropertyException
-              </import>
-              <import>
-                org.opends.server.admin.server.ConfigurationAddListener
-              </import>
-              <import>
-                org.opends.server.admin.server.ConfigurationDeleteListener
-              </import>
-              <import>org.forgerock.opendj.config.server.ConfigException</import>
-            </xsl:if>
-            <xsl:if test="$this-all-relations/adm:one-to-zero-or-one">
-              <import>java.util.Collection</import>
-              <import>
-                org.opends.server.admin.PropertyException
-              </import>
-              <import>
-                org.opends.server.admin.server.ConfigurationAddListener
-              </import>
-              <import>
-                org.opends.server.admin.server.ConfigurationDeleteListener
-              </import>
-              <import>org.forgerock.opendj.config.server.ConfigException</import>
-            </xsl:if>
-            <xsl:if test="$this-all-relations/adm:one-to-one">
-              <import>org.forgerock.opendj.config.server.ConfigException</import>
-            </xsl:if>
-            <xsl:if test="$this-all-properties[@multi-valued='true']">
-              <import>java.util.SortedSet</import>
-              <import>java.util.Collection</import>
-            </xsl:if>
-            <xsl:if test="$this-all-properties[@read-only='true']">
-              <import>
-                org.opends.server.admin.PropertyException
-              </import>
-            </xsl:if>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:if test="$this/@extends">
-          <xsl:if test="$parent-package != $this-package">
-            <xsl:element name="import">
-              <xsl:value-of
-                select="concat($parent-package, '.meta.', $parent-java-class, 'CfgDefn')" />
-            </xsl:element>
-          </xsl:if>
-        </xsl:if>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:call-template name="generate-meta-class-declaration" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:call-template name="generate-meta-class-body" />
-    <xsl:text>}&#xa;</xsl:text>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/package-info.xsl b/opendj-server-legacy/resource/admin/package-info.xsl
deleted file mode 100644
index f063f6a..0000000
--- a/opendj-server-legacy/resource/admin/package-info.xsl
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="java-utilities.xsl" />
-  <xsl:output method="text" encoding="us-ascii" />
-  <!--
-    Global parameter: the sub-package name. Either 'meta', 'client', or 'server'.
-  -->
-  <xsl:param name="type" select="'.'" />
-  <!-- 
-    Main document parsing template.
-  -->
-  <xsl:template match="/">
-    <xsl:call-template name="copyright-notice" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of select="'/**&#xa;'" />
-    <xsl:choose>
-      <xsl:when test="$type='meta'">
-        <xsl:call-template name="add-java-comment">
-          <xsl:with-param name="indent-text" select="' *'" />
-          <xsl:with-param name="content"
-            select="concat('Provides introspection interfaces for the ',
-                           normalize-space(adm:package/adm:synopsis),
-                           ' This package provides access to meta-',
-                           'information about the managed objects, their ',
-                           'properties, their relationships with other ',
-                           'managed objects, and their inheritance model.')" />
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$type='client'">
-        <xsl:call-template name="add-java-comment">
-          <xsl:with-param name="indent-text" select="' *'" />
-          <xsl:with-param name="content"
-            select="concat('Provides client-side interfaces for querying ',
-                           'and managing the ',
-                           normalize-space(adm:package/adm:synopsis),
-                           ' Applications can use the interfaces defined ',
-                           'within this package to retrieve, list, create, ',
-                           'and remove managed objects, as well as query ',
-                           'and update their properties.')" />
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$type='server'">
-        <xsl:call-template name="add-java-comment">
-          <xsl:with-param name="indent-text" select="' *'" />
-          <xsl:with-param name="content"
-            select="concat('Provides server-side interfaces for accessing ',
-                           'the ', normalize-space(adm:package/adm:synopsis),
-                           ' Components within the server can use the ',
-                           'interfaces defined within this package to query ',
-                           'the properties of the managed objects and ',
-                           'register to be notified when managed objects are ',
-                           'added, removed, or modified.')" />
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('Invalid package-info sub-package name: ', $type)" />
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:value-of select="' */&#xa;'" />
-    <xsl:value-of select="concat('@org.opends.server.types.PublicAPI(&#xa;',
-                                 '    stability=org.opends.server.types.StabilityLevel.VOLATILE,&#xa;',
-                                 '    mayInstantiate=false,&#xa;',
-                                 '    mayExtend=false,&#xa;',
-                                 '    mayInvoke=true)&#xa;')"/>
-    <xsl:value-of
-      select="concat('package ', adm:package/@name, '.', $type, ';&#xa;')" />
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/preprocessor.xsl b/opendj-server-legacy/resource/admin/preprocessor.xsl
deleted file mode 100644
index b2c7288..0000000
--- a/opendj-server-legacy/resource/admin/preprocessor.xsl
+++ /dev/null
@@ -1,1248 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008-2010 Sun Microsystems, Inc.
-  Portions copyright 2011 ForgeRock AS.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:admpp="http://www.opends.org/admin-preprocessor"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:exsl="http://exslt.org/common"
-  xmlns:file="xalan://java.io.File">
-  <xsl:import href="java-utilities.xsl" />
-  <xsl:output method="xml" indent="yes" />
-  <!--
-    Global parameter: the absolute path of the base directory where
-    XML managed object definitions can be found.
-  -->
-  <xsl:param name="base-dir" select="'.'" />
-  <!-- 
-    Get an absolute URI from a package, object name, and suffix.
-  -->
-  <xsl:template name="get-uri">
-    <xsl:param name="package" select="/.." />
-    <xsl:param name="name" select="/.." />
-    <xsl:param name="suffix" select="'.xml'" />
-    <!--
-      Convert the package name to a relative path.
-    -->
-    <xsl:variable name="rpath" select="translate($package, '.', '/')" />
-    <!-- 
-      Convert the managed object name to a file name.
-    -->
-    <xsl:variable name="java-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="$name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <!--
-      Get the absolute path.
-    -->
-    <xsl:variable name="base-file" select="file:new($base-dir)" />
-    <xsl:variable name="base-dir-uri" select="file:toURI($base-file)" />
-    <xsl:value-of
-      select="concat($base-dir-uri, '/', $rpath, '/', $java-name, $suffix)" />
-  </xsl:template>
-  <!--
-    Get the URI of the named package definition.
-  -->
-  <xsl:template name="get-package-uri">
-    <xsl:param name="package" select="/.." />
-    <xsl:call-template name="get-uri">
-      <xsl:with-param name="package" select="$package" />
-      <xsl:with-param name="name" select="'package'" />
-    </xsl:call-template>
-  </xsl:template>
-  <!--
-    Get the URI of the named managed object definition.
-  -->
-  <xsl:template name="get-managed-object-uri">
-    <xsl:param name="package" select="/.." />
-    <xsl:param name="name" select="/.." />
-    <xsl:call-template name="get-uri">
-      <xsl:with-param name="package" select="$package" />
-      <xsl:with-param name="name"
-        select="concat($name, '-configuration')" />
-    </xsl:call-template>
-  </xsl:template>
-  <!--
-    Pre-process the current managed object element.
-  -->
-  <xsl:template name="pre-process-managed-object">
-    <xsl:if test="not(adm:root-managed-object | adm:managed-object)">
-      <xsl:message terminate="yes">
-        <xsl:value-of select="'No managed object definition found.'" />
-      </xsl:message>
-    </xsl:if>
-    <xsl:apply-templates
-      select="adm:root-managed-object | adm:managed-object"
-      mode="pre-process" />
-  </xsl:template>
-  <!--
-    Pre-process a managed object definition: pull in the managed object's
-    inherited property definitions and relations.
-  -->
-  <xsl:template match="adm:managed-object" mode="pre-process">
-    <xsl:if test="not(@name)">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="'Managed object definition does not specify managed object name.'" />
-      </xsl:message>
-    </xsl:if>
-    <xsl:if test="not(@package)">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="'Managed object definition does not specify managed object package.'" />
-      </xsl:message>
-    </xsl:if>
-    <xsl:variable name="parent-name" select="@extends" />
-    <xsl:variable name="parent-package">
-      <!--
-        The parent package defaults to this managed object's package.
-      -->
-      <xsl:choose>
-        <xsl:when test="@parent-package">
-          <xsl:value-of select="@parent-package" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@package" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <!--
-      Get this managed object's hierarchy if there is one.
-    -->
-    <xsl:variable name="_hierarchy">
-      <xsl:if test="$parent-name">
-        <xsl:variable name="uri">
-          <xsl:call-template name="get-managed-object-uri">
-            <xsl:with-param name="package" select="$parent-package" />
-            <xsl:with-param name="name" select="$parent-name" />
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:if test="not(document($uri)/adm:managed-object)">
-          <xsl:message terminate="yes">
-            <xsl:value-of
-              select="concat('No managed object definition found in ', $uri, '.')" />
-          </xsl:message>
-        </xsl:if>
-        <xsl:if
-          test="not(document($uri)/adm:managed-object[@name=$parent-name and @package=$parent-package])">
-          <xsl:message terminate="yes">
-            <xsl:value-of
-              select="concat('Managed object definition found in ', $uri, ' but it did not define a managed object ', $parent-name, ' in package ', $parent-package, '.')" />
-          </xsl:message>
-        </xsl:if>
-        <xsl:apply-templates select="document($uri)/adm:managed-object"
-          mode="pre-process" />
-      </xsl:if>
-    </xsl:variable>
-    <xsl:variable name="hierarchy" select="exsl:node-set($_hierarchy)" />
-    <!--
-      Now pre-process this managed object.
-    -->
-    <xsl:copy>
-      <!--
-        Shallow copy this element and its attributes.
-      -->
-      <xsl:copy-of select="@*" />
-      <!--
-        Pre-process this managed object's elements.
-      -->
-      <xsl:apply-templates
-        select="adm:TODO|adm:synopsis|adm:description"
-        mode="pre-process">
-        <xsl:with-param name="moname" select="@name" />
-        <xsl:with-param name="mopackage" select="@package" />
-        <xsl:with-param name="hierarchy" select="$hierarchy" />
-      </xsl:apply-templates>
-      <!--
-        Copy all inherited tags plus locally defined tags.
-      -->
-      <xsl:copy-of select="$hierarchy/adm:managed-object/adm:tag" />
-      <xsl:apply-templates select="adm:tag" mode="pre-process">
-        <xsl:with-param name="moname" select="@name" />
-        <xsl:with-param name="mopackage" select="@package" />
-        <xsl:with-param name="hierarchy" select="$hierarchy" />
-      </xsl:apply-templates>
-      <!--
-        Copy constraint elements.
-      -->
-      <xsl:apply-templates select="adm:constraint" mode="pre-process">
-        <xsl:with-param name="moname" select="@name" />
-        <xsl:with-param name="mopackage" select="@package" />
-        <xsl:with-param name="hierarchy" select="$hierarchy" />
-      </xsl:apply-templates>
-      <!--
-        Copy profile elements.
-      -->
-      <xsl:apply-templates select="adm:profile" mode="pre-process">
-        <xsl:with-param name="moname" select="@name" />
-        <xsl:with-param name="mopackage" select="@package" />
-        <xsl:with-param name="hierarchy" select="$hierarchy" />
-      </xsl:apply-templates>
-      <!-- 
-        Add a pre-processor element defining this managed object's uppermost
-        definition.
-      -->
-      <xsl:if test="$parent-name">
-        <xsl:element name="adm:profile">
-          <xsl:attribute name="name">
-            <xsl:value-of select="'preprocessor'" />
-          </xsl:attribute>
-          <xsl:element name="admpp:parent-managed-object">
-            <xsl:attribute name="name">
-              <xsl:value-of select="$parent-name" />
-            </xsl:attribute>
-            <xsl:attribute name="package">
-              <xsl:value-of select="$parent-package" />
-            </xsl:attribute>
-          </xsl:element>
-          <xsl:copy-of
-            select="$hierarchy/adm:managed-object/adm:profile[@name='preprocessor']/admpp:parent-managed-object" />
-        </xsl:element>
-      </xsl:if>
-      <!--
-        Copy all inherited relations.
-      -->
-      <xsl:copy-of select="$hierarchy/adm:managed-object/adm:relation" />
-      <!--
-        Copy all local relations.
-      -->
-      <xsl:apply-templates select="adm:relation" mode="pre-process">
-        <xsl:with-param name="moname" select="@name" />
-        <xsl:with-param name="mopackage" select="@package" />
-        <xsl:with-param name="hierarchy" select="$hierarchy" />
-      </xsl:apply-templates>
-      <!--
-        Copy all inherited properties.
-      -->
-      <xsl:variable name="property-overrides"
-        select="adm:property-override" />
-      <xsl:copy-of
-        select="$hierarchy/adm:managed-object/adm:property[not(@name=$property-overrides/@name)]" />
-      <!--
-        Copy all local properties.
-      -->
-      <xsl:apply-templates
-        select="adm:property|adm:property-reference|adm:property-override"
-        mode="pre-process">
-        <xsl:with-param name="moname" select="@name" />
-        <xsl:with-param name="mopackage" select="@package" />
-        <xsl:with-param name="hierarchy" select="$hierarchy" />
-      </xsl:apply-templates>
-    </xsl:copy>
-  </xsl:template>
-  <!--
-    Pre-process a managed object definition: pull in the managed object's
-    inherited property definitions and relations.
-  -->
-  <xsl:template match="adm:root-managed-object" mode="pre-process">
-    <!--
-      Now pre-process this root managed object.
-      By definition it has no hierarchy.
-    -->
-    <xsl:copy>
-      <!--
-        Shallow copy this element and its attributes.
-      -->
-      <xsl:copy-of select="@*" />
-      <!--
-        Pre-process this managed object's elements.
-      -->
-      <xsl:apply-templates mode="pre-process">
-        <xsl:with-param name="moname" select="'root'" />
-        <xsl:with-param name="mopackage"
-          select="'org.opends.server.admin.std'" />
-      </xsl:apply-templates>
-    </xsl:copy>
-  </xsl:template>
-  <!--
-    Pre-process a tag and validate it and by adding a "preprocessor"
-    profile which contains information about where the tag was defined.
-  -->
-  <xsl:template match="adm:tag" mode="pre-process">
-    <xsl:param name="mopackage" select="/.." />
-    <xsl:param name="moname" select="/.." />
-    <xsl:param name="hierarchy" />
-    <!--
-      Make sure that this tag is not duplicated.
-    -->
-    <xsl:variable name="name" select="@name" />
-    <xsl:if test="../adm:tag[@name=$name][2]">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Tag ', @name, ' is already defined in this managed object')" />
-      </xsl:message>
-    </xsl:if>
-    <!--
-      Make sure that this tag does not override an existing tag.
-    -->
-    <xsl:if test="$hierarchy/adm:managed-object/adm:tag[@name=$name]">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Tag ', @name, ' is already defined in a parent managed object')" />
-      </xsl:message>
-    </xsl:if>
-    <!--
-      Get the referenced package.
-    -->
-    <xsl:variable name="uri">
-      <xsl:call-template name="get-managed-object-uri">
-        <xsl:with-param name="package"
-          select="'org.opends.server.admin.std'" />
-        <xsl:with-param name="name" select="'root'" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="not(document($uri)/adm:root-managed-object)">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Root managed object definition not found in ', $uri, '.')" />
-      </xsl:message>
-    </xsl:if>
-    <xsl:if
-      test="not(document($uri)/adm:root-managed-object/adm:tag-definition[@name=$name])">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Tag &quot;', $name,
-                           '&quot; not defined in root managed object definition.')" />
-      </xsl:message>
-    </xsl:if>
-    <!--
-      Copy the tag.
-    -->
-    <xsl:element name="adm:tag">
-      <xsl:copy-of select="@*" />
-      <xsl:apply-templates mode="pre-process">
-        <xsl:with-param name="moname" select="$moname" />
-        <xsl:with-param name="mopackage" select="$mopackage" />
-      </xsl:apply-templates>
-    </xsl:element>
-  </xsl:template>
-  <!--
-    Pre-process a property definition by adding a "preprocessor" profile
-    which contains information about where the property was defined.
-  -->
-  <xsl:template match="adm:property" mode="pre-process">
-    <xsl:param name="mopackage" select="/.." />
-    <xsl:param name="moname" select="/.." />
-    <xsl:param name="hierarchy" select="/.." />
-    <!--
-      Make sure that this property does not have the same name as another
-      property or reference in this managed object.
-    -->
-    <xsl:variable name="name" select="@name" />
-    <xsl:if
-      test="../adm:property[@name=$name][2] |
-            ../adm:property-reference[@name=$name]">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Property definition ', @name, ' is already defined in this managed object')" />
-      </xsl:message>
-    </xsl:if>
-    <!--
-      Make sure that this property does not override an existing property.
-    -->
-    <xsl:if
-      test="$hierarchy/adm:managed-object/adm:property[@name=$name]">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Property definition ', @name, ' is already defined in a parent managed object')" />
-      </xsl:message>
-    </xsl:if>
-    <xsl:copy>
-      <!--
-        Shallow copy this element and its attributes.
-      -->
-      <xsl:copy-of select="@*" />
-      <!--
-        Apply templates to subordinate elements (e.g. descriptions).
-      -->
-      <xsl:apply-templates mode="pre-process">
-        <xsl:with-param name="mopackage" select="$mopackage" />
-        <xsl:with-param name="moname" select="$moname" />
-        <xsl:with-param name="hierarchy" select="$hierarchy" />
-      </xsl:apply-templates>
-      <!--
-        Now append the preprocessor profile.
-      -->
-      <xsl:element name="adm:profile">
-        <xsl:attribute name="name">
-          <xsl:value-of select="'preprocessor'" />
-        </xsl:attribute>
-        <xsl:element name="admpp:last-defined-in">
-          <xsl:attribute name="name">
-            <xsl:value-of select="$moname" />
-          </xsl:attribute>
-          <xsl:attribute name="package">
-            <xsl:value-of select="$mopackage" />
-          </xsl:attribute>
-        </xsl:element>
-      </xsl:element>
-    </xsl:copy>
-  </xsl:template>
-  <!--
-    Pre-process a property reference pulling in the referenced property
-    definition and by adding a "preprocessor" profile which contains
-    information about where the property was defined.
-  -->
-  <xsl:template match="adm:property-reference" mode="pre-process">
-    <xsl:param name="mopackage" select="/.." />
-    <xsl:param name="moname" select="/.." />
-    <xsl:param name="hierarchy" />
-    <!--
-      Make sure that this property reference does not have the same name as another
-      property or reference in this managed object.
-    -->
-    <xsl:variable name="name" select="@name" />
-    <xsl:if
-      test="../adm:property[@name=$name] |
-            ../adm:property-reference[@name=$name][2]">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Property definition ', @name, ' is already defined in this managed object')" />
-      </xsl:message>
-    </xsl:if>
-    <!--
-      Make sure that this property does not override an existing property.
-    -->
-    <xsl:if
-      test="$hierarchy/adm:managed-object/adm:property[@name=$name]">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Property reference ', @name, ' is already defined in a parent managed object')" />
-      </xsl:message>
-    </xsl:if>
-    <!--
-      Determine the package containing the reference property definition.
-    -->
-    <xsl:variable name="package">
-      <xsl:choose>
-        <xsl:when test="@package">
-          <xsl:value-of select="@package" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$mopackage" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <!--
-      Get the referenced package.
-    -->
-    <xsl:variable name="uri">
-      <xsl:call-template name="get-package-uri">
-        <xsl:with-param name="package" select="$package" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="not(document($uri)/adm:package)">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('No package definition found in ', $uri, '.')" />
-      </xsl:message>
-    </xsl:if>
-    <xsl:if test="not(document($uri)/adm:package[@name=$package])">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Package definition found in ', $uri, ' but it did not define package ', $package, '.')" />
-      </xsl:message>
-    </xsl:if>
-    <xsl:if
-      test="not(document($uri)/adm:package[@name=$package]/adm:property[@name=$name])">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Referenced property definition &quot;', $name,
-                           '&quot; not found in package definition &quot;', $package,
-                           '&quot;.')" />
-      </xsl:message>
-    </xsl:if>
-    <!--
-      Copy the referenced property definition taking care to override
-      the default behavior and admin action if required.
-    -->
-    <xsl:variable name="property"
-      select="document($uri)/adm:package[@name=$package]/adm:property[@name=$name]" />
-    <xsl:element name="adm:property">
-      <xsl:copy-of select="$property/@*" />
-      <xsl:apply-templates
-        select="$property/adm:TODO | $property/adm:synopsis | $property/adm:description"
-        mode="pre-process">
-        <xsl:with-param name="mopackage" select="$mopackage" />
-        <xsl:with-param name="moname" select="$moname" />
-        <xsl:with-param name="hierarchy" select="$hierarchy" />
-      </xsl:apply-templates>
-      <xsl:choose>
-        <xsl:when test="adm:requires-admin-action">
-          <xsl:apply-templates select="adm:requires-admin-action"
-            mode="pre-process">
-            <xsl:with-param name="mopackage" select="$mopackage" />
-            <xsl:with-param name="moname" select="$moname" />
-            <xsl:with-param name="hierarchy" select="$hierarchy" />
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates
-            select="$property/adm:requires-admin-action"
-            mode="pre-process">
-            <xsl:with-param name="mopackage" select="$mopackage" />
-            <xsl:with-param name="moname" select="$moname" />
-            <xsl:with-param name="hierarchy" select="$hierarchy" />
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="adm:default-behavior">
-          <xsl:apply-templates select="adm:default-behavior"
-            mode="pre-process">
-            <xsl:with-param name="mopackage" select="$mopackage" />
-            <xsl:with-param name="moname" select="$moname" />
-            <xsl:with-param name="hierarchy" select="$hierarchy" />
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$property/adm:default-behavior"
-            mode="pre-process">
-            <xsl:with-param name="mopackage" select="$mopackage" />
-            <xsl:with-param name="moname" select="$moname" />
-            <xsl:with-param name="hierarchy" select="$hierarchy" />
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates
-        select="$property/adm:syntax | $property/adm:profile"
-        mode="pre-process">
-        <xsl:with-param name="mopackage" select="$mopackage" />
-        <xsl:with-param name="moname" select="$moname" />
-        <xsl:with-param name="hierarchy" select="$hierarchy" />
-      </xsl:apply-templates>
-      <!--
-        Now append the preprocessor profile.
-      -->
-      <xsl:element name="adm:profile">
-        <xsl:attribute name="name">
-          <xsl:value-of select="'preprocessor'" />
-        </xsl:attribute>
-        <xsl:element name="admpp:last-defined-in">
-          <xsl:attribute name="name">
-            <xsl:value-of select="$moname" />
-          </xsl:attribute>
-          <xsl:attribute name="package">
-            <xsl:value-of select="$mopackage" />
-          </xsl:attribute>
-        </xsl:element>
-        <xsl:element name="admpp:first-defined-in">
-          <xsl:attribute name="package">
-            <xsl:value-of select="$package" />
-          </xsl:attribute>
-        </xsl:element>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <!--
-    Pre-process a property override pulling in the inherited property
-    definition and by adding a "preprocessor" profile which contains
-    information about where the property was redefined.
-  -->
-  <xsl:template match="adm:property-override" mode="pre-process">
-    <xsl:param name="mopackage" select="/.." />
-    <xsl:param name="moname" select="/.." />
-    <xsl:param name="hierarchy" />
-    <!--
-      Make sure that this property override does not have the same name as another
-      property override in this managed object.
-    -->
-    <xsl:variable name="name" select="@name" />
-    <xsl:if test="../adm:property-override[@name=$name][2]">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Property override ', @name, ' is already overridden in this managed object')" />
-      </xsl:message>
-    </xsl:if>
-    <!--
-      Make sure that this property overrides an existing property.
-    -->
-    <xsl:if
-      test="not($hierarchy/adm:managed-object/adm:property[@name=$name])">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Cannot find inherited property ', @name, ' for property override')" />
-      </xsl:message>
-    </xsl:if>
-    <!--
-      Copy the inherited property definition taking care to override
-      the default behavior and admin action if required.
-    -->
-    <xsl:variable name="property"
-      select="$hierarchy/adm:managed-object/adm:property[@name=$name]" />
-    <xsl:element name="adm:property">
-      <xsl:copy-of select="$property/@*[local-name() != 'advanced']" />
-      <xsl:choose>
-        <xsl:when test="@advanced">
-          <xsl:copy-of select="@advanced" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$property/@advanced" />
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates
-        select="$property/adm:TODO | $property/adm:synopsis | $property/adm:description"
-        mode="pre-process">
-        <xsl:with-param name="mopackage" select="$mopackage" />
-        <xsl:with-param name="moname" select="$moname" />
-        <xsl:with-param name="hierarchy" select="$hierarchy" />
-      </xsl:apply-templates>
-      <xsl:choose>
-        <xsl:when test="adm:requires-admin-action">
-          <xsl:apply-templates select="adm:requires-admin-action"
-            mode="pre-process">
-            <xsl:with-param name="mopackage" select="$mopackage" />
-            <xsl:with-param name="moname" select="$moname" />
-            <xsl:with-param name="hierarchy" select="$hierarchy" />
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates
-            select="$property/adm:requires-admin-action"
-            mode="pre-process">
-            <xsl:with-param name="mopackage" select="$mopackage" />
-            <xsl:with-param name="moname" select="$moname" />
-            <xsl:with-param name="hierarchy" select="$hierarchy" />
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="adm:default-behavior">
-          <xsl:apply-templates select="adm:default-behavior"
-            mode="pre-process">
-            <xsl:with-param name="mopackage" select="$mopackage" />
-            <xsl:with-param name="moname" select="$moname" />
-            <xsl:with-param name="hierarchy" select="$hierarchy" />
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$property/adm:default-behavior"
-            mode="pre-process">
-            <xsl:with-param name="mopackage" select="$mopackage" />
-            <xsl:with-param name="moname" select="$moname" />
-            <xsl:with-param name="hierarchy" select="$hierarchy" />
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates
-        select="$property/adm:syntax | $property/adm:profile[@name!='preprocessor']"
-        mode="pre-process">
-        <xsl:with-param name="mopackage" select="$mopackage" />
-        <xsl:with-param name="moname" select="$moname" />
-        <xsl:with-param name="hierarchy" select="$hierarchy" />
-      </xsl:apply-templates>
-      <!--
-        Now append the preprocessor profile.
-      -->
-      <xsl:element name="adm:profile">
-        <xsl:attribute name="name">
-          <xsl:value-of select="'preprocessor'" />
-        </xsl:attribute>
-        <xsl:element name="admpp:last-defined-in">
-          <xsl:attribute name="name">
-            <xsl:value-of select="$moname" />
-          </xsl:attribute>
-          <xsl:attribute name="package">
-            <xsl:value-of select="$mopackage" />
-          </xsl:attribute>
-        </xsl:element>
-        <xsl:choose>
-          <xsl:when
-            test="$property/adm:profile[@name='preprocessor']/admpp:first-defined-in">
-            <xsl:copy-of
-              select="$property/adm:profile[@name='preprocessor']/admpp:first-defined-in" />
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:element name="admpp:first-defined-in">
-              <xsl:copy-of
-                select="$property/adm:profile[@name='preprocessor']/admpp:last-defined-in/@*" />
-            </xsl:element>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <!--
-    Pre-process a relation, merging information from the referenced
-    managed object where required, and by adding a "preprocessor" profile
-    which contains information about where the relation was defined.
-  -->
-  <xsl:template match="adm:relation" mode="pre-process">
-    <xsl:param name="mopackage" select="/.." />
-    <xsl:param name="moname" select="/.." />
-    <xsl:param name="hierarchy" select="/.." />
-    <!--
-      Determine the name of the relation.
-    -->
-    <xsl:variable name="name" select="@name" />
-    <!--
-      Make sure that this relation does not override an existing relation.
-    -->
-    <xsl:if
-      test="$hierarchy/adm:managed-object/adm:relation[@name=$name]">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Relation ', $name, ' is already defined in a parent managed object.')" />
-      </xsl:message>
-    </xsl:if>
-    <!--
-      Make sure that this relation is not already defined in this managed object.
-    -->
-    <xsl:if test="../adm:relation[@name=$name][2]">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Relation ', $name, ' is already defined in this managed object.')" />
-      </xsl:message>
-    </xsl:if>
-    <!-- 
-      Now get the referenced managed object.
-    -->
-    <xsl:variable name="mname">
-      <xsl:choose>
-        <xsl:when test="not(@managed-object-name)">
-          <xsl:value-of select="$name" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@managed-object-name" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="mpackage">
-      <xsl:choose>
-        <xsl:when test="not(@managed-object-package)">
-          <xsl:value-of select="$mopackage" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@managed-object-package" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="uri">
-      <xsl:call-template name="get-managed-object-uri">
-        <xsl:with-param name="name" select="$mname" />
-        <xsl:with-param name="package" select="$mpackage" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="managed-object"
-      select="document($uri)/adm:managed-object[@name=$mname]" />
-    <xsl:if test="not($managed-object)">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('Managed object definition &quot;', $mname, '&quot; not found in ', $uri, '.')" />
-      </xsl:message>
-    </xsl:if>
-    <!--
-      Now merge the relation.
-    -->
-    <xsl:copy>
-      <xsl:copy-of select="@*" />
-      <!--
-        Add missing attribute managed-object-name if it is not provided.
-      -->
-      <xsl:if test="not(@managed-object-name)">
-        <xsl:attribute name="managed-object-name">
-          <xsl:value-of select="$mname" />
-        </xsl:attribute>
-      </xsl:if>
-      <!--
-        Add missing attribute managed-object-package if it is not provided.
-      -->
-      <xsl:if test="not(@managed-object-package)">
-        <xsl:attribute name="managed-object-package">
-          <xsl:value-of select="$mpackage" />
-        </xsl:attribute>
-      </xsl:if>
-      <!-- 
-        Copy TODO element.
-      -->
-      <xsl:copy-of select="adm:TODO" />
-      <!-- 
-        Copy synopsis element from referenced managed object if it is undefined.
-      -->
-      <xsl:choose>
-        <xsl:when test="adm:synopsis">
-          <xsl:apply-templates select="adm:synopsis"
-            mode="merge-relation">
-            <xsl:with-param name="managed-object"
-              select="$managed-object" />
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$managed-object/adm:synopsis"
-            mode="merge-relation">
-            <xsl:with-param name="managed-object"
-              select="$managed-object" />
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <!-- 
-        Copy description element from referenced managed object if it is undefined.
-      -->
-      <xsl:choose>
-        <xsl:when test="adm:description">
-          <xsl:apply-templates select="adm:description"
-            mode="merge-relation">
-            <xsl:with-param name="managed-object"
-              select="$managed-object" />
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$managed-object/adm:description"
-            mode="merge-relation">
-            <xsl:with-param name="managed-object"
-              select="$managed-object" />
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <!--
-        Merge remaining elements.
-      -->
-      <xsl:apply-templates
-        select="*[not(self::adm:TODO|self::adm:synopsis|self::adm:description)]"
-        mode="merge-relation">
-        <xsl:with-param name="managed-object" select="$managed-object" />
-      </xsl:apply-templates>
-      <!--
-        Now append the preprocessor profile.
-      -->
-      <xsl:element name="adm:profile">
-        <xsl:attribute name="name">
-          <xsl:value-of select="'preprocessor'" />
-        </xsl:attribute>
-        <xsl:element name="admpp:last-defined-in">
-          <xsl:attribute name="name">
-            <xsl:value-of select="$moname" />
-          </xsl:attribute>
-          <xsl:attribute name="package">
-            <xsl:value-of select="$mopackage" />
-          </xsl:attribute>
-        </xsl:element>
-      </xsl:element>
-    </xsl:copy>
-  </xsl:template>
-  <!--
-    Default template for merging relations.
-  -->
-  <xsl:template match="*|comment()" mode="merge-relation">
-    <xsl:param name="managed-object" select="/.." />
-    <xsl:copy>
-      <xsl:copy-of select="@*" />
-      <xsl:apply-templates mode="merge-relation">
-        <xsl:with-param name="managed-object" select="$managed-object" />
-      </xsl:apply-templates>
-    </xsl:copy>
-  </xsl:template>
-  <!--
-    Merge a default managed object.
-  -->
-  <xsl:template match="adm:default-managed-object" mode="merge-relation">
-    <xsl:param name="managed-object" select="/.." />
-    <xsl:copy>
-      <xsl:copy-of select="@*" />
-      <!--
-        Add missing attribute managed-object-name if it is not provided.
-      -->
-      <xsl:if test="not(@managed-object-name)">
-        <xsl:attribute name="managed-object-name">
-          <xsl:value-of select="$managed-object/@name" />
-        </xsl:attribute>
-      </xsl:if>
-      <!--
-        Add missing attribute managed-object-package if it is not provided.
-      -->
-      <xsl:if test="not(@managed-object-package)">
-        <xsl:attribute name="managed-object-package">
-          <xsl:value-of select="$managed-object/@package" />
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates mode="merge-relation">
-        <xsl:with-param name="managed-object" select="$managed-object" />
-      </xsl:apply-templates>
-    </xsl:copy>
-  </xsl:template>
-  <!--
-    Merge a one-to-many relation.
-  -->
-  <xsl:template match="adm:one-to-many" mode="merge-relation">
-    <xsl:param name="managed-object" select="/.." />
-    <!--
-      Make sure that if this relation uses a naming property that the
-      naming property exists, is single-valued, mandatory, and read-only.
-    -->
-    <xsl:if test="@naming-property">
-      <xsl:variable name="naming-property-name"
-        select="@naming-property" />
-      <!--
-        FIXME: this does not cope with the situation where the property
-        is inherited, referenced, or overridden.
-      -->
-      <xsl:variable name="naming-property"
-        select="$managed-object/adm:property[@name=$naming-property-name]" />
-      <xsl:if test="not($naming-property)">
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('Relation ', ../@name,
-                           ' references an unknown naming property ',
-                           $naming-property-name, ' in ',
-                           $managed-object/@name, '.')" />
-        </xsl:message>
-      </xsl:if>
-      <xsl:if test="not($naming-property/@read-only='true')">
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('Relation ', ../@name,
-                           ' references the naming property ',
-                           $naming-property-name, ' in ',
-                           $managed-object/@name, ' which is not read-only. ',
-                           'Naming properties must be read-only.')" />
-        </xsl:message>
-      </xsl:if>
-      <xsl:if test="not($naming-property/@mandatory='true')">
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('Relation ', ../@name,
-                           ' references the naming property ',
-                           $naming-property-name, ' in ',
-                           $managed-object/@name, ' which is not mandatory. ',
-                           'Naming properties must be mandatory.')" />
-        </xsl:message>
-      </xsl:if>
-      <xsl:if test="$naming-property/@multi-valued='true'">
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('Relation ', ../@name,
-                           ' references the naming property ',
-                           $naming-property-name, ' in ',
-                           $managed-object/@name, ' which is multi-valued. ',
-                           'Naming properties must be single-valued.')" />
-        </xsl:message>
-      </xsl:if>
-    </xsl:if>
-    <xsl:copy>
-      <xsl:copy-of select="@*" />
-      <!--
-        Add missing plural name attribute if not present.
-      -->
-      <xsl:if test="not(@plural-name)">
-        <xsl:attribute name="plural-name">
-          <xsl:value-of select="$managed-object/@plural-name" />
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates mode="merge-relation">
-        <xsl:with-param name="managed-object" select="$managed-object" />
-      </xsl:apply-templates>
-    </xsl:copy>
-  </xsl:template>
-  <!--
-    Process a rich-description element in a relation.
-  -->
-  <xsl:template match="adm:synopsis|adm:description"
-    mode="merge-relation">
-    <xsl:param name="managed-object" select="/.." />
-    <xsl:copy>
-      <!--
-        Shallow copy.
-      -->
-      <xsl:copy-of select="@*" />
-      <xsl:apply-templates mode="rich-description">
-        <xsl:with-param name="ufn">
-          <xsl:call-template name="name-to-ufn">
-            <xsl:with-param name="value" select="$managed-object/@name" />
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="ufpn">
-          <xsl:call-template name="name-to-ufn">
-            <xsl:with-param name="value"
-              select="$managed-object/@plural-name" />
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:apply-templates>
-    </xsl:copy>
-  </xsl:template>
-  <!--
-    Process a rich-description element.
-  -->
-  <xsl:template
-    match="adm:synopsis|adm:description|adm:unit-description"
-    mode="pre-process">
-    <xsl:copy>
-      <!--
-        Shallow copy.
-      -->
-      <xsl:copy-of select="@*" />
-      <xsl:apply-templates mode="rich-description">
-        <xsl:with-param name="ufn" select="$this-ufn" />
-        <xsl:with-param name="ufpn" select="$this-ufpn" />
-      </xsl:apply-templates>
-    </xsl:copy>
-  </xsl:template>
-  <!--
-    Process a relative inherited default behavior
-  -->
-  <xsl:template match="adm:relative" mode="pre-process">
-    <xsl:param name="mopackage" select="/.." />
-    <xsl:param name="moname" select="/.." />
-    <xsl:param name="hierarchy" select="/.." />
-    <xsl:copy>
-      <!--
-        Shallow copy.
-      -->
-      <xsl:copy-of select="@*" />
-      <!--
-        Add missing attribute managed-object-package if it is not provided.
-      -->
-      <xsl:if test="not(@managed-object-package)">
-        <xsl:attribute name="managed-object-package">
-          <xsl:value-of select="$mopackage" />
-        </xsl:attribute>
-      </xsl:if>
-      <!--
-        Apply templates to subordinate elements.
-      -->
-      <xsl:apply-templates mode="pre-process">
-        <xsl:with-param name="mopackage" select="$mopackage" />
-        <xsl:with-param name="moname" select="$moname" />
-        <xsl:with-param name="hierarchy" select="$hierarchy" />
-      </xsl:apply-templates>
-    </xsl:copy>
-  </xsl:template>
-  <!--
-    Process a user-friendly-name element.
-  -->
-  <xsl:template match="adm:user-friendly-name"
-    mode="rich-description">
-    <xsl:param name="ufn" select="/.." />
-    <xsl:value-of select="$ufn" />
-  </xsl:template>
-  <!--
-    Process a user-friendly-plural-name element.
-  -->
-  <xsl:template match="adm:user-friendly-plural-name"
-    mode="rich-description">
-    <xsl:param name="ufpn" select="/.." />
-    <xsl:value-of select="$ufpn" />
-  </xsl:template>
-  <!--
-    Process a product-name element.
-  -->
-  <xsl:template match="adm:product-name" mode="rich-description">
-    <xsl:value-of select="$product-name" />
-  </xsl:template>
-  <!--
-    Default template for rich descriptions.
-  -->
-  <xsl:template match="*|comment()" mode="rich-description">
-    <xsl:param name="ufn" select="/.." />
-    <xsl:param name="ufpn" select="/.." />
-    <xsl:copy>
-      <xsl:copy-of select="@*" />
-      <xsl:apply-templates mode="rich-description">
-        <xsl:with-param name="ufn" select="$ufn" />
-        <xsl:with-param name="ufpn" select="$ufpn" />
-      </xsl:apply-templates>
-    </xsl:copy>
-  </xsl:template>
-  <!--
-    Default template for pre-processing.
-  -->
-  <xsl:template match="*|comment()" mode="pre-process">
-    <xsl:param name="mopackage" select="/.." />
-    <xsl:param name="moname" select="/.." />
-    <xsl:param name="hierarchy" />
-    <xsl:copy>
-      <xsl:copy-of select="@*" />
-      <xsl:apply-templates mode="pre-process">
-        <xsl:with-param name="mopackage" select="$mopackage" />
-        <xsl:with-param name="moname" select="$moname" />
-        <xsl:with-param name="hierarchy" select="$hierarchy" />
-      </xsl:apply-templates>
-    </xsl:copy>
-  </xsl:template>
-  <!--
-    Useful variables relating to the current managed object.
-  -->
-  <!--
-    Product name.
-    
-    FIXME: should get this from the root configuration but for some
-    reason we get a circular dependency error when constructing
-    the URI in JDK1.6.
-  -->
-  <xsl:variable name="product-name" select="'OpenDJ'" />
-  <xsl:variable name="this-name">
-    <xsl:choose>
-      <xsl:when test="/adm:managed-object">
-        <xsl:value-of select="/adm:managed-object/@name" />
-      </xsl:when>
-      <xsl:otherwise>
-        <!--
-          Must be the root configuration.  
-        -->
-        <xsl:value-of select="'root'" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="this-plural-name">
-    <xsl:choose>
-      <xsl:when test="/adm:managed-object">
-        <xsl:value-of select="/adm:managed-object/@plural-name" />
-      </xsl:when>
-      <xsl:otherwise>
-        <!--
-          Must be the root configuration - the plural form should never
-          be required as this is a singleton. We'll define it for
-          consistency. 
-        -->
-        <xsl:value-of select="'roots'" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="this-ufn">
-    <xsl:choose>
-      <xsl:when test="/adm:managed-object/adm:user-friendly-name">
-        <xsl:value-of
-          select="normalize-space(/adm:managed-object/adm:user-friendly-name)" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="name-to-ufn">
-          <xsl:with-param name="value" select="$this-name" />
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="this-ufpn">
-    <xsl:choose>
-      <xsl:when
-        test="/adm:managed-object/adm:user-friendly-plural-name">
-        <xsl:value-of
-          select="normalize-space(/adm:managed-object/adm:user-friendly-plural-name)" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="name-to-ufn">
-          <xsl:with-param name="value" select="$this-plural-name" />
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="_this">
-    <xsl:call-template name="pre-process-managed-object" />
-  </xsl:variable>
-  <xsl:variable name="_this_tmp" select="exsl:node-set($_this)" />
-  <xsl:variable name="this"
-    select="$_this_tmp/adm:managed-object | $_this_tmp/adm:root-managed-object" />
-  <xsl:variable name="this-is-abstract"
-    select="boolean(string($this/@abstract) = 'true')" />
-  <xsl:variable name="this-is-advanced"
-    select="boolean(string($this/@advanced) = 'true')" />
-  <xsl:variable name="this-is-hidden"
-    select="boolean(string($this/@hidden) = 'true')" />
-  <xsl:variable name="this-is-root"
-    select="not(local-name($this) = 'managed-object')" />
-  <xsl:variable name="this-package">
-    <xsl:choose>
-      <xsl:when test="not($this-is-root)">
-        <xsl:value-of select="$this/@package" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="'org.opends.server.admin.std'" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="this-java-class">
-    <xsl:call-template name="name-to-java">
-      <xsl:with-param name="value" select="$this-name" />
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="_top-name"
-    select="$this/adm:profile[@name='preprocessor']/admpp:parent-managed-object[last()]/@name" />
-  <xsl:variable name="_top-length" select="string-length($_top-name)" />
-  <xsl:variable name="_this-length" select="string-length($this-name)" />
-  <xsl:variable name="_diff" select="$_this-length - $_top-length" />
-  <xsl:variable name="_start"
-    select="substring($this-name, 1, $_diff - 1)" />
-  <xsl:variable name="_middle"
-    select="substring($this-name, $_diff, 1)" />
-  <xsl:variable name="_end"
-    select="substring($this-name, $_diff + 1, $_top-length)" />
-  <xsl:variable name="this-short-name">
-    <xsl:choose>
-      <xsl:when test="$this-is-root">
-        <xsl:value-of select="''" />
-      </xsl:when>
-      <xsl:when test="not($_top-name)">
-        <xsl:value-of select="''" />
-      </xsl:when>
-      <xsl:when test="$_middle != '-' or $_end != $_top-name">
-        <!--
-        <xsl:message terminate="no">
-          <xsl:value-of
-            select="concat('The managed object ', $this-name, ' should end with ', $_top-name)" />
-        </xsl:message>
-        -->
-        <xsl:value-of select="$this-name" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$_start" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="this-short-java-class">
-    <xsl:call-template name="name-to-java">
-      <xsl:with-param name="value" select="$this-short-name" />
-    </xsl:call-template>
-  </xsl:variable>
-  <!-- 
-    Useful variables relating to the parent managed object.
-  -->
-  <xsl:variable name="parent-name" select="$this/@extends" />
-  <xsl:variable name="parent-package">
-    <xsl:choose>
-      <xsl:when test="$this/@parent-package">
-        <xsl:value-of select="$this/@parent-package" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$this-package" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="parent-java-class">
-    <xsl:call-template name="name-to-java">
-      <xsl:with-param name="value" select="$parent-name" />
-    </xsl:call-template>
-  </xsl:variable>
-  <!-- 
-    Useful variables relating to managed object's relations.
-  -->
-  <xsl:variable name="this-local-relations"
-    select="$this/adm:relation[adm:profile[@name='preprocessor']/admpp:last-defined-in[@name=$this-name and @package=$this-package]]" />
-  <xsl:variable name="this-inherited-relations"
-    select="$this/adm:relation[adm:profile[@name='preprocessor']/admpp:last-defined-in[not(@name=$this-name and @package=$this-package)]]" />
-  <xsl:variable name="this-all-relations" select="$this/adm:relation" />
-  <!-- 
-    Useful variables relating to managed object's properties.
-  -->
-  <xsl:variable name="this-local-properties"
-    select="$this/adm:property[adm:profile[@name='preprocessor']/admpp:last-defined-in[@name=$this-name and @package=$this-package]]" />
-  <xsl:variable name="this-inherited-properties"
-    select="$this/adm:property[adm:profile[@name='preprocessor']/admpp:last-defined-in[not(@name=$this-name and @package=$this-package)]]" />
-  <xsl:variable name="this-all-properties" select="$this/adm:property" />
-  <!--
-    Default rule for testing.
-  -->
-  <xsl:template match="/">
-    <xsl:copy-of select="$this" />
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types.xsl b/opendj-server-legacy/resource/admin/property-types.xsl
deleted file mode 100644
index 0422b6d..0000000
--- a/opendj-server-legacy/resource/admin/property-types.xsl
+++ /dev/null
@@ -1,626 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008-2010 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="java-utilities.xsl" />
-  <!-- 
-    
-    
-    
-    WARNING: when new property types are defined, they must be
-    included here.
-    
-    These stylesheets are included and NOT imported so that they
-    have the same import precedence as the default rules.
-    
-    
-    
-  -->
-  <xsl:include href="property-types/aggregation.xsl" />
-  <xsl:include href="property-types/attribute-type.xsl" />
-  <xsl:include href="property-types/boolean.xsl" />
-  <xsl:include href="property-types/dn.xsl" />
-  <xsl:include href="property-types/duration.xsl" />
-  <xsl:include href="property-types/enumeration.xsl" />
-  <xsl:include href="property-types/integer.xsl" />
-  <xsl:include href="property-types/ip-address-mask.xsl" />
-  <xsl:include href="property-types/ip-address.xsl" />
-  <xsl:include href="property-types/java-class.xsl" />
-  <xsl:include href="property-types/aci.xsl" />
-  <xsl:include href="property-types/oid.xsl" />
-  <xsl:include href="property-types/password.xsl" />
-  <xsl:include href="property-types/size.xsl" />
-  <xsl:include href="property-types/string.xsl" />
-  <xsl:include href="property-types/extensible-matching-rule-type.xsl" />
-  <!--
-    
-    
-    
-    Default rules applicable to each property type.
-    
-    Property type stylesheets should override these where necessary.
-    
-    
-    
-  -->
-  <!--
-    Get the Java object-based type associated with a property syntax.
-    
-    By default property values are represented using strings.
-  -->
-  <xsl:template match="*" mode="java-value-type">
-    <xsl:value-of select="'String'" />
-  </xsl:template>
-  <!--
-    Get the Java primitive type, if applicable, associated with a
-    property syntax.
-    
-    By default property values are represented using the type defined by
-    java-value-type.
-  -->
-  <xsl:template match="*" mode="java-value-primitive-type">
-    <xsl:apply-templates select="." mode="java-value-type" />
-  </xsl:template>
-  <!--
-    Generate import elements represesenting the import statements
-    required by values of the property.
-    
-    By default property values are represented using strings which
-    don't require an import statement - so do nothing.
-  -->
-  <xsl:template match="*" mode="java-value-imports">
-    <xsl:param name="interface" select="/.." />
-  </xsl:template>
-  <!--
-    Generate the Java definition type used to define the property.
-    
-    By default properties are defined using string property
-    definitions.
-  -->
-  <xsl:template match="*" mode="java-definition-type">
-    <xsl:value-of select="'StringPropertyDefinition'" />
-  </xsl:template>
-  <!--
-    Generate import elements represesenting the import statements
-    required by the property's definition and its values.
-    
-    By default assume that the definition type is in
-    org.opends.server.admin and is derived directly from the
-    java-definition-type (might not be the case for parameterized
-    types. In addition pull in the value imports.
-  -->
-  <xsl:template match="*" mode="java-definition-imports">
-    <xsl:element name="import">
-      <xsl:value-of select="'org.opends.server.admin.'" />
-      <xsl:apply-templates select="." mode="java-definition-type" />
-    </xsl:element>
-    <xsl:apply-templates select="." mode="java-value-imports">
-      <xsl:with-param name="interface" select="'server'" />
-    </xsl:apply-templates>
-  </xsl:template>
-  <!--
-    If the property definition is generic, get the generic type. Otherwise,
-    do nothing.
-    
-    Default: do nothing.
-  -->
-  <xsl:template match="*" mode="java-definition-generic-type" />
-  <!--
-    Generate property definition specific constructor setters.
-    
-    By default, do nothing.
-  -->
-  <xsl:template match="*" mode="java-definition-ctor" />
-  <!--
-    Generate property definition specific post-construction code.
-    
-    By default, do nothing.
-  -->
-  <xsl:template match="*" mode="java-definition-post-ctor" />
-  <!--
-    Generate property getter declaration(s).
-    
-    By default, generate a single getter with minimal documentation.
-  -->
-  <xsl:template match="*" mode="java-property-getter-declaration">
-    <xsl:param name="interface" select="/.." />
-    <xsl:call-template
-      name="generate-default-property-getter-declaration">
-      <xsl:with-param name="interface" select="$interface" />
-    </xsl:call-template>
-  </xsl:template>
-  <!--
-    Generate property getter implementation(s).
-    
-    By default, generate a single getter.
-  -->
-  <xsl:template match="*" mode="java-property-getter-implementation">
-    <xsl:param name="interface" select="/.." />
-    <xsl:call-template
-      name="generate-default-property-getter-implementation">
-      <xsl:with-param name="interface" select="$interface" />
-    </xsl:call-template>
-  </xsl:template>
-  <!--
-    Generate property setter declaration(s).
-    
-    By default, generate a single setter with minimal documentation.
-  -->
-  <xsl:template match="*" mode="java-property-setter-declaration">
-    <xsl:call-template
-      name="generate-default-property-setter-declaration" />
-  </xsl:template>
-  <!--
-    Generate property setter implementation(s).
-    
-    By default, generate a single setter.
-  -->
-  <xsl:template match="*" mode="java-property-setter-implementation">
-    <xsl:call-template
-      name="generate-default-property-setter-implementation" />
-  </xsl:template>
-  <!--
-    
-    
-    Wrapper templates which can be called directly instead of
-    requiring the more indirect and less readable apply-templates
-    mechanism.
-    
-    
-  -->
-  <!-- 
-    Get the Java imports required for a property's values.
-  -->
-  <xsl:template name="get-property-java-imports">
-    <xsl:param name="interface" select="/.." />
-    <xsl:apply-templates select="adm:syntax/*"
-      mode="java-value-imports">
-      <xsl:with-param name="interface" select="$interface" />
-    </xsl:apply-templates>
-  </xsl:template>
-  <!-- 
-    Get the Java imports required for a property's definition.
-  -->
-  <xsl:template name="get-property-definition-java-imports">
-    <xsl:apply-templates select="adm:syntax/*"
-      mode="java-definition-imports" />
-  </xsl:template>
-  <!-- 
-    Get the Java object-based type associated with a property syntax.
-  -->
-  <xsl:template name="get-property-java-type">
-    <xsl:apply-templates select="adm:syntax/*" mode="java-value-type" />
-  </xsl:template>
-  <!-- 
-    Get the Java primitive type, if applicable, associated with a
-    property syntax.
-  -->
-  <xsl:template name="get-property-java-primitive-type">
-    <xsl:apply-templates select="adm:syntax/*"
-      mode="java-value-primitive-type" />
-  </xsl:template>
-  <!-- 
-    Get the property definition type associated with a
-    property syntax.
-  -->
-  <xsl:template name="get-property-definition-type">
-    <xsl:apply-templates select="adm:syntax/*"
-      mode="java-definition-type" />
-  </xsl:template>
-  <!-- 
-    If the property definition is generic, get the generic type. Otherwise,
-    do nothing.
-  -->
-  <xsl:template name="get-property-definition-generic-type">
-    <xsl:apply-templates select="adm:syntax/*"
-      mode="java-definition-generic-type" />
-  </xsl:template>
-  <!-- 
-    Generate property definition specific constructor setters.
-  -->
-  <xsl:template name="get-property-definition-ctor">
-    <xsl:apply-templates select="adm:syntax/*"
-      mode="java-definition-ctor" />
-  </xsl:template>
-  <!-- 
-    Generate property definition specific post-construction code.
-  -->
-  <xsl:template name="get-property-definition-post-ctor">
-    <xsl:apply-templates select="adm:syntax/*"
-      mode="java-definition-post-ctor" />
-  </xsl:template>
-  <!-- 
-    Generate the property getter declarations.
-  -->
-  <xsl:template name="generate-property-getter-declaration">
-    <xsl:param name="interface" select="/.." />
-    <xsl:apply-templates select="adm:syntax/*"
-      mode="java-property-getter-declaration">
-      <xsl:with-param name="interface" select="$interface" />
-    </xsl:apply-templates>
-  </xsl:template>
-  <!-- 
-    Generate the property getter implementations.
-  -->
-  <xsl:template name="generate-property-getter-implementation">
-    <xsl:param name="interface" select="/.." />
-    <xsl:apply-templates select="adm:syntax/*"
-      mode="java-property-getter-implementation">
-      <xsl:with-param name="interface" select="$interface" />
-    </xsl:apply-templates>
-  </xsl:template>
-  <!-- 
-    Generate the property setter declarations.
-  -->
-  <xsl:template name="generate-property-setter-declaration">
-    <xsl:apply-templates select="adm:syntax/*"
-      mode="java-property-setter-declaration" />
-  </xsl:template>
-  <!-- 
-    Generate the property setter implementations.
-  -->
-  <xsl:template name="generate-property-setter-implementation">
-    <xsl:apply-templates select="adm:syntax/*"
-      mode="java-property-setter-implementation" />
-  </xsl:template>
-  <!--
-    Generate the default property getter declarations.
-  -->
-  <xsl:template name="generate-default-property-getter-declaration">
-    <xsl:param name="interface" select="/.." />
-    <xsl:apply-templates select="../.."
-      mode="generate-default-property-getter-declaration-aux">
-      <xsl:with-param name="interface" select="$interface" />
-    </xsl:apply-templates>
-  </xsl:template>
-  <xsl:template match="adm:property"
-    mode="generate-default-property-getter-declaration-aux">
-    <xsl:param name="interface" select="/.." />
-    <xsl:variable name="name" select="@name" />
-    <xsl:variable name="java-property-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="$name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:value-of
-      select="concat('  /**&#xa;',
-                     '   * Gets the &quot;', $name,'&quot; property.&#xa;')" />
-    <xsl:if test="adm:synopsis">
-      <xsl:value-of select="'   * &lt;p&gt;&#xa;'" />
-      <xsl:call-template name="add-java-comment">
-        <xsl:with-param name="indent-text" select="'   *'" />
-        <xsl:with-param name="content" select="adm:synopsis" />
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:if test="adm:description">
-      <xsl:value-of select="'   * &lt;p&gt;&#xa;'" />
-      <xsl:call-template name="add-java-comment">
-        <xsl:with-param name="indent-text" select="'   *'" />
-        <xsl:with-param name="content" select="adm:description" />
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="string(@multi-valued) != 'true'">
-        <xsl:value-of
-          select="concat('   *&#xa;',
-                     '   * @return Returns the value of the &quot;', $name,'&quot; property.&#xa;',
-                     '   */&#xa;')" />
-        <xsl:value-of select="'  '" />
-        <xsl:choose>
-          <xsl:when test="adm:default-behavior/adm:defined">
-            <!-- 
-              The method is guaranteed to return a value since there is a
-              well-defined default value.
-            -->
-            <xsl:call-template name="get-property-java-primitive-type" />
-          </xsl:when>
-          <xsl:when
-            test="$interface = 'server' and @mandatory = 'true'">
-            <!-- 
-              The method is guaranteed to return a value in the server interface, but
-              not necessarily in the client, since the mandatory property might not
-              have been created yet.
-            -->
-            <xsl:call-template name="get-property-java-primitive-type" />
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="get-property-java-type" />
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$interface='server'">
-            <xsl:value-of
-              select="concat('   *&#xa;',
-                     '   * @return Returns an unmodifiable set containing the values of the &quot;', $name,'&quot; property.&#xa;',
-                     '   */&#xa;')" />
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of
-              select="concat('   *&#xa;',
-                     '   * @return Returns the values of the &quot;', $name,'&quot; property.&#xa;',
-                     '   */&#xa;')" />
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:value-of select="'  SortedSet&lt;'" />
-        <xsl:call-template name="get-property-java-type" />
-        <xsl:value-of select="'&gt;'" />
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:choose>
-      <xsl:when test="adm:syntax/adm:boolean">
-        <xsl:value-of select="' is'" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="' get'" />
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:value-of
-      select="concat($java-property-name,
-                                 '();&#xa;')" />
-  </xsl:template>
-  <!--
-    Generate the default property getter implementation.
-  -->
-  <xsl:template
-    name="generate-default-property-getter-implementation">
-    <xsl:param name="interface" select="/.." />
-    <xsl:apply-templates select="../.."
-      mode="generate-default-property-getter-implementation-aux">
-      <xsl:with-param name="interface" select="$interface" />
-    </xsl:apply-templates>
-  </xsl:template>
-  <xsl:template match="adm:property"
-    mode="generate-default-property-getter-implementation-aux">
-    <xsl:param name="interface" select="/.." />
-    <xsl:variable name="java-prop-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="@name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:value-of
-      select="concat('    /**&#xa;',
-                     '     * {@inheritDoc}&#xa;',
-                     '     */&#xa;',
-                     '    public ')" />
-    <xsl:choose>
-      <xsl:when test="string(@multi-valued) != 'true'">
-        <xsl:choose>
-          <xsl:when test="adm:default-behavior/adm:defined">
-            <!--
-              The method is guaranteed to return a value since there is a
-              well-defined default value.
-            -->
-            <xsl:call-template name="get-property-java-primitive-type" />
-          </xsl:when>
-          <xsl:when
-            test="$interface = 'server' and @mandatory = 'true'">
-            <!--
-              The method is guaranteed to return a value in the server interface, but
-              not necessarily in the client, since the mandatory property might not
-              have been created yet.
-            -->
-            <xsl:call-template name="get-property-java-primitive-type" />
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="get-property-java-type" />
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="'SortedSet&lt;'" />
-        <xsl:call-template name="get-property-java-type" />
-        <xsl:value-of select="'&gt;'" />
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:choose>
-      <xsl:when test="adm:syntax/adm:boolean">
-        <xsl:value-of select="' is'" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="' get'" />
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:choose>
-      <xsl:when test="$interface='server'">
-        <xsl:value-of
-          select="concat($java-prop-name, '() {&#xa;',
-                                     '      return p', $java-prop-name , ';&#xa;' ,
-                                     '    }&#xa;')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="string(@multi-valued) != 'true'">
-            <xsl:value-of
-              select="concat($java-prop-name, '() {&#xa;',
-                                     '      return impl.getPropertyValue',
-                                     '(INSTANCE.get', $java-prop-name ,
-                                     'PropertyDefinition());&#xa;' ,
-                                     '    }&#xa;')" />
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of
-              select="concat($java-prop-name, '() {&#xa;',
-                                     '      return impl.getPropertyValues',
-                                     '(INSTANCE.get', $java-prop-name ,
-                                     'PropertyDefinition());&#xa;' ,
-                                     '    }&#xa;')" />
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!--
-    Generate the default property setter declarations.
-  -->
-  <xsl:template name="generate-default-property-setter-declaration">
-    <xsl:apply-templates select="../.."
-      mode="generate-default-property-setter-declaration-aux" />
-  </xsl:template>
-  <xsl:template match="adm:property"
-    mode="generate-default-property-setter-declaration-aux">
-    <xsl:if test="not(@monitoring='true')">
-      <xsl:variable name="name" select="@name" />
-      <xsl:variable name="java-property-name">
-        <xsl:call-template name="name-to-java">
-          <xsl:with-param name="value" select="$name" />
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of
-        select="concat('  /**&#xa;',
-                     '   * Sets the &quot;', $name, '&quot; property.&#xa;')" />
-      <xsl:if test="adm:synopsis">
-        <xsl:value-of select="'   * &lt;p&gt;&#xa;'" />
-        <xsl:call-template name="add-java-comment">
-          <xsl:with-param name="indent-text" select="'   *'" />
-          <xsl:with-param name="content" select="adm:synopsis" />
-        </xsl:call-template>
-      </xsl:if>
-      <xsl:if test="adm:description">
-        <xsl:value-of select="'   * &lt;p&gt;&#xa;'" />
-        <xsl:call-template name="add-java-comment">
-          <xsl:with-param name="indent-text" select="'   *'" />
-          <xsl:with-param name="content" select="adm:description" />
-        </xsl:call-template>
-      </xsl:if>
-      <xsl:if test="@read-only='true'">
-        <xsl:value-of select="'   * &lt;p&gt;&#xa;'" />
-        <xsl:value-of
-          select="concat(
-                     '   * This property is read-only and can only be modified during&#xa;',
-                     '   * creation of a ', $this-ufn, '.&#xa;')" />
-      </xsl:if>
-      <xsl:choose>
-        <xsl:when test="not(@multi-valued='true')">
-          <xsl:value-of
-            select="concat('   *&#xa;',
-                     '   * @param value The value of the &quot;', $name, '&quot; property.&#xa;',
-                     '   * @throws PropertyException&#xa;',
-                     '   *           If the new value is invalid.&#xa;')" />
-          <xsl:if test="@read-only='true'">
-            <xsl:value-of
-              select="concat(
-                     '   * @throws PropertyException&#xa;',
-                     '   *           If this ', $this-ufn, ' is not being initialized.&#xa;')" />
-          </xsl:if>
-          <xsl:value-of
-            select="concat(
-                     '   */&#xa;',
-                     '  void set', $java-property-name, '(')" />
-          <xsl:choose>
-            <xsl:when test="@mandatory = 'true'">
-              <xsl:call-template
-                name="get-property-java-primitive-type" />
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:call-template name="get-property-java-type" />
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:value-of select="' value'" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of
-            select="concat('   *&#xa;',
-                     '   * @param values The values of the &quot;', $name, '&quot; property.&#xa;',
-                     '   * @throws PropertyException&#xa;',
-                     '   *           If one or more of the new values are invalid.&#xa;')" />
-          <xsl:if test="@read-only='true'">
-            <xsl:value-of
-              select="concat(
-                     '   * @throws PropertyException&#xa;',
-                     '   *           If this ', $this-ufn, ' is not being initialized.&#xa;')" />
-          </xsl:if>
-          <xsl:value-of
-            select="concat(
-                     '   */&#xa;',
-                     '  void set', $java-property-name, '(Collection&lt;')" />
-          <xsl:call-template name="get-property-java-type" />
-          <xsl:value-of select="'&gt; values'" />
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:value-of select="') throws PropertyException'" />
-      <xsl:if test="@read-only='true'">
-        <xsl:value-of select="', PropertyException'" />
-      </xsl:if>
-      <xsl:value-of select="';&#xa;'" />
-    </xsl:if>
-  </xsl:template>
-  <!--
-    Generate the default property setter implementation.
-  -->
-  <xsl:template
-    name="generate-default-property-setter-implementation">
-    <xsl:apply-templates select="../.."
-      mode="generate-default-property-setter-implementation-aux" />
-  </xsl:template>
-  <xsl:template match="adm:property"
-    mode="generate-default-property-setter-implementation-aux">
-    <xsl:if test="not(@monitoring='true')">
-      <xsl:variable name="java-prop-name">
-        <xsl:call-template name="name-to-java">
-          <xsl:with-param name="value" select="@name" />
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of
-        select="concat('    /**&#xa;',
-                     '     * {@inheritDoc}&#xa;',
-                     '     */&#xa;',
-                     '    public void set',
-                     $java-prop-name ,
-                     '(')" />
-      <xsl:choose>
-        <xsl:when test="not(@multi-valued='true')">
-          <xsl:choose>
-            <xsl:when test="@mandatory='true'">
-              <xsl:call-template
-                name="get-property-java-primitive-type" />
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:call-template name="get-property-java-type" />
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:value-of select="' value)'" />
-          <xsl:if test="@read-only='true'">
-            <xsl:value-of
-              select="' throws PropertyException'" />
-          </xsl:if>
-          <xsl:value-of
-            select="concat(' {&#xa;' ,
-                     '      impl.setPropertyValue(INSTANCE.get',
-                     $java-prop-name ,
-                     'PropertyDefinition(), value);&#xa;',
-                     '    }&#xa;')" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="'Collection&lt;'" />
-          <xsl:call-template name="get-property-java-type" />
-          <xsl:value-of select="'&gt; values)'" />
-          <xsl:if test="@read-only='true'">
-            <xsl:value-of
-              select="' throws PropertyException'" />
-          </xsl:if>
-          <xsl:value-of
-            select="concat(' {&#xa;' ,
-                     '      impl.setPropertyValues(INSTANCE.get',
-                     $java-prop-name ,
-                     'PropertyDefinition(), values);&#xa;',
-                     '    }&#xa;')" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/aci.xsl b/opendj-server-legacy/resource/admin/property-types/aci.xsl
deleted file mode 100644
index 1b17c27..0000000
--- a/opendj-server-legacy/resource/admin/property-types/aci.xsl
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing dseecompat ACI.
-  -->
-  <xsl:template match="adm:aci" mode="java-value-imports">
-    <import>org.opends.server.authorization.dseecompat.Aci</import>
-  </xsl:template>
-  <xsl:template match="adm:aci" mode="java-value-type">
-    <xsl:value-of select="'Aci'" />
-  </xsl:template>
-  <xsl:template match="adm:aci" mode="java-definition-type">
-    <xsl:value-of select="'ACIPropertyDefinition'" />
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/aggregation.xsl b/opendj-server-legacy/resource/admin/property-types/aggregation.xsl
deleted file mode 100644
index 8b6861f..0000000
--- a/opendj-server-legacy/resource/admin/property-types/aggregation.xsl
+++ /dev/null
@@ -1,278 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008-2010 Sun Microsystems, Inc.
-  Portions Copyright 2016 ForgeRock AS.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../java-utilities.xsl" />
-  <xsl:include href="../conditions.xsl" />
-  <!-- 
-    Templates for processing aggregation properties.
-  -->
-  <xsl:template match="adm:aggregation"
-    mode="java-definition-imports">
-    <xsl:element name="import">
-      <xsl:call-template name="get-definition-package" />
-      <xsl:value-of select="'.client.'" />
-      <xsl:call-template name="get-client-type" />
-    </xsl:element>
-    <xsl:element name="import">
-      <xsl:call-template name="get-definition-package" />
-      <xsl:value-of select="'.server.'" />
-      <xsl:call-template name="get-server-type" />
-    </xsl:element>
-    <xsl:if test="../../@multi-valued = 'true'">
-      <import>java.util.TreeSet</import>
-    </xsl:if>
-    <xsl:if test="adm:constraint/adm:target-needs-enabling-condition">
-      <import>org.opends.server.admin.condition.Conditions</import>
-    </xsl:if>
-    <xsl:if test="adm:constraint/adm:target-is-enabled-condition">
-      <import>org.opends.server.admin.condition.Conditions</import>
-    </xsl:if>
-    <import>
-      org.opends.server.admin.AggregationPropertyDefinition
-    </import>
-  </xsl:template>
-  <xsl:template match="adm:aggregation" mode="java-value-type">
-    <xsl:value-of select="'String'" />
-  </xsl:template>
-  <xsl:template match="adm:aggregation" mode="java-value-imports">
-    <xsl:param name="interface" select="/.." />
-    <xsl:if test="$interface = 'server'">
-      <import>org.forgerock.opendj.ldap.DN</import>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template match="adm:aggregation" mode="java-definition-type">
-    <xsl:value-of select="'AggregationPropertyDefinition'" />
-  </xsl:template>
-  <xsl:template match="adm:aggregation"
-    mode="java-definition-generic-type">
-    <xsl:call-template name="get-client-type" />
-    <xsl:value-of select="', '" />
-    <xsl:call-template name="get-server-type" />
-  </xsl:template>
-  <xsl:template match="adm:aggregation" mode="java-definition-ctor">
-    <xsl:if test="not(@parent-path)">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('No parent-path defined for aggregation property ', ../../@name)" />
-      </xsl:message>
-    </xsl:if>
-    <xsl:if test="not(@relation-name)">
-      <xsl:message terminate="yes">
-        <xsl:value-of
-          select="concat('No relation-name defined for aggregation property ', ../../@name)" />
-      </xsl:message>
-    </xsl:if>
-    <xsl:value-of
-      select="concat('      builder.setParentPath(&quot;',
-                     normalize-space(@parent-path), '&quot;);&#xa;')" />
-    <xsl:value-of
-      select="concat('      builder.setRelationDefinition(&quot;',
-                     normalize-space(@relation-name), '&quot;);&#xa;')" />
-    <xsl:if test="adm:constraint/adm:target-needs-enabling-condition">
-      <xsl:value-of
-        select="'      builder.setTargetNeedsEnablingCondition('" />
-      <xsl:apply-templates
-        select="adm:constraint/adm:target-needs-enabling-condition/*"
-        mode="compile-condition" />
-      <xsl:value-of select="');&#xa;'" />
-    </xsl:if>
-    <xsl:if test="adm:constraint/adm:target-is-enabled-condition">
-      <xsl:value-of
-        select="'      builder.setTargetIsEnabledCondition('" />
-      <xsl:apply-templates select="adm:constraint/adm:target-is-enabled-condition/*"
-        mode="compile-condition" />
-      <xsl:value-of select="');&#xa;'" />
-    </xsl:if>
-  </xsl:template>
-  <xsl:template match="adm:aggregation"
-    mode="java-definition-post-ctor">
-    <xsl:value-of select="'      INSTANCE.registerConstraint(PD_'" />
-    <xsl:call-template name="name-to-java-constant">
-      <xsl:with-param name="value" select="../../@name" />
-    </xsl:call-template>
-    <xsl:value-of select="'.getSourceConstraint());&#xa;'" />
-  </xsl:template>
-  <!--
-    Generate property getter declaration(s).
-  -->
-  <xsl:template match="adm:aggregation"
-    mode="java-property-getter-declaration">
-    <xsl:param name="interface" select="/.." />
-    <xsl:call-template
-      name="generate-default-property-getter-declaration">
-      <xsl:with-param name="interface" select="$interface" />
-    </xsl:call-template>
-    <xsl:if test="$interface='server'">
-      <xsl:variable name="name" select="../../@name" />
-      <xsl:variable name="java-property-name">
-        <xsl:call-template name="name-to-java">
-          <xsl:with-param name="value" select="$name" />
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:variable name="comment">
-        <xsl:if test="../../adm:synopsis">
-          <xsl:value-of select="'&lt;p&gt;&#xa;'" />
-          <xsl:value-of select="normalize-space(../../adm:synopsis)" />
-          <xsl:value-of select="'&#xa;'" />
-        </xsl:if>
-        <xsl:if test="../../adm:description">
-          <xsl:value-of select="'&lt;p&gt;&#xa;'" />
-          <xsl:value-of select="normalize-space(../../adm:description)" />
-          <xsl:value-of select="'&#xa;'" />
-        </xsl:if>
-      </xsl:variable>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:choose>
-        <xsl:when test="string(../../@multi-valued) != 'true'">
-          <xsl:call-template name="add-java-comment2">
-            <xsl:with-param name="indent" select="2" />
-            <xsl:with-param name="content"
-              select="concat(
-                       'Gets the &quot;', $name,'&quot; property as a DN.&#xa;',
-                       $comment,
-                       '&#xa;',
-                       '@return Returns the DN value of the &quot;', $name, '&quot; property.&#xa;')" />
-          </xsl:call-template>
-          <xsl:value-of
-            select="concat('  DN get', $java-property-name, 'DN();&#xa;')" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="add-java-comment2">
-            <xsl:with-param name="indent" select="2" />
-            <xsl:with-param name="content"
-              select="concat(
-                       'Gets the &quot;', $name,'&quot; property as a set of DNs.&#xa;',
-                       $comment,
-                       '&#xa;',
-                       '@return Returns the DN values of the &quot;', $name, '&quot; property.&#xa;')" />
-          </xsl:call-template>
-          <xsl:value-of
-            select="concat('  SortedSet&lt;DN&gt; get', $java-property-name, 'DNs();&#xa;')" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-  <!--
-    Generate property getter implementation(s).
-  -->
-  <xsl:template match="adm:aggregation"
-    mode="java-property-getter-implementation">
-    <xsl:param name="interface" select="/.." />
-    <xsl:call-template
-      name="generate-default-property-getter-implementation">
-      <xsl:with-param name="interface" select="$interface" />
-    </xsl:call-template>
-    <xsl:if test="$interface='server'">
-      <xsl:variable name="name" select="../../@name" />
-      <xsl:variable name="java-property-name">
-        <xsl:call-template name="name-to-java">
-          <xsl:with-param name="value" select="$name" />
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="add-java-comment2">
-        <xsl:with-param name="indent" select="4" />
-        <xsl:with-param name="content" select="'{@inheritDoc}&#xa;'" />
-      </xsl:call-template>
-      <xsl:choose>
-        <xsl:when test="string(../../@multi-valued) != 'true'">
-          <xsl:value-of
-            select="concat('    public DN get', $java-property-name, 'DN() {&#xa;')" />
-          <xsl:value-of
-            select="concat('      String value = get', $java-property-name, '();&#xa;')" />
-          <xsl:value-of
-            select="'      if (value == null) return null;&#xa;'" />
-          <xsl:value-of
-            select="concat('      return INSTANCE.get', $java-property-name, 'PropertyDefinition().getChildDN(value);&#xa;')" />
-          <xsl:value-of select="'    }&#xa;'" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of
-            select="concat('    public SortedSet&lt;DN&gt; get', $java-property-name, 'DNs() {&#xa;')" />
-          <xsl:value-of
-            select="concat('      SortedSet&lt;String&gt; values = get', $java-property-name, '();&#xa;')" />
-          <xsl:value-of
-            select="'      SortedSet&lt;DN&gt; dnValues = new TreeSet&lt;DN&gt;();&#xa;'" />
-          <xsl:value-of
-            select="'      for (String value : values) {&#xa;'" />
-          <xsl:value-of
-            select="concat('        DN dn = INSTANCE.get', $java-property-name, 'PropertyDefinition().getChildDN(value);&#xa;')" />
-          <xsl:value-of select="'        dnValues.add(dn);&#xa;'" />
-          <xsl:value-of select="'      }&#xa;'" />
-          <xsl:value-of select="'      return dnValues;&#xa;'" />
-          <xsl:value-of select="'    }&#xa;'" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-  <!--
-    Gets the Java client configuration interface for the referenced type.
-  -->
-  <xsl:template name="get-client-type">
-    <xsl:call-template name="get-reference-type" />
-    <xsl:value-of select="'CfgClient'" />
-  </xsl:template>
-  <!--
-    Gets the Java server configuration interface for the referenced type.
-  -->
-  <xsl:template name="get-server-type">
-    <xsl:call-template name="get-reference-type" />
-    <xsl:value-of select="'Cfg'" />
-  </xsl:template>
-  <!--
-    Gets the Java definition configuration interface for the referenced type.
-  -->
-  <xsl:template name="get-definition-type">
-    <xsl:call-template name="get-reference-type" />
-    <xsl:value-of select="'CfgDefn'" />
-  </xsl:template>
-  <!--
-    Gets the Java definition configuration package.
-  -->
-  <xsl:template name="get-definition-package">
-    <xsl:choose>
-      <xsl:when test="@managed-object-package">
-        <xsl:value-of select="@managed-object-package" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$this-package" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!--
-    Gets the Java name for the referenced type.
-  -->
-  <xsl:template name="get-reference-type">
-    <xsl:choose>
-      <xsl:when test="@managed-object-name">
-        <xsl:call-template name="name-to-java">
-          <xsl:with-param name="value" select="@managed-object-name" />
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="name-to-java">
-          <xsl:with-param name="value" select="@relation-name" />
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/attribute-type.xsl b/opendj-server-legacy/resource/admin/property-types/attribute-type.xsl
deleted file mode 100644
index 6ce3f43..0000000
--- a/opendj-server-legacy/resource/admin/property-types/attribute-type.xsl
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  Portions copyright 2015-2016 ForgeRock AS.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing attribute type properties.
-  -->
-  <xsl:template match="adm:attribute-type" mode="java-value-imports">
-    <import>org.forgerock.opendj.ldap.schema.AttributeType</import>
-  </xsl:template>
-  <xsl:template match="adm:attribute-type" mode="java-value-type">
-    <xsl:value-of select="'AttributeType'" />
-  </xsl:template>
-  <xsl:template match="adm:attribute-type"
-    mode="java-definition-type">
-    <xsl:value-of select="'AttributeTypePropertyDefinition'" />
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/boolean.xsl b/opendj-server-legacy/resource/admin/property-types/boolean.xsl
deleted file mode 100644
index 3fbb34f..0000000
--- a/opendj-server-legacy/resource/admin/property-types/boolean.xsl
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing boolean properties.
-  -->
-  <xsl:template match="adm:boolean" mode="java-value-type">
-    <xsl:value-of select="'Boolean'" />
-  </xsl:template>
-  <xsl:template match="adm:boolean" mode="java-value-primitive-type">
-    <xsl:value-of select="'boolean'" />
-  </xsl:template>
-  <xsl:template match="adm:boolean" mode="java-definition-type">
-    <xsl:value-of select="'BooleanPropertyDefinition'" />
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/dn.xsl b/opendj-server-legacy/resource/admin/property-types/dn.xsl
deleted file mode 100644
index c2be7ec..0000000
--- a/opendj-server-legacy/resource/admin/property-types/dn.xsl
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  Portions Copyright 2016 ForgeRock AS.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing DN properties.
-  -->
-  <xsl:template match="adm:dn" mode="java-value-imports">
-    <import>org.forgerock.opendj.ldap.DN</import>
-  </xsl:template>
-  <xsl:template match="adm:dn" mode="java-value-type">
-    <xsl:value-of select="'DN'" />
-  </xsl:template>
-  <xsl:template match="adm:dn" mode="java-definition-type">
-    <xsl:value-of select="'DNPropertyDefinition'" />
-  </xsl:template>
-  <xsl:template match="adm:dn" mode="java-definition-ctor">
-    <xsl:if test="adm:base">
-      <xsl:value-of
-        select="concat('      builder.setBaseDN(&quot;',
-                       normalize-space(adm:base), '&quot;);&#xa;')" />
-    </xsl:if>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/duration.xsl b/opendj-server-legacy/resource/admin/property-types/duration.xsl
deleted file mode 100644
index 83c51d3..0000000
--- a/opendj-server-legacy/resource/admin/property-types/duration.xsl
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing duration properties.
-  -->
-  <xsl:template match="adm:duration" mode="java-value-type">
-    <xsl:value-of select="'Long'" />
-  </xsl:template>
-  <xsl:template match="adm:duration" mode="java-value-primitive-type">
-    <xsl:value-of select="'long'" />
-  </xsl:template>
-  <xsl:template match="adm:duration" mode="java-definition-type">
-    <xsl:value-of select="'DurationPropertyDefinition'" />
-  </xsl:template>
-  <xsl:template match="adm:duration" mode="java-definition-ctor">
-    <xsl:if test="boolean(@allow-unlimited)">
-      <xsl:value-of
-        select="concat('      builder.setAllowUnlimited(',
-                       @allow-unlimited, ');&#xa;')" />
-    </xsl:if>
-    <xsl:if test="boolean(@base-unit)">
-      <xsl:value-of
-        select="concat('      builder.setBaseUnit(&quot;',
-                       @base-unit, '&quot;);&#xa;')" />
-    </xsl:if>
-    <xsl:if test="boolean(@maximum-unit)">
-      <xsl:value-of
-        select="concat('      builder.setMaximumUnit(&quot;',
-                       @maximum-unit, '&quot;);&#xa;')" />
-    </xsl:if>
-    <xsl:if test="boolean(@upper-limit)">
-      <xsl:value-of
-        select="concat('      builder.setUpperLimit(&quot;',
-                       @upper-limit, '&quot;);&#xa;')" />
-    </xsl:if>
-    <xsl:if test="boolean(@lower-limit)">
-      <xsl:value-of
-        select="concat('      builder.setLowerLimit(&quot;',
-                       @lower-limit, '&quot;);&#xa;')" />
-    </xsl:if>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/enumeration.xsl b/opendj-server-legacy/resource/admin/property-types/enumeration.xsl
deleted file mode 100644
index 9ddd21d..0000000
--- a/opendj-server-legacy/resource/admin/property-types/enumeration.xsl
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:admpp="http://www.opends.org/admin-preprocessor"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing enumeration properties.
-  -->
-  <xsl:template match="adm:enumeration" mode="java-value-imports">
-    <xsl:variable name="pp"
-      select="../../adm:profile[@name='preprocessor']" />
-    <xsl:element name="import">
-      <xsl:choose>
-        <xsl:when test="$pp/admpp:first-defined-in">
-          <xsl:value-of
-            select="concat($pp/admpp:first-defined-in/@package, '.')" />
-          <xsl:if test="$pp/admpp:first-defined-in/@name">
-            <xsl:value-of select="'meta.'" />
-            <xsl:call-template name="name-to-java">
-              <xsl:with-param name="value"
-                select="$pp/admpp:first-defined-in/@name" />
-            </xsl:call-template>
-            <xsl:value-of select="'CfgDefn.'" />
-          </xsl:if>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of
-            select="concat($pp/admpp:last-defined-in/@package, '.')" />
-          <xsl:value-of select="'meta.'" />
-          <xsl:call-template name="name-to-java">
-            <xsl:with-param name="value"
-              select="$pp/admpp:last-defined-in/@name" />
-          </xsl:call-template>
-          <xsl:value-of select="'CfgDefn.'" />
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="." mode="java-value-type" />
-    </xsl:element>
-  </xsl:template>
-  <xsl:template match="adm:enumeration"
-    mode="java-definition-imports">
-    <xsl:element name="import">
-      <xsl:value-of
-        select="'org.opends.server.admin.EnumPropertyDefinition'" />
-    </xsl:element>
-    <xsl:variable name="pp"
-      select="../../adm:profile[@name='preprocessor']" />
-    <xsl:if test="$pp/admpp:first-defined-in">
-      <xsl:element name="import">
-        <xsl:value-of
-          select="concat($pp/admpp:first-defined-in/@package, '.')" />
-        <xsl:if test="$pp/admpp:first-defined-in/@name">
-          <xsl:value-of select="'meta.'" />
-          <xsl:call-template name="name-to-java">
-            <xsl:with-param name="value"
-              select="$pp/admpp:first-defined-in/@name" />
-          </xsl:call-template>
-          <xsl:value-of select="'CfgDefn.'" />
-        </xsl:if>
-        <xsl:apply-templates select="." mode="java-value-type" />
-      </xsl:element>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template match="adm:enumeration" mode="java-value-type">
-    <xsl:call-template name="name-to-java">
-      <xsl:with-param name="value" select="../../@name" />
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="adm:enumeration" mode="java-definition-type">
-    <xsl:value-of select="'EnumPropertyDefinition'" />
-  </xsl:template>
-  <xsl:template match="adm:enumeration"
-    mode="java-definition-generic-type">
-    <xsl:apply-templates select="." mode="java-value-type" />
-  </xsl:template>
-  <xsl:template match="adm:enumeration" mode="java-definition-ctor">
-    <xsl:value-of select="'      builder.setEnumClass('" />
-    <xsl:apply-templates select="." mode="java-value-type" />
-    <xsl:value-of select="'.class);&#xa;'" />
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/extensible-matching-rule-type.xsl b/opendj-server-legacy/resource/admin/property-types/extensible-matching-rule-type.xsl
deleted file mode 100644
index 580c163..0000000
--- a/opendj-server-legacy/resource/admin/property-types/extensible-matching-rule-type.xsl
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2009 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing extensible matching rule type properties.
-  -->
-  <xsl:template match="adm:extensible-matching-rule-type" mode="java-value-imports">
-    <import>org.opends.server.api.ExtensibleMatchingRule</import>
-  </xsl:template>
-  <xsl:template match="adm:extensible-matching-rule-type" mode="java-value-type">
-    <xsl:value-of select="'ExtensibleMatchingRule'" />
-  </xsl:template>
-  <xsl:template match="adm:extensible-matching-rule-type"
-    mode="java-definition-type">
-    <xsl:value-of select="'ExtensibleMatchingRuleTypePropertyDefinition'" />
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/integer.xsl b/opendj-server-legacy/resource/admin/property-types/integer.xsl
deleted file mode 100644
index 2ced1a1..0000000
--- a/opendj-server-legacy/resource/admin/property-types/integer.xsl
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing integer properties.
-  -->
-  <xsl:template match="adm:integer" mode="java-value-type">
-    <xsl:value-of select="'Integer'" />
-  </xsl:template>
-  <xsl:template match="adm:integer" mode="java-value-primitive-type">
-    <xsl:value-of select="'int'" />
-  </xsl:template>
-  <xsl:template match="adm:integer" mode="java-definition-type">
-    <xsl:value-of select="'IntegerPropertyDefinition'" />
-  </xsl:template>
-  <xsl:template match="adm:integer" mode="java-definition-ctor">
-    <xsl:if test="boolean(@allow-unlimited)">
-      <xsl:value-of
-        select="concat('      builder.setAllowUnlimited(',
-                       @allow-unlimited, ');&#xa;')" />
-    </xsl:if>
-    <xsl:if test="boolean(@upper-limit)">
-      <xsl:value-of
-        select="concat('      builder.setUpperLimit(',
-                       @upper-limit, ');&#xa;')" />
-    </xsl:if>
-    <xsl:if test="boolean(@lower-limit)">
-      <xsl:value-of
-        select="concat('      builder.setLowerLimit(',
-                       @lower-limit, ');&#xa;')" />
-    </xsl:if>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/ip-address-mask.xsl b/opendj-server-legacy/resource/admin/property-types/ip-address-mask.xsl
deleted file mode 100644
index 31339ad..0000000
--- a/opendj-server-legacy/resource/admin/property-types/ip-address-mask.xsl
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing IP address mask properties.
-  -->
-  <xsl:template match="adm:ip-address-mask" mode="java-value-imports">
-    <import>org.forgerock.opendj.ldap.AddressMask</import>
-  </xsl:template>
-  <xsl:template match="adm:ip-address-mask" mode="java-value-type">
-    <xsl:value-of select="'AddressMask'" />
-  </xsl:template>
-  <xsl:template match="adm:ip-address-mask" mode="java-definition-type">
-    <xsl:value-of select="'IPAddressMaskPropertyDefinition'" />
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/ip-address.xsl b/opendj-server-legacy/resource/admin/property-types/ip-address.xsl
deleted file mode 100644
index 9a5d74b..0000000
--- a/opendj-server-legacy/resource/admin/property-types/ip-address.xsl
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing IP address properties.
-  -->
-  <xsl:template match="adm:ip-address" mode="java-value-imports">
-    <import>java.net.InetAddress</import>
-  </xsl:template>
-  <xsl:template match="adm:ip-address" mode="java-value-type">
-    <xsl:value-of select="'InetAddress'" />
-  </xsl:template>
-  <xsl:template match="adm:ip-address" mode="java-definition-type">
-    <xsl:value-of select="'IPAddressPropertyDefinition'" />
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/java-class.xsl b/opendj-server-legacy/resource/admin/property-types/java-class.xsl
deleted file mode 100644
index 5074c7a..0000000
--- a/opendj-server-legacy/resource/admin/property-types/java-class.xsl
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing java class properties.
-  -->
-  <xsl:template match="adm:java-class" mode="java-value-type">
-    <xsl:value-of select="'String'" />
-  </xsl:template>
-  <xsl:template match="adm:java-class" mode="java-definition-type">
-    <xsl:value-of select="'ClassPropertyDefinition'" />
-  </xsl:template>
-  <xsl:template match="adm:java-class" mode="java-definition-ctor">
-    <xsl:for-each select="adm:instance-of">
-      <!-- 
-        The first instance of element added to the definition
-        will become the primary type for the class. This first
-        element is guaranteed to be the first instance-of field
-        appearing in the property's definition heirarchy working
-        up from the bottom.
-      -->
-      <xsl:value-of
-        select="concat('      builder.addInstanceOf(&quot;',
-                       normalize-space(), '&quot;);&#xa;')" />
-    </xsl:for-each>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/oid.xsl b/opendj-server-legacy/resource/admin/property-types/oid.xsl
deleted file mode 100644
index ada4875..0000000
--- a/opendj-server-legacy/resource/admin/property-types/oid.xsl
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing OID properties.
-  -->
-  <xsl:template match="adm:oid" mode="java-value-type">
-    <xsl:value-of select="'String'" />
-  </xsl:template>
-  <xsl:template match="adm:oid" mode="java-definition-type">
-    <xsl:value-of select="'StringPropertyDefinition'" />
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/password.xsl b/opendj-server-legacy/resource/admin/property-types/password.xsl
deleted file mode 100644
index 246f423..0000000
--- a/opendj-server-legacy/resource/admin/property-types/password.xsl
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing password properties.
-  -->
-  <xsl:template match="adm:password" mode="java-value-type">
-    <xsl:value-of select="'String'" />
-  </xsl:template>
-  <xsl:template match="adm:password" mode="java-definition-type">
-    <xsl:value-of select="'StringPropertyDefinition'" />
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/size.xsl b/opendj-server-legacy/resource/admin/property-types/size.xsl
deleted file mode 100644
index 699446c..0000000
--- a/opendj-server-legacy/resource/admin/property-types/size.xsl
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing size properties.
-  -->
-  <xsl:template match="adm:size" mode="java-value-type">
-    <xsl:value-of select="'Long'" />
-  </xsl:template>
-  <xsl:template match="adm:size" mode="java-value-primitive-type">
-    <xsl:value-of select="'long'" />
-  </xsl:template>
-  <xsl:template match="adm:size" mode="java-definition-type">
-    <xsl:value-of select="'SizePropertyDefinition'" />
-  </xsl:template>
-  <xsl:template match="adm:size" mode="java-definition-ctor">
-    <xsl:if test="boolean(@allow-unlimited)">
-      <xsl:value-of
-        select="concat('      builder.setAllowUnlimited(',
-                       @allow-unlimited, ');&#xa;')" />
-    </xsl:if>
-    <xsl:if test="boolean(@upper-limit)">
-      <xsl:value-of
-        select="concat('      builder.setUpperLimit(&quot;',
-                       @upper-limit, '&quot;);&#xa;')" />
-    </xsl:if>
-    <xsl:if test="boolean(@lower-limit)">
-      <xsl:value-of
-        select="concat('      builder.setLowerLimit(&quot;',
-                       @lower-limit, '&quot;);&#xa;')" />
-    </xsl:if>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/property-types/string.xsl b/opendj-server-legacy/resource/admin/property-types/string.xsl
deleted file mode 100644
index b1776ab..0000000
--- a/opendj-server-legacy/resource/admin/property-types/string.xsl
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!-- 
-    Templates for processing string properties.
-  -->
-  <xsl:template match="adm:string" mode="java-value-type">
-    <xsl:value-of select="'String'" />
-  </xsl:template>
-  <xsl:template match="adm:string" mode="java-definition-type">
-    <xsl:value-of select="'StringPropertyDefinition'" />
-  </xsl:template>
-  <xsl:template match="adm:string" mode="java-definition-ctor">
-    <xsl:if test="boolean(@case-insensitive)">
-      <xsl:value-of
-        select="concat('      builder.setCaseInsensitive(',
-                       @case-insensitive, ');&#xa;')" />
-    </xsl:if>
-    <xsl:if test="adm:pattern/adm:regex">
-      <xsl:value-of
-        select="concat('      builder.setPattern(&quot;',
-                       normalize-space(adm:pattern/adm:regex), '&quot;, &quot;',
-                       normalize-space(adm:pattern/adm:usage), '&quot;);&#xa;')" />
-    </xsl:if>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/serverMO.xsl b/opendj-server-legacy/resource/admin/serverMO.xsl
deleted file mode 100644
index fe4534b..0000000
--- a/opendj-server-legacy/resource/admin/serverMO.xsl
+++ /dev/null
@@ -1,410 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2007-2008 Sun Microsystems, Inc.
-  Portions Copyright 2014 ForgeRock AS.
-  ! -->
-<xsl:stylesheet version="1.0" xmlns:adm="http://www.opends.org/admin"
-  xmlns:admpp="http://www.opends.org/admin-preprocessor"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="java-utilities.xsl" />
-  <xsl:import href="preprocessor.xsl" />
-  <xsl:import href="property-types.xsl" />
-  <xsl:output method="text" encoding="us-ascii" />
-  <!--
-    Template for generating the interface declaration.
-  -->
-  <xsl:template name="generate-interface-declaration">
-    <xsl:value-of select="'/**&#xa;'" />
-    <xsl:call-template name="add-java-comment">
-      <xsl:with-param name="indent-text" select="' *'" />
-      <xsl:with-param name="content"
-        select="concat('A server-side interface for querying ', $this-ufn,
-                       ' settings.')" />
-    </xsl:call-template>
-    <xsl:value-of select="' * &lt;p&gt;&#xa;'" />
-    <xsl:call-template name="add-java-comment">
-      <xsl:with-param name="indent-text" select="' *'" />
-      <xsl:with-param name="content" select="$this/adm:synopsis" />
-    </xsl:call-template>
-    <xsl:value-of select="' */&#xa;'" />
-    <xsl:value-of
-      select="concat('public interface ',
-                                   $this-java-class ,
-                                   'Cfg extends ')" />
-    <xsl:choose>
-      <xsl:when test="boolean($this/@extends)">
-        <xsl:value-of select="concat($parent-java-class,'Cfg ')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="'Configuration '" />
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>{&#xa;</xsl:text>
-  </xsl:template>
-  <!--
-    Template for generating the configuration class getter.
-  -->
-  <xsl:template name="generate-configuration-definition-getter">
-    <xsl:value-of
-      select="concat('  /**&#xa;',
-                       '   * Gets the configuration class associated with this ', $this-ufn, '.&#xa;',
-                       '   *&#xa;',
-                       '   * @return Returns the configuration class associated with this ', $this-ufn, '.&#xa;',
-                       '   */&#xa;')" />
-    <xsl:value-of
-      select="concat('  Class&lt;? extends ', $this-java-class,'Cfg&gt; configurationClass();&#xa;')" />
-  </xsl:template>
-  <!--
-    Template for generating the change listener declaration.
-  -->
-  <xsl:template name="generate-change-listener-declaration">
-    <xsl:value-of
-      select="concat('  /**&#xa;',
-                       '   * Register to be notified when this ', $this-ufn,' is changed.&#xa;',
-                       '   *&#xa;',
-                       '   * @param listener&#xa;',
-                       '   *          The ', $this-ufn,' configuration change listener.&#xa;',
-                       '   */&#xa;')" />
-    <xsl:value-of
-      select="concat('  void add', $this-short-java-class,
-                       'ChangeListener(ConfigurationChangeListener&lt;',
-                       $this-java-class,'Cfg&gt; listener);&#xa;')" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:value-of
-      select="concat('  /**&#xa;',
-                       '   * Deregister an existing ', $this-ufn,' configuration change listener.&#xa;',
-                       '   *&#xa;',
-                       '   * @param listener&#xa;',
-                       '   *          The ', $this-ufn,' configuration change listener.&#xa;',
-                       '   */&#xa;')" />
-    <xsl:value-of
-      select="concat('  void remove', $this-short-java-class,
-                       'ChangeListener(ConfigurationChangeListener&lt;',
-                       $this-java-class,'Cfg&gt; listener);&#xa;')" />
-  </xsl:template>
-  <!--
-    Template for generating the relation getter declarations.
-  -->
-  <xsl:template name="generate-relation-declarations">
-    <xsl:variable name="name" select="@name" />
-    <xsl:variable name="ufn">
-      <xsl:call-template name="name-to-ufn">
-        <xsl:with-param name="value" select="$name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="java-relation-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="$name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="java-class-name">
-      <xsl:call-template name="name-to-java">
-        <xsl:with-param name="value" select="@managed-object-name" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="adm:one-to-one">
-        <xsl:value-of
-          select="concat('  /**&#xa;',
-                       '   * Gets the ', $ufn,'.&#xa;',
-                       '   *&#xa;',
-                       '   * @return Returns the ', $ufn,'.&#xa;',
-                       '   * @throws ConfigException&#xa;',
-                       '   *           If the ', $ufn,' could not be found or it could not&#xa;',
-                       '   *           be successfully decoded.&#xa;',
-                       '   */&#xa;')" />
-        <xsl:value-of
-          select="concat('  ', $java-class-name, 'Cfg get',
-                       $java-relation-name, '() throws ConfigException;&#xa;')" />
-      </xsl:when>
-      <xsl:when test="adm:one-to-zero-or-one">
-        <xsl:value-of
-          select="concat('  /**&#xa;',
-                       '   * Determines whether or not the ', $ufn,' exists.&#xa;',
-                       '   *&#xa;',
-                       '   * @return Returns &lt;true&gt; if the ', $ufn,' exists.&#xa;',
-                       '   */&#xa;')" />
-        <xsl:value-of
-          select="concat('  boolean has',
-                       $java-relation-name, '();&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('  /**&#xa;',
-                       '   * Gets the ', $ufn,' if it is present.&#xa;',
-                       '   *&#xa;',
-                       '   * @return Returns the ', $ufn,' if it is present.&#xa;',
-                       '   * @throws ConfigException&#xa;',
-                       '   *           If the ', $ufn,' does not exist or it could not&#xa;',
-                       '   *           be successfully decoded.&#xa;',
-                       '   */&#xa;')" />
-        <xsl:value-of
-          select="concat('  ', $java-class-name, 'Cfg get',
-                       $java-relation-name, '() throws ConfigException;&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('  /**&#xa;',
-                       '   * Registers to be notified when the ', $ufn,' is added.&#xa;',
-                       '   *&#xa;',
-                       '   * @param listener&#xa;',
-                       '   *          The ', $ufn,' configuration add listener.&#xa;',
-                       '   * @throws ConfigException&#xa;',
-                       '   *          If the add listener could not be registered.&#xa;',
-                       '   */&#xa;')" />
-        <xsl:value-of
-          select="concat('  void add', $java-relation-name,
-                       'AddListener(ConfigurationAddListener&lt;',
-                       $java-class-name,'Cfg&gt; listener) throws ConfigException;&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('  /**&#xa;',
-                       '   * Deregisters an existing ', $ufn,' configuration add listener.&#xa;',
-                       '   *&#xa;',
-                       '   * @param listener&#xa;',
-                       '   *          The ', $ufn,' configuration add listener.&#xa;',
-                       '   */&#xa;')" />
-        <xsl:value-of
-          select="concat('  void remove', $java-relation-name,
-                       'AddListener(ConfigurationAddListener&lt;',
-                       $java-class-name,'Cfg&gt; listener);&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('  /**&#xa;',
-                       '   * Registers to be notified the ', $ufn,' is deleted.&#xa;',
-                       '   *&#xa;',
-                       '   * @param listener&#xa;',
-                       '   *          The ', $ufn,' configuration delete listener.&#xa;',
-                       '   * @throws ConfigException&#xa;',
-                       '   *          If the delete listener could not be registered.&#xa;',
-                       '   */&#xa;')" />
-        <xsl:value-of
-          select="concat('  void add', $java-relation-name,
-                       'DeleteListener(ConfigurationDeleteListener&lt;',
-                       $java-class-name,'Cfg&gt; listener) throws ConfigException;&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('  /**&#xa;',
-                       '   * Deregisters an existing ', $ufn,' configuration delete listener.&#xa;',
-                       '   *&#xa;',
-                       '   * @param listener&#xa;',
-                       '   *          The ', $ufn,' configuration delete listener.&#xa;',
-                       '   */&#xa;')" />
-        <xsl:value-of
-          select="concat('  void remove', $java-relation-name,
-                       'DeleteListener(ConfigurationDeleteListener&lt;',
-                       $java-class-name,'Cfg&gt; listener);&#xa;')" />
-      </xsl:when>
-      <xsl:when test="adm:one-to-many">
-        <xsl:variable name="plural-name"
-          select="adm:one-to-many/@plural-name" />
-        <xsl:variable name="ufpn">
-          <xsl:call-template name="name-to-ufn">
-            <xsl:with-param name="value" select="$plural-name" />
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="java-relation-plural-name">
-          <xsl:call-template name="name-to-java">
-            <xsl:with-param name="value" select="$plural-name" />
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:value-of
-          select="concat('  /**&#xa;',
-                       '   * Lists the ', $ufpn, '.&#xa;',
-                       '   *&#xa;',
-                       '   * @return Returns an array containing the names of the&#xa;',
-                       '   *         ', $ufpn,'.&#xa;',
-                       '   */&#xa;')" />
-        <xsl:value-of
-          select="concat('  String[] list', $java-relation-plural-name, '();&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('  /**&#xa;',
-                       '   * Gets the named ', $ufn,'.&#xa;',
-                       '   *&#xa;',
-                       '   * @param name&#xa;',
-                       '   *          The name of the ',$ufn,' to retrieve.&#xa;',
-                       '   * @return Returns the named ', $ufn,'.&#xa;',
-                       '   * @throws ConfigException&#xa;',
-                       '   *           If the ', $ufn,' could not be found or it&#xa;',
-                       '   *           could not be successfully decoded.&#xa;',
-                       '   */&#xa;')" />
-        <xsl:value-of
-          select="concat('  ', $java-class-name, 'Cfg get',
-                       $java-relation-name, '(String name) throws ConfigException;&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('  /**&#xa;',
-                       '   * Registers to be notified when new ', $ufpn,' are added.&#xa;',
-                       '   *&#xa;',
-                       '   * @param listener&#xa;',
-                       '   *          The ', $ufn,' configuration add listener.&#xa;',
-                       '   * @throws ConfigException&#xa;',
-                       '   *          If the add listener could not be registered.&#xa;',
-                       '   */&#xa;')" />
-        <xsl:value-of
-          select="concat('  void add', $java-relation-name,
-                       'AddListener(ConfigurationAddListener&lt;',
-                       $java-class-name,'Cfg&gt; listener) throws ConfigException;&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('  /**&#xa;',
-                       '   * Deregisters an existing ', $ufn,' configuration add listener.&#xa;',
-                       '   *&#xa;',
-                       '   * @param listener&#xa;',
-                       '   *          The ', $ufn,' configuration add listener.&#xa;',
-                       '   */&#xa;')" />
-        <xsl:value-of
-          select="concat('  void remove', $java-relation-name,
-                       'AddListener(ConfigurationAddListener&lt;',
-                       $java-class-name,'Cfg&gt; listener);&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('  /**&#xa;',
-                       '   * Registers to be notified when existing ', $ufpn,' are deleted.&#xa;',
-                       '   *&#xa;',
-                       '   * @param listener&#xa;',
-                       '   *          The ', $ufn,' configuration delete listener.&#xa;',
-                       '   * @throws ConfigException&#xa;',
-                       '   *          If the delete listener could not be registered.&#xa;',
-                       '   */&#xa;')" />
-        <xsl:value-of
-          select="concat('  void add', $java-relation-name,
-                       'DeleteListener(ConfigurationDeleteListener&lt;',
-                       $java-class-name,'Cfg&gt; listener) throws ConfigException;&#xa;')" />
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:text>&#xa;</xsl:text>
-        <xsl:value-of
-          select="concat('  /**&#xa;',
-                       '   * Deregisters an existing ', $ufn,' configuration delete listener.&#xa;',
-                       '   *&#xa;',
-                       '   * @param listener&#xa;',
-                       '   *          The ', $ufn,' configuration delete listener.&#xa;',
-                       '   */&#xa;')" />
-        <xsl:value-of
-          select="concat('  void remove', $java-relation-name,
-                       'DeleteListener(ConfigurationDeleteListener&lt;',
-                       $java-class-name,'Cfg&gt; listener);&#xa;')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message terminate="yes">
-          <xsl:value-of
-            select="concat('Unknown relation type &quot;', local-name(*), '&quot; in relation &quot;', $name, '&quot;.')" />
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!--
-    Main document parsing template.
-  -->
-  <xsl:template match="/">
-    <xsl:call-template name="copyright-notice" />
-    <xsl:value-of
-      select="concat('package ', $this-package, '.server;&#xa;')" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:call-template name="generate-import-statements">
-      <xsl:with-param name="imports">
-        <xsl:for-each select="$this-local-properties">
-          <xsl:call-template name="get-property-java-imports" >
-            <xsl:with-param name="interface" select="'server'" />
-          </xsl:call-template>
-        </xsl:for-each>
-        <xsl:if test="$this-local-properties[@multi-valued='true']">
-          <import>java.util.SortedSet</import>
-        </xsl:if>
-        <xsl:choose>
-          <xsl:when test="$this/@extends">
-            <xsl:if test="$parent-package != $this-package">
-              <xsl:element name="import">
-                <xsl:value-of
-                  select="concat($parent-package, '.server.', $parent-java-class, 'Cfg')" />
-              </xsl:element>
-            </xsl:if>
-          </xsl:when>
-          <xsl:otherwise>
-            <import>org.opends.server.admin.Configuration</import>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:if test="not($this-is-root)">
-          <import>
-            org.opends.server.admin.server.ConfigurationChangeListener
-          </import>
-        </xsl:if>
-        <xsl:if test="$this-local-relations">
-          <import>org.forgerock.opendj.config.server.ConfigException</import>
-        </xsl:if>
-        <xsl:if
-          test="$this-local-relations/adm:one-to-zero-or-one|$this-local-relations/adm:one-to-many">
-          <import>
-            org.opends.server.admin.server.ConfigurationAddListener
-          </import>
-          <import>
-            org.opends.server.admin.server.ConfigurationDeleteListener
-          </import>
-        </xsl:if>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:call-template name="generate-interface-declaration" />
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:call-template name="generate-configuration-definition-getter" />
-    <xsl:if test="not($this-is-root)">
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-change-listener-declaration" />
-    </xsl:if>
-    <xsl:for-each select="$this-local-properties">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-property-getter-declaration">
-        <xsl:with-param name="interface" select="'server'" />
-      </xsl:call-template>
-    </xsl:for-each>
-    <xsl:for-each select="$this-local-relations">
-      <xsl:sort select="@name" />
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:text>&#xa;</xsl:text>
-      <xsl:call-template name="generate-relation-declarations" />
-    </xsl:for-each>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:text>}&#xa;</xsl:text>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/text-utilities.xsl b/opendj-server-legacy/resource/admin/text-utilities.xsl
deleted file mode 100644
index 4b9fd94..0000000
--- a/opendj-server-legacy/resource/admin/text-utilities.xsl
+++ /dev/null
@@ -1,176 +0,0 @@
-<!--
-  The contents of this file are subject to the terms of the Common Development and
-  Distribution License (the License). You may not use this file except in compliance with the
-  License.
-
-  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
-  specific language governing permission and limitations under the License.
-
-  When distributing Covered Software, include this CDDL Header Notice in each file and include
-  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
-  Header, with the fields enclosed by brackets [] replaced by your own identifying
-  information: "Portions Copyright [year] [name of copyright owner]".
-
-  Copyright 2008 Sun Microsystems, Inc.
-  ! -->
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <!--
-    This XSLT file contains generic templates which can be used for any
-    application.
-  -->
-  <xsl:import href="abbreviations.xsl" />
-  <xsl:output method="text" encoding="us-ascii" />
-  <!--
-    Format a block of text. This template handles two levels of
-    indentation: the indentation string for the first line, and a
-    second indentation string used for subsequent lines. The template
-    will output the content wrapping at the nearest word boundary to
-    the specified column.
-    
-    @param indent-text
-    The indentation text used for the first line.
-    
-    @param indent-text2
-    The indentation text used for all lines except
-    the first - defaults to the value of indent-text.
-    
-    @param content
-    The text to be formatted.
-    
-    @param wrap-column
-    The text column before which text should be word
-    wrapped.
-  -->
-  <xsl:template name="format-text">
-    <xsl:param name="indent-text" />
-    <xsl:param name="indent-text2" select="$indent-text" />
-    <xsl:param name="wrap-column" />
-    <xsl:param name="content" />
-    <xsl:value-of select="$indent-text" />
-    <xsl:call-template name="format-text-help">
-      <xsl:with-param name="indent-text" select="$indent-text2" />
-      <xsl:with-param name="wrap-column" select="$wrap-column" />
-      <xsl:with-param name="content" select="normalize-space($content)" />
-      <xsl:with-param name="column"
-        select="string-length($indent-text) + 1" />
-    </xsl:call-template>
-    <xsl:text>&#xa;</xsl:text>
-  </xsl:template>
-  <!--
-    PRIVATE implementation template for format-text.
-  -->
-  <xsl:template name="format-text-help">
-    <xsl:param name="indent-text" />
-    <xsl:param name="wrap-column" />
-    <xsl:param name="content" />
-    <xsl:param name="column" />
-    <xsl:variable name="head" select="substring-before($content, ' ')" />
-    <xsl:variable name="tail" select="substring-after($content, ' ')" />
-    <xsl:if test="string-length($content)">
-      <xsl:choose>
-        <xsl:when test="string-length($head) = 0">
-          <xsl:if
-            test="(string-length($content) + $column) > $wrap-column">
-            <xsl:text>&#xa;</xsl:text>
-            <xsl:value-of select="$indent-text" />
-          </xsl:if>
-          <xsl:value-of select="' '" />
-          <xsl:value-of select="$content" />
-        </xsl:when>
-        <xsl:when
-          test="(string-length($head) + $column) > $wrap-column">
-          <xsl:text>&#xa;</xsl:text>
-          <xsl:value-of select="$indent-text" />
-          <xsl:value-of select="' '" />
-          <xsl:value-of select="$head" />
-          <xsl:call-template name="format-text-help">
-            <xsl:with-param name="indent-text" select="$indent-text" />
-            <xsl:with-param name="wrap-column" select="$wrap-column" />
-            <xsl:with-param name="content" select="$tail" />
-            <xsl:with-param name="column"
-              select="string-length($indent-text) + string-length($head) + 1" />
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="concat(' ', $head)" />
-          <xsl:call-template name="format-text-help">
-            <xsl:with-param name="indent-text" select="$indent-text" />
-            <xsl:with-param name="wrap-column" select="$wrap-column" />
-            <xsl:with-param name="content" select="$tail" />
-            <xsl:with-param name="column"
-              select="$column + string-length($head) + 1" />
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-  <!--
-    Convert a string to title-case or, if the string is a known
-    abbreviation, convert it to upper-case. For example, the string
-    "hello" will be converted to the string "Hello", but the string
-    "ldap" will be converted to "LDAP".
-    
-    @param value
-    The string to be converted to title-case.
-  -->
-  <xsl:template name="to-title-case">
-    <xsl:param name="value" />
-    <xsl:variable name="is-abbreviation">
-      <xsl:call-template name="is-abbreviation">
-        <xsl:with-param name="value" select="$value" />
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:choose>
-      <!-- Convert common abbreviations to uppercase -->
-      <xsl:when test="$is-abbreviation = 'true'">
-        <xsl:value-of
-          select="translate($value,
-                            'abcdefghijklmnopqrstuvwxyz',
-                            'ABCDEFGHIJKLMNOPQRSTUVWXYZ')" />
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="first" select="substring($value, 1, 1)" />
-        <xsl:variable name="remainder" select="substring($value, 2)" />
-        <xsl:variable name="first-upper"
-          select="translate($first,
-                            'abcdefghijklmnopqrstuvwxyz',
-                            'ABCDEFGHIJKLMNOPQRSTUVWXYZ')" />
-        <xsl:value-of select="concat($first-upper, $remainder)" />
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <!--
-    Convert an entity or property ID to a user friendly mixed-cased
-    name. For example, the string "my-string-value" will be converted to
-    the string "My String Value".
-    
-    @param value
-    The ID string to be converted to a Java name.
-  -->
-  <xsl:template name="name-to-ufn">
-    <xsl:param name="value" select="/.." />
-    <xsl:if test="string-length($value)">
-      <xsl:choose>
-        <xsl:when test="contains($value, '-')">
-          <xsl:variable name="head"
-            select="substring-before($value, '-')" />
-          <xsl:variable name="tail"
-            select="substring-after($value, '-')" />
-          <xsl:call-template name="to-title-case">
-            <xsl:with-param name="value" select="$head" />
-          </xsl:call-template>
-          <xsl:value-of select="' '" />
-          <xsl:call-template name="name-to-ufn">
-            <xsl:with-param name="value" select="$tail" />
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="to-title-case">
-            <xsl:with-param name="value" select="$value" />
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/opendj-server-legacy/resource/admin/xml.xsd b/opendj-server-legacy/resource/admin/xml.xsd
deleted file mode 100644
index bb367cc..0000000
--- a/opendj-server-legacy/resource/admin/xml.xsd
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-
- <xs:annotation>
-  <xs:documentation>
-   See http://www.w3.org/XML/1998/namespace.html and
-   http://www.w3.org/TR/REC-xml for information about this namespace.
-
-    This schema document describes the XML namespace, in a form
-    suitable for import by other schema documents.  
-
-    Note that local names in this namespace are intended to be defined
-    only by the World Wide Web Consortium or its subgroups.  The
-    following names are currently defined in this namespace and should
-    not be used with conflicting semantics by any Working Group,
-    specification, or document instance:
-
-    base (as an attribute name): denotes an attribute whose value
-         provides a URI to be used as the base for interpreting any
-         relative URIs in the scope of the element on which it
-         appears; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML Base specification.
-
-    id   (as an attribute name): denotes an attribute whose value
-         should be interpreted as if declared to be of type ID.
-         The xml:id specification is not yet a W3C Recommendation,
-         but this attribute is included here to facilitate experimentation
-         with the mechanisms it proposes.  Note that it is _not_ included
-         in the specialAttrs attribute group.
-
-    lang (as an attribute name): denotes an attribute whose value
-         is a language code for the natural language of the content of
-         any element; its value is inherited.  This name is reserved
-         by virtue of its definition in the XML specification.
-  
-    space (as an attribute name): denotes an attribute whose
-         value is a keyword indicating what whitespace processing
-         discipline is intended for the content of the element; its
-         value is inherited.  This name is reserved by virtue of its
-         definition in the XML specification.
-
-    Father (in any context at all): denotes Jon Bosak, the chair of 
-         the original XML Working Group.  This name is reserved by 
-         the following decision of the W3C XML Plenary and 
-         XML Coordination groups:
-
-             In appreciation for his vision, leadership and dedication
-             the W3C XML Plenary on this 10th day of February, 2000
-             reserves for Jon Bosak in perpetuity the XML name
-             xml:Father
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>This schema defines attributes and an attribute group
-        suitable for use by
-        schemas wishing to allow xml:base, xml:lang, xml:space or xml:id
-        attributes on elements they define.
-
-        To enable this, such a schema must import this schema
-        for the XML namespace, e.g. as follows:
-        &lt;schema . . .&gt;
-         . . .
-         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                    schemaLocation="http://www.w3.org/2001/xml.xsd"/&gt;
-
-        Subsequently, qualified reference to any of the attributes
-        or the group defined below will have the desired effect, e.g.
-
-        &lt;type . . .&gt;
-         . . .
-         &lt;attributeGroup ref="xml:specialAttrs"/&gt;
- 
-         will define a type which will schema-validate an instance
-         element with any of those attributes</xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>In keeping with the XML Schema WG's standard versioning
-   policy, this schema document will persist at
-   http://www.w3.org/2005/08/xml.xsd.
-   At the date of issue it can also be found at
-   http://www.w3.org/2001/xml.xsd.
-   The schema document at that URI may however change in the future,
-   in order to remain compatible with the latest version of XML Schema
-   itself, or with the XML namespace itself.  In other words, if the XML
-   Schema or XML namespaces change, the version of this document at
-   http://www.w3.org/2001/xml.xsd will change
-   accordingly; the version at
-   http://www.w3.org/2005/08/xml.xsd will not change.
-  </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang">
-  <xs:annotation>
-   <xs:documentation>Attempting to install the relevant ISO 2- and 3-letter
-         codes as the enumerated possible values is probably never
-         going to be a realistic possibility.  See
-         RFC 3066 at http://www.ietf.org/rfc/rfc3066.txt and the IANA registry
-         at http://www.iana.org/assignments/lang-tag-apps.htm for
-         further information.
-
-         The union allows for the 'un-declaration' of xml:lang with
-         the empty string.</xs:documentation>
-  </xs:annotation>
-  <xs:simpleType>
-   <xs:union memberTypes="xs:language">
-    <xs:simpleType>    
-     <xs:restriction base="xs:string">
-      <xs:enumeration value=""/>
-     </xs:restriction>
-    </xs:simpleType>
-   </xs:union>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="space">
-  <xs:simpleType>
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
-  <xs:annotation>
-   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
-                     information about this attribute.</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
- 
- <xs:attribute name="id" type="xs:ID">
-  <xs:annotation>
-   <xs:documentation>See http://www.w3.org/TR/xml-id/ for
-                     information about this attribute.</xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>
\ No newline at end of file
diff --git a/opendj-server-legacy/resource/schema/03-rfc3712.ldif b/opendj-server-legacy/resource/schema/03-rfc3712.ldif
index e86e0f2..752073e 100644
--- a/opendj-server-legacy/resource/schema/03-rfc3712.ldif
+++ b/opendj-server-legacy/resource/schema/03-rfc3712.ldif
@@ -11,6 +11,7 @@
 # information: "Portions Copyright [year] [name of copyright owner]".
 #
 # Copyright 2006-2010 Sun Microsystems, Inc.
+# Portions Copyright 2016 ForgeRock AS.
 
 # This file contains schema definitions from RFC 3712, which defines a
 # mechanism for storing printer information in the Directory Server.
@@ -58,7 +59,7 @@
   SYNTAX  1.3.6.1.4.1.1466.115.121.1.15{127} X-ORIGIN 'RFC 3712' )
 attributeTypes: ( 1.3.18.0.2.4.1132
   NAME 'printer-multiple-document-jobs-supported'
-  DESC 'Indicates whether or not this printer supports more than one document
+  DESC 'Indicates whether this printer supports more than one document
   per job.' EQUALITY booleanMatch SYNTAX  1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE X-ORIGIN 'RFC 3712' )
 attributeTypes: ( 1.3.18.0.2.4.1109 NAME 'printer-charset-configured'
diff --git a/opendj-server-legacy/src/admin/messages/CertificateAttributeSyntaxCfgDefn.properties b/opendj-server-legacy/src/admin/messages/CertificateAttributeSyntaxCfgDefn.properties
index 59f050c..a6d10fb 100644
--- a/opendj-server-legacy/src/admin/messages/CertificateAttributeSyntaxCfgDefn.properties
+++ b/opendj-server-legacy/src/admin/messages/CertificateAttributeSyntaxCfgDefn.properties
@@ -3,5 +3,5 @@
 synopsis=Certificate Attribute Syntaxes define an attribute syntax for storing X.509 Certificates.
 property.enabled.synopsis=Indicates whether the Certificate Attribute Syntax is enabled.
 property.java-class.synopsis=Specifies the fully-qualified name of the Java class that provides the Certificate Attribute Syntax implementation.
-property.strict-format.synopsis=Indicates whether or not X.509 Certificate values are required to strictly comply with the standard definition for this syntax.
+property.strict-format.synopsis=Indicates whether X.509 Certificate values are required to strictly comply with the standard definition for this syntax.
 property.strict-format.description=When set to false, certificates will not be validated and, as a result any sequence of bytes will be acceptable.
diff --git a/opendj-server-legacy/src/admin/messages/CoreSchemaCfgDefn.properties b/opendj-server-legacy/src/admin/messages/CoreSchemaCfgDefn.properties
index c524489..a4a9253 100644
--- a/opendj-server-legacy/src/admin/messages/CoreSchemaCfgDefn.properties
+++ b/opendj-server-legacy/src/admin/messages/CoreSchemaCfgDefn.properties
@@ -12,7 +12,7 @@
 property.disabled-syntax.syntax.string.pattern.synopsis=The OID of the disabled syntax, or NONE
 property.enabled.synopsis=Indicates whether the Core Schema is enabled for use.
 property.java-class.synopsis=Specifies the fully-qualified name of the Java class that provides the Core Schema implementation.
-property.strict-format-country-string.synopsis=Indicates whether or not country code values are required to strictly comply with the standard definition for this syntax.
+property.strict-format-country-string.synopsis=Indicates whether country code values are required to strictly comply with the standard definition for this syntax.
 property.strict-format-country-string.description=When set to false, country codes will not be validated and, as a result any string containing 2 characters will be acceptable.
 property.strip-syntax-min-upper-bound-attribute-type-description.synopsis=Indicates whether the suggested minimum upper bound appended to an attribute's syntax OID in it's schema definition Attribute Type Description is stripped off.
 property.strip-syntax-min-upper-bound-attribute-type-description.description=When retrieving the server's schema, some APIs (JNDI) fail in their syntax lookup methods, because they do not parse this value correctly. This configuration option allows the server to be configured to provide schema definitions these APIs can parse correctly.
diff --git a/opendj-server-legacy/src/admin/messages/CountryStringAttributeSyntaxCfgDefn.properties b/opendj-server-legacy/src/admin/messages/CountryStringAttributeSyntaxCfgDefn.properties
index f8b6e00..b78390a 100644
--- a/opendj-server-legacy/src/admin/messages/CountryStringAttributeSyntaxCfgDefn.properties
+++ b/opendj-server-legacy/src/admin/messages/CountryStringAttributeSyntaxCfgDefn.properties
@@ -3,5 +3,5 @@
 synopsis=Country String Attribute Syntaxes define an attribute syntax for storing country codes.
 property.enabled.synopsis=Indicates whether the Country String Attribute Syntax is enabled.
 property.java-class.synopsis=Specifies the fully-qualified name of the Java class that provides the Country String Attribute Syntax implementation.
-property.strict-format.synopsis=Indicates whether or not country code values are required to strictly comply with the standard definition for this syntax.
+property.strict-format.synopsis=Indicates whether country code values are required to strictly comply with the standard definition for this syntax.
 property.strict-format.description=When set to false, country codes will not be validated and, as a result any string containing 2 characters will be acceptable.
diff --git a/opendj-server-legacy/src/admin/messages/ExternalChangelogDomainCfgDefn.properties b/opendj-server-legacy/src/admin/messages/ExternalChangelogDomainCfgDefn.properties
index 9ecbef0..4c7c34b 100644
--- a/opendj-server-legacy/src/admin/messages/ExternalChangelogDomainCfgDefn.properties
+++ b/opendj-server-legacy/src/admin/messages/ExternalChangelogDomainCfgDefn.properties
@@ -1,7 +1,7 @@
 user-friendly-name=External Changelog Domain
 user-friendly-plural-name=External Changelog Domains
 synopsis=The External Changelog Domain provides configuration of the external changelog for the replication domain.
-property.ecl-include.synopsis=Specifies a list of attributes which should be published with every change log entry, regardless of whether or not the attribute itself has changed.
+property.ecl-include.synopsis=Specifies a list of attributes which should be published with every change log entry, regardless of whether the attribute itself has changed.
 property.ecl-include.description=The list of attributes may include wild cards such as "*" and "+" as well as object class references prefixed with an ampersand, for example "@person". The included attributes will be published using the "includedAttributes" operational attribute as a single LDIF value rather like the "changes" attribute. For modify and modifyDN operations the included attributes will be taken from the entry before any changes were applied.
 property.ecl-include-for-deletes.synopsis=Specifies a list of attributes which should be published with every delete operation change log entry, in addition to those specified by the "ecl-include" property.
 property.ecl-include-for-deletes.description=This property provides a means for applications to archive entries after they have been deleted. See the description of the "ecl-include" property for further information about how the included attributes are published.
diff --git a/opendj-server-legacy/src/admin/messages/ReferentialIntegrityPluginCfgDefn.properties b/opendj-server-legacy/src/admin/messages/ReferentialIntegrityPluginCfgDefn.properties
index 274baa6..780a672 100644
--- a/opendj-server-legacy/src/admin/messages/ReferentialIntegrityPluginCfgDefn.properties
+++ b/opendj-server-legacy/src/admin/messages/ReferentialIntegrityPluginCfgDefn.properties
@@ -6,12 +6,12 @@
 property.attribute-type.description=At least one attribute type must be specified, and the syntax of any attributes must be either a distinguished name (1.3.6.1.4.1.1466.115.121.1.12) or name and optional UID (1.3.6.1.4.1.1466.115.121.1.34).
 property.base-dn.synopsis=Specifies the base DN that limits the scope within which referential integrity is maintained.
 property.base-dn.default-behavior.alias.synopsis=Referential integrity is maintained in all public naming contexts.
-property.check-references.synopsis=Specifies whether or not reference attributes must refer to existing entries.
+property.check-references.synopsis=Specifies whether reference attributes must refer to existing entries.
 property.check-references.description=When this property is set to true, this plugin will ensure that any new references added as part of an add or modify operation point to existing entries, and that the referenced entries match the filter criteria for the referencing attribute, if specified.
 property.check-references-filter-criteria.synopsis=Specifies additional filter criteria which will be enforced when checking references.
 property.check-references-filter-criteria.description=If a reference attribute has filter criteria defined then this plugin will ensure that any new references added as part of an add or modify operation refer to an existing entry which matches the specified filter.
 property.check-references-filter-criteria.syntax.string.pattern.synopsis=An attribute-filter mapping.
-property.check-references-scope-criteria.synopsis=Specifies whether or not referenced entries must reside within the same naming context as the entry containing the reference.
+property.check-references-scope-criteria.synopsis=Specifies whether referenced entries must reside within the same naming context as the entry containing the reference.
 property.check-references-scope-criteria.description=The reference scope will only be enforced when reference checking is enabled.
 property.check-references-scope-criteria.syntax.enumeration.value.global.synopsis=References may refer to existing entries located anywhere in the Directory.
 property.check-references-scope-criteria.syntax.enumeration.value.naming-context.synopsis=References must refer to existing entries located within the same naming context.
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java
index dc4c5e0..211f842 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ControlPanelLog.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
  */
 package org.opends.guitools.controlpanel.util;
 
@@ -89,7 +89,7 @@
   }
 
   /**
-   * Indicates whether or not the log file has been initialized.
+   * Indicates whether the log file has been initialized.
    * @return true when the log file has been initialized
    */
   public static boolean isInitialized() {
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
index 4ade2ef..0f714af 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallLauncher.java
@@ -169,9 +169,8 @@
   }
 
   /**
-   * Indicates whether or not the launcher should print a usage
-   * statement based on the content of the arguments passed into
-   * the constructor.
+   * Indicates whether the launcher should print a usage statement
+   * based on the content of the arguments passed into the constructor.
    * @return boolean where true indicates usage should be printed
    */
   protected boolean isNoPrompt() {
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
index 2facb8f..daaf8f8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
@@ -540,7 +540,7 @@
 
 
   /**
-   * Indicates whether or not this application is capable of cancelling
+   * Indicates whether this application is capable of cancelling
    * the operation performed in the run method.  A cancellable operation
    * should leave its environment in the same state as it was prior to
    * running the operation (files deleted, changes backed out etc.).
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
index 5dbe297..08e178b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Installation.java
@@ -359,7 +359,7 @@
   }
 
   /**
-   * Indicates whether or not this installation appears to be an actual OpenDJ
+   * Indicates whether this installation appears to be an actual OpenDJ
    * installation.
    *
    * @param file
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
index ddad227..0a44b64 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java
@@ -492,7 +492,7 @@
   }
 
   /**
-   * Sets whether or not this session should print messages to the
+   * Sets whether this session should print messages to the
    * console if in CLI mode.
    * @param quiet where true indicates this session should be quiet
    */
@@ -501,10 +501,10 @@
   }
 
   /**
-   * Indicates whether or not the user has requested quiet mode.
+   * Indicates whether the user has requested quiet mode.
    * <p>
    * Quiet mode in the CLI means that nothing is written to output including
-   * prompts for information and whether or not to continue an operation
+   * prompts for information and whether to continue an operation
    * experiencing errors.
    *
    * @return boolean where true indicates this session should be quiet.
@@ -514,7 +514,7 @@
   }
 
   /**
-   * Sets whether or not this session should be verbose.
+   * Sets whether this session should be verbose.
    * @param verbose where true indicates this session should be verbose
    */
   public void setVerbose(boolean verbose) {
@@ -522,7 +522,7 @@
   }
 
   /**
-   * Indicates whether or not the user has requested verbose mode.
+   * Indicates whether the user has requested verbose mode.
    *
    * @return boolean where true indicates this session should be verbose.
    */
@@ -531,7 +531,7 @@
   }
 
   /**
-   * Sets whether or not we must continue when there is a non critical error.
+   * Sets whether we must continue when there is a non critical error.
    * @param forceOnError where true indicates to continue uninstall if there is
    * a non critical error.
    */
@@ -540,7 +540,7 @@
   }
 
   /**
-   * Indicates whether or not the user has requested to continue when a non
+   * Indicates whether the user has requested to continue when a non
    * critical error occurs.
    *
    * @return boolean where true indicates to continue uninstall if there is a
@@ -551,7 +551,7 @@
   }
 
   /**
-   * Indicates whether or not the user has requested interactive mode.
+   * Indicates whether the user has requested interactive mode.
    * <p>
    * Interactive mode in the CLI means that the CLI will prompt the user
    * for more information if it is required.  Interactivity does NOT
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java
index 456f6d1..2d75fb8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2015 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
  */
 
 package org.opends.quicksetup.ui;
@@ -268,7 +268,7 @@
   }
 
   /**
-   * Indicates whether or not the user is allowed to return to a previous
+   * Indicates whether the user is allowed to return to a previous
    * step from <code>step</code>.
    * @param step WizardStep for which the the return value indicates whether
    * or not the user can return to a previous step
@@ -280,7 +280,7 @@
   }
 
   /**
-   * Indicates whether or not the user is allowed to move to a new
+   * Indicates whether the user is allowed to move to a new
    * step from <code>step</code>.
    * @param step WizardStep for which the the return value indicates whether
    * or not the user can move to a new step
@@ -292,7 +292,7 @@
   }
 
   /**
-   * Indicates whether or not the user is allowed to finish the wizard from
+   * Indicates whether the user is allowed to finish the wizard from
    * <code>step</code>.
    * @param step WizardStep for which the the return value indicates whether
    * or not the user can finish the wizard
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
index efe5ca7..e1e6361 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/FileManager.java
@@ -134,7 +134,7 @@
    * Move a file.
    * @param object File to move
    * @param newParent File representing new parent directory
-   * @param filter that will be asked whether or not the operation should be performed
+   * @param filter that will be asked whether the operation should be performed
    * @throws ApplicationException if something goes wrong
    */
   public void move(File object, File newParent, FileFilter filter)
@@ -160,7 +160,7 @@
   /**
    * Deletes a single file or directory.
    * @param object File to delete
-   * @param filter that will be asked whether or not the operation should be performed
+   * @param filter that will be asked whether the operation should be performed
    * @throws ApplicationException if something goes wrong
    */
   public void delete(File object, FileFilter filter)
@@ -292,7 +292,7 @@
   }
 
  /**
-  * Determines whether or not two files differ in content.
+  * Determines whether two files differ in content.
   *
   * @param f1 file to compare
   * @param f2 file to compare
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java
index 37fd555..abcf298 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/StandardOutputSuppressor.java
@@ -64,7 +64,7 @@
   }
 
   /**
-   * Checks whether or not this class has suppressed standard out streams.
+   * Checks whether this class has suppressed standard out streams.
    * @return boolean where true indicates output is suppressed
    */
   public static boolean isSuppressed() {
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
index 151d9d6..a96703d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
@@ -426,7 +426,7 @@
    *
    * @param f
    *          File for which parentage will be insured
-   * @return boolean indicating whether or not the input <code>f</code> has a
+   * @return boolean indicating whether the input <code>f</code> has a
    *         parent after this method is invoked.
    */
   static boolean ensureParentsExist(File f)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
index 0bbed86..0e1d35a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/cli/SecureConnectionCliArgs.java
@@ -111,7 +111,7 @@
   }
 
   /**
-   * Indicates whether or not any of the arguments are present.
+   * Indicates whether any of the arguments are present.
    *
    * @return boolean where true indicates that at least one of the arguments is
    *         present
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
index 7a2612f..3d03c5e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
@@ -206,7 +206,7 @@
 
 
   /**
-   * A boolean indicating whether or not the account associated with this
+   * A boolean indicating whether the account associated with this
    * authentication state has been administratively disabled.
    */
   protected ConditionResult isDisabled = ConditionResult.UNDEFINED;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/SubentryChangeListener.java b/opendj-server-legacy/src/main/java/org/opends/server/api/SubentryChangeListener.java
index ec9cc27..1ddc05f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/SubentryChangeListener.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/SubentryChangeListener.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
 package org.opends.server.api;
 
@@ -30,7 +30,7 @@
  * <BR><BR>
  * Each change listener will be notified whenever an update is being
  * made to subentry in the server, so the listener should use a very
- * efficient mechanism for determining whether or not any action is
+ * efficient mechanism for determining whether any action is
  * required for the associated operation and quickly return for cases
  * in which the update is not applicable.
  * <BR><BR>
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendStat.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendStat.java
index f76b880..e94dba2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendStat.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendStat.java
@@ -279,9 +279,9 @@
   /** The argument which should be used to specify the config file. */
   private StringArgument configFile;
 
-  /** Flag indicating whether or not the sub-commands have already been initialized. */
+  /** Flag indicating whether the sub-commands have already been initialized. */
   private boolean subCommandsInitialized;
-  /** Flag indicating whether or not the global arguments have already been initialized. */
+  /** Flag indicating whether the global arguments have already been initialized. */
   private boolean globalArgumentsInitialized;
 
   /**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
index 6579e0a..ba780ce 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
@@ -494,7 +494,7 @@
     }
 
     /**
-     * Calculates the amount of available memory which can be used by this import, taking into account whether or not
+     * Calculates the amount of available memory which can be used by this import, taking into account whether
      * the import is running offline or online as a task.
      */
     private long calculateAvailableHeapMemoryForBuffers()
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
index 45f1e70..1362d63 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/Task.java
@@ -458,8 +458,7 @@
   }
 
   /**
-   * Indicates whether or not this task is an iteration of
-   * some recurring task.
+   * Indicates whether this task is an iteration of some recurring task.
    *
    * @return boolean where true indicates that this task is
    *         recurring, false otherwise.
@@ -470,7 +469,7 @@
   }
 
   /**
-   * Indicates whether or not this task has been cancelled.
+   * Indicates whether this task has been cancelled.
    *
    * @return boolean where true indicates that this task was
    *         cancelled either before or during execution
@@ -1071,7 +1070,7 @@
   }
 
   /**
-   * Indicates whether or not this task is interruptible or not.
+   * Indicates whether this task is interruptible or not.
    *
    * @return boolean where true indicates that this task can be interrupted.
    */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java
index 8ebe131..5da479c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskScheduler.java
@@ -917,9 +917,8 @@
 
   /**
    * Determines whether the specified task should start running.  This is based
-   * on the start time, the set of dependencies, and whether or not the
-   * scheduler is active.  Note that the caller to this method must hold the
-   * scheduler lock.
+   * on the start time, the set of dependencies, and whether the scheduler is active.
+   * Note that the caller to this method must hold the scheduler lock.
    *
    * @param  task  The task for which to make the determination.
    *
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskState.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskState.java
index d011109..cac6651 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskState.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
  */
 package org.opends.server.backends.task;
 
@@ -244,7 +244,7 @@
 
 
   /**
-   * Indicates whether or not this task has been cancelled.
+   * Indicates whether this task has been cancelled.
    *
    * @param  taskState  The task state for which to make the determination.
    *
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
index 341d1aa..d71910b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/VLVRequestControl.java
@@ -193,7 +193,7 @@
   /**
    * Creates a new VLV request control with the provided information.
    *
-   * @param  isCritical    Indicates whether or not the control is critical.
+   * @param  isCritical    Indicates whether the control is critical.
    * @param  beforeCount   The number of entries before the target offset to
    *                       retrieve in the results page.
    * @param  afterCount    The number of entries after the target offset to
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java b/opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java
index eace481..7107b62 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/BaseDnRegistry.java
@@ -43,7 +43,7 @@
   private final TreeMap<DN, Backend<?>> publicNamingContexts = new TreeMap<>();
 
   /**
-   * Indicates whether or not this base DN registry is in test mode.
+   * Indicates whether this base DN registry is in test mode.
    * A registry instance that is in test mode will not modify backend
    * objects referred to in the above maps.
    */
@@ -54,7 +54,7 @@
    *
    * @param  baseDN to register
    * @param  backend with which the base DN is associated
-   * @param  isPrivate indicates whether or not this base DN is private
+   * @param  isPrivate indicates whether this base DN is private
    * @return list of error messages generated by registering the base DN
    *         that should be logged if the changes to this registry are
    *         committed to the server
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
index 2f719f4..bbb3081 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ConnectionHandlerConfigManager.java
@@ -320,7 +320,7 @@
     }
   }
 
-  /** Determines whether or not the new configuration's implementation class is acceptable. */
+  /** Determines whether the new configuration's implementation class is acceptable. */
   private boolean isJavaClassAcceptable(
       ConnectionHandlerCfg config,
       List<LocalizableMessage> unacceptableReasons) {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
index dac3d0d..fc9ccac 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
@@ -1491,7 +1491,7 @@
       startUpTime  = System.currentTimeMillis();
       startTimeUTC = TimeThread.getGMTTime();
 
-      // Determine whether or not we should start the connection handlers.
+      // Determine whether we should start the connection handlers.
       boolean startConnectionHandlers = !environmentConfig.disableConnectionHandlers();
 
       diskSpaceMonitor.startDiskSpaceMonitor();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
index 7a5422d..c7c876f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/ExtendedOperationConfigManager.java
@@ -282,7 +282,7 @@
     }
   }
 
-  /** Determines whether or not the new configuration's implementation class is acceptable. */
+  /** Determines whether the new configuration's implementation class is acceptable. */
   private boolean isJavaClassAcceptable(ExtendedOperationHandlerCfg config,
                                         List<LocalizableMessage> unacceptableReasons)
   {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java
index 890046e..ca92974 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PasswordPolicyConfigManager.java
@@ -404,7 +404,7 @@
   }
 
   /**
-   * Determines whether or not the new authentication policy configuration's
+   * Determines whether the new authentication policy configuration's
    * implementation class is acceptable.
    */
   private <T extends AuthenticationPolicyCfg> boolean isAuthenticationPolicyConfigurationAcceptable(
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java b/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
index 478f640..fe0b1cb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/PersistentSearch.java
@@ -118,7 +118,7 @@
   /** The set of change types to send to the client. */
   private final Set<PersistentSearchChangeType> changeTypes;
 
-  /** Indicates whether or not this persistent search has already been aborted. */
+  /** Indicates whether this persistent search has already been aborted. */
   private boolean isCancelled;
 
   /** Indicates whether entries returned should include the entry change notification control. */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
index 37d4be1..9987aee 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/PasswordPolicyImportPlugin.java
@@ -279,7 +279,7 @@
                doLDIFImport(LDIFImportConfig importConfig, Entry entry)
   {
     // Check if this entry is a password policy subentry
-    // and if so evaluate whether or not its acceptable.
+    // and if so evaluate whether it is acceptable.
     if ((entry.isSubentry() || entry.isLDAPSubentry()) &&
             entry.isPasswordPolicySubentry())
     {
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
index 134eaad..e99f095 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/JmxConnectionHandler.java
@@ -97,15 +97,12 @@
     this.connectionList = new CopyOnWriteArrayList<>();
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public ConfigChangeResult applyConfigurationChange(
       JMXConnectionHandlerCfg config) {
     final ConfigChangeResult ccr = new ConfigChangeResult();
 
-    // Determine whether or not the RMI connection needs restarting.
+    // Determine whether the RMI connection needs restarting.
     boolean rmiConnectorRestart = false;
     boolean portChanged = false;
 
@@ -172,7 +169,6 @@
     return o1 != null && !o1.equals(o2);
   }
 
-  /** {@inheritDoc} */
   @Override
   public void finalizeConnectionHandler(LocalizableMessage finalizeReason) {
     // Make sure that we don't get notified of any more changes.
@@ -265,9 +261,6 @@
     return rmiConnector;
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public String getShutdownListenerName() {
     return connectionHandlerName;
@@ -286,9 +279,6 @@
     return currentConfig.getSSLCertNickname();
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public void initializeConnectionHandler(ServerContext serverContext, JMXConnectionHandlerCfg config)
          throws ConfigException, InitializationException
@@ -327,32 +317,21 @@
     config.addJMXChangeListener(this);
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public String getConnectionHandlerName() {
     return connectionHandlerName;
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public String getProtocol() {
     return protocol;
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public Collection<HostPort> getListeners() {
     return listeners;
   }
 
-
-  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationAcceptable(ConnectionHandlerCfg configuration,
                                            List<LocalizableMessage> unacceptableReasons)
@@ -393,16 +372,15 @@
           new InetSocketAddress(newPort).getAddress(), newPort, true)) {
         throw new IOException(ERR_CONNHANDLER_ADDRESS_INUSE.get().toString());
       }
+      return true;
     } catch (Exception e) {
       LocalizableMessage message = ERR_CONNHANDLER_CANNOT_BIND.get("JMX", configDN,
               WILDCARD_ADDRESS, newPort, getExceptionMessage(e));
       unacceptableReasons.add(message);
       return false;
     }
-    return true;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean isConfigurationChangeAcceptable(
       JMXConnectionHandlerCfg config,
@@ -414,8 +392,7 @@
 
 
   /**
-   * Determines whether or not clients are allowed to connect over JMX
-   * using SSL.
+   * Determines whether clients are allowed to connect over JMX using SSL.
    *
    * @return Returns {@code true} if clients are allowed to
    *         connect over JMX using SSL.
@@ -424,9 +401,6 @@
     return currentConfig.isUseSSL();
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public void processServerShutdown(LocalizableMessage reason) {
     // We should also close the RMI registry.
@@ -456,8 +430,6 @@
     connectionList.remove(connection);
   }
 
-
-  /** {@inheritDoc} */
   @Override
   public void run() {
     try
@@ -470,9 +442,6 @@
     }
   }
 
-
-
-  /** {@inheritDoc} */
   @Override
   public void toString(StringBuilder buffer) {
     buffer.append(connectionHandlerName);
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
index 66a5185..9702974 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskEntry.java
@@ -365,7 +365,7 @@
   }
 
   /**
-   * Indicates whether or not this task supports a cancel operation.
+   * Indicates whether this task supports a cancel operation.
    *
    * @return boolean where true means this task supports being canceled.
    */
@@ -406,7 +406,7 @@
   }
 
   /**
-   * Indicates whether or not this task is done.
+   * Indicates whether this task is done.
    *
    * @return boolean where true means this task is done
    */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
index afddab6..2730fcf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskTool.java
@@ -99,7 +99,7 @@
    * Called when this utility should perform its actions locally in this
    * JVM.
    *
-   * @param initializeServer indicates whether or not to initialize the
+   * @param initializeServer indicates whether to initialize the
    *        directory server in the case of a local action
    * @param out stream to write messages; may be null
    * @param err stream to write messages; may be null
@@ -223,7 +223,7 @@
    * tool using the tasks interface based on user input.
    *
    * @param argParser used to parse user arguments
-   * @param initializeServer indicates whether or not to initialize the
+   * @param initializeServer indicates whether to initialize the
    *        directory server in the case of a local action
    * @param out stream to write messages; may be null
    * @param err stream to write messages; may be null
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
index 9f5f6ba..14f8c68 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/FileManager.java
@@ -395,7 +395,7 @@
    *
    * @param f
    *          File for which parentage will be insured
-   * @return boolean indicating whether or not the input <code>f</code> has a
+   * @return boolean indicating whether the input {@code f} has a
    *         parent after this method is invoked.
    */
   private static boolean insureParentsExist(File f)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
index d092f65..d6e86d8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeCli.java
@@ -73,14 +73,10 @@
   private BooleanArgument verbose;
   private BooleanArgument acceptLicense;
 
-
   /** The argument which should be used to request usage information. */
   private BooleanArgument showUsageArgument;
 
-  /**
-   * Flag indicating whether or not the global arguments have
-   * already been initialized.
-   */
+  /** Flag indicating whether the global arguments have already been initialized. */
   private boolean globalArgumentsInitialized;
 
   private UpgradeCli(InputStream in, OutputStream out, OutputStream err)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
index 40bb565..c066d85 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java
@@ -602,8 +602,7 @@
    *
    * @param summary
    *          A message describing why the index needs to be rebuilt and asking
-   *          them whether or not they wish to perform this task after the
-   *          upgrade.
+   *          them whether they wish to perform this task after the upgrade.
    * @param indexNames
    *          The indexes to rebuild.
    * @return The rebuild index task.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java b/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
index 2f6376d..0aaefc6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/CommonSchemaElements.java
@@ -45,7 +45,7 @@
  * <p>
  * Any methods which accesses the set of names associated with this
  * definition, will retrieve the primary name as the first name,
- * regardless of whether or not it was contained in the original set
+ * regardless of whether it was contained in the original set
  * of <code>names</code> passed to the constructor.
  * <p>
  * Where ordered sets of names, or extra properties are provided, the
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/OperationConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/OperationConfig.java
index 0f18443..2f6a07a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/OperationConfig.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/OperationConfig.java
@@ -12,15 +12,11 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
  */
-
 package org.opends.server.types;
 
-/**
- * Base for data structures that define configuration
- * for operations.
- */
+/** Base for data structures that define configuration for operations. */
 @org.opends.server.types.PublicAPI(
      stability=org.opends.server.types.StabilityLevel.VOLATILE,
      mayInstantiate=true,
@@ -28,10 +24,7 @@
      mayInvoke=true)
 public abstract class OperationConfig {
 
-  /**
-   * When true indicates that the operation should stop as soon as
-   * possible.
-   */
+  /** When true indicates that the operation should stop as soon as possible. */
   private boolean cancelled;
 
   /**
@@ -44,8 +37,7 @@
   }
 
   /**
-   * Indicates whether or not this operation has been
-   * cancelled.
+   * Indicates whether this operation has been cancelled.
    *
    * @return boolean where true indicates that this
    *         operation has been cancelled and if currently
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java b/opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java
index 77162bc..cad6a7e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/SSLClientAuthPolicy.java
@@ -20,8 +20,8 @@
  * This enumeration defines a policy that indicates how the server
  * should deal with SSL/TLS-based client connections.  It is used to
  * determine whether the server should request that clients provide
- * their own certificates, and whether or not to accept client
- * connections in which the client did not provide a certificate.
+ * their own certificates, and whether to accept client connections
+ * in which the client did not provide a certificate.
  */
 @org.opends.server.types.PublicAPI(
      stability=org.opends.server.types.StabilityLevel.UNCOMMITTED,
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java b/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
index e10018d..8f6d878 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
@@ -108,7 +108,7 @@
     }
 
     /**
-     * Check whether or not, this key type is supported by the current JVM.
+     * Check whether this key type is supported by the current JVM.
      * @return true if this key type is supported, false otherwise.
      */
     public boolean isSupported()
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
index 9776aa3..1f0234d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/StaticUtils.java
@@ -1257,7 +1257,7 @@
    *                        the determination.
    * @param  port           TCP port number of the TCP address for which to
    *                        make the determination.
-   * @param  allowReuse     Whether or not TCP address reuse is allowed when
+   * @param  allowReuse     Whether TCP address reuse is allowed when
    *                        making the determination.
    *
    * @return  {@code true} if the provided TCP address is already in
@@ -2162,8 +2162,7 @@
   }
 
   /**
-   * Indicates whether or not a string represents a syntactically correct
-   * email address.
+   * Indicates whether a string represents a syntactically correct email address.
    *
    * @param addr to validate
    * @return boolean where {@code true} indicates that the string is a
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java
index fd4aba3..0f45a4f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionArgumentParser.java
@@ -84,7 +84,7 @@
   }
 
   /**
-   * Indicates whether or not the user has indicated that they would like to
+   * Indicates whether the user has indicated that they would like to
    * perform a remote operation based on the arguments.
    *
    * @return true if the user wants to perform a remote operation; false
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
index 5beb0be..1da5c1c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -1177,8 +1177,7 @@
   }
 
   /**
-   * Indicates whether or not a connection should use SSL based on this
-   * interaction.
+   * Indicates whether a connection should use SSL based on this interaction.
    *
    * @return boolean where true means use SSL
    */
@@ -1188,8 +1187,7 @@
   }
 
   /**
-   * Indicates whether or not a connection should use StartTLS based on this
-   * interaction.
+   * Indicates whether a connection should use StartTLS based on this interaction.
    *
    * @return boolean where true means use StartTLS
    */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
index 83b9cd1..faa103f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
@@ -620,7 +620,7 @@
     final Entry fullEntry = entry.duplicate(true);
 
     // Even though the associated update succeeded,
-    // we should still check whether or not we should return the entry.
+    // we should still check whether we should return the entry.
     final SearchResultEntry unfilteredSearchEntry = new SearchResultEntry(fullEntry, null);
     if (getAccessControlHandler().maySend(operation, unfilteredSearchEntry))
     {
@@ -654,7 +654,7 @@
     }
 
     // Even though the associated update succeeded,
-    // we should still check whether or not we should return the entry.
+    // we should still check whether we should return the entry.
     final SearchResultEntry unfilteredSearchEntry = new SearchResultEntry(entry, null);
     if (getAccessControlHandler().maySend(operation, unfilteredSearchEntry))
     {
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties
index 7df9281..e6f5049 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/admin_tool.properties
@@ -363,7 +363,7 @@
  the replication mechanism in the first server to communicate with the other \
  servers.  You have to specify this option only if replication was not \
  previously configured in the first server
-INFO_DESCRIPTION_ENABLE_SECURE_REPLICATION1=Specifies whether or not the \
+INFO_DESCRIPTION_ENABLE_SECURE_REPLICATION1=Specifies whether the \
  communication through the replication port of the first server is encrypted \
  or not.  This option will only be taken into account the first time \
  replication is configured on the first server
@@ -404,7 +404,7 @@
  by the replication mechanism in the second server to communicate with the \
  other servers.  You have to specify this option only if replication was not \
  previously configured in the second server
-INFO_DESCRIPTION_ENABLE_SECURE_REPLICATION2=Specifies whether or not the \
+INFO_DESCRIPTION_ENABLE_SECURE_REPLICATION2=Specifies whether the \
  communication through the replication port of the second server is encrypted \
  or not.  This option will only be taken into account the first time \
  replication is configured on the second server
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
index d72b35c..34fe451 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
@@ -1772,7 +1772,7 @@
    * @param cfg
    *          The configuration to be tested.
    * @param isValid
-   *          Whether or not the provided configuration is valid.
+   *          Whether the provided configuration is valid.
    * @throws Exception
    *           If an unexpected exception occurred.
    */
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
index 7e8692a..6ac6dbc 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
@@ -284,11 +284,11 @@
 
 
   /**
-   * Sets whether or not to allow pre-encoded password values for the
+   * Sets whether to allow pre-encoded password values for the
    * current password storage scheme and returns the previous value so that
    * it can be restored.
    *
-   * @param allowPreencoded whether or not to allow pre-encoded passwords
+   * @param allowPreencoded whether to allow pre-encoded passwords
    * @return the previous value for the allow preencoded passwords
    */
   protected static boolean setAllowPreencodedPasswords(boolean allowPreencoded)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
index 38c4d50..0853fc8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
@@ -311,7 +311,7 @@
    * arguments generated for each method will be:
    * <OL>
    *   <LI>A client connection to use to perform the operation</LI>
-   *   <LI>A flag indicating whether or not the operation should succeed</LI>
+   *   <LI>A flag indicating whether the operation should succeed</LI>
    * </OL>
    *
    * @return  A set of data that can be used for performing the tests.
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/LDAPURLTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/types/LDAPURLTestCase.java
index 66a9cc1..7e82bbb 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/LDAPURLTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/LDAPURLTestCase.java
@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2016 ForgeRock AS.
  */
 package org.opends.server.types;
 
@@ -85,7 +85,7 @@
    * @param filterString
    *          The filter string.
    * @param fullyDecode
-   *          Whether or not the URL should be fully decoded.
+   *          Whether the URL should be fully decoded.
    * @throws Exception
    *           If an unexpected exception occurred.
    */
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java
index c248f61..91ccd73 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/types/PrivilegeTestCase.java
@@ -339,7 +339,7 @@
    * arguments generated for each method will be:
    * <OL>
    *   <LI>A client connection to use to perform the operation</LI>
-   *   <LI>A flag indicating whether or not the operation should succeed</LI>
+   *   <LI>A flag indicating whether the operation should succeed</LI>
    * </OL>
    *
    * @return  A set of data that can be used for performing the tests.
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProvider.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProvider.java
index f175254..a8f8fcd 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProvider.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProvider.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 package org.forgerock.opendj.server.core;
 
@@ -224,7 +224,7 @@
     void stopDataProvider();
 
     /**
-     * Indicates whether or not the provided base DN in this data provider
+     * Indicates whether the provided base DN in this data provider
      * supports change notification.
      *
      * @param baseDN
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java
index 4a9e500..cee33a1 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2016 ForgeRock AS.
  */
 package org.forgerock.opendj.server.core;
 
@@ -134,7 +134,7 @@
     void registerEventListener(DataProviderEventListener listener);
 
     /**
-     * Indicates whether or not the provided base DN in the underlying data
+     * Indicates whether the provided base DN in the underlying data
      * provider supports change notification.
      *
      * @param baseDN
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderID.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderID.java
index c1966c4..56b69b5 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderID.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderID.java
@@ -12,7 +12,7 @@
  * information: "Portions Copyright [year] [name of copyright owner]".
  *
  * Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2013-2015 ForgeRock AS.
+ * Portions copyright 2013-2016 ForgeRock AS.
  */
 package org.forgerock.opendj.server.core;
 
@@ -53,15 +53,10 @@
         return new DataProviderID(name, false /* user */);
     }
 
-    /**
-     * Flag indicating whether or not this ID represents an internal
-     * data provider.
-     */
+    /** Whether this ID represents an internal data provider. */
     private final boolean isInternal;
-
     /** The data provider name. */
     private final String name;
-
     /** The normalized name. */
     private final String normalizedName;
 
@@ -72,7 +67,6 @@
         this.isInternal = isInternal;
     }
 
-    /** {@inheritDoc} */
     @Override
     public int compareTo(final DataProviderID o) {
         if (isInternal != o.isInternal) {
@@ -83,7 +77,6 @@
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean equals(final Object obj) {
         if (this == obj) {
@@ -106,14 +99,13 @@
         return name;
     }
 
-    /** {@inheritDoc} */
     @Override
     public int hashCode() {
         return normalizedName.hashCode();
     }
 
     /**
-     * Indicating whether or not this ID represents an internal data provider.
+     * Indicating whether this ID represents an internal data provider.
      *
      * @return <code>true</code> if this ID represents an internal data
      *         provider.
@@ -122,7 +114,6 @@
         return isInternal;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String toString() {
         if (isInternal) {

--
Gitblit v1.10.0