You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2013/05/03 17:08:45 UTC

svn commit: r1478829 [3/9] - /directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/

Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/apache.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/apache.xml?rev=1478829&r1=1478828&r2=1478829&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/apache.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/apache.xml Fri May  3 15:08:44 2013
@@ -19,15 +19,6 @@
 -->
 <schema name="apache">
   <attributetypes>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.38" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>privateKeyFormat</alias>
-      </aliases>
-      <description>The format of the private key used for TLS</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseExactIA5Match</equality>
-    </attributetype>
     <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.35" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
         <alias>schemaModifyTimestamp</alias>
@@ -39,44 +30,26 @@
       <equality>generalizedTimeMatch</equality>
       <ordering>generalizedTimeOrderingMatch</ordering>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.20" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
-      <aliases>
-        <alias>entryDN</alias>
-      </aliases>
-      <description>DN of the entry</description>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-    </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.44" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>revisions</alias>
+        <alias>apacheServicePid</alias>
       </aliases>
-      <description>Revision numbers used in change log</description>
-      <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
-      <equality>integerMatch</equality>
-      <ordering>integerOrderingMatch</ordering>
+      <description>A string up to 256 characters in length</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.6" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.49" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheSubAlias</alias>
+        <alias>changeLogContext</alias>
       </aliases>
-      <description>Index attribute used to track sub level aliases</description>
+      <description>tells about the changelog context suffix</description>
       <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.1.16.1</syntax>
-      <equality>uuidMatch</equality>
-    </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>storedProcLangId</alias>
-      </aliases>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseExactIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.17" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.18" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheCatalogEntryName</alias>
+        <alias>apacheCatalogEntryBaseDn</alias>
       </aliases>
       <description>A string up to 256 characters in length</description>
       <usage>USER_APPLICATIONS</usage>
@@ -92,6 +65,15 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.38" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>privateKeyFormat</alias>
+      </aliases>
+      <description>The format of the private key used for TLS</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseExactIA5Match</equality>
+    </attributetype>
     <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.3" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
       <aliases>
         <alias>apachePresence</alias>
@@ -102,166 +84,158 @@
       <equality>caseIgnoreMatch</equality>
       <substring>caseIgnoreSubstringsMatch</substring>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.32" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.16" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>comparators</alias>
+        <alias>apacheServiceFactoryPid</alias>
       </aliases>
-      <description>A multivalued comparator description attribute</description>
+      <description>A string up to 256 characters in length</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
+    </attributetype>
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.43" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+      <aliases>
+        <alias>apacheSubLevel</alias>
+      </aliases>
+      <description>Index attribute used to track sub level searches</description>
+      <usage>DSA_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
+    </attributetype>
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.36" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>schemaModifiersName</alias>
+      </aliases>
+      <description>the DN of the modifier of the schema</description>
+      <superior>modifiersName</superior>
       <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>unixFilePath</alias>
+        <alias>javaxScriptLangId</alias>
       </aliases>
-      <description>A UNIX file path where case does make a difference</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseExactIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.40" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.46" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>privateKey</alias>
+        <alias>changeType</alias>
       </aliases>
-      <description>The private key material used for TLS</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
+      <description>type of change operation</description>
+      <usage>DSA_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
+      <equality>caseIgnoreMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.24.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.45" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>prescriptiveACI</alias>
+        <alias>changeTime</alias>
       </aliases>
-      <description>Access control information that applies to a set of entries</description>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.1</syntax>
-      <equality>directoryStringFirstComponentMatch</equality>
+      <description>represents the time when the change event occurred</description>
+      <usage>DSA_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
+      <equality>generalizedTimeMatch</equality>
+      <ordering>generalizedTimeOrderingMatch</ordering>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.34" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.32" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>syntaxCheckers</alias>
+        <alias>comparators</alias>
       </aliases>
-      <description>A multivalued syntaxCheckers description attribute</description>
+      <description>A multivalued comparator description attribute</description>
       <usage>DIRECTORY_OPERATION</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
       <equality>caseIgnoreMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.31" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
-      <aliases>
-        <alias>entryDeleted</alias>
-      </aliases>
-      <description>Whether or not an entry has been deleted.</description>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
-      <equality>booleanMatch</equality>
-    </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>prefNodeName</alias>
+        <alias>subschemaSubentryName</alias>
       </aliases>
-      <description>Attribute to describe the name of a Java Preferences API node</description>
+      <description>the DN of the schema subentry the modification info corresponds to</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseExactMatch</equality>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.41" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.34" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>publicKeyFormat</alias>
+        <alias>syntaxCheckers</alias>
       </aliases>
-      <description>The format of the public key used for TLS</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseExactIA5Match</equality>
+      <description>A multivalued syntaxCheckers description attribute</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.4203.666.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.50" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
       <aliases>
-        <alias>entryCSN</alias>
+        <alias>apacheRdn</alias>
       </aliases>
-      <description>change sequence number of the entry</description>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.4203.666.11.2.1</syntax>
-      <equality>csnMatch</equality>
-      <ordering>csnOrderingMatch</ordering>
+      <description>Index attribute RDN with values both user provided and normalized based on schema</description>
+      <usage>DSA_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>exactDnAsStringMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.40" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>javaByteCode</alias>
+        <alias>privateKey</alias>
       </aliases>
+      <description>The private key material used for TLS</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.5" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
-      <aliases>
-        <alias>apacheOneAlias</alias>
-      </aliases>
-      <description>Index attribute used to track single level aliases</description>
-      <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.1.16.1</syntax>
-      <equality>uuidMatch</equality>
-    </attributetype>
-    <attributetype oid="2.5.24.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.25" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>entryACI</alias>
+        <alias>prescriptiveTriggerSpecification</alias>
       </aliases>
-      <description>Access control information that applies to a single entry</description>
+      <description>Trigger specification that applies to a set of entries</description>
       <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.1</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.59</syntax>
       <equality>directoryStringFirstComponentMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.50" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.6" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
       <aliases>
-        <alias>apacheRdn</alias>
+        <alias>apacheSubAlias</alias>
       </aliases>
-      <description>Index attribute RDN with values both user provided and normalized based on schema</description>
+      <description>Index attribute used to track sub level aliases</description>
       <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>exactDnAsStringMatch</equality>
-    </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>apacheSamType</alias>
-      </aliases>
-      <description>Single-use Authentication Mechanism type/vendor code</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
-      <equality>integerMatch</equality>
+      <syntax>1.3.6.1.1.16.1</syntax>
+      <equality>uuidMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.17" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>javaxScriptLangId</alias>
+        <alias>apacheCatalogEntryName</alias>
       </aliases>
+      <description>A string up to 256 characters in length</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseExactIA5Match</equality>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.47" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.33" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>rev</alias>
-        <alias>eventId</alias>
+        <alias>normalizers</alias>
       </aliases>
-      <description>the unique sequential id for the event (a.k.a revision number)</description>
-      <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
-      <equality>integerMatch</equality>
-      <ordering>integerOrderingMatch</ordering>
+      <description>A multivalued normalizer description attribute</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.46" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>changeType</alias>
+        <alias>storedProcLangId</alias>
       </aliases>
-      <description>type of change operation</description>
-      <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.44</syntax>
-      <equality>caseIgnoreMatch</equality>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseExactIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.10" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.51" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>autonomousAreaSubentry</alias>
+        <alias>entryParentId</alias>
       </aliases>
-      <description>Used to track a subentry associated with an autonomousArea</description>
+      <description>attribute holding the id of parent entry</description>
       <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseExactMatch</equality>
+      <ordering>caseExactOrderingMatch</ordering>
     </attributetype>
     <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.19" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
@@ -272,33 +246,61 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.4" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheOneLevel</alias>
+        <alias>fullyQualifiedJavaClassName</alias>
       </aliases>
-      <description>Index attribute used to track one level searches</description>
-      <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
-      <equality>integerMatch</equality>
+      <description>The fully qualified name for a (Java) class</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseExactIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.27" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+    <attributetype oid="2.5.24.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>triggerExecutionSubentries</alias>
+        <alias>subentryACI</alias>
       </aliases>
-      <description>Used to track subentries associated with a trigger area which an entry falls under</description>
+      <description>Access control information that applies to a single subentry</description>
       <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.1</syntax>
+      <equality>directoryStringFirstComponentMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.24.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.24.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>subentryACI</alias>
+        <alias>prescriptiveACI</alias>
       </aliases>
-      <description>Access control information that applies to a single subentry</description>
+      <description>Access control information that applies to a set of entries</description>
       <usage>DIRECTORY_OPERATION</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.1</syntax>
       <equality>directoryStringFirstComponentMatch</equality>
     </attributetype>
+    <attributetype oid="2.5.24.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>entryACI</alias>
+      </aliases>
+      <description>Access control information that applies to a single entry</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.1</syntax>
+      <equality>directoryStringFirstComponentMatch</equality>
+    </attributetype>
+    <attributetype oid="1.3.6.1.4.1.4203.666.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+      <aliases>
+        <alias>entryCSN</alias>
+      </aliases>
+      <description>change sequence number of the entry</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.4203.666.11.2.1</syntax>
+      <equality>csnMatch</equality>
+      <ordering>csnOrderingMatch</ordering>
+    </attributetype>
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>keyAlgorithm</alias>
+      </aliases>
+      <description>The algorithm used for the key/pair used by the server for TLS</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseExactIA5Match</equality>
+    </attributetype>
     <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.22" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
         <alias>javaClassByteCode</alias>
@@ -307,6 +309,15 @@
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
     </attributetype>
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.27" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+      <aliases>
+        <alias>triggerExecutionSubentries</alias>
+      </aliases>
+      <description>Used to track subentries associated with a trigger area which an entry falls under</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
+    </attributetype>
     <attributetype oid="1.3.6.1.1.16.4" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
         <alias>entryUUID</alias>
@@ -317,6 +328,15 @@
       <equality>uuidMatch</equality>
       <ordering>uuidOrderingMatch</ordering>
     </attributetype>
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>entryTriggerSpecification</alias>
+      </aliases>
+      <description>Trigger specification that applies to a single entry</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.59</syntax>
+      <equality>directoryStringFirstComponentMatch</equality>
+    </attributetype>
     <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.23" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
         <alias>classLoaderDefaultSearchContext</alias>
@@ -327,24 +347,6 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.21" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>fullyQualifiedJavaClassName</alias>
-      </aliases>
-      <description>The fully qualified name for a (Java) class</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseExactIA5Match</equality>
-    </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.26" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>entryTriggerSpecification</alias>
-      </aliases>
-      <description>Trigger specification that applies to a single entry</description>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.59</syntax>
-      <equality>directoryStringFirstComponentMatch</equality>
-    </attributetype>
     <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.42" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
         <alias>publicKey</alias>
@@ -353,70 +355,58 @@
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.4203.666.1.25" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
-      <aliases>
-        <alias>contextCSN</alias>
-      </aliases>
-      <description>the largest committed CSN of a context</description>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.4203.666.11.2.1</syntax>
-      <equality>csnMatch</equality>
-      <ordering>csnOrderingMatch</ordering>
-    </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.25" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>prescriptiveTriggerSpecification</alias>
+        <alias>prefNodeName</alias>
       </aliases>
-      <description>Trigger specification that applies to a set of entries</description>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.59</syntax>
-      <equality>directoryStringFirstComponentMatch</equality>
+      <description>Attribute to describe the name of a Java Preferences API node</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseExactMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.18" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.20" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheCatalogEntryBaseDn</alias>
+        <alias>unixFilePath</alias>
       </aliases>
-      <description>A string up to 256 characters in length</description>
+      <description>A UNIX file path where case does make a difference</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <equality>caseExactIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.7" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>apacheServicePid</alias>
+        <alias>apacheAlias</alias>
       </aliases>
-      <description>A string up to 256 characters in length</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <description>asdf</description>
+      <usage>DSA_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.51" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.1.20" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>entryParentId</alias>
+        <alias>entryDN</alias>
       </aliases>
-      <description>attribute holding the id of parent entry</description>
+      <description>DN of the entry</description>
       <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseExactMatch</equality>
-      <ordering>caseExactOrderingMatch</ordering>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.39" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.9" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>keyAlgorithm</alias>
+        <alias>apacheSamType</alias>
       </aliases>
-      <description>The algorithm used for the key/pair used by the server for TLS</description>
+      <description>Single-use Authentication Mechanism type/vendor code</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseExactIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.43" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.10" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>apacheSubLevel</alias>
+        <alias>autonomousAreaSubentry</alias>
       </aliases>
-      <description>Index attribute used to track sub level searches</description>
-      <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
-      <equality>integerMatch</equality>
+      <description>Used to track a subentry associated with an autonomousArea</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
     <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.48" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
@@ -427,6 +417,25 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>exactDnAsStringMatch</equality>
     </attributetype>
+    <attributetype oid="1.3.6.1.4.1.4203.666.1.25" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+      <aliases>
+        <alias>contextCSN</alias>
+      </aliases>
+      <description>the largest committed CSN of a context</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.4203.666.11.2.1</syntax>
+      <equality>csnMatch</equality>
+      <ordering>csnOrderingMatch</ordering>
+    </attributetype>
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.41" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>publicKeyFormat</alias>
+      </aliases>
+      <description>The format of the public key used for TLS</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseExactIA5Match</equality>
+    </attributetype>
     <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
         <alias>javaxScriptCode</alias>
@@ -443,85 +452,63 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseExactIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.36" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>schemaModifiersName</alias>
-      </aliases>
-      <description>the DN of the modifier of the schema</description>
-      <superior>modifiersName</superior>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
-    </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.45" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.44" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
       <aliases>
-        <alias>changeTime</alias>
+        <alias>revisions</alias>
       </aliases>
-      <description>represents the time when the change event occurred</description>
+      <description>Revision numbers used in change log</description>
       <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.24</syntax>
-      <equality>generalizedTimeMatch</equality>
-      <ordering>generalizedTimeOrderingMatch</ordering>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
+      <ordering>integerOrderingMatch</ordering>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.33" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.4" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
       <aliases>
-        <alias>normalizers</alias>
+        <alias>apacheOneLevel</alias>
       </aliases>
-      <description>A multivalued normalizer description attribute</description>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
+      <description>Index attribute used to track one level searches</description>
+      <usage>DSA_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.16" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.47" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>apacheServiceFactoryPid</alias>
+        <alias>rev</alias>
+        <alias>eventId</alias>
       </aliases>
-      <description>A string up to 256 characters in length</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <description>the unique sequential id for the event (a.k.a revision number)</description>
+      <usage>DSA_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
+      <ordering>integerOrderingMatch</ordering>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.7" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.31" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>apacheAlias</alias>
+        <alias>entryDeleted</alias>
       </aliases>
-      <description>asdf</description>
-      <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <description>Whether or not an entry has been deleted.</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.7</syntax>
+      <equality>booleanMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.49" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.5" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
       <aliases>
-        <alias>changeLogContext</alias>
+        <alias>apacheOneAlias</alias>
       </aliases>
-      <description>tells about the changelog context suffix</description>
+      <description>Index attribute used to track single level aliases</description>
       <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <syntax>1.3.6.1.1.16.1</syntax>
+      <equality>uuidMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.2.37" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.1.5.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>subschemaSubentryName</alias>
+        <alias>javaByteCode</alias>
       </aliases>
-      <description>the DN of the schema subentry the modification info corresponds to</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.5</syntax>
     </attributetype>
   </attributetypes>
   <objectclasses>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.4" obsolete="false">
-      <aliases>
-        <alias>apacheFactoryConfiguration</alias>
-      </aliases>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>STRUCTURAL</type>
-      <mandatory>
-        <attributetype>cn</attributetype>
-        <attributetype>apacheServicePid</attributetype>
-      </mandatory>
-    </objectclass>
     <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.8" obsolete="false">
       <aliases>
         <alias>javaClass</alias>
@@ -535,16 +522,20 @@
         <attributetype>javaClassByteCode</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.5.5" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.11" obsolete="false">
       <aliases>
-        <alias>javaStoredProcUnit</alias>
+        <alias>tlsKeyInfo</alias>
       </aliases>
       <superiors>
-        <superior>storedProcUnit</superior>
+        <superior>top</superior>
       </superiors>
-      <type>STRUCTURAL</type>
+      <type>AUXILIARY</type>
       <mandatory>
-        <attributetype>javaByteCode</attributetype>
+        <attributetype>privateKeyFormat</attributetype>
+        <attributetype>keyAlgorithm</attributetype>
+        <attributetype>privateKey</attributetype>
+        <attributetype>publicKeyFormat</attributetype>
+        <attributetype>publicKey</attributetype>
       </mandatory>
     </objectclass>
     <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.6" obsolete="false">
@@ -559,30 +550,14 @@
         <attributetype>windowsFilePath</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.13" obsolete="false">
-      <aliases>
-        <alias>tag</alias>
-      </aliases>
-      <description>represents a Tag in change log</description>
-      <type>STRUCTURAL</type>
-      <mandatory>
-        <attributetype>rev</attributetype>
-      </mandatory>
-      <optional>
-        <attributetype>description</attributetype>
-      </optional>
-    </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.5.3" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.2.28" obsolete="false">
       <aliases>
-        <alias>storedProcUnit</alias>
+        <alias>triggerExecutionSubentry</alias>
       </aliases>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>ABSTRACT</type>
+      <description>Used to track a subentry associated with trigger areas</description>
+      <type>AUXILIARY</type>
       <mandatory>
-        <attributetype>storedProcLangId</attributetype>
-        <attributetype>storedProcUnitName</attributetype>
+        <attributetype>prescriptiveTriggerSpecification</attributetype>
       </mandatory>
     </objectclass>
     <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.12" obsolete="false">
@@ -598,18 +573,6 @@
         <attributetype>committer</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.7" obsolete="false">
-      <aliases>
-        <alias>unixFile</alias>
-      </aliases>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>STRUCTURAL</type>
-      <mandatory>
-        <attributetype>unixFilePath</attributetype>
-      </mandatory>
-    </objectclass>
     <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.9" obsolete="false">
       <aliases>
         <alias>apacheSubschema</alias>
@@ -625,6 +588,22 @@
         <attributetype>syntaxCheckers</attributetype>
       </optional>
     </objectclass>
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.5" obsolete="false">
+      <aliases>
+        <alias>apacheCatalogEntry</alias>
+      </aliases>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>STRUCTURAL</type>
+      <mandatory>
+        <attributetype>cn</attributetype>
+        <attributetype>apacheCatalogEntryBaseDn</attributetype>
+      </mandatory>
+      <optional>
+        <attributetype>apacheCatalogEntryName</attributetype>
+      </optional>
+    </objectclass>
     <objectclass oid="2.5.17.1" obsolete="false">
       <aliases>
         <alias>accessControlSubentry</alias>
@@ -634,26 +613,45 @@
         <attributetype>prescriptiveACI</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.2.28" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.7" obsolete="false">
       <aliases>
-        <alias>triggerExecutionSubentry</alias>
+        <alias>unixFile</alias>
       </aliases>
-      <description>Used to track a subentry associated with trigger areas</description>
-      <type>AUXILIARY</type>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>prescriptiveTriggerSpecification</attributetype>
+        <attributetype>unixFilePath</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.1" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.13" obsolete="false">
       <aliases>
-        <alias>prefNode</alias>
+        <alias>tag</alias>
+      </aliases>
+      <description>represents a Tag in change log</description>
+      <type>STRUCTURAL</type>
+      <mandatory>
+        <attributetype>rev</attributetype>
+      </mandatory>
+      <optional>
+        <attributetype>description</attributetype>
+      </optional>
+    </objectclass>
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.10" obsolete="false">
+      <aliases>
+        <alias>schemaModificationAttributes</alias>
       </aliases>
+      <description>a special entry tracking schema modification attributes</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>prefNodeName</attributetype>
+        <attributetype>ou</attributetype>
+        <attributetype>subschemaSubentryName</attributetype>
+        <attributetype>schemaModifyTimestamp</attributetype>
+        <attributetype>schemaModifiersName</attributetype>
       </mandatory>
     </objectclass>
     <objectclass oid="1.3.6.1.4.1.18060.0.4.1.5.8" obsolete="false">
@@ -669,36 +667,28 @@
         <attributetype>javaxScriptCode</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.5" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.5.5" obsolete="false">
       <aliases>
-        <alias>apacheCatalogEntry</alias>
+        <alias>javaStoredProcUnit</alias>
       </aliases>
       <superiors>
-        <superior>top</superior>
+        <superior>storedProcUnit</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>cn</attributetype>
-        <attributetype>apacheCatalogEntryBaseDn</attributetype>
+        <attributetype>javaByteCode</attributetype>
       </mandatory>
-      <optional>
-        <attributetype>apacheCatalogEntryName</attributetype>
-      </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.10" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.1" obsolete="false">
       <aliases>
-        <alias>schemaModificationAttributes</alias>
+        <alias>prefNode</alias>
       </aliases>
-      <description>a special entry tracking schema modification attributes</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>ou</attributetype>
-        <attributetype>subschemaSubentryName</attributetype>
-        <attributetype>schemaModifyTimestamp</attributetype>
-        <attributetype>schemaModifiersName</attributetype>
+        <attributetype>prefNodeName</attributetype>
       </mandatory>
     </objectclass>
     <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.3" obsolete="false">
@@ -717,47 +707,51 @@
         <attributetype>apacheServiceFactoryPid</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.11" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.5.3" obsolete="false">
       <aliases>
-        <alias>tlsKeyInfo</alias>
+        <alias>storedProcUnit</alias>
       </aliases>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>AUXILIARY</type>
+      <type>ABSTRACT</type>
       <mandatory>
-        <attributetype>privateKeyFormat</attributetype>
-        <attributetype>keyAlgorithm</attributetype>
-        <attributetype>privateKey</attributetype>
-        <attributetype>publicKeyFormat</attributetype>
-        <attributetype>publicKey</attributetype>
+        <attributetype>storedProcLangId</attributetype>
+        <attributetype>storedProcUnitName</attributetype>
       </mandatory>
     </objectclass>
-  </objectclasses>
-  <matchingrules>
-    <matchingrule oid="1.3.6.1.1.16.2" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.1.3.4" obsolete="false">
       <aliases>
-        <alias>uuidMatch</alias>
+        <alias>apacheFactoryConfiguration</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.1.16.1</syntaxoid>
-    </matchingrule>
-    <matchingrule oid="1.3.6.1.4.1.18060.0.4.1.1.3" obsolete="false">
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>STRUCTURAL</type>
+      <mandatory>
+        <attributetype>cn</attributetype>
+        <attributetype>apacheServicePid</attributetype>
+      </mandatory>
+    </objectclass>
+  </objectclasses>
+  <matchingrules>
+    <matchingrule oid="1.3.6.1.4.1.18060.0.4.1.1.1" obsolete="false">
       <aliases>
-        <alias>jdbmStringMatch</alias>
+        <alias>exactDnAsStringMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.12</syntaxoid>
     </matchingrule>
-    <matchingrule oid="1.3.6.1.4.1.18060.0.4.1.1.2" obsolete="false">
+    <matchingrule oid="1.3.6.1.4.1.4203.666.11.2.3" obsolete="false">
       <aliases>
-        <alias>bigIntegerMatch</alias>
+        <alias>csnOrderingMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.4203.666.11.2.1</syntaxoid>
     </matchingrule>
-    <matchingrule oid="1.3.6.1.4.1.18060.0.4.1.1.1" obsolete="false">
+    <matchingrule oid="1.3.6.1.1.16.2" obsolete="false">
       <aliases>
-        <alias>exactDnAsStringMatch</alias>
+        <alias>uuidMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.12</syntaxoid>
+      <syntaxoid>1.3.6.1.1.16.1</syntaxoid>
     </matchingrule>
     <matchingrule oid="1.3.6.1.4.1.4203.666.11.2.2" obsolete="false">
       <aliases>
@@ -771,25 +765,34 @@
       </aliases>
       <syntaxoid>1.3.6.1.4.1.4203.666.11.2.4</syntaxoid>
     </matchingrule>
-    <matchingrule oid="1.3.6.1.1.16.3" obsolete="false">
+    <matchingrule oid="1.3.6.1.4.1.18060.0.4.1.1.3" obsolete="false">
       <aliases>
-        <alias>uuidOrderingMatch</alias>
+        <alias>jdbmStringMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.1.16.1</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
     </matchingrule>
-    <matchingrule oid="1.3.6.1.4.1.4203.666.11.2.3" obsolete="false">
+    <matchingrule oid="1.3.6.1.4.1.18060.0.4.1.1.2" obsolete="false">
       <aliases>
-        <alias>csnOrderingMatch</alias>
+        <alias>bigIntegerMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.4203.666.11.2.1</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
+    </matchingrule>
+    <matchingrule oid="1.3.6.1.1.16.3" obsolete="false">
+      <aliases>
+        <alias>uuidOrderingMatch</alias>
+      </aliases>
+      <syntaxoid>1.3.6.1.1.16.1</syntaxoid>
     </matchingrule>
   </matchingrules>
   <syntaxes>
-    <syntax oid="1.3.6.1.4.1.4203.666.11.2.4" obsolete="false" humanreadable="true">
-      <description>CSN SID</description>
+    <syntax oid="1.3.6.1.4.1.18060.0.4.1.0.0" obsolete="false" humanreadable="true">
+      <description>Java Byte</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.4203.666.11.2.1" obsolete="false" humanreadable="true">
-      <description>CSN</description>
+    <syntax oid="1.3.6.1.1.16.1" obsolete="false" humanreadable="true">
+      <description>UUID</description>
+    </syntax>
+    <syntax oid="1.3.6.1.4.1.18060.0.4.1.0.4" obsolete="false" humanreadable="true">
+      <description>Java Int</description>
     </syntax>
     <syntax oid="1.3.6.1.4.1.18060.0.4.1.0.2" obsolete="false" humanreadable="true">
       <description>Java Short</description>
@@ -797,14 +800,11 @@
     <syntax oid="1.3.6.1.4.1.18060.0.4.1.0.3" obsolete="false" humanreadable="true">
       <description>Java Long</description>
     </syntax>
-    <syntax oid="1.3.6.1.1.16.1" obsolete="false" humanreadable="true">
-      <description>UUID</description>
-    </syntax>
-    <syntax oid="1.3.6.1.4.1.18060.0.4.1.0.4" obsolete="false" humanreadable="true">
-      <description>Java Int</description>
+    <syntax oid="1.3.6.1.4.1.4203.666.11.2.4" obsolete="false" humanreadable="true">
+      <description>CSN SID</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.18060.0.4.1.0.0" obsolete="false" humanreadable="true">
-      <description>Java Byte</description>
+    <syntax oid="1.3.6.1.4.1.4203.666.11.2.1" obsolete="false" humanreadable="true">
+      <description>CSN</description>
     </syntax>
   </syntaxes>
 </schema>

Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/apachedns.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/apachedns.xml?rev=1478829&r1=1478828&r2=1478829&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/apachedns.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/apachedns.xml Fri May  3 15:08:44 2013
@@ -19,33 +19,53 @@
 -->
 <schema name="apachedns">
   <attributetypes>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.13" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheDnsMxPreference</alias>
+        <alias>apacheDnsCharacterString</alias>
       </aliases>
-      <description>An integer denoting the mail exchange preference</description>
+      <description>A string up to 256 characters in length</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
-      <equality>integerMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.12" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheDnsSoaMinimum</alias>
+        <alias>apacheDnsDomainName</alias>
       </aliases>
-      <description>The unsigned 32 bit minimum TTL field that should be exported with any RR from this zone.</description>
+      <description>A domain name represented as a sequence of labels</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
-      <equality>integerMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheDnsSoaSerial</alias>
+        <alias>apacheDnsSoaRName</alias>
       </aliases>
-      <description>The unsigned 32 bit version number of the original copy of the zone</description>
+      <description>The domain name which specifies the mailbox of the person responsible for this zone</description>
+      <superior>apacheDnsDomainName</superior>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
+    </attributetype>
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>apacheDnsServiceWeight</alias>
+      </aliases>
+      <description>The unsigned 16 bit weight specifying a relative weight for entries with the same priority</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
     </attributetype>
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+      <aliases>
+        <alias>apacheDnsSoaMName</alias>
+      </aliases>
+      <description>The domain name of the name server that was the primary source of data for this zone</description>
+      <superior>apacheDnsDomainName</superior>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <equality>caseIgnoreIA5Match</equality>
+    </attributetype>
     <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.11" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
         <alias>apacheDnsSoaExpire</alias>
@@ -55,11 +75,11 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheDnsSoaRetry</alias>
+        <alias>apacheDnsServicePriority</alias>
       </aliases>
-      <description>A 32 bit time interval that should elapse before a failed refresh should be retired</description>
+      <description>The unsigned 16 bit priority of this target host</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
@@ -73,158 +93,118 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>apacheDnsSoaMName</alias>
-      </aliases>
-      <description>The domain name of the name server that was the primary source of data for this zone</description>
-      <superior>apacheDnsDomainName</superior>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
-    </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
-      <aliases>
-        <alias>apacheDnsDomainName</alias>
-      </aliases>
-      <description>A domain name represented as a sequence of labels</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
-    </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheDnsCharacterString</alias>
+        <alias>apacheDnsIpAddress</alias>
       </aliases>
-      <description>A string up to 256 characters in length</description>
+      <description>A 4 octet IP address</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.16" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheDnsServicePort</alias>
+        <alias>apacheDnsTtl</alias>
       </aliases>
-      <description>The unsigned 16 bit port on this target host of this service</description>
+      <description>An integer denoting time to live</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.15" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.8" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheDnsServiceWeight</alias>
+        <alias>apacheDnsSoaSerial</alias>
       </aliases>
-      <description>The unsigned 16 bit weight specifying a relative weight for entries with the same priority</description>
+      <description>The unsigned 32 bit version number of the original copy of the zone</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.12" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheDnsIpAddress</alias>
+        <alias>apacheDnsSoaMinimum</alias>
       </aliases>
-      <description>A 4 octet IP address</description>
+      <description>The unsigned 32 bit minimum TTL field that should be exported with any RR from this zone.</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheDnsSoaRName</alias>
+        <alias>apacheDnsClass</alias>
       </aliases>
-      <description>The domain name which specifies the mailbox of the person responsible for this zone</description>
-      <superior>apacheDnsDomainName</superior>
+      <description>The class of a resource record</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
       <equality>caseIgnoreIA5Match</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.14" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.13" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheDnsServicePriority</alias>
+        <alias>apacheDnsMxPreference</alias>
       </aliases>
-      <description>The unsigned 16 bit priority of this target host</description>
+      <description>An integer denoting the mail exchange preference</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.16" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheDnsTtl</alias>
+        <alias>apacheDnsServicePort</alias>
       </aliases>
-      <description>An integer denoting time to live</description>
+      <description>The unsigned 16 bit port on this target host of this service</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
       <equality>integerMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.18060.0.4.2.2.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>apacheDnsClass</alias>
+        <alias>apacheDnsSoaRetry</alias>
       </aliases>
-      <description>The class of a resource record</description>
+      <description>A 32 bit time interval that should elapse before a failed refresh should be retired</description>
       <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
-      <equality>caseIgnoreIA5Match</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <equality>integerMatch</equality>
     </attributetype>
   </attributetypes>
   <objectclasses>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.11" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.7" obsolete="false">
       <aliases>
-        <alias>apacheDnsReferralAddress</alias>
+        <alias>apacheDnsMailExchangeRecord</alias>
       </aliases>
-      <description>A non-authoritative referral or glue address record</description>
+      <description>A mail exchange MX record</description>
       <superiors>
         <superior>apacheDnsAbstractRecord</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
+        <attributetype>apacheDnsMxPreference</attributetype>
         <attributetype>apacheDnsDomainName</attributetype>
-        <attributetype>apacheDnsIpAddress</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.9" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.2" obsolete="false">
       <aliases>
-        <alias>apacheDnsServiceRecord</alias>
+        <alias>apacheDnsAddressRecord</alias>
       </aliases>
-      <description>A service SRV record</description>
+      <description>An address A record</description>
       <superiors>
         <superior>apacheDnsAbstractRecord</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>apacheDnsServicePriority</attributetype>
-        <attributetype>apacheDnsServiceWeight</attributetype>
-        <attributetype>apacheDnsServicePort</attributetype>
-        <attributetype>apacheDnsDomainName</attributetype>
-      </mandatory>
-    </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.1" obsolete="false">
-      <aliases>
-        <alias>apacheDnsAbstractRecord</alias>
-      </aliases>
-      <description>An abstract DNS record objectClass used to build other specific structural objectclasses for different record types</description>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>ABSTRACT</type>
-      <mandatory>
-        <attributetype>cn</attributetype>
+        <attributetype>apacheDnsIpAddress</attributetype>
       </mandatory>
-      <optional>
-        <attributetype>apacheDnsTtl</attributetype>
-        <attributetype>description</attributetype>
-      </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.2" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.10" obsolete="false">
       <aliases>
-        <alias>apacheDnsAddressRecord</alias>
+        <alias>apacheDnsReferralNameServer</alias>
       </aliases>
-      <description>An address A record</description>
+      <description>A non-authoritative referral or delegation name server</description>
       <superiors>
         <superior>apacheDnsAbstractRecord</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>apacheDnsIpAddress</attributetype>
+        <attributetype>apacheDnsDomainName</attributetype>
       </mandatory>
     </objectclass>
     <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.3" obsolete="false">
@@ -240,18 +220,27 @@
         <attributetype>apacheDnsDomainName</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.6" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.5" obsolete="false">
       <aliases>
-        <alias>apacheDnsCanonicalNameRecord</alias>
+        <alias>apacheDnsStartOfAuthorityRecord</alias>
       </aliases>
-      <description>A canonical name CNAME record</description>
+      <description>A start of authority SOA record</description>
       <superiors>
         <superior>apacheDnsAbstractRecord</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>apacheDnsDomainName</attributetype>
+        <attributetype>apacheDnsSoaMName</attributetype>
+        <attributetype>apacheDnsSoaRName</attributetype>
+        <attributetype>apacheDnsSoaMinimum</attributetype>
       </mandatory>
+      <optional>
+        <attributetype>apacheDnsClass</attributetype>
+        <attributetype>apacheDnsSoaSerial</attributetype>
+        <attributetype>apacheDnsSoaRefresh</attributetype>
+        <attributetype>apacheDnsSoaRetry</attributetype>
+        <attributetype>apacheDnsSoaExpire</attributetype>
+      </optional>
     </objectclass>
     <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.8" obsolete="false">
       <aliases>
@@ -266,47 +255,41 @@
         <attributetype>apacheDnsCharacterString</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.5" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.11" obsolete="false">
       <aliases>
-        <alias>apacheDnsStartOfAuthorityRecord</alias>
+        <alias>apacheDnsReferralAddress</alias>
       </aliases>
-      <description>A start of authority SOA record</description>
+      <description>A non-authoritative referral or glue address record</description>
       <superiors>
         <superior>apacheDnsAbstractRecord</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>apacheDnsSoaMName</attributetype>
-        <attributetype>apacheDnsSoaRName</attributetype>
-        <attributetype>apacheDnsSoaMinimum</attributetype>
+        <attributetype>apacheDnsDomainName</attributetype>
+        <attributetype>apacheDnsIpAddress</attributetype>
       </mandatory>
-      <optional>
-        <attributetype>apacheDnsClass</attributetype>
-        <attributetype>apacheDnsSoaSerial</attributetype>
-        <attributetype>apacheDnsSoaRefresh</attributetype>
-        <attributetype>apacheDnsSoaRetry</attributetype>
-        <attributetype>apacheDnsSoaExpire</attributetype>
-      </optional>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.7" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.9" obsolete="false">
       <aliases>
-        <alias>apacheDnsMailExchangeRecord</alias>
+        <alias>apacheDnsServiceRecord</alias>
       </aliases>
-      <description>A mail exchange MX record</description>
+      <description>A service SRV record</description>
       <superiors>
         <superior>apacheDnsAbstractRecord</superior>
       </superiors>
       <type>STRUCTURAL</type>
       <mandatory>
-        <attributetype>apacheDnsMxPreference</attributetype>
+        <attributetype>apacheDnsServicePriority</attributetype>
+        <attributetype>apacheDnsServiceWeight</attributetype>
+        <attributetype>apacheDnsServicePort</attributetype>
         <attributetype>apacheDnsDomainName</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.4" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.6" obsolete="false">
       <aliases>
-        <alias>apacheDnsNameServerRecord</alias>
+        <alias>apacheDnsCanonicalNameRecord</alias>
       </aliases>
-      <description>A name server NS record</description>
+      <description>A canonical name CNAME record</description>
       <superiors>
         <superior>apacheDnsAbstractRecord</superior>
       </superiors>
@@ -315,11 +298,11 @@
         <attributetype>apacheDnsDomainName</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.10" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.4" obsolete="false">
       <aliases>
-        <alias>apacheDnsReferralNameServer</alias>
+        <alias>apacheDnsNameServerRecord</alias>
       </aliases>
-      <description>A non-authoritative referral or delegation name server</description>
+      <description>A name server NS record</description>
       <superiors>
         <superior>apacheDnsAbstractRecord</superior>
       </superiors>
@@ -328,5 +311,22 @@
         <attributetype>apacheDnsDomainName</attributetype>
       </mandatory>
     </objectclass>
+    <objectclass oid="1.3.6.1.4.1.18060.0.4.2.3.1" obsolete="false">
+      <aliases>
+        <alias>apacheDnsAbstractRecord</alias>
+      </aliases>
+      <description>An abstract DNS record objectClass used to build other specific structural objectclasses for different record types</description>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>ABSTRACT</type>
+      <mandatory>
+        <attributetype>cn</attributetype>
+      </mandatory>
+      <optional>
+        <attributetype>apacheDnsTtl</attributetype>
+        <attributetype>description</attributetype>
+      </optional>
+    </objectclass>
   </objectclasses>
 </schema>