directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r823443 - in /directory/studio/trunk/schemaeditor: resources/schemas/openldap/ src/main/java/org/apache/directory/studio/schemaeditor/view/widget/
Date Fri, 09 Oct 2009 07:52:12 GMT
Author: seelmann
Date: Fri Oct  9 07:52:11 2009
New Revision: 823443

URL: http://svn.apache.org/viewvc?rev=823443&view=rev
Log:
DIRSTUDIO-331 (Instant error when importing schema in a new schema-project):
o updated OpenLDAP core schema to latest 2.4, 
o added missing syntaxes and matching rules to system schema

Added:
    directory/studio/trunk/schemaeditor/resources/schemas/openldap/collective.xml
    directory/studio/trunk/schemaeditor/resources/schemas/openldap/duaconf.xml
Modified:
    directory/studio/trunk/schemaeditor/resources/schemas/openldap/core.xml
    directory/studio/trunk/schemaeditor/resources/schemas/openldap/ppolicy.xml
    directory/studio/trunk/schemaeditor/resources/schemas/openldap/system.xml
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java

Added: directory/studio/trunk/schemaeditor/resources/schemas/openldap/collective.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/resources/schemas/openldap/collective.xml?rev=823443&view=auto
==============================================================================
--- directory/studio/trunk/schemaeditor/resources/schemas/openldap/collective.xml (added)
+++ directory/studio/trunk/schemaeditor/resources/schemas/openldap/collective.xml Fri Oct  9 07:52:11 2009
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema name="collective">
+   <attributetypes>
+      <attributetype oid="2.5.4.7.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+         <aliases>
+            <alias>c-l</alias>
+         </aliases>
+         <superior>l</superior>
+         <usage>USER_APPLICATIONS</usage>
+      </attributetype>
+      <attributetype oid="2.5.4.8.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+         <aliases>
+            <alias>c-st</alias>
+         </aliases>
+         <superior>st</superior>
+         <usage>USER_APPLICATIONS</usage>
+      </attributetype>
+      <attributetype oid="2.5.4.9.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+         <aliases>
+            <alias>c-street</alias>
+         </aliases>
+         <superior>street</superior>
+         <usage>USER_APPLICATIONS</usage>
+      </attributetype>
+      <attributetype oid="2.5.4.10.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+         <aliases>
+            <alias>c-o</alias>
+         </aliases>
+         <superior>o</superior>
+         <usage>USER_APPLICATIONS</usage>
+      </attributetype>
+      <attributetype oid="2.5.4.11.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+         <aliases>
+            <alias>c-ou</alias>
+         </aliases>
+         <superior>ou</superior>
+         <usage>USER_APPLICATIONS</usage>
+      </attributetype>
+      <attributetype oid="2.5.4.16.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+         <aliases>
+            <alias>c-PostalAddress</alias>
+         </aliases>
+         <superior>postalAddress</superior>
+         <usage>USER_APPLICATIONS</usage>
+      </attributetype>
+      <attributetype oid="2.5.4.17.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+         <aliases>
+            <alias>c-PostalCode</alias>
+         </aliases>
+         <superior>postalCode</superior>
+         <usage>USER_APPLICATIONS</usage>
+      </attributetype>
+      <attributetype oid="2.5.4.18.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+         <aliases>
+            <alias>c-PostOfficeBox</alias>
+         </aliases>
+         <superior>postOfficeBox</superior>
+         <usage>USER_APPLICATIONS</usage>
+      </attributetype>
+      <attributetype oid="2.5.4.19.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+         <aliases>
+            <alias>c-PhysicalDeliveryOfficeName</alias>
+         </aliases>
+         <superior>physicalDeliveryOfficeName</superior>
+         <usage>USER_APPLICATIONS</usage>
+      </attributetype>
+      <attributetype oid="2.5.4.20.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+         <aliases>
+            <alias>c-TelephoneNumber</alias>
+         </aliases>
+         <superior>telephoneNumber</superior>
+         <usage>USER_APPLICATIONS</usage>
+      </attributetype>
+      <attributetype oid="2.5.4.21.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+         <aliases>
+            <alias>c-TelexNumber</alias>
+         </aliases>
+         <superior>telexNumber</superior>
+         <usage>USER_APPLICATIONS</usage>
+      </attributetype>
+      <attributetype oid="2.5.4.23.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+         <aliases>
+            <alias>c-FacsimileTelephoneNumber</alias>
+         </aliases>
+         <superior>facsimileTelephoneNumber</superior>
+         <usage>USER_APPLICATIONS</usage>
+      </attributetype>
+      <attributetype oid="2.5.4.25.1" obsolete="false" singlevalue="false" collective="true" nousermodification="false">
+         <aliases>
+            <alias>c-InternationalISDNNumber</alias>
+         </aliases>
+         <superior>internationalISDNNumber</superior>
+         <usage>USER_APPLICATIONS</usage>
+      </attributetype>
+   </attributetypes>
+</schema>
\ No newline at end of file

Modified: directory/studio/trunk/schemaeditor/resources/schemas/openldap/core.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/resources/schemas/openldap/core.xml?rev=823443&r1=823442&r2=823443&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/resources/schemas/openldap/core.xml (original)
+++ directory/studio/trunk/schemaeditor/resources/schemas/openldap/core.xml Fri Oct  9 07:52:11 2009
@@ -36,9 +36,10 @@
             <alias>c</alias>
             <alias>countryName</alias>
          </aliases>
-         <description>RFC2256: ISO-3166 country 2-letter code</description>
+         <description>RFC4519: two-letter ISO-3166 country code</description>
          <superior>name</superior>
          <usage>USER_APPLICATIONS</usage>
+         <syntax>1.3.6.1.4.1.1466.115.121.1.11</syntax>
       </attributetype>
       <attributetype oid="2.5.4.7" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
          <aliases>

Added: directory/studio/trunk/schemaeditor/resources/schemas/openldap/duaconf.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/resources/schemas/openldap/duaconf.xml?rev=823443&view=auto
==============================================================================
--- directory/studio/trunk/schemaeditor/resources/schemas/openldap/duaconf.xml (added)
+++ directory/studio/trunk/schemaeditor/resources/schemas/openldap/duaconf.xml Fri Oct  9 07:52:11 2009
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema name="duaconf">
+   <attributetypes>
+      <attributetype oid="1.3.6.1.4.1.11.1.3.1.1.0" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+         <aliases>
+            <alias>defaultServerList</alias>
+         </aliases>
+         <description>Default LDAP server host address used by a DUA</description>
+         <usage>USER_APPLICATIONS</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.11.1.3.1.1.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+         <aliases>
+            <alias>defaultSearchBase</alias>
+         </aliases>
+         <description>Default LDAP base DN used by a DUA</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.11.1.3.1.1.2" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+         <aliases>
+            <alias>preferredServerList</alias>
+         </aliases>
+         <description>Preferred LDAP server host addresses to be used by a DUA</description>
+         <usage>USER_APPLICATIONS</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.11.1.3.1.1.3" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+         <aliases>
+            <alias>searchTimeLimit</alias>
+         </aliases>
+         <description>Maximum time in seconds a DUA should allow for a search to complete</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.11.1.3.1.1.4" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+         <aliases>
+            <alias>bindTimeLimit</alias>
+         </aliases>
+         <description>Maximum time in seconds a DUA should allow for the bind operation to complete</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.11.1.3.1.1.5" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+         <aliases>
+            <alias>followReferrals</alias>
+         </aliases>
+         <description>Tells DUA if it should follow referrals returned by a DSA search result</description>
+         <usage>USER_APPLICATIONS</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.11.1.3.1.1.16" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+         <aliases>
+            <alias>dereferenceAliases</alias>
+         </aliases>
+         <description>Tells DUA if it should dereference aliases</description>
+         <usage>USER_APPLICATIONS</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.11.1.3.1.1.6" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+         <aliases>
+            <alias>authenticationMethod</alias>
+         </aliases>
+         <description>A keystring which identifies the type of authentication method used to contact the DSA</description>
+         <usage>USER_APPLICATIONS</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.11.1.3.1.1.7" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+         <aliases>
+            <alias>profileTTL</alias>
+         </aliases>
+         <description>Time to live, in seconds, before a client DUA should re-read this configuration profile</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.11.1.3.1.1.14" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+         <aliases>
+            <alias>serviceSearchDescriptor</alias>
+         </aliases>
+         <description>LDAP search descriptor list used by a DUA</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.11.1.3.1.1.9" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+         <aliases>
+            <alias>attributeMap</alias>
+         </aliases>
+         <description>Attribute mappings used by a DUA</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.11.1.3.1.1.10" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+         <aliases>
+            <alias>credentialLevel</alias>
+         </aliases>
+         <description>Identifies type of credentials a DUA should use when binding to the LDAP server</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.11.1.3.1.1.11" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+         <aliases>
+            <alias>objectclassMap</alias>
+         </aliases>
+         <description>Objectclass mappings used by a DUA</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.11.1.3.1.1.12" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+         <aliases>
+            <alias>defaultSearchScope</alias>
+         </aliases>
+         <description>Default search scope used by a DUA</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.11.1.3.1.1.13" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+         <aliases>
+            <alias>serviceCredentialLevel</alias>
+         </aliases>
+         <description>Identifies type of credentials a DUA should use when binding to the LDAP server for a specific service</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.11.1.3.1.1.15" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
+         <aliases>
+            <alias>serviceAuthenticationMethod</alias>
+         </aliases>
+         <description>Authentication method used by a service of the DUA</description>
+         <usage>USER_APPLICATIONS</usage>
+         <syntax>1.3.6.1.4.1.1466.115.121.1.15</syntax>
+         <equality>caseIgnoreMatch</equality>
+      </attributetype>
+   </attributetypes>
+   <objectclasses>
+      <objectclass oid="1.3.6.1.4.1.11.1.3.1.2.5" obsolete="false">
+         <aliases>
+            <alias>DUAConfigProfile</alias>
+         </aliases>
+         <description>Abstraction of a base configuration for a DUA</description>
+         <superiors>
+            <superior>top</superior>
+         </superiors>
+         <type>STRUCTURAL</type>
+         <mandatory>
+            <attributetype>cn</attributetype>
+         </mandatory>
+         <optional>
+            <attributetype>defaultServerList</attributetype>
+            <attributetype>preferredServerList</attributetype>
+            <attributetype>defaultSearchBase</attributetype>
+            <attributetype>defaultSearchScope</attributetype>
+            <attributetype>searchTimeLimit</attributetype>
+            <attributetype>bindTimeLimit</attributetype>
+            <attributetype>credentialLevel</attributetype>
+            <attributetype>authenticationMethod</attributetype>
+            <attributetype>followReferrals</attributetype>
+            <attributetype>dereferenceAliases</attributetype>
+            <attributetype>serviceSearchDescriptor</attributetype>
+            <attributetype>serviceCredentialLevel</attributetype>
+            <attributetype>serviceAuthenticationMethod</attributetype>
+            <attributetype>objectclassMap</attributetype>
+            <attributetype>attributeMap</attributetype>
+            <attributetype>profileTTL</attributetype>
+         </optional>
+      </objectclass>
+   </objectclasses>
+</schema>
\ No newline at end of file

Modified: directory/studio/trunk/schemaeditor/resources/schemas/openldap/ppolicy.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/resources/schemas/openldap/ppolicy.xml?rev=823443&r1=823442&r2=823443&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/resources/schemas/openldap/ppolicy.xml (original)
+++ directory/studio/trunk/schemaeditor/resources/schemas/openldap/ppolicy.xml Fri Oct  9 07:52:11 2009
@@ -125,7 +125,7 @@
          <aliases>
             <alias>pwdCheckModule</alias>
          </aliases>
-         <description>Loadable module that instantiates \"check_password() function</description>
+         <description>Loadable module that instantiates check_password() function</description>
          <usage>USER_APPLICATIONS</usage>
          <syntax>1.3.6.1.4.1.1466.115.121.1.26</syntax>
          <equality>caseExactIA5Match</equality>

Modified: directory/studio/trunk/schemaeditor/resources/schemas/openldap/system.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/resources/schemas/openldap/system.xml?rev=823443&r1=823442&r2=823443&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/resources/schemas/openldap/system.xml (original)
+++ directory/studio/trunk/schemaeditor/resources/schemas/openldap/system.xml Fri Oct  9 07:52:11 2009
@@ -1,6 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schema name="system">
    <attributetypes>
+      <attributetype oid="1.3.6.1.1.1.1.0" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+         <aliases>
+            <alias>uidNumber</alias>
+         </aliases>
+         <description>An integer uniquely identifying a user in an administrative domain</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.1.1.1.1" obsolete="false" singlevalue="true" collective="false" nousermodification="false">
+         <aliases>
+            <alias>gidNumber</alias>
+         </aliases>
+         <description>An integer uniquely identifying a group in an administrative domain</description>
+         <usage>USER_APPLICATIONS</usage>
+         <syntax>1.3.6.1.4.1.1466.115.121.1.27</syntax>
+         <equality>integerMatch</equality>
+      </attributetype>
       <attributetype oid="2.5.4.0" obsolete="false" singlevalue="false" collective="false" nousermodification="false">
          <aliases>
             <alias>objectClass</alias>
@@ -123,76 +141,70 @@
          </mandatory>
       </objectclass>
    </objectclasses>
-       <matchingrules>
-      <matchingrule oid="2.5.13.14" obsolete="false">
+   <matchingrules>
+      <matchingrule oid="1.3.6.1.1.16.3" obsolete="false">
          <aliases>
-            <alias>integerMatch</alias>
+            <alias>UUIDOrderingMatch</alias>
          </aliases>
-         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
+         <syntaxoid>1.3.6.1.1.16.1</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.3" obsolete="false">
+      <matchingrule oid="1.3.6.1.1.16.2" obsolete="false">
          <aliases>
-            <alias>caseIgnoreOrderingMatch</alias>
+            <alias>UUIDMatch</alias>
          </aliases>
-         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
+         <syntaxoid>1.3.6.1.1.16.1</syntaxoid>
       </matchingrule>
-      <matchingrule oid="1.3.6.1.4.1.1466.109.114.3" obsolete="false">
+      <matchingrule oid="1.2.840.113556.1.4.804" obsolete="false">
          <aliases>
-            <alias>caseIgnoreIA5SubstringsMatch</alias>
+            <alias>integerBitOrMatch</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.27</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.4" obsolete="false">
+      <matchingrule oid="1.2.840.113556.1.4.803" obsolete="false">
          <aliases>
-            <alias>caseIgnoreSubstringsMatch</alias>
+            <alias>integerBitAndMatch</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.27</syntaxoid>
       </matchingrule>
-      <matchingrule oid="1.3.6.1.4.1.1466.109.114.2" obsolete="false">
+      <matchingrule oid="1.3.6.1.4.1.4203.1.2.1" obsolete="false">
          <aliases>
-            <alias>caseIgnoreIA5Match</alias>
+            <alias>caseExactIA5SubstringsMatch</alias>
          </aliases>
          <syntaxoid>1.3.6.1.4.1.1466.115.121.1.26</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.27" obsolete="false">
-         <aliases>
-            <alias>generalizedTimeMatch</alias>
-         </aliases>
-         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.24</syntaxoid>
-      </matchingrule>
-      <matchingrule oid="2.5.13.8" obsolete="false">
+      <matchingrule oid="1.3.6.1.4.1.1466.109.114.3" obsolete="false">
          <aliases>
-            <alias>numericStringMatch</alias>
+            <alias>caseIgnoreIA5SubstringsMatch</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.26</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.1" obsolete="false">
+      <matchingrule oid="1.3.6.1.4.1.1466.109.114.2" obsolete="false">
          <aliases>
-            <alias>distinguishedNameMatch</alias>
+            <alias>caseIgnoreIA5Match</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.26</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.13" obsolete="false">
+      <matchingrule oid="1.3.6.1.4.1.1466.109.114.1" obsolete="false">
          <aliases>
-            <alias>booleanMatch</alias>
+            <alias>caseExactIA5Match</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.26</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.6" obsolete="false">
+      <matchingrule oid="2.5.13.38" obsolete="false">
          <aliases>
-            <alias>caseExactOrderingMatch</alias>
+            <alias>certificateListExactMatch</alias>
          </aliases>
-         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
+         <syntaxoid>1.3.6.1.1.15.5</syntaxoid>
       </matchingrule>
-      <matchingrule oid="1.3.6.1.4.1.1466.109.114.1" obsolete="false">
+      <matchingrule oid="2.5.13.34" obsolete="false">
          <aliases>
-            <alias>caseExactIA5Match</alias>
+            <alias>certificateExactMatch</alias>
          </aliases>
-         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.26</syntaxoid>
+         <syntaxoid>1.3.6.1.1.15.1</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.0" obsolete="false">
+      <matchingrule oid="2.5.13.30" obsolete="false">
          <aliases>
-            <alias>objectIdentifierMatch</alias>
+            <alias>objectIdentifierFirstComponentMatch</alias>
          </aliases>
          <syntaxoid>1.3.6.1.4.1.1466.115.121.1.38</syntaxoid>
       </matchingrule>
@@ -202,15 +214,27 @@
          </aliases>
          <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.10" obsolete="false">
+      <matchingrule oid="2.5.13.28" obsolete="false">
          <aliases>
-            <alias>numericStringSubstringsMatch</alias>
+            <alias>generalizedTimeOrderingMatch</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.24</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.7" obsolete="false">
+      <matchingrule oid="2.5.13.27" obsolete="false">
          <aliases>
-            <alias>caseExactSubstringsMatch</alias>
+            <alias>generalizedTimeMatch</alias>
+         </aliases>
+         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.24</syntaxoid>
+      </matchingrule>
+      <matchingrule oid="2.5.13.23" obsolete="false">
+         <aliases>
+            <alias>uniqueMemberMatch</alias>
+         </aliases>
+         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.34</syntaxoid>
+      </matchingrule>
+      <matchingrule oid="2.5.13.21" obsolete="false">
+         <aliases>
+            <alias>telephoneNumberSubstringsMatch</alias>
          </aliases>
          <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
       </matchingrule>
@@ -220,282 +244,415 @@
          </aliases>
          <syntaxoid>1.3.6.1.4.1.1466.115.121.1.50</syntaxoid>
       </matchingrule>
+      <matchingrule oid="2.5.13.19" obsolete="false">
+         <aliases>
+            <alias>octetStringSubstringsMatch</alias>
+         </aliases>
+         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
+      </matchingrule>
       <matchingrule oid="2.5.13.18" obsolete="false">
          <aliases>
             <alias>octetStringOrderingMatch</alias>
          </aliases>
          <syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
       </matchingrule>
+      <matchingrule oid="2.5.13.17" obsolete="false">
+         <aliases>
+            <alias>octetStringMatch</alias>
+         </aliases>
+         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.40</syntaxoid>
+      </matchingrule>
+      <matchingrule oid="2.5.13.16" obsolete="false">
+         <aliases>
+            <alias>bitStringMatch</alias>
+         </aliases>
+         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.6</syntaxoid>
+      </matchingrule>
       <matchingrule oid="2.5.13.15" obsolete="false">
          <aliases>
             <alias>integerOrderingMatch</alias>
          </aliases>
          <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.23" obsolete="false">
+      <matchingrule oid="2.5.13.14" obsolete="false">
          <aliases>
-            <alias>uniqueMemberMatch</alias>
+            <alias>integerMatch</alias>
          </aliases>
-         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.34</syntaxoid>
+         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.27</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.30" obsolete="false">
+      <matchingrule oid="2.5.13.11" obsolete="false">
          <aliases>
-            <alias>objectIdentifierFirstComponentMatch</alias>
+            <alias>caseIgnoreListMatch</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.41</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.5" obsolete="false">
+      <matchingrule oid="2.5.13.10" obsolete="false">
          <aliases>
-            <alias>caseExactMatch</alias>
+            <alias>numericStringSubstringsMatch</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.58</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.17" obsolete="false">
+      <matchingrule oid="2.5.13.9" obsolete="false">
          <aliases>
-            <alias>octetStringMatch</alias>
+            <alias>numericStringOrderingMatch</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.36</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.28" obsolete="false">
+      <matchingrule oid="2.5.13.8" obsolete="false">
          <aliases>
-            <alias>generalizedTimeOrderingMatch</alias>
+            <alias>numericStringMatch</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.36</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.21" obsolete="false">
+      <matchingrule oid="2.5.13.7" obsolete="false">
          <aliases>
-            <alias>telephoneNumberSubstringsMatch</alias>
+            <alias>caseExactSubstringsMatch</alias>
          </aliases>
          <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.2" obsolete="false">
+      <matchingrule oid="2.5.13.6" obsolete="false">
          <aliases>
-            <alias>caseIgnoreMatch</alias>
+            <alias>caseExactOrderingMatch</alias>
          </aliases>
          <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
       </matchingrule>
-      <matchingrule oid="1.3.6.1.1.16.2" obsolete="false">
+      <matchingrule oid="2.5.13.5" obsolete="false">
          <aliases>
-            <alias>UUIDMatch</alias>
+            <alias>caseExactMatch</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.1.16.3" obsolete="false">
+      <matchingrule oid="2.5.13.4" obsolete="false">
          <aliases>
-            <alias>UUIDOrderingMatch</alias>
+            <alias>caseIgnoreSubstringsMatch</alias>
          </aliases>
-         <syntaxoid>1.3.6.1.1.16.1</syntaxoid>
+         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
       </matchingrule>
-      <matchingrule oid="1.3.6.1.4.1.1466.109.114.3" obsolete="false">
+      <matchingrule oid="2.5.13.3" obsolete="false">
          <aliases>
-            <alias>caseExactIA5SubstringsMatch</alias>
+            <alias>caseIgnoreOrderingMatch</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.15</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.34" obsolete="false">
+      <matchingrule oid="2.5.13.2" obsolete="false">
          <aliases>
-            <alias>certificateExactMatch</alias>
+            <alias>caseIgnoreMatch</alias>
          </aliases>
-         <syntaxoid>1.2.826.0.1.3344810.7.1</syntaxoid>
+         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.15</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.35" obsolete="false">
+      <matchingrule oid="1.2.36.79672281.1.13.3" obsolete="false">
          <aliases>
-            <alias>certificateMatch</alias>
+            <alias>rdnMatch</alias>
          </aliases>
-         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.8</syntaxoid>
+         <syntaxoid>1.2.36.79672281.1.5.0</syntaxoid>
       </matchingrule>
-      <matchingrule oid="1.2.840.113556.1.4.803" obsolete="false">
+      <matchingrule oid="2.5.13.1" obsolete="false">
          <aliases>
-            <alias>integerBitAndMatch</alias>
+            <alias>distinguishedNameMatch</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.12</syntaxoid>
       </matchingrule>
-      <matchingrule oid="1.2.840.113556.1.4.804" obsolete="false">
+      <matchingrule oid="2.5.13.0" obsolete="false">
          <aliases>
-            <alias>integerBitOrMatch</alias>
+            <alias>objectIdentifierMatch</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.38</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.9" obsolete="false">
+      <matchingrule oid="2.5.13.12" obsolete="false">
          <aliases>
-            <alias>numericStringOrderingMatch</alias>
+            <alias>caseIgnoreListSubstringsMatch</alias>
          </aliases>
-         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.36</syntaxoid>
+         <syntaxoid>11.3.6.1.4.1.1466.115.121.1.58</syntaxoid>
       </matchingrule>
-      <matchingrule oid="2.5.13.19" obsolete="false">
+      <matchingrule oid="2.5.13.22" obsolete="false">
          <aliases>
-            <alias>octetStringSubstringsMatch</alias>
+            <alias>presentationAddressMatch</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.43</syntaxoid>
       </matchingrule>
-      <matchingrule oid="1.2.36.79672281.1.13.3" obsolete="false">
+      <matchingrule oid="2.5.13.24" obsolete="false">
          <aliases>
-            <alias>rdnMatch</alias>
+            <alias>protocolInformationMatch</alias>
          </aliases>
-         <syntaxoid>1.2.36.79672281.1.5.0</syntaxoid>
+         <syntaxoid>1.3.6.1.4.1.1466.115.121.1.42</syntaxoid>
       </matchingrule>
-    </matchingrules>
- <syntaxes>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.11" obsolete="false" humanreadable="true">
+   </matchingrules>
+   <syntaxes>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.4" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Country String</alias>
+            <alias>Audio</alias>
          </aliases>
+         <description>Audio</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.49" obsolete="false" humanreadable="false">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.5" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Supported Algorithm</alias>
+            <alias>Binary</alias>
          </aliases>
+         <description>Binary</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.38" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.6" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>OID</alias>
+            <alias>Bit String</alias>
          </aliases>
+         <description>Bit String</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.52" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.7" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Telex Number</alias>
+            <alias>Boolean</alias>
          </aliases>
+         <description>Boolean</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.22" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.8" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Facsimile Telephone Number</alias>
+            <alias>Certificate</alias>
          </aliases>
+         <description>Certificate</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.44" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.9" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Printable String</alias>
+            <alias>Certificate List</alias>
          </aliases>
+         <description>Certificate List</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.15" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.10" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Directory String</alias>
+            <alias>Certificate Pair</alias>
+         </aliases>
+         <description>Certificate Pair</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.4203.666.11.10.2.1" obsolete="false" humanreadable="true">
+         <aliases>
+            <alias>X.509 AttributeCertificate</alias>
          </aliases>
+         <description>X.509 AttributeCertificate</description>
       </syntax>
       <syntax oid="1.3.6.1.4.1.1466.115.121.1.12" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>DN</alias>
+            <alias>Distinguished Name</alias>
          </aliases>
+         <description>Distinguished Name</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.45" obsolete="false" humanreadable="true">
+      <syntax oid="1.2.36.79672281.1.5.0" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Subtree Specification</alias>
+            <alias>RDN</alias>
          </aliases>
+         <description>RDN</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.34" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.14" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Name And Optional UID</alias>
+            <alias>Delivery Method</alias>
          </aliases>
+         <description>Delivery Method</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.8" obsolete="false" humanreadable="false">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.15" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Certificate</alias>
+            <alias>Directory String</alias>
          </aliases>
+         <description>Directory String</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.41" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.22" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Postal Address</alias>
+            <alias>Facsimile Telephone Number</alias>
+         </aliases>
+         <description>Facsimile Telephone Number</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.24" obsolete="false" humanreadable="true">
+         <aliases>
+            <alias>Generalized Time</alias>
          </aliases>
+         <description>Generalized Time</description>
       </syntax>
       <syntax oid="1.3.6.1.4.1.1466.115.121.1.26" obsolete="false" humanreadable="true">
          <aliases>
             <alias>IA5 String</alias>
          </aliases>
+         <description>IA5 String</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.40" obsolete="false" humanreadable="false">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.27" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Octet String</alias>
+            <alias>Integer</alias>
          </aliases>
+         <description>Integer</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.6" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.28" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Bit String</alias>
+            <alias>JPEG</alias>
          </aliases>
+         <description>JPEG</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.39" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.34" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Other Mailbox</alias>
+            <alias>Name And Optional UID</alias>
          </aliases>
+         <description>Name And Optional UID</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.7" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.36" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Boolean</alias>
+            <alias>Numeric String</alias>
          </aliases>
+         <description>Numeric String</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.27" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.38" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>INTEGER</alias>
+            <alias>OID</alias>
          </aliases>
+         <description>OID</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.24" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.39" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Generalized Time</alias>
+            <alias>Other Mailbox</alias>
          </aliases>
+         <description>Other Mailbox</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.4" obsolete="false" humanreadable="false">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.40" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Audio</alias>
+            <alias>Octet String</alias>
          </aliases>
+         <description>Octet String</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.9" obsolete="false" humanreadable="false">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.41" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Certificate List</alias>
+            <alias>Postal Address</alias>
          </aliases>
+         <description>Postal Address</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.36" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.44" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Numeric String</alias>
+            <alias>Printable String</alias>
          </aliases>
+         <description>Printable String</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.14" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.11" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Delivery Method</alias>
+            <alias>Country String</alias>
          </aliases>
+         <description>Country String</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.28" obsolete="false" humanreadable="false">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.45" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>JPEG</alias>
+            <alias>SubtreeSpecification</alias>
          </aliases>
+         <description>SubtreeSpecification</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.49" obsolete="false" humanreadable="true">
+         <aliases>
+            <alias>Supported Algorithm</alias>
+         </aliases>
+         <description>Supported Algorithm</description>
       </syntax>
       <syntax oid="1.3.6.1.4.1.1466.115.121.1.50" obsolete="false" humanreadable="true">
          <aliases>
             <alias>Telephone Number</alias>
          </aliases>
+         <description>Telephone Number</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.5" obsolete="false" humanreadable="false">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.52" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Binary</alias>
+            <alias>Telex Number</alias>
          </aliases>
+         <description>Telex Number</description>
       </syntax>
-      <syntax oid="1.3.6.1.4.1.1466.115.121.1.10" obsolete="false" humanreadable="false">
+      <syntax oid="1.3.6.1.1.1.0.0" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>Certificate Pair</alias>
+            <alias>RFC2307 NIS Netgroup Triple</alias>
          </aliases>
+         <description>RFC2307 NIS Netgroup Triple</description>
       </syntax>
       <syntax oid="1.3.6.1.1.1.0.1" obsolete="false" humanreadable="true">
          <aliases>
             <alias>RFC2307 Boot Parameter</alias>
          </aliases>
+         <description>RFC2307 Boot Parameter</description>
       </syntax>
-      <syntax oid="1.3.6.1.1.1.0.0" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.1.16.1" obsolete="false" humanreadable="true">
          <aliases>
-            <alias>RFC2307 NIS Netgroup Triple</alias>
+            <alias>UUID</alias>
          </aliases>
+         <description>UUID</description>
       </syntax>
-      <syntax oid="1.3.6.1.1.16.1" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.30" obsolete="false" humanreadable="false">
          <aliases>
-            <alias>UUID</alias>
+            <alias>Matching Rule Description</alias>
          </aliases>
+         <description>Matching Rule Description</description>
       </syntax>
-      <syntax oid="1.2.36.79672281.1.5.0" obsolete="false" humanreadable="true">
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.3" obsolete="false" humanreadable="false">
          <aliases>
-            <alias>RDN</alias>
+            <alias>Attribute Type Description</alias>
+         </aliases>
+         <description>Attribute Type Description</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.37" obsolete="false" humanreadable="false">
+         <aliases>
+            <alias>Object Class Description</alias>
+         </aliases>
+         <description>Object Class Description</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.31" obsolete="false" humanreadable="false">
+         <aliases>
+            <alias>Matching Rule Use Description</alias>
+         </aliases>
+         <description>Matching Rule Use Description</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.54" obsolete="false" humanreadable="false">
+         <aliases>
+            <alias>LDAP Syntax Description</alias>
+         </aliases>
+         <description>LDAP Syntax Description</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.25" obsolete="false" humanreadable="false">
+         <aliases>
+            <alias>Guide</alias>
+         </aliases>
+         <description>Guide</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.51" obsolete="false" humanreadable="false">
+         <aliases>
+            <alias>Teletex Terminal Identifier</alias>
+         </aliases>
+         <description>Teletex Terminal Identifier</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.43" obsolete="false" humanreadable="false">
+         <aliases>
+            <alias>Presentation Address</alias>
+         </aliases>
+         <description>Presentation Address</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.21" obsolete="false" humanreadable="false">
+         <aliases>
+            <alias>Enhanced Guide</alias>
+         </aliases>
+         <description>Enhanced Guide</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.42" obsolete="false" humanreadable="false">
+         <aliases>
+            <alias>Protocol Information</alias>
+         </aliases>
+         <description>Protocol Information</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.23" obsolete="false" humanreadable="false">
+         <aliases>
+            <alias>Fax</alias>
+         </aliases>
+         <description>Fax</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.19" obsolete="false" humanreadable="false">
+         <aliases>
+            <alias>DSA Quality Syntax</alias>
+         </aliases>
+         <description>DSA Quality Syntax</description>
+      </syntax>
+      <syntax oid="1.3.6.1.4.1.1466.115.121.1.13" obsolete="false" humanreadable="false">
+         <aliases>
+            <alias>Data Quality Syntax</alias>
          </aliases>
+         <description>Data Quality Syntax</description>
       </syntax>
    </syntaxes>
-</schema>
+</schema>
\ No newline at end of file

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java?rev=823443&r1=823442&r2=823443&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/CoreSchemasSelectionWidget.java Fri Oct  9 07:52:11 2009
@@ -68,8 +68,8 @@
 
     /** The array containing the 'core' from OpenLDAP */
     private static final String[] coreSchemasFromOpenLdap = new String[]
-        { "corba", "core", "cosine", "dyngroup", "inetorgperson", "java", "misc", "nis", "openldap", "ppolicy", //$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$
-            "system" }; //$NON-NLS-1$
+        { "collective", "corba", "core", "cosine", "dyngroup", "duaconf", "inetorgperson", "java", "misc", "nis", //$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$
+            "openldap", "ppolicy", "system" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
     // UI Fields
     private Button typeApacheDSButton;



Mime
View raw message