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 2011/12/14 16:20:42 UTC

svn commit: r1214294 [9/9] - in /directory/studio/trunk/plugins/schemaeditor: resources/schemas/apacheds/ src/main/java/org/apache/directory/studio/schemaeditor/view/widget/

Modified: directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/system.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/system.xml?rev=1214294&r1=1214293&r2=1214294&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/system.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/resources/schemas/apacheds/system.xml Wed Dec 14 15:20:41 2011
@@ -19,63 +19,47 @@
 -->
 <schema name="system">
   <attributetypes>
-    <attributetype oid="1.3.6.1.1.5" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>vendorVersion</alias>
+        <alias>vendorName</alias>
       </aliases>
-      <description>RFC3045: version of implementation</description>
+      <description>RFC3045: name of implementation vendor</description>
       <usage>DSA_OPERATION</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.1466.101.120.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.1.5" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>supportedControl</alias>
+        <alias>vendorVersion</alias>
       </aliases>
-      <description>RFC2252: supported controls</description>
+      <description>RFC3045: version of implementation</description>
       <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseExactMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.18.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.1466.101.119.3" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>subtreeSpecification</alias>
+        <alias>entryTtl</alias>
       </aliases>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.45</syntax>
+      <description>RFC2589: entry time-to-live</description>
+      <usage>DSA_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.1466.101.120.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.1466.101.119.4" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
       <aliases>
-        <alias>supportedExtension</alias>
+        <alias>dynamicSubtrees</alias>
       </aliases>
-      <description>RFC2252: supported extended operations</description>
+      <description>RFC2589: dynamic subtrees</description>
       <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.4203.1.3.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.1466.101.120.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>supportedFeatures</alias>
+        <alias>supportedControl</alias>
       </aliases>
+      <description>RFC2252: supported controls</description>
       <usage>DSA_OPERATION</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
-      <equality>objectIdentifierMatch</equality>
-    </attributetype>
-    <attributetype oid="2.5.18.9" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
-      <aliases>
-        <alias>hasSubordinates</alias>
-      </aliases>
-      <description>X.501: entry has children</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.250.1.57" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>labeledURI</alias>
-      </aliases>
-      <description>RFC2079: Uniform Resource Identifier with optional label</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.1466.101.120.14" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
@@ -85,84 +69,72 @@
       <usage>DSA_OPERATION</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
     </attributetype>
-    <attributetype oid="2.5.4.49" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.1466.101.120.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>distinguishedName</alias>
+        <alias>supportedLDAPVersion</alias>
       </aliases>
-      <description>RFC2256: common supertype of DN attributes</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <description>RFC2252: supported LDAP versions</description>
+      <usage>DSA_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
     </attributetype>
-    <attributetype oid="2.5.21.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.1466.101.120.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>attributeTypes</alias>
+        <alias>ldapSyntaxes</alias>
       </aliases>
-      <description>RFC2252: attribute types</description>
+      <description>RFC2252: LDAP syntaxes</description>
       <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.3</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.54</syntax>
       <equality>objectIdentifierFirstComponentMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.1466.101.120.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.1466.101.120.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>altServer</alias>
+        <alias>namingContexts</alias>
       </aliases>
-      <description>RFC2252: alternative servers</description>
+      <description>RFC2252: naming contexts</description>
       <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.1466.101.119.4" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.1466.101.120.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dynamicSubtrees</alias>
+        <alias>altServer</alias>
       </aliases>
-      <description>RFC2589: dynamic subtrees</description>
+      <description>RFC2252: alternative servers</description>
       <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.1466.101.120.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.1466.101.120.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>supportedLDAPVersion</alias>
+        <alias>supportedExtension</alias>
       </aliases>
-      <description>RFC2252: supported LDAP versions</description>
+      <description>RFC2252: supported extended operations</description>
       <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
     </attributetype>
-    <attributetype oid="2.5.4.41" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="1.3.6.1.4.1.250.1.57" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>name</alias>
+        <alias>labeledURI</alias>
       </aliases>
-      <description>RFC2256: common supertype of name attributes</description>
+      <description>RFC2079: Uniform Resource Identifier with optional label</description>
       <usage>USER_APPLICATIONS</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
-      <substring>caseIgnoreSubstringsMatch</substring>
-    </attributetype>
-    <attributetype oid="2.5.4.35" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>userPassword</alias>
-      </aliases>
-      <description>RFC2256/2307: password of user</description>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
-      <equality>octetStringMatch</equality>
+      <equality>caseExactMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.18.10" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="1.3.6.1.4.1.4203.1.3.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>subschemaSubentry</alias>
+        <alias>supportedFeatures</alias>
       </aliases>
-      <description>RFC2252: name of controlling subschema entry</description>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
-      <equality>distinguishedNameMatch</equality>
+      <usage>DSA_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+      <equality>objectIdentifierMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.21.9" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="2.16.840.1.113730.3.1.34" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>structuralObjectClass</alias>
+        <alias>ref</alias>
       </aliases>
-      <description>X.500(93): structural object class of entry</description>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
-      <equality>objectIdentifierMatch</equality>
+      <description>namedref: subordinate referral URL</description>
+      <usage>DISTRIBUTED_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseExactMatch</equality>
     </attributetype>
     <attributetype oid="2.5.18.1" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
@@ -174,25 +146,22 @@
       <equality>generalizedTimeMatch</equality>
       <ordering>generalizedTimeOrderingMatch</ordering>
     </attributetype>
-    <attributetype oid="2.5.4.3" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.18.10" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>cn</alias>
-        <alias>commonName</alias>
+        <alias>subschemaSubentry</alias>
       </aliases>
-      <description>RFC2256: common name(s) for which the entity is known by</description>
-      <superior>name</superior>
-      <usage>USER_APPLICATIONS</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseIgnoreMatch</equality>
-      <substring>caseIgnoreSubstringsMatch</substring>
+      <description>RFC2252: name of controlling subschema entry</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.18.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.18.12" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
       <aliases>
-        <alias>administrativeRole</alias>
+        <alias>collectiveAttributeSubentries</alias>
       </aliases>
       <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
-      <equality>objectIdentifierMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
     <attributetype oid="2.5.18.2" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
@@ -204,15 +173,6 @@
       <equality>generalizedTimeMatch</equality>
       <ordering>generalizedTimeOrderingMatch</ordering>
     </attributetype>
-    <attributetype oid="1.3.6.1.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
-      <aliases>
-        <alias>vendorName</alias>
-      </aliases>
-      <description>RFC3045: name of implementation vendor</description>
-      <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseExactMatch</equality>
-    </attributetype>
     <attributetype oid="2.5.18.3" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
         <alias>creatorsName</alias>
@@ -222,59 +182,29 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.4.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+    <attributetype oid="2.5.18.4" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>aliasedObjectName</alias>
-        <alias>aliasedEntryName</alias>
+        <alias>modifiersName</alias>
       </aliases>
-      <description>RFC2256: name of aliased object</description>
-      <usage>USER_APPLICATIONS</usage>
+      <description>RFC2252: name of last modifier</description>
+      <usage>DIRECTORY_OPERATION</usage>
       <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
       <equality>distinguishedNameMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.21.8" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>matchingRuleUse</alias>
-      </aliases>
-      <description>RFC2252: matching rule uses</description>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.31</syntax>
-      <equality>objectIdentifierFirstComponentMatch</equality>
-    </attributetype>
-    <attributetype oid="2.5.21.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.18.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>dITContentRules</alias>
+        <alias>administrativeRole</alias>
       </aliases>
-      <description>RFC2252: DIT content rules</description>
       <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.16</syntax>
-      <equality>objectIdentifierFirstComponentMatch</equality>
-    </attributetype>
-    <attributetype oid="1.3.6.1.4.1.1466.101.119.3" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
-      <aliases>
-        <alias>entryTtl</alias>
-      </aliases>
-      <description>RFC2589: entry time-to-live</description>
-      <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
-    </attributetype>
-    <attributetype oid="2.16.840.1.113730.3.1.34" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>ref</alias>
-      </aliases>
-      <description>namedref: subordinate referral URL</description>
-      <usage>DISTRIBUTED_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
-      <equality>caseExactMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+      <equality>objectIdentifierMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.21.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.18.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>nameForms</alias>
+        <alias>subtreeSpecification</alias>
       </aliases>
-      <description>RFC2252: name forms</description>
       <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.35</syntax>
-      <equality>objectIdentifierFirstComponentMatch</equality>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.45</syntax>
     </attributetype>
     <attributetype oid="2.5.18.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
@@ -284,22 +214,14 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
       <equality>objectIdentifierMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.21.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
-      <aliases>
-        <alias>objectClasses</alias>
-      </aliases>
-      <description>RFC2252: object classes</description>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.37</syntax>
-      <equality>objectIdentifierFirstComponentMatch</equality>
-    </attributetype>
-    <attributetype oid="2.5.18.12" obsolete="false" singlevalue="false" collective="false" nousermodification="true">
+    <attributetype oid="2.5.18.9" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
       <aliases>
-        <alias>collectiveAttributeSubentries</alias>
+        <alias>hasSubordinates</alias>
       </aliases>
+      <description>X.501: entry has children</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.7</syntax>
+      <equality>booleanMatch</equality>
     </attributetype>
     <attributetype oid="2.5.21.1" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
@@ -310,6 +232,15 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.17</syntax>
       <equality>integerFirstComponentMatch</equality>
     </attributetype>
+    <attributetype oid="2.5.21.2" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>dITContentRules</alias>
+      </aliases>
+      <description>RFC2252: DIT content rules</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.16</syntax>
+      <equality>objectIdentifierFirstComponentMatch</equality>
+    </attributetype>
     <attributetype oid="2.5.21.4" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
         <alias>matchingRules</alias>
@@ -319,13 +250,49 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.30</syntax>
       <equality>objectIdentifierFirstComponentMatch</equality>
     </attributetype>
-    <attributetype oid="1.3.6.1.4.1.1466.101.120.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.21.5" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>namingContexts</alias>
+        <alias>attributeTypes</alias>
       </aliases>
-      <description>RFC2252: naming contexts</description>
-      <usage>DSA_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <description>RFC2252: attribute types</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.3</syntax>
+      <equality>objectIdentifierFirstComponentMatch</equality>
+    </attributetype>
+    <attributetype oid="2.5.21.6" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>objectClasses</alias>
+      </aliases>
+      <description>RFC2252: object classes</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.37</syntax>
+      <equality>objectIdentifierFirstComponentMatch</equality>
+    </attributetype>
+    <attributetype oid="2.5.21.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>nameForms</alias>
+      </aliases>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.35</syntax>
+      <equality>objectIdentifierFirstComponentMatch</equality>
+    </attributetype>
+    <attributetype oid="2.5.21.8" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>matchingRuleUse</alias>
+      </aliases>
+      <description>RFC2252: matching rule uses</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.31</syntax>
+      <equality>objectIdentifierFirstComponentMatch</equality>
+    </attributetype>
+    <attributetype oid="2.5.21.9" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+      <aliases>
+        <alias>structuralObjectClass</alias>
+      </aliases>
+      <description>X.500(93): structural object class of entry</description>
+      <usage>DIRECTORY_OPERATION</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
+      <equality>objectIdentifierMatch</equality>
     </attributetype>
     <attributetype oid="2.5.4.0" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
@@ -336,38 +303,91 @@
       <syntax>1.3.6.1.4.1.1466.115.121.1.38</syntax>
       <equality>objectIdentifierMatch</equality>
     </attributetype>
-    <attributetype oid="2.5.18.4" obsolete="false" singlevalue="true" collective="false" nousermodification="true">
+    <attributetype oid="2.5.4.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
       <aliases>
-        <alias>modifiersName</alias>
+        <alias>aliasedObjectName</alias>
+        <alias>aliasedEntryName</alias>
       </aliases>
-      <description>RFC2252: name of last modifier</description>
-      <usage>DIRECTORY_OPERATION</usage>
+      <description>RFC2256: name of aliased object</description>
+      <usage>USER_APPLICATIONS</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.1466.101.120.16" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+    <attributetype oid="2.5.4.3" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
       <aliases>
-        <alias>ldapSyntaxes</alias>
+        <alias>cn</alias>
+        <alias>commonName</alias>
       </aliases>
-      <description>RFC2252: LDAP syntaxes</description>
-      <usage>DIRECTORY_OPERATION</usage>
-      <syntax>1.3.6.1.4.1.1466.115.121.1.54</syntax>
-      <equality>objectIdentifierFirstComponentMatch</equality>
+      <description>RFC2256: common name(s) for which the entity is known by</description>
+      <superior>name</superior>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
+    </attributetype>
+    <attributetype oid="2.5.4.35" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>userPassword</alias>
+      </aliases>
+      <description>RFC2256/2307: password of user</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.40</syntax>
+      <equality>octetStringMatch</equality>
+    </attributetype>
+    <attributetype oid="2.5.4.41" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>name</alias>
+      </aliases>
+      <description>RFC2256: common supertype of name attributes</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+      <equality>caseIgnoreMatch</equality>
+      <substring>caseIgnoreSubstringsMatch</substring>
+    </attributetype>
+    <attributetype oid="2.5.4.49" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+      <aliases>
+        <alias>distinguishedName</alias>
+      </aliases>
+      <description>RFC2256: common supertype of DN attributes</description>
+      <usage>USER_APPLICATIONS</usage>
+      <syntax>1.3.6.1.4.1.1466.115.121.1.12</syntax>
+      <equality>distinguishedNameMatch</equality>
     </attributetype>
   </attributetypes>
   <objectclasses>
-    <objectclass oid="2.5.6.1" obsolete="false">
+    <objectclass oid="1.3.6.1.4.1.1466.101.119.2" obsolete="false">
       <aliases>
-        <alias>alias</alias>
+        <alias>dynamicObject</alias>
       </aliases>
-      <description>RFC2256: an alias</description>
+      <description>RFC2589: Dynamic Object</description>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>AUXILIARY</type>
+    </objectclass>
+    <objectclass oid="1.3.6.1.4.1.1466.101.120.111" obsolete="false">
+      <aliases>
+        <alias>extensibleObject</alias>
+      </aliases>
+      <description>RFC2252: extensible object</description>
+      <superiors>
+        <superior>top</superior>
+      </superiors>
+      <type>AUXILIARY</type>
+    </objectclass>
+    <objectclass oid="1.3.6.1.4.1.4203.1.4.1" obsolete="false">
+      <aliases>
+        <alias>OpenLDAProotDSE</alias>
+        <alias>LDAProotDSE</alias>
+      </aliases>
+      <description>OpenLDAP Root DSE object</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
-      <mandatory>
-        <attributetype>aliasedObjectName</attributetype>
-      </mandatory>
+      <optional>
+        <attributetype>cn</attributetype>
+      </optional>
     </objectclass>
     <objectclass oid="2.16.840.1.113730.3.2.6" obsolete="false">
       <aliases>
@@ -382,25 +402,18 @@
         <attributetype>ref</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="2.5.6.0" obsolete="false">
-      <aliases>
-        <alias>top</alias>
-      </aliases>
-      <description>top of the superclass chain</description>
-      <type>ABSTRACT</type>
-      <mandatory>
-        <attributetype>objectClass</attributetype>
-      </mandatory>
-    </objectclass>
-    <objectclass oid="1.3.6.1.4.1.1466.101.120.111" obsolete="false">
+    <objectclass oid="2.5.17.0" obsolete="false">
       <aliases>
-        <alias>extensibleObject</alias>
+        <alias>subentry</alias>
       </aliases>
-      <description>RFC2252: extensible object</description>
       <superiors>
         <superior>top</superior>
       </superiors>
-      <type>AUXILIARY</type>
+      <type>STRUCTURAL</type>
+      <mandatory>
+        <attributetype>cn</attributetype>
+        <attributetype>subtreeSpecification</attributetype>
+      </mandatory>
     </objectclass>
     <objectclass oid="2.5.17.2" obsolete="false">
       <aliases>
@@ -424,152 +437,144 @@
         <attributetype>matchingRuleUse</attributetype>
       </optional>
     </objectclass>
-    <objectclass oid="2.5.17.0" obsolete="false">
+    <objectclass oid="2.5.6.0" obsolete="false">
       <aliases>
-        <alias>subentry</alias>
+        <alias>top</alias>
       </aliases>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>STRUCTURAL</type>
+      <description>top of the superclass chain</description>
+      <type>ABSTRACT</type>
       <mandatory>
-        <attributetype>cn</attributetype>
-        <attributetype>subtreeSpecification</attributetype>
+        <attributetype>objectClass</attributetype>
       </mandatory>
     </objectclass>
-    <objectclass oid="1.3.6.1.4.1.4203.1.4.1" obsolete="false">
+    <objectclass oid="2.5.6.1" obsolete="false">
       <aliases>
-        <alias>OpenLDAProotDSE</alias>
-        <alias>LDAProotDSE</alias>
+        <alias>alias</alias>
       </aliases>
-      <description>OpenLDAP Root DSE object</description>
+      <description>RFC2256: an alias</description>
       <superiors>
         <superior>top</superior>
       </superiors>
       <type>STRUCTURAL</type>
-      <optional>
-        <attributetype>cn</attributetype>
-      </optional>
-    </objectclass>
-    <objectclass oid="1.3.6.1.4.1.1466.101.119.2" obsolete="false">
-      <aliases>
-        <alias>dynamicObject</alias>
-      </aliases>
-      <description>RFC2589: Dynamic Object</description>
-      <superiors>
-        <superior>top</superior>
-      </superiors>
-      <type>AUXILIARY</type>
+      <mandatory>
+        <attributetype>aliasedObjectName</attributetype>
+      </mandatory>
     </objectclass>
   </objectclasses>
   <matchingrules>
-    <matchingrule oid="2.5.13.18" obsolete="false">
+    <matchingrule oid="1.3.6.1.4.1.1466.109.114.1" obsolete="false">
       <aliases>
-        <alias>octetStringOrderingMatch</alias>
+        <alias>caseExactIA5Match</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.26</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.33" obsolete="false">
+    <matchingrule oid="1.3.6.1.4.1.1466.109.114.2" obsolete="false">
       <aliases>
-        <alias>keywordMatch</alias>
+        <alias>caseIgnoreIA5Match</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.26</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.17" obsolete="false">
+    <matchingrule oid="1.3.6.1.4.1.1466.109.114.3" obsolete="false">
       <aliases>
-        <alias>octetStringMatch</alias>
+        <alias>caseIgnoreIA5SubstringsMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.3" obsolete="false">
+    <matchingrule oid="2.5.13.0" obsolete="false">
       <aliases>
-        <alias>caseIgnoreOrderingMatch</alias>
+        <alias>objectIdentifierMatch</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.38</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.8" obsolete="false">
+    <matchingrule oid="2.5.13.1" obsolete="false">
       <aliases>
-        <alias>numericStringMatch</alias>
+        <alias>distinguishedNameMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.36</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.12</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.21" obsolete="false">
+    <matchingrule oid="2.5.13.10" obsolete="false">
       <aliases>
-        <alias>telephoneNumberSubstringsMatch</alias>
+        <alias>numericStringSubstringsMatch</alias>
       </aliases>
       <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.15" obsolete="false">
+    <matchingrule oid="2.5.13.11" obsolete="false">
       <aliases>
-        <alias>integerOrderingMatch</alias>
+        <alias>caseIgnoreListMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.41</syntaxoid>
     </matchingrule>
-    <matchingrule oid="1.3.6.1.4.1.1466.109.114.2" obsolete="false">
+    <matchingrule oid="2.5.13.12" obsolete="false">
       <aliases>
-        <alias>caseIgnoreIA5Match</alias>
+        <alias>caseIgnoreListSubstringsMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.26</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.16" obsolete="false">
+    <matchingrule oid="2.5.13.13" obsolete="false">
       <aliases>
-        <alias>bitStringMatch</alias>
+        <alias>booleanMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.6</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.7</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.20" obsolete="false">
+    <matchingrule oid="2.5.13.14" obsolete="false">
       <aliases>
-        <alias>telephoneNumberMatch</alias>
+        <alias>integerMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.50</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.9" obsolete="false">
+    <matchingrule oid="2.5.13.15" obsolete="false">
       <aliases>
-        <alias>numericStringOrderingMatch</alias>
+        <alias>integerOrderingMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.36</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
     </matchingrule>
-    <matchingrule oid="1.3.6.1.4.1.1466.109.114.1" obsolete="false">
+    <matchingrule oid="2.5.13.16" obsolete="false">
       <aliases>
-        <alias>caseExactIA5Match</alias>
+        <alias>bitStringMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.26</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.6</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.13" obsolete="false">
+    <matchingrule oid="2.5.13.17" obsolete="false">
       <aliases>
-        <alias>booleanMatch</alias>
+        <alias>octetStringMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.7</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.1" obsolete="false">
+    <matchingrule oid="2.5.13.18" obsolete="false">
       <aliases>
-        <alias>distinguishedNameMatch</alias>
+        <alias>octetStringOrderingMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.12</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.6" obsolete="false">
+    <matchingrule oid="2.5.13.19" obsolete="false">
       <aliases>
-        <alias>caseExactOrderingMatch</alias>
+        <alias>octetStringSubstringsMatch</alias>
+      </aliases>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
+    </matchingrule>
+    <matchingrule oid="2.5.13.2" obsolete="false">
+      <aliases>
+        <alias>caseIgnoreMatch</alias>
       </aliases>
       <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
     </matchingrule>
-    <matchingrule oid="1.3.6.1.4.1.1466.109.114.3" obsolete="false">
+    <matchingrule oid="2.5.13.20" obsolete="false">
       <aliases>
-        <alias>caseIgnoreIA5SubstringsMatch</alias>
+        <alias>telephoneNumberMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.50</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.28" obsolete="false">
+    <matchingrule oid="2.5.13.21" obsolete="false">
       <aliases>
-        <alias>generalizedTimeOrderingMatch</alias>
+        <alias>telephoneNumberSubstringsMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.24</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.29" obsolete="false">
+    <matchingrule oid="2.5.13.22" obsolete="false">
       <aliases>
-        <alias>integerFirstComponentMatch</alias>
+        <alias>presentationAddressMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.43</syntaxoid>
     </matchingrule>
     <matchingrule oid="2.5.13.23" obsolete="false">
       <aliases>
@@ -577,53 +582,41 @@
       </aliases>
       <syntaxoid>1.3.6.1.4.1.1466.115.121.1.34</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.4" obsolete="false">
-      <aliases>
-        <alias>caseIgnoreSubstringsMatch</alias>
-      </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
-    </matchingrule>
-    <matchingrule oid="2.5.13.7" obsolete="false">
+    <matchingrule oid="2.5.13.24" obsolete="false">
       <aliases>
-        <alias>caseExactSubstringsMatch</alias>
+        <alias>protocolInformationMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.42</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.30" obsolete="false">
+    <matchingrule oid="2.5.13.27" obsolete="false">
       <aliases>
-        <alias>objectIdentifierFirstComponentMatch</alias>
+        <alias>generalizedTimeMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.38</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.24</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.22" obsolete="false">
+    <matchingrule oid="2.5.13.28" obsolete="false">
       <aliases>
-        <alias>presentationAddressMatch</alias>
+        <alias>generalizedTimeOrderingMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.43</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.24</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.14" obsolete="false">
+    <matchingrule oid="2.5.13.29" obsolete="false">
       <aliases>
-        <alias>integerMatch</alias>
+        <alias>integerFirstComponentMatch</alias>
       </aliases>
       <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.10" obsolete="false">
-      <aliases>
-        <alias>numericStringSubstringsMatch</alias>
-      </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
-    </matchingrule>
-    <matchingrule oid="2.5.13.11" obsolete="false">
+    <matchingrule oid="2.5.13.3" obsolete="false">
       <aliases>
-        <alias>caseIgnoreListMatch</alias>
+        <alias>caseIgnoreOrderingMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.41</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.2" obsolete="false">
+    <matchingrule oid="2.5.13.30" obsolete="false">
       <aliases>
-        <alias>caseIgnoreMatch</alias>
+        <alias>objectIdentifierFirstComponentMatch</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.38</syntaxoid>
     </matchingrule>
     <matchingrule oid="2.5.13.31" obsolete="false">
       <aliases>
@@ -631,133 +624,169 @@
       </aliases>
       <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.19" obsolete="false">
+    <matchingrule oid="2.5.13.32" obsolete="false">
       <aliases>
-        <alias>octetStringSubstringsMatch</alias>
+        <alias>wordMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.27" obsolete="false">
+    <matchingrule oid="2.5.13.33" obsolete="false">
       <aliases>
-        <alias>generalizedTimeMatch</alias>
+        <alias>keywordMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.24</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.12" obsolete="false">
+    <matchingrule oid="2.5.13.4" obsolete="false">
       <aliases>
-        <alias>caseIgnoreListSubstringsMatch</alias>
+        <alias>caseIgnoreSubstringsMatch</alias>
       </aliases>
       <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.0" obsolete="false">
+    <matchingrule oid="2.5.13.5" obsolete="false">
       <aliases>
-        <alias>objectIdentifierMatch</alias>
+        <alias>caseExactMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.38</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.5" obsolete="false">
+    <matchingrule oid="2.5.13.6" obsolete="false">
       <aliases>
-        <alias>caseExactMatch</alias>
+        <alias>caseExactOrderingMatch</alias>
       </aliases>
       <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.24" obsolete="false">
+    <matchingrule oid="2.5.13.7" obsolete="false">
       <aliases>
-        <alias>protocolInformationMatch</alias>
+        <alias>caseExactSubstringsMatch</alias>
       </aliases>
-      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.42</syntaxoid>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
     </matchingrule>
-    <matchingrule oid="2.5.13.32" obsolete="false">
+    <matchingrule oid="2.5.13.8" obsolete="false">
       <aliases>
-        <alias>wordMatch</alias>
+        <alias>numericStringMatch</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.36</syntaxoid>
+    </matchingrule>
+    <matchingrule oid="2.5.13.9" obsolete="false">
+      <aliases>
+        <alias>numericStringOrderingMatch</alias>
+      </aliases>
+      <syntaxoid>1.3.6.1.4.1.1466.115.121.1.36</syntaxoid>
     </matchingrule>
   </matchingrules>
   <syntaxes>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.1" obsolete="false" humanreadable="true">
+      <description>ACI Item</description>
+    </syntax>
     <syntax oid="1.3.6.1.4.1.1466.115.121.1.10" obsolete="false" humanreadable="false">
       <description>Certificate Pair</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.49" obsolete="false" humanreadable="false">
-      <description>Supported Algorithm</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.11" obsolete="false" humanreadable="true">
+      <description>Country String</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.48" obsolete="false" humanreadable="true">
-      <description>Supplier And Consumer</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.12" obsolete="false" humanreadable="true">
+      <description>DN</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.9" obsolete="false" humanreadable="false">
-      <description>Certificate List</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.13" obsolete="false" humanreadable="true">
+      <description>Data Quality Syntax</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.20" obsolete="false" humanreadable="true">
-      <description>DSE Type</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.14" obsolete="false" humanreadable="true">
+      <description>Delivery Method</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.56" obsolete="false" humanreadable="true">
-      <description>LDAP BootstrapSchema Definition</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.15" obsolete="false" humanreadable="true">
+      <description>Directory String</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.33" obsolete="false" humanreadable="true">
-      <description>MHS OR Address</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.16" obsolete="false" humanreadable="true">
+      <description>DIT Content Rule Description</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.12" obsolete="false" humanreadable="true">
-      <description>DN</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.17" obsolete="false" humanreadable="true">
+      <description>DIT Structure Rule Description</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.43" obsolete="false" humanreadable="true">
-      <description>Presentation Address</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.18" obsolete="false" humanreadable="true">
+      <description>DL Submit Permission</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.40" obsolete="false" humanreadable="false">
-      <description>Octet String</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.19" obsolete="false" humanreadable="true">
+      <description>DSA Quality Syntax</description>
+    </syntax>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.2" obsolete="false" humanreadable="true">
+      <description>Access Point</description>
+    </syntax>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.20" obsolete="false" humanreadable="true">
+      <description>DSE Type</description>
     </syntax>
     <syntax oid="1.3.6.1.4.1.1466.115.121.1.21" obsolete="false" humanreadable="true">
       <description>Enhanced Guide</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.36" obsolete="false" humanreadable="true">
-      <description>Numeric String</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.22" obsolete="false" humanreadable="true">
+      <description>Facsimile Telephone Number</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.7" obsolete="false" humanreadable="true">
-      <description>Boolean</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.23" obsolete="false" humanreadable="false">
+      <description>Fax</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.55" obsolete="false" humanreadable="true">
-      <description>Modify Rights</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.24" obsolete="false" humanreadable="true">
+      <description>Generalized Time</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.22" obsolete="false" humanreadable="true">
-      <description>Facsimile Telephone Number</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.25" obsolete="false" humanreadable="true">
+      <description>Guide</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.54" obsolete="false" humanreadable="true">
-      <description>LDAP Syntax Description</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.26" obsolete="false" humanreadable="true">
+      <description>IA5 String</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.42" obsolete="false" humanreadable="true">
-      <description>Protocol Information</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.27" obsolete="false" humanreadable="true">
+      <description>INTEGER</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.41" obsolete="false" humanreadable="true">
-      <description>Postal Address</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.28" obsolete="false" humanreadable="false">
+      <description>JPEG</description>
     </syntax>
     <syntax oid="1.3.6.1.4.1.1466.115.121.1.29" obsolete="false" humanreadable="true">
       <description>Master And Shadow Access Points</description>
     </syntax>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.3" obsolete="false" humanreadable="true">
+      <description>Attribute Type Description</description>
+    </syntax>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.30" obsolete="false" humanreadable="true">
+      <description>Matching Rule Description</description>
+    </syntax>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.31" obsolete="false" humanreadable="true">
+      <description>Matching Rule Use Description</description>
+    </syntax>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.32" obsolete="false" humanreadable="true">
+      <description>Mail Preference</description>
+    </syntax>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.33" obsolete="false" humanreadable="true">
+      <description>MHS OR Address</description>
+    </syntax>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.34" obsolete="false" humanreadable="true">
+      <description>Name And Optional UID</description>
+    </syntax>
     <syntax oid="1.3.6.1.4.1.1466.115.121.1.35" obsolete="false" humanreadable="true">
       <description>Name Form Description</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.13" obsolete="false" humanreadable="true">
-      <description>Data Quality Syntax</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.36" obsolete="false" humanreadable="true">
+      <description>Numeric String</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.6" obsolete="false" humanreadable="true">
-      <description>Bit String</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.37" obsolete="false" humanreadable="true">
+      <description>Object Class Description</description>
     </syntax>
     <syntax oid="1.3.6.1.4.1.1466.115.121.1.38" obsolete="false" humanreadable="true">
       <description>OID</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.31" obsolete="false" humanreadable="true">
-      <description>Matching Rule Use Description</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.39" obsolete="false" humanreadable="true">
+      <description>Other Mailbox</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.14" obsolete="false" humanreadable="true">
-      <description>Delivery Method</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.4" obsolete="false" humanreadable="false">
+      <description>Audio</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.53" obsolete="false" humanreadable="true">
-      <description>UTC Time</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.40" obsolete="false" humanreadable="false">
+      <description>Octet String</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.28" obsolete="false" humanreadable="false">
-      <description>JPEG</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.41" obsolete="false" humanreadable="true">
+      <description>Postal Address</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.15" obsolete="false" humanreadable="true">
-      <description>Directory String</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.42" obsolete="false" humanreadable="true">
+      <description>Protocol Information</description>
+    </syntax>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.43" obsolete="false" humanreadable="true">
+      <description>Presentation Address</description>
     </syntax>
     <syntax oid="1.3.6.1.4.1.1466.115.121.1.44" obsolete="false" humanreadable="true">
       <description>Printable String</description>
@@ -765,92 +794,62 @@
     <syntax oid="1.3.6.1.4.1.1466.115.121.1.45" obsolete="false" humanreadable="true">
       <description>Subtree Specification</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.32" obsolete="false" humanreadable="true">
-      <description>Mail Preference</description>
-    </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.5" obsolete="false" humanreadable="false">
-      <description>Binary</description>
-    </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.27" obsolete="false" humanreadable="true">
-      <description>INTEGER</description>
-    </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.23" obsolete="false" humanreadable="false">
-      <description>Fax</description>
-    </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.16" obsolete="false" humanreadable="true">
-      <description>DIT Content Rule Description</description>
-    </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.59" obsolete="false" humanreadable="true">
-      <description>Trigger Specification</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.46" obsolete="false" humanreadable="true">
+      <description>Supplier Information</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.52" obsolete="false" humanreadable="true">
-      <description>Telex Number</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.47" obsolete="false" humanreadable="true">
+      <description>Supplier Or Consumer</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.37" obsolete="false" humanreadable="true">
-      <description>Object Class Description</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.48" obsolete="false" humanreadable="true">
+      <description>Supplier And Consumer</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.24" obsolete="false" humanreadable="true">
-      <description>Generalized Time</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.49" obsolete="false" humanreadable="false">
+      <description>Supported Algorithm</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.4" obsolete="false" humanreadable="false">
-      <description>Audio</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.5" obsolete="false" humanreadable="false">
+      <description>Binary</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.17" obsolete="false" humanreadable="true">
-      <description>DIT Structure Rule Description</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.50" obsolete="false" humanreadable="true">
+      <description>Telephone Number</description>
     </syntax>
     <syntax oid="1.3.6.1.4.1.1466.115.121.1.51" obsolete="false" humanreadable="true">
       <description>Teletex Terminal Identifier</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.47" obsolete="false" humanreadable="true">
-      <description>Supplier Or Consumer</description>
-    </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.39" obsolete="false" humanreadable="true">
-      <description>Other Mailbox</description>
-    </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.50" obsolete="false" humanreadable="true">
-      <description>Telephone Number</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.52" obsolete="false" humanreadable="true">
+      <description>Telex Number</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.25" obsolete="false" humanreadable="true">
-      <description>Guide</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.53" obsolete="false" humanreadable="true">
+      <description>UTC Time</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.19" obsolete="false" humanreadable="true">
-      <description>DSA Quality Syntax</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.54" obsolete="false" humanreadable="true">
+      <description>LDAP Syntax Description</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.3" obsolete="false" humanreadable="true">
-      <description>Attribute Type Description</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.55" obsolete="false" humanreadable="true">
+      <description>Modify Rights</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.26" obsolete="false" humanreadable="true">
-      <description>IA5 String</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.56" obsolete="false" humanreadable="true">
+      <description>LDAP BootstrapSchema Definition</description>
     </syntax>
     <syntax oid="1.3.6.1.4.1.1466.115.121.1.57" obsolete="false" humanreadable="true">
       <description>LDAP BootstrapSchema Description</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.18" obsolete="false" humanreadable="true">
-      <description>DL Submit Permission</description>
-    </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.2" obsolete="false" humanreadable="true">
-      <description>Access Point</description>
-    </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.30" obsolete="false" humanreadable="true">
-      <description>Matching Rule Description</description>
-    </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.11" obsolete="false" humanreadable="true">
-      <description>Country String</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.58" obsolete="false" humanreadable="true">
+      <description>Substring Assertion</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.46" obsolete="false" humanreadable="true">
-      <description>Supplier Information</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.59" obsolete="false" humanreadable="true">
+      <description>Trigger Specification</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.34" obsolete="false" humanreadable="true">
-      <description>Name And Optional UID</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.6" obsolete="false" humanreadable="true">
+      <description>Bit String</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.58" obsolete="false" humanreadable="true">
-      <description>Substring Assertion</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.7" obsolete="false" humanreadable="true">
+      <description>Boolean</description>
     </syntax>
     <syntax oid="1.3.6.1.4.1.1466.115.121.1.8" obsolete="false" humanreadable="false">
       <description>Certificate</description>
     </syntax>
-    <syntax oid="1.3.6.1.4.1.1466.115.121.1.1" obsolete="false" humanreadable="true">
-      <description>ACI Item</description>
+    <syntax oid="1.3.6.1.4.1.1466.115.121.1.9" obsolete="false" humanreadable="false">
+      <description>Certificate List</description>
     </syntax>
   </syntaxes>
 </schema>

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java?rev=1214294&r1=1214293&r2=1214294&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java Wed Dec 14 15:20:41 2011
@@ -61,8 +61,8 @@ public class CoreSchemasSelectionWidget
 
     /** The array containing the 'core' from ApacheDS */
     private static final String[] coreSchemasFromApacheDS = new String[]
-        { "apache", "apachedns", "apachemeta", "autofs", "collective", "corba", "core", "cosine", "dhcp", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-            "inetorgperson", "java", "krb5kdc", "mozilla", "nis", "samba", "system" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
+        { "adsconfig","apache", "apachedns", "apachemeta", "autofs", "collective", "corba", "core", "cosine", "dhcp", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
+            "inetorgperson", "java", "krb5kdc", "mozilla", "nis", "pwdpolicy", "samba", "system" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
 
     /** The array containing the 'core' from OpenLDAP */
     private static final String[] coreSchemasFromOpenLdap = new String[]