Ordered the AttributeType in the entries

git-svn-id: https://svn.apache.org/repos/asf/directory/shared/trunk@1428992 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.0.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.0.ldif
index 3a3eeab..1860d2f 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.0.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.0.ldif
@@ -1,12 +1,12 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.0,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.0
-m-description: The base bean
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-base
+m-description: The base bean
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
 m-typeobjectclass: ABSTRACT
-creatorsname: uid=admin,ou=system
 m-may: ads-enabled
 m-may: description
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.120.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.120.ldif
index fe13233..0922ae6 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.120.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.120.ldif
@@ -1,12 +1,12 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.120,ou=objectClasses,cn=adsconfig,ou=schema
-m-must: ads-changeLogId
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.120
-m-supobjectclass: ads-base
-m-description: The ChangeLog
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-changeLog
-creatorsname: uid=admin,ou=system
+m-description: The ChangeLog
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-base
 m-must: ads-changeLogExposed
+m-must: ads-changeLogId
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.130.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.130.ldif
index fc205a0..ca2ba38 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.130.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.130.ldif
@@ -1,7 +1,7 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.130,ou=objectClasses,cn=adsconfig,ou=schema
-m-name: ads-interceptor
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.130
+m-name: ads-interceptor
 m-description: The Interceptor ObjectClass
 objectclass: top
 objectclass: metaTop
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.131.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.131.ldif
index abfc84a..ebffebf 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.131.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.131.ldif
@@ -1,7 +1,7 @@
 version: 1

 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.131, ou=objectClasses, cn=adsconfig, ou=schema

-m-name: ads-authenticationInterceptor

 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.131

+m-name: ads-authenticationInterceptor

 m-description: The AuthenticationInterceptor ObjectClass

 objectclass: top

 objectclass: metaTop

diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.140.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.140.ldif
index 43da721..e91a3c5 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.140.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.140.ldif
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.140,ou=objectClasses,cn=adsconfig,ou=schema
-m-must: ads-journalId
-m-must: ads-journalFileName
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.140
-m-supobjectclass: ads-base
-m-description: The Journal
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-journal
-creatorsname: uid=admin,ou=system
+m-description: The Journal
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-base
 m-must: ads-journalWorkingDir
 m-must: ads-journalRotation
+m-must: ads-journalId
+m-must: ads-journalFileName
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.150.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.150.ldif
index 7de5167..ca3e566 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.150.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.150.ldif
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.150,ou=objectClasses,cn=adsconfig,ou=schema
+m-oid: 1.3.6.1.4.1.18060.0.4.1.3.150
+m-name: ads-partition
+m-description: A generic partition
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-base
+m-typeobjectclass: ABSTRACT
 m-must: ads-partitionId
 m-must: ads-partitionSuffix
-m-oid: 1.3.6.1.4.1.18060.0.4.1.3.150
-m-supobjectclass: ads-base
-m-description: A generic partition
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
-m-name: ads-partition
-m-typeobjectclass: ABSTRACT
-creatorsname: uid=admin,ou=system
 m-may: ads-contextEntry
 m-may: ads-partitionSyncOnWrite
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.151.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.151.ldif
index 20b1b21..a8dcbd2 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.151.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.151.ldif
@@ -1,12 +1,12 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.151,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.151
-m-supobjectclass: ads-partition
-m-description: A JDBM partition
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-jdbmPartition
-creatorsname: uid=admin,ou=system
+m-description: A JDBM partition
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-partition
 m-may: ads-partitionCacheSize
 m-may: ads-jdbmPartitionOptimizerEnabled
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.160.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.160.ldif
index 370354f..e5056bf 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.160.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.160.ldif
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.160,ou=objectClasses,cn=adsconfig,ou=schema
+m-oid: 1.3.6.1.4.1.18060.0.4.1.3.160
+m-name: ads-index
+m-description: A generic indexed attribute
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-base
+m-typeobjectclass: ABSTRACT
 m-must: ads-indexAttributeId
 m-must: ads-indexHasReverse
-m-oid: 1.3.6.1.4.1.18060.0.4.1.3.160
-m-supobjectclass: ads-base
-m-description: A generic indexed attribute
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
-m-name: ads-index
-m-typeobjectclass: ABSTRACT
 creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.161.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.161.ldif
index b4894fc..8f49be9 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.161.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.161.ldif
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.161,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.161
-m-supobjectclass: ads-index
-m-description: A JDBM indexed attribute
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-jdbmIndex
-creatorsname: uid=admin,ou=system
+m-description: A JDBM indexed attribute
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-index
 m-may: ads-indexFileName
 m-may: ads-indexWorkingDir
 m-may: ads-indexNumDupLimit
 m-may: ads-indexCacheSize
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.18.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.18.ldif
index 64b4fbb..2180702 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.18.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.18.ldif
@@ -1,17 +1,17 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.18,ou=objectClasses,cn=adsconfig,ou=schema
+m-oid: 1.3.6.1.4.1.18060.0.4.1.3.18
+m-name: ads-transport
+m-description: A transport (TCP or UDP)
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-base
+m-typeobjectclass: ABSTRACT
 m-must: ads-transportId
 m-must: ads-systemPort
-m-oid: 1.3.6.1.4.1.18060.0.4.1.3.18
-m-supobjectclass: ads-base
-m-description: A transport (TCP or UDP)
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
-m-name: ads-transport
-m-typeobjectclass: ABSTRACT
-creatorsname: uid=admin,ou=system
 m-must: ads-transportAddress
 m-may: ads-transportBacklog
 m-may: ads-transportEnableSSL
 m-may: ads-transportNbThreads
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.19.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.19.ldif
index 0a17c41..1dc1901 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.19.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.19.ldif
@@ -1,10 +1,10 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.19,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.19
-m-supobjectclass: ads-transport
-m-description: A TCP transport
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-tcpTransport
+m-description: A TCP transport
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-transport
 creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.20.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.20.ldif
index b96d7e2..d91e348 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.20.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.20.ldif
@@ -1,10 +1,10 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.20,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.20
-m-supobjectclass: ads-transport
-m-description: an UDP transport
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-udpTransport
+m-description: an UDP transport
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-transport
 creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.250.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.250.ldif
index b16521b..bf67f1c 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.250.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.250.ldif
@@ -1,12 +1,12 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.250,ou=objectClasses,cn=adsconfig,ou=schema
-m-must: ads-serverId
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.250
-m-supobjectclass: ads-base
-m-description: The server ObjectClass
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-server
+m-description: The server ObjectClass
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-base
 m-typeobjectclass: ABSTRACT
+m-must: ads-serverId
 creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.260.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.260.ldif
index 7ea6628..5779bc4 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.260.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.260.ldif
@@ -1,12 +1,12 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.260,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.260
-m-supobjectclass: ads-server
-m-description: The DirectoryService based server ObjectClass
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-dsBasedServer
+m-description: The DirectoryService based server ObjectClass
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-server
 m-typeobjectclass: ABSTRACT
-creatorsname: uid=admin,ou=system
 m-may: ads-searchBaseDN
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif
index 8f12d4a..bbcb3f8 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif
@@ -1,13 +1,12 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.300,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.300
-m-supobjectclass: ads-dsBasedServer
-m-description: The LdapServer ObjectClass
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-ldapServer
-creatorsname: uid=admin,ou=system
+m-description: The LdapServer ObjectClass
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-dsBasedServer
 m-must: ads-confidentialityRequired
 m-must: ads-maxSizeLimit
 m-must: ads-maxTimeLimit
@@ -19,3 +18,4 @@
 m-may: ads-certificatePassword
 m-may: ads-replReqHandler
 m-must: ads-replEnabled
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.400.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.400.ldif
index a2fdea3..5a81e90 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.400.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.400.ldif
@@ -1,13 +1,12 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.400,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.400
-m-supobjectclass: ads-dsBasedServer
-m-description: The KerberosServer ObjectClass
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-kdcServer
-creatorsname: uid=admin,ou=system
+m-description: The KerberosServer ObjectClass
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-dsBasedServer
 m-may: ads-krbAllowableClockSkew
 m-may: ads-krbEncryptionTypes
 m-may: ads-krbEmptyAddressesAllowed
@@ -21,3 +20,4 @@
 m-may: ads-krbMaximumTicketLifetime
 m-may: ads-krbPrimaryRealm
 m-may: ads-krbBodyChecksumVerified
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.500.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.500.ldif
index 3594ff2..7b8fd0e 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.500.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.500.ldif
@@ -1,10 +1,10 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.500,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.500
-m-supobjectclass: ads-dsBasedServer
-m-description: The DnsServer ObjectClass
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-dnsServer
+m-description: The DnsServer ObjectClass
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-dsBasedServer
 creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.600.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.600.ldif
index cdae45d..1a1f739 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.600.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.600.ldif
@@ -1,10 +1,10 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.600,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.600
-m-supobjectclass: ads-dsBasedServer
-m-description: The DhcpServer ObjectClass
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-dhcpServer
+m-description: The DhcpServer ObjectClass
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-dsBasedServer
 creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.700.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.700.ldif
index 2d20234..0a327eb 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.700.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.700.ldif
@@ -1,10 +1,10 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.700,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.700
-m-supobjectclass: ads-server
-m-description: The NtpServer ObjectClass
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-ntpServer
+m-description: The NtpServer ObjectClass
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-server
 creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.800.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.800.ldif
index 527a436..4d84d25 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.800.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.800.ldif
@@ -1,13 +1,12 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.800,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.800
-m-supobjectclass: ads-dsBasedServer
-m-description: The ChangePassword ObjectClass
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-changePasswordServer
-creatorsname: uid=admin,ou=system
+m-description: The ChangePassword ObjectClass
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-dsBasedServer
 m-may: ads-krbAllowableClockSkew
 m-may: ads-krbEmptyAddressesAllowed
 m-may: ads-krbEncryptionTypes
@@ -16,3 +15,4 @@
 m-may: ads-chgPwdPolicyPasswordLength
 m-may: ads-chgPwdPolicyTokenSize
 m-may: ads-chgPwdServicePrincipal
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.801.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.801.ldif
index 1683f8b..a9de95f 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.801.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.801.ldif
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.801,ou=objectClasses,cn=adsconfig,ou=schema
+m-oid: 1.3.6.1.4.1.18060.0.4.1.3.801
+m-name: ads-saslMechHandler
+m-description: SASL mechanism handler
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-base
 m-must: ads-saslMechName
 m-must: ads-saslMechClassName
-m-oid: 1.3.6.1.4.1.18060.0.4.1.3.801
-m-supobjectclass: ads-base
-m-description: SASL mechanism handler
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
-m-name: ads-saslMechHandler
-creatorsname: uid=admin,ou=system
 m-may: ads-ntlmMechProvider
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.802.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.802.ldif
index d1b41b2..05e95b3 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.802.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.802.ldif
@@ -1,12 +1,12 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.802,ou=objectClasses,cn=adsconfig,ou=schema
+m-oid: 1.3.6.1.4.1.18060.0.4.1.3.802
+m-name: ads-extendedOpHandler
+m-description: Extended operation handler
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-base
 m-must: ads-extendedOpHandlerClass
 m-must: ads-extendedOpId
-m-oid: 1.3.6.1.4.1.18060.0.4.1.3.802
-m-supobjectclass: ads-base
-m-description: Extended operation handler
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
-m-name: ads-extendedOpHandler
 creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.803.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.803.ldif
index 6187e14..49a3cf3 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.803.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.803.ldif
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.803,ou=objectClasses,cn=adsconfig,ou=schema
+m-oid: 1.3.6.1.4.1.18060.0.4.1.3.803
+m-name: ads-httpWebApp
+m-description: a web app
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-base
 m-must: ads-httpWarFile
 m-must: ads-id
-m-oid: 1.3.6.1.4.1.18060.0.4.1.3.803
-m-supobjectclass: ads-base
-m-description: a web app
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
-m-name: ads-httpWebApp
-creatorsname: uid=admin,ou=system
 m-must: ads-httpAppCtxPath
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.804.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.804.ldif
index 142bd15..e63751d 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.804.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.804.ldif
@@ -1,11 +1,11 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.804,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.804
-m-supobjectclass: ads-server
+m-name: ads-httpServer
 m-description: integrated jetty http server
 objectclass: top
 objectclass: metaTop
 objectclass: metaObjectClass
-m-name: ads-httpServer
-creatorsname: uid=admin,ou=system
+m-supobjectclass: ads-server
 m-may: ads-httpConfFile
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.805.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.805.ldif
index e3991aa..c43b206 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.805.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.805.ldif
@@ -1,5 +1,12 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.805,ou=objectClasses,cn=adsconfig,ou=schema
+m-oid: 1.3.6.1.4.1.18060.0.4.1.3.805
+m-name: ads-replEventLog
+m-description: class to hold a replication consumer event log details
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-base
 m-must: ads-dsReplicaId
 m-must: ads-replAliasDerefMode
 m-must: ads-searchBaseDN
@@ -8,11 +15,4 @@
 m-must: ads-replRefreshNPersist
 m-may: ads-replLastSentCsn
 m-may: ads-replCookie
-m-oid: 1.3.6.1.4.1.18060.0.4.1.3.805
-m-supobjectclass: ads-base
-m-description: class to hold a replication consumer event log details
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
-m-name: ads-replEventLog
 creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif
index 0e38770..549309d 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif
@@ -1,13 +1,12 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.806,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.806
-m-supobjectclass: ads-base
-m-description: replication consumer configuration
-objectclass: metaObjectClass
-objectclass: metaTop
-objectclass: top
 m-name: ads-replConsumer
-creatorsname: uid=admin,ou=system
+m-description: replication consumer configuration
+objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: ads-base
 m-must: ads-replConsumerId
 m-must: ads-searchBaseDN
 m-must: ads-replProvHostName
@@ -27,3 +26,4 @@
 m-may: ads-replPeerCertificate
 m-may: ads-replConsumerImpl
 m-may: ads-replCookie
+creatorsname: uid=admin,ou=system
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.900.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.900.ldif
index 6d619ec..277d5e7 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.900.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.900.ldif
@@ -1,11 +1,11 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.900,ou=objectClasses,cn=adsconfig,ou=schema
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.900
+m-name: ads-passwordPolicy
+m-description: class to hold the PasswordPolicy configuration
 objectclass: top
 objectclass: metaTop
 objectclass: metaObjectClass
-m-name: ads-passwordPolicy
-m-description: class to hold the PasswordPolicy configuration
 m-supobjectclass: ads-base
 m-must: ads-pwdId
 m-must: ads-pwdAttribute
diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.901.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.901.ldif
index 4127bcf..4c51cef 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.901.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.901.ldif
@@ -1,14 +1,14 @@
 version: 1

 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.901, ou=objectClasses, cn=adsconfig, ou=schema

-objectclass: metaObjectClass

-objectclass: metaTop

-objectclass: top

-m-name: ads-authenticator

 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.901

+m-name: ads-authenticator

 m-description: A generic authenticator

+objectclass: top

+objectclass: metaTop

+objectclass: metaObjectClass

 m-supobjectclass: ads-base

 m-typeobjectclass: ABSTRACT

+m-must: ads-authenticatorId

 createtimestamp: 20100111145217Z

 creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system

 entrycsn: 20100111202217.958000Z#000000#000#000000

-m-must: ads-authenticatorId

diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.902.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.902.ldif
index 23c690d..3b6602d 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.902.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.902.ldif
@@ -1,11 +1,11 @@
 version: 1

 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.902,ou=objectClasses,cn=adsconfig,ou=schema

 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.902

-m-description: an authenticator implementation

-m-supobjectclass: ads-authenticator

-objectclass: metaObjectClass

-objectclass: metaTop

-objectclass: top

 m-name: ads-authenticatorImpl

+m-description: an authenticator implementation

+objectclass: top

+objectclass: metaTop

+objectclass: metaObjectClass

+m-supobjectclass: ads-authenticator

 m-must: ads-authenticatorClass

 creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system

diff --git a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.904.ldif b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.904.ldif
index 19fe775..b610261 100644
--- a/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.904.ldif
+++ b/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.904.ldif
@@ -1,13 +1,12 @@
 version: 1

 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.904,ou=objectClasses,cn=adsconfig,ou=schema

 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.904

-m-description: delegated authentication configuration

-m-supobjectclass: ads-authenticator

-creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system

-objectclass: metaObjectClass

-objectclass: metaTop

-objectclass: top

 m-name: ads-delegatingAuthenticator

+m-description: delegated authentication configuration

+objectclass: top

+objectclass: metaTop

+objectclass: metaObjectClass

+m-supobjectclass: ads-authenticator

 m-must: ads-delegateHost

 m-must: ads-delegatePort

-

+creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system