You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2006/12/12 23:48:12 UTC
svn commit: r486387 -
/directory/branches/trunks/schema/apacheds/core/src/main/schema/apachemeta.schema
Author: elecharny
Date: Tue Dec 12 14:48:11 2006
New Revision: 486387
URL: http://svn.apache.org/viewvc?view=rev&rev=486387
Log:
Added some doc from RFC 4517 & RFC 4512. Added m-extensionSyntax and m-extensionMatchingRule AT. Fixed some types. Removed the MUST (m-oid) when the OC inherit from metaTop, where the m-oid is already declared in MUST. Removed the m-description from MUST and moved it to MAY in metaTop. Fixed Syntax OC which was totally buggy
Modified:
directory/branches/trunks/schema/apacheds/core/src/main/schema/apachemeta.schema
Modified: directory/branches/trunks/schema/apacheds/core/src/main/schema/apachemeta.schema
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/schema/apachemeta.schema?view=diff&rev=486387&r1=486386&r2=486387
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/schema/apachemeta.schema (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/schema/apachemeta.schema Tue Dec 12 14:48:11 2006
@@ -24,7 +24,7 @@
# | Syntax OID | name |
# +------------------------------+-----------------------------+
# | 1.3.6.1.4.1.18060.0.4.0.0.1 | objectClassType |
-# | 1.3.6.1.4.1.18060.0.4.0.0.2 | numericOid |
+# | 1.3.6.1.4.1.18060.0.4.0.0.2 | NumericOid |
# | 1.3.6.1.4.1.18060.0.4.0.0.3 | attributeTypeUsage |
# | 1.3.6.1.4.1.18060.0.4.0.0.4 | number |
# | 1.3.6.1.4.1.18060.0.4.0.0.5 | oidLen |
@@ -77,6 +77,8 @@
# | 1.3.6.1.4.1.18060.0.4.0.2.32 | m-fqcn |
# | 1.3.6.1.4.1.18060.0.4.0.2.33 | m-bytecode |
# | 1.3.6.1.4.1.18060.0.4.0.2.34 | m-humanReadible |
+# | 1.3.6.1.4.1.18060.0.4.0.2.35 | m-extensionSyntax |
+# | 1.3.6.1.4.1.18060.0.4.0.2.36 | m-extensionMatchingRule |
# +------------------------------+-----------------------------+
#
# +------------------------------+-----------------------------+
@@ -109,102 +111,209 @@
DESC 'Top level objectclass of all meta objects'
SUP top
ABSTRACT
- MUST ( m-oid $ m-description )
+ MUST m-oid
+ MAY m-description
)
# --- metaobjectclass objectclass ---------------------------------------------
+# ObjectClassDescription = LPAREN WSP
+# numericoid ; object identifier
+# [ SP "NAME" SP qdescrs ] ; short names (descriptors)
+# [ SP "DESC" SP qdstring ] ; description
+# [ SP "OBSOLETE" ] ; not active
+# [ SP "SUP" SP oids ] ; superior object classes
+# [ SP kind ] ; kind of class
+# [ SP "MUST" SP oids ] ; attribute types
+# [ SP "MAY" SP oids ] ; attribute types
+# extensions WSP RPAREN
+#
+# kind = "ABSTRACT" / "STRUCTURAL" / "AUXILIARY"
+#
+# The numericOid is an m-oid attributeType, it is stored in
+# the metaTop objectClass
+#------------------------------------------------------------------------------
objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.2
NAME 'metaObjectclass'
DESC 'meta definition of the objectclass object'
SUP metaTop
STRUCTURAL
- MUST m-name
- MAY ( m-supObjectClass $ m-must $ m-may $ m-typeObjectClass $
- m-obsolete $ m-extensionAttributeType )
+ MUST m-oid
+ MAY ( m-name $ m-obsolete $ m-supObjectClass $ m-typeObjectClass $ m-must $
+ m-may $ m-extensionObjectClass )
)
# --- metaAttributeType objectclass -------------------------------------------
+#
+# AttributeTypeDescription = LPAREN WSP
+# numericoid ; object identifier
+# [ SP "NAME" SP qdescrs ] ; short names (descriptors)
+# [ SP "DESC" SP qdstring ] ; description
+# [ SP "OBSOLETE" ] ; not active
+# [ SP "SUP" SP oid ] ; supertype
+# [ SP "EQUALITY" SP oid ] ; equality matching rule
+# [ SP "ORDERING" SP oid ] ; ordering matching rule
+# [ SP "SUBSTR" SP oid ] ; substrings matching rule
+# [ SP "SYNTAX" SP noidlen ] ; value syntax
+# [ SP "SINGLE-VALUE" ] ; single-value
+# [ SP "COLLECTIVE" ] ; collective
+# [ SP "NO-USER-MODIFICATION" ] ; not user modifiable
+# [ SP "USAGE" SP usage ] ; usage
+# extensions WSP RPAREN ; extensions
+#
+# usage = "userApplications" | ; user
+# "directoryOperation" | ; directory operational
+# "distributedOperation" | ; DSA-shared operational
+# "dSAOperation" ; DSA-specific operational
+#
+# IMPORTANT NOTE :
+# ----------------
+# ==> Either m-sup OR m-syntax MUST be present
+#------------------------------------------------------------------------------
objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.3
NAME 'metaAttributeType'
DESC 'meta definition of the AttributeType object'
SUP metaTop
STRUCTURAL
- MUST ( m-name $ m-syntax )
- MAY ( m-supAttributeType $ m-obsolete $
- m-equality $ m-ordering $ m-substr $ m-singleValue $ m-collective $
+ MAY ( m-name $ m-obsolete $ m-supAttributeType $ m-equality $ m-ordering $
+ m-substr $ m-syntax $ m-singleValue $ m-collective $
m-noUserModification $ m-usage $ m-extensionAttributeType )
)
# --- metaSyntax objectclass --------------------------------------------------
+#
+# SyntaxDescription = LPAREN WSP
+# numericoid ; object identifier
+# [ SP "DESC" SP qdstring ] ; description
+# extensions WSP RPAREN ; extensions
+#
+# Except numericOid, no element is mandatory
+#------------------------------------------------------------------------------
objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.4
NAME 'metaSyntax'
DESC 'meta definition of the Syntax object'
SUP metaTop
STRUCTURAL
- MUST ( m-oid $ m-humanReadible )
- MAY ( m-obsolete $ m-description )
+ MAY m-extensionSyntax
)
# --- metaMatchingRule objectclass --------------------------------------------
+#
+# MatchingRuleDescription = LPAREN WSP
+# numericoid ; object identifier
+# [ SP "NAME" SP qdescrs ] ; short names (descriptors)
+# [ SP "DESC" SP qdstring ] ; description
+# [ SP "OBSOLETE" ] ; not active
+# SP "SYNTAX" SP numericoid ; assertion syntax
+# extensions WSP RPAREN ; extensions
+#
+#------------------------------------------------------------------------------
objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.5
NAME 'metaMatchingRule'
DESC 'meta definition of the MatchingRule object'
SUP metaTop
STRUCTURAL
- MUST ( m-oid $ m-syntax )
- MAY ( m-obsolete $ m-description $ m-name )
+ MUST m-syntax
+ MAY ( m-name $ m-obsolete $ m-extensionMatchingRule )
)
# --- metaDITStructureRule objectclass ----------------------------------------
+#
+# DITStructureRuleDescription = LPAREN WSP
+# ruleid ; rule identifier
+# [ SP "NAME" SP qdescrs ] ; short names (descriptors)
+# [ SP "DESC" SP qdstring ] ; description
+# [ SP "OBSOLETE" ] ; not active
+# SP "FORM" SP oid ; NameForm
+# [ SP "SUP" ruleids ] ; superior rules
+# extensions WSP RPAREN ; extensions
+#
+# IMPORTANT NOTE :
+# ----------------
+# ==> This ObjectClass does not inherit from metaTop, but directly from top.
+#------------------------------------------------------------------------------
objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.6
NAME 'metaDITStructureRule'
DESC 'meta definition of the DITStructureRule object'
SUP top
STRUCTURAL
MUST ( m-ruleId $ m-form )
- MAY ( m-obsolete $ m-supDITStructureRule $ m-extensionDITStructureRule )
+ MAY ( m-name $ m-obsolete $ m-supDITStructureRule $
+ m-extensionDITStructureRule )
)
# --- metaNameForm objectclass ------------------------------------------------
+#
+# NameFormDescription = LPAREN WSP
+# numericoid ; object identifier
+# [ SP "NAME" SP qdescrs ] ; short names (descriptors)
+# [ SP "DESC" SP qdstring ] ; description
+# [ SP "OBSOLETE" ] ; not active
+# SP "OC" SP oid ; structural object class
+# SP "MUST" SP oids ; attribute types
+# [ SP "MAY" SP oids ] ; attribute types
+# extensions WSP RPAREN ; extensions
+#------------------------------------------------------------------------------
objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.7
NAME 'metaNameForm'
DESC 'meta definition of the NameForm object'
SUP metaTop
STRUCTURAL
MUST ( m-oc $ m-must )
- MAY ( m-obsolete $ m-may $ m-extensionNameForm )
+ MAY ( m-name $ m-obsolete $ m-may $ m-extensionNameForm )
)
# --- metaMatchingRuleUse objectclass -----------------------------------------
+#
+# MatchingRuleUseDescription = LPAREN WSP
+# numericoid ; object identifier
+# [ SP "NAME" SP qdescrs ] ; short names (descriptors)
+# [ SP "DESC" SP qdstring ] ; description
+# [ SP "OBSOLETE" ] ; not active
+# SP "APPLIES" SP oids ; attribute types
+# extensions WSP RPAREN ; extensions
+#------------------------------------------------------------------------------
objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.8
NAME 'metaMatchingRuleUse'
DESC 'meta definition of the MatchingRuleUse object'
SUP metaTop
STRUCTURAL
MUST m-applies
- MAY ( m-obsolete $ m-extensionMatchingRuleUse )
+ MAY ( m-name $ m-obsolete $ m-extensionMatchingRuleUse )
)
# --- metaDITContentRule objectclass ------------------------------------------
+#
+# DITContentRuleDescription = LPAREN WSP
+# numericoid ; object identifier
+# [ SP "NAME" SP qdescrs ] ; short names (descriptors)
+# [ SP "DESC" SP qdstring ] ; description
+# [ SP "OBSOLETE" ] ; not active
+# [ SP "AUX" SP oids ] ; auxiliary object classes
+# [ SP "MUST" SP oids ] ; attribute types
+# [ SP "MAY" SP oids ] ; attribute types
+# [ SP "NOT" SP oids ] ; attribute types
+# extensions WSP RPAREN ; extensions
+#------------------------------------------------------------------------------
objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.9
NAME 'metaDITContentRule'
DESC 'meta definition of the DITContentRule object'
SUP metaTop
STRUCTURAL
- MAY ( m-obsolete $ m-must $ m-may $ m-not $ m-extensionDITContentRule )
+ MAY ( m-name $ m-obsolete $ m-aux $ m-must $ m-may $ m-not $
+ m-extensionDITContentRule )
)
-# --- metaSyntaxChecker objectclass ------------------------------------------
+# --- metaSyntaxChecker objectclass -------------------------------------------
objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.10
NAME 'metaSyntaxChecker'
DESC 'meta definition of the SyntaxChecker object'
SUP metaTop
STRUCTURAL
- MUST ( m-oid $ m-fqcn )
+ MUST m-fqcn
MAY m-bytecode
)
-# --- metaSchema objectclass ------------------------------------------
+# --- metaSchema objectclass --------------------------------------------------
objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.11
NAME 'metaSchema'
DESC 'A schema object under which meta schema definitions are found'
@@ -213,23 +322,23 @@
MUST cn
)
-# --- metaNormalizer objectclass ------------------------------------------
+# --- metaNormalizer objectclass ----------------------------------------------
objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.12
NAME 'metaNormalizer'
DESC 'meta definition of a Normalizer object'
SUP metaTop
STRUCTURAL
- MUST ( m-oid $ m-fqcn )
+ MUST m-fqcn
MAY m-bytecode
)
-# --- metaComparator objectclass ------------------------------------------
+# --- metaComparator objectclass ----------------------------------------------
objectclass ( 1.3.6.1.4.1.18060.0.4.0.3.13
NAME 'metaComparator'
DESC 'meta definition of a Comparator object'
SUP metaTop
STRUCTURAL
- MUST ( m-oid $ m-fqcn )
+ MUST m-fqcn
MAY m-bytecode
)
@@ -267,7 +376,7 @@
SINGLE-VALUE
)
-# --- m-supObjectClass AttributeType -----------------------------------------
+# --- m-supObjectClass AttributeType ------------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.5 NAME 'm-supObjectClass'
DESC 'The list of superiors'
EQUALITY nameOrNumericIdMatch
@@ -288,7 +397,7 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.38
)
-# --- m-typeObjectClass AttributeType ---------------------------------------
+# --- m-typeObjectClass AttributeType -----------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.8 NAME 'm-typeObjectClass'
DESC 'The objectclass type'
EQUALITY objectClassTypeMatch
@@ -296,14 +405,14 @@
SINGLE-VALUE
)
-# --- m-extensionObjectClass AttributeType ----------------------------------
+# --- m-extensionObjectClass AttributeType ------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.9 NAME 'm-extensionObjectClass'
DESC 'An objectclass extension'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768}
)
-# --- m-supAttributeType AttributeType --------------------------------------
+# --- m-supAttributeType AttributeType ----------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.10 NAME 'm-supAttributeType'
DESC 'The list of superior'
EQUALITY nameOrNumericIdMatch
@@ -343,7 +452,7 @@
SINGLE-VALUE
)
-# --- m-singleValue AttributeType --------------------------------------------
+# --- m-singleValue AttributeType ---------------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.15 NAME 'm-singleValue'
DESC 'The attribute is single valued'
EQUALITY booleanMatch
@@ -359,7 +468,7 @@
SINGLE-VALUE
)
-# --- m-noUserModification AttributeType ------------------------------------
+# --- m-noUserModification AttributeType --------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.17 NAME 'm-noUserModification'
DESC 'The attribute is protected'
EQUALITY booleanMatch
@@ -367,9 +476,9 @@
SINGLE-VALUE
)
-# --- m-usage AttributeType -------------------------------------
-attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.18 NAME 'm-usage'
- DESC 'Usage type of an attributeType'
+# --- m-attributeTypeUusage AttributeType -------------------------------------
+attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.18 NAME 'm-attributeTypeUsage'
+ DESC 'Type of operation'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE
@@ -454,12 +563,12 @@
# --- m-extensionMatchingRuleUse AttributeType --------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.30 NAME 'm-extensionMatchingRuleUse'
- DESC 'Extensions for DITContentRule'
+ DESC 'Extensions for MatchingRuleUse'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
)
-# --- m-matchingRuleSyntax AttributeType --------------------------------
+# --- m-matchingRuleSyntax AttributeType --------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.31 NAME 'm-matchingRuleSyntax'
DESC 'The matchingRule attribute syntax '
EQUALITY numericOidMatch
@@ -467,7 +576,7 @@
SINGLE-VALUE
)
-# --- m-fqcn AttributeType --------------------------------
+# --- m-fqcn AttributeType ----------------------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.32 NAME 'm-fqcn'
DESC 'The fully qualified class name of a code based schema entity'
EQUALITY caseExactMatch
@@ -475,17 +584,33 @@
SINGLE-VALUE
)
-# --- m-bytecode AttributeType --------------------------------
+# --- m-bytecode AttributeType ------------------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.33 NAME 'm-bytecode'
DESC 'The Java bytecode for a code based schema entity'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.5
SINGLE-VALUE
)
-# --- m-bytecode AttributeType --------------------------------
+# --- m-bytecode AttributeType ------------------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.34 NAME 'm-humanReadible'
DESC 'whether or not a syntax is human readible'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE
)
+
+# --- m-extensionSyntax AttributeType -----------------------------------------
+attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.35 NAME 'm-extensionSyntax'
+ DESC 'Extensions for Syntax'
+ EQUALITY caseIgnoreMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+)
+
+# --- m-extensionMatchingRule AttributeType -----------------------------------
+attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.36 NAME 'm-extensionMatchingRule'
+ DESC 'Extensions for MatchingRule'
+ EQUALITY caseIgnoreMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+)
+
+