You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2005/09/18 21:05:44 UTC
svn commit: r289953 - in /directory/apacheds/trunk/core/src/main:
java/org/apache/ldap/server/schema/bootstrap/ schema/
Author: akarasulu
Date: Sun Sep 18 12:05:38 2005
New Revision: 289953
URL: http://svn.apache.org/viewcvs?rev=289953&view=rev
Log:
changes ...
o added the marker objectClass for access control subentries
o added associated prescriptiveACI attribute which MUST be added to an
accessControlEntry
o changed ACI Item syntax to be represented as a human readable attribute:
RFC 2251 presumes it is not human readable - depends on how ugly our
ACIItem grammar is :)
o added matching rule, placeholder comparator, and noop placeholder normalizer
for directoryStringFirstComponentMatch matchingRule so the schema does not
choke
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java
directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java
directory/apacheds/trunk/core/src/main/schema/apache.schema
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java?rev=289953&r1=289952&r2=289953&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemComparatorProducer.java Sun Sep 18 12:05:38 2005
@@ -218,6 +218,16 @@
comparator = new ComparableComparator();
cb.schemaObjectProduced( this, "2.5.13.30", comparator );
+ /*
+ * Straight out of RFC 3698: Section 2.6
+ * http://www.faqs.org/rfcs/rfc3698.html
+ * =======================================
+ * ( 2.5.13.31 NAME 'directoryStringFirstComponentMatch'
+ * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ */
+ comparator = new ComparableComparator();
+ cb.schemaObjectProduced( this, "2.5.13.31", comparator );
+
/*
( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java?rev=289953&r1=289952&r2=289953&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemMatchingRuleProducer.java Sun Sep 18 12:05:38 2005
@@ -249,6 +249,19 @@
mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.38" );
cb.schemaObjectProduced( this, mrule.getOid(), mrule );
+ /*
+ * Straight out of RFC 3698: Section 2.6
+ * http://www.faqs.org/rfcs/rfc3698.html
+ * =======================================
+ * ( 2.5.13.31 NAME 'directoryStringFirstComponentMatch'
+ * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ */
+
+ mrule = new BootstrapMatchingRule( "2.5.13.31", registries );
+ mrule.setNames( new String[] { "directoryStringFirstComponentMatch" } );
+ mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
+ cb.schemaObjectProduced( this, mrule.getOid(), mrule );
+
mrule = new BootstrapMatchingRule( "1.3.6.1.4.1.1466.109.114.1", registries );
mrule.setNames( new String[] { "caseExactIA5Match" } );
mrule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
@@ -265,7 +278,7 @@
( 2.5.13.13 NAME 'booleanMatch'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
-
+
( 2.5.13.18 NAME 'octetStringOrderingMatch'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java?rev=289953&r1=289952&r2=289953&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemNormalizerProducer.java Sun Sep 18 12:05:38 2005
@@ -217,6 +217,16 @@
cb.schemaObjectProduced( this, "2.5.13.30", normalizer );
/*
+ * Straight out of RFC 3698: Section 2.6
+ * http://www.faqs.org/rfcs/rfc3698.html
+ * =======================================
+ * ( 2.5.13.31 NAME 'directoryStringFirstComponentMatch'
+ * SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ */
+ normalizer = new NoOpNormalizer();
+ cb.schemaObjectProduced( this, "2.5.13.31", normalizer );
+
+ /*
( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
*/
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java?rev=289953&r1=289952&r2=289953&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/schema/bootstrap/SystemSyntaxProducer.java Sun Sep 18 12:05:38 2005
@@ -133,7 +133,8 @@
*/
syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.1", syntaxCheckerRegistry );
syntax.setNames( new String[] { "ACI Item" } );
- syntax.setHumanReadible( false );
+ // This is in direct conflict with RFC 2252 but for us ACI Item is human readable
+ syntax.setHumanReadible( true );
cb.schemaObjectProduced( this, syntax.getOid(), syntax );
syntax = new BootstrapSyntax( "1.3.6.1.4.1.1466.115.121.1.2", syntaxCheckerRegistry );
Modified: directory/apacheds/trunk/core/src/main/schema/apache.schema
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/schema/apache.schema?rev=289953&r1=289952&r2=289953&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/schema/apache.schema (original)
+++ directory/apacheds/trunk/core/src/main/schema/apache.schema Sun Sep 18 12:05:38 2005
@@ -106,3 +106,14 @@
STRUCTURAL
MUST prefNodeName )
+attributetype ( 1.2.6.1.4.1.18060.1.1.1.3.100 NAME 'prescriptiveACI'
+ DESC 'Access control information that applies to a set of entries'
+ EQUALITY directoryStringFirstComponentMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.1
+ USAGE directoryOperation )
+
+objectclass ( 1.2.6.1.4.1.18060.1.1.1.4.100
+ NAME 'accessControlSubentry'
+ AUXILIARY
+ MUST prescriptiveACI )
+