Author: akarasulu
Date: Fri Feb 2 12:22:31 2007
New Revision: 502723
URL: http://svn.apache.org/viewvc?view=rev&rev=502723
Log:
changes ...
o cleaned up meta schema by removing m-owner, and extension attributes
o made changes to schema partition dao to use creatorsName for the owner on
a schema
o made sure the bootstrap schema partition plugin added creatorsName and a
timestamp
o removed owner constant from metaschema
o fixed tests and code that depended on owner attribute
Modified:
directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java
directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java
directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerITest.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
directory/apacheds/trunk/schema-bootstrap/src/main/schema/apachemeta.schema
Modified: directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java?view=diff&rev=502723&r1=502722&r2=502723
==============================================================================
--- directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java
(original)
+++ directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java
Fri Feb 2 12:22:31 2007
@@ -42,6 +42,7 @@
import org.apache.directory.shared.ldap.schema.SchemaObject;
import org.apache.directory.shared.ldap.schema.Syntax;
import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
+import org.apache.directory.shared.ldap.util.DateUtils;
/**
@@ -58,7 +59,8 @@
Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_SCHEMA_OC
);
entry.put( SystemSchemaConstants.CN_AT, schema.getSchemaName() );
- entry.put( MetaSchemaConstants.M_OWNER_AT, schema.getOwner() );
+ entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
+ entry.put( SystemSchemaConstants.CREAT_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
if ( schema.isDisabled() )
{
@@ -80,42 +82,50 @@
}
- public Attributes getAttributes( SyntaxChecker syntaxChecker )
+ public Attributes getAttributes( SyntaxChecker syntaxChecker, Schema schema )
{
Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_SYNTAX_CHECKER_OC
);
entry.put( MetaSchemaConstants.M_OID_AT, syntaxChecker.getSyntaxOid() );
entry.put( MetaSchemaConstants.M_FQCN_AT, syntaxChecker.getClass().getName() );
+ entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
+ entry.put( SystemSchemaConstants.CREAT_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
return entry;
}
- public Attributes getAttributes( Syntax syntax )
+ public Attributes getAttributes( Syntax syntax, Schema schema )
{
Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_SYNTAX_OC
);
entry.put( MetaSchemaConstants.X_HUMAN_READIBLE_AT, getBoolean( syntax.isHumanReadible()
) );
+ entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
+ entry.put( SystemSchemaConstants.CREAT_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
injectCommon( syntax, entry );
return entry;
}
- public Attributes getAttributes( String oid, Normalizer normalizer )
+ public Attributes getAttributes( String oid, Normalizer normalizer, Schema schema )
{
Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_NORMALIZER_OC
);
entry.put( MetaSchemaConstants.M_OID_AT, oid );
entry.put( MetaSchemaConstants.M_FQCN_AT, normalizer.getClass().getName() );
+ entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
+ entry.put( SystemSchemaConstants.CREAT_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
return entry;
}
- public Attributes getAttributes( String oid, Comparator comparator )
+ public Attributes getAttributes( String oid, Comparator comparator, Schema schema )
{
Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_COMPARATOR_OC
);
entry.put( MetaSchemaConstants.M_OID_AT, oid );
entry.put( MetaSchemaConstants.M_FQCN_AT, comparator.getClass().getName() );
+ entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
+ entry.put( SystemSchemaConstants.CREAT_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
return entry;
}
@@ -126,44 +136,54 @@
* @return
* @throws NamingException
*/
- public Attributes getAttributes( MatchingRule matchingRule ) throws NamingException
+ public Attributes getAttributes( MatchingRule matchingRule, Schema schema ) throws NamingException
{
Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_MATCHING_RULE_OC
);
entry.put( MetaSchemaConstants.M_SYNTAX_AT, matchingRule.getSyntax().getOid() );
+ entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
+ entry.put( SystemSchemaConstants.CREAT_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
injectCommon( matchingRule, entry );
return entry;
}
- public Attributes getAttributes( MatchingRuleUse matchingRuleUse )
+ public Attributes getAttributes( MatchingRuleUse matchingRuleUse, Schema schema )
{
Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "" );
+ entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
+ entry.put( SystemSchemaConstants.CREAT_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
return entry;
}
- public Attributes getAttributes( DITStructureRule dITStructureRule )
+ public Attributes getAttributes( DITStructureRule dITStructureRule, Schema schema )
{
Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "" );
+ entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
+ entry.put( SystemSchemaConstants.CREAT_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
return entry;
}
- public Attributes getAttributes( DITContentRule dITContentRule )
+ public Attributes getAttributes( DITContentRule dITContentRule, Schema schema )
{
Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "" );
+ entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
+ entry.put( SystemSchemaConstants.CREAT_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
return entry;
}
- public Attributes getAttributes( NameForm nameForm )
+ public Attributes getAttributes( NameForm nameForm, Schema schema )
{
Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( "" );
+ entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
+ entry.put( SystemSchemaConstants.CREAT_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
return entry;
}
@@ -186,7 +206,7 @@
* @return
* @throws NamingException
*/
- public Attributes getAttributes( AttributeType attributeType ) throws NamingException
+ public Attributes getAttributes( AttributeType attributeType, Schema schema ) throws
NamingException
{
Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC
);
@@ -195,6 +215,8 @@
entry.put( MetaSchemaConstants.M_NO_USER_MODIFICATION_AT, getBoolean( ! attributeType.isCanUserModify()
) );
entry.put( MetaSchemaConstants.M_SINGLE_VALUE_AT, getBoolean( attributeType.isSingleValue()
) );
entry.put( MetaSchemaConstants.M_USAGE_AT, attributeType.getUsage().toString() );
+ entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
+ entry.put( SystemSchemaConstants.CREAT_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
injectCommon( attributeType, entry );
@@ -269,11 +291,13 @@
* @return the attributes of the metaSchema entry representing the objectClass
* @throws NamingException if there are any problems
*/
- public Attributes getAttributes( ObjectClass objectClass ) throws NamingException
+ public Attributes getAttributes( ObjectClass objectClass, Schema schema ) throws NamingException
{
Attributes entry = new AttributesImpl( SystemSchemaConstants.OBJECT_CLASS_AT, "top",
true );
entry.get( SystemSchemaConstants.OBJECT_CLASS_AT ).add( MetaSchemaConstants.META_OBJECT_CLASS_OC
);
entry.put( MetaSchemaConstants.M_TYPE_OBJECT_CLASS_AT, objectClass.getType().toString()
);
+ entry.put( SystemSchemaConstants.CREATORS_NAME_AT, schema.getOwner() );
+ entry.put( SystemSchemaConstants.CREAT_TIMESTAMP_AT, DateUtils.getGeneralizedTime()
);
injectCommon( objectClass, entry );
Modified: directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java?view=diff&rev=502723&r1=502722&r2=502723
==============================================================================
--- directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
(original)
+++ directory/apacheds/trunk/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/BootstrapPlugin.java
Fri Feb 2 12:22:31 2007
@@ -325,12 +325,13 @@
{
AttributeType at = ( AttributeType ) ii.next();
String schemaName = attributeTypeRegistry.getSchemaName( at.getOid() );
+ Schema schema = ( Schema ) registries.getLoadedSchemas().get( schemaName );
getLog().info( "\t\t o [" + schemaName + "] - " + getNameOrNumericoid( at ) );
LdapDN dn = checkCreateSchema( schemaName );
dn.add( CoreSchemaConstants.OU_AT + "=attributeTypes" );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
checkCreateContainer( dn );
- Attributes entry = attributesFactory.getAttributes( at );
+ Attributes entry = attributesFactory.getAttributes( at, schema );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + at.getOid() );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
store.add( dn, entry );
@@ -352,12 +353,13 @@
{
ObjectClass oc = ( ObjectClass ) ii.next();
String schemaName = objectClassRegistry.getSchemaName( oc.getOid() );
+ Schema schema = ( Schema ) registries.getLoadedSchemas().get( schemaName );
getLog().info( "\t\t o [" + schemaName + "] - " + getNameOrNumericoid( oc ) );
LdapDN dn = checkCreateSchema( schemaName );
dn.add( CoreSchemaConstants.OU_AT + "=objectClasses" );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
checkCreateContainer( dn );
- Attributes entry = attributesFactory.getAttributes( oc );
+ Attributes entry = attributesFactory.getAttributes( oc, schema );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + oc.getOid() );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
store.add( dn, entry );
@@ -379,12 +381,13 @@
{
MatchingRule mr = ( MatchingRule ) ii.next();
String schemaName = matchingRuleRegistry.getSchemaName( mr.getOid() );
+ Schema schema = ( Schema ) registries.getLoadedSchemas().get( schemaName );
getLog().info( "\t\t o [" + schemaName + "] - " + getNameOrNumericoid( mr ) );
LdapDN dn = checkCreateSchema( schemaName );
dn.add( CoreSchemaConstants.OU_AT + "=matchingRules" );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
checkCreateContainer( dn );
- Attributes entry = attributesFactory.getAttributes( mr );
+ Attributes entry = attributesFactory.getAttributes( mr, schema );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + mr.getOid() );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
store.add( dn, entry );
@@ -406,12 +409,13 @@
{
String oid = ( String ) ii.next();
String schemaName = comparatorRegistry.getSchemaName( oid );
+ Schema schema = ( Schema ) registries.getLoadedSchemas().get( schemaName );
getLog().info( "\t\t o [" + schemaName + "] - " + oid );
LdapDN dn = checkCreateSchema( schemaName );
dn.add( CoreSchemaConstants.OU_AT + "=comparators" );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
checkCreateContainer( dn );
- Attributes entry = attributesFactory.getAttributes( oid, comparatorRegistry.lookup(
oid ) );
+ Attributes entry = attributesFactory.getAttributes( oid, comparatorRegistry.lookup(
oid ), schema );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + oid );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
store.add( dn, entry );
@@ -433,12 +437,13 @@
{
String oid = ( String ) ii.next();
String schemaName = normalizerRegistry.getSchemaName( oid );
+ Schema schema = ( Schema ) registries.getLoadedSchemas().get( schemaName );
getLog().info( "\t\t o [" + schemaName + "] - " + oid );
LdapDN dn = checkCreateSchema( schemaName );
dn.add( CoreSchemaConstants.OU_AT + "=normalizers" );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
checkCreateContainer( dn );
- Attributes entry = attributesFactory.getAttributes( oid, normalizerRegistry.lookup(
oid ) );
+ Attributes entry = attributesFactory.getAttributes( oid, normalizerRegistry.lookup(
oid ), schema );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + oid );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
store.add( dn, entry );
@@ -461,10 +466,11 @@
Syntax syntax = ( Syntax ) ii.next();
getLog().info( "\t\t o [" + syntax.getSchema() + "] - " + getNameOrNumericoid(
syntax ) );
LdapDN dn = checkCreateSchema( syntax.getSchema() );
+ Schema schema = ( Schema ) registries.getLoadedSchemas().get( syntax.getSchema()
);
dn.add( CoreSchemaConstants.OU_AT + "=syntaxes" );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
checkCreateContainer( dn );
- Attributes entry = attributesFactory.getAttributes( syntax );
+ Attributes entry = attributesFactory.getAttributes( syntax, schema );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + syntax.getOid() );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
store.add( dn, entry );
@@ -486,12 +492,13 @@
{
SyntaxChecker syntaxChecker = ( SyntaxChecker ) ii.next();
String schemaName = syntaxCheckerRegistry.getSchemaName( syntaxChecker.getSyntaxOid()
);
+ Schema schema = ( Schema ) registries.getLoadedSchemas().get( schemaName );
getLog().info( "\t\t o [" + schemaName + "] - " + syntaxChecker.getSyntaxOid()
);
LdapDN dn = checkCreateSchema( schemaName );
dn.add( CoreSchemaConstants.OU_AT + "=syntaxCheckers" );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
checkCreateContainer( dn );
- Attributes entry = attributesFactory.getAttributes( syntaxChecker );
+ Attributes entry = attributesFactory.getAttributes( syntaxChecker, schema );
dn.add( MetaSchemaConstants.M_OID_AT + "=" + syntaxChecker.getSyntaxOid() );
dn.normalize( registries.getAttributeTypeRegistry().getNormalizerMapping() );
store.add( dn, entry );
Modified: directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java?view=diff&rev=502723&r1=502722&r2=502723
==============================================================================
--- directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java
(original)
+++ directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java
Fri Feb 2 12:22:31 2007
@@ -47,7 +47,6 @@
public static final String M_FQCN_AT = "m-fqcn";
public static final String M_DEPENDENCIES_AT = "m-dependencies";
public static final String M_DISABLED_AT = "m-disabled";
- public static final String M_OWNER_AT = "m-owner";
public static final String M_DESCRIPTION_AT = "m-description";
public static final String M_OBSOLETE_AT = "m-obsolete";
public static final String M_NAME_AT = "m-name";
Modified: directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java?view=diff&rev=502723&r1=502722&r2=502723
==============================================================================
--- directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
(original)
+++ directory/apacheds/trunk/constants/src/main/java/org/apache/directory/server/constants/SystemSchemaConstants.java
Fri Feb 2 12:22:31 2007
@@ -32,5 +32,7 @@
public static final String CN_AT = "cn";
public static final String OBJECT_CLASS_AT = "objectClass";
+ public static final String CREATORS_NAME_AT = "creatorsName";
+ public static final String CREAT_TIMESTAMP_AT = "createTimestamp";
}
Modified: directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerITest.java?view=diff&rev=502723&r1=502722&r2=502723
==============================================================================
--- directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerITest.java
(original)
+++ directory/apacheds/trunk/core-unit/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerITest.java
Fri Feb 2 12:22:31 2007
@@ -67,7 +67,6 @@
Attributes dummySchema = new AttributesImpl( "objectClass", "top" );
dummySchema.get( "objectClass" ).add( MetaSchemaConstants.META_SCHEMA_OC );
dummySchema.put( "cn", DUMMY_SCHEMA );
- dummySchema.put( MetaSchemaConstants.M_OWNER_AT, "uid=admin,ou=system" );
dummySchema.put( MetaSchemaConstants.M_DISABLED_AT, "TRUE" );
super.schemaRoot.createSubcontext( "cn=" + DUMMY_SCHEMA, dummySchema );
@@ -85,7 +84,6 @@
Attributes dummySchema = new AttributesImpl( "objectClass", "top" );
dummySchema.get( "objectClass" ).add( MetaSchemaConstants.META_SCHEMA_OC );
dummySchema.put( "cn", DUMMY_SCHEMA );
- dummySchema.put( MetaSchemaConstants.M_OWNER_AT, "uid=admin,ou=system" );
dummySchema.put( MetaSchemaConstants.M_DISABLED_AT, "TRUE" );
dummySchema.put( MetaSchemaConstants.M_DEPENDENCIES_AT, TEST_SCHEMA );
dummySchema.get( MetaSchemaConstants.M_DEPENDENCIES_AT ).add( "core" );
@@ -105,7 +103,6 @@
Attributes dummySchema = new AttributesImpl( "objectClass", "top" );
dummySchema.get( "objectClass" ).add( MetaSchemaConstants.META_SCHEMA_OC );
dummySchema.put( "cn", DUMMY_SCHEMA );
- dummySchema.put( MetaSchemaConstants.M_OWNER_AT, "uid=admin,ou=system" );
dummySchema.put( MetaSchemaConstants.M_DISABLED_AT, "TRUE" );
dummySchema.put( MetaSchemaConstants.M_DEPENDENCIES_AT, "missing" );
dummySchema.get( MetaSchemaConstants.M_DEPENDENCIES_AT ).add( "core" );
@@ -141,7 +138,6 @@
Attributes dummySchema = new AttributesImpl( "objectClass", "top" );
dummySchema.get( "objectClass" ).add( MetaSchemaConstants.META_SCHEMA_OC );
dummySchema.put( "cn", DUMMY_SCHEMA );
- dummySchema.put( MetaSchemaConstants.M_OWNER_AT, "uid=admin,ou=system" );
super.schemaRoot.createSubcontext( "cn=" + DUMMY_SCHEMA, dummySchema );
assertNotNull( registries.getLoadedSchemas().get( DUMMY_SCHEMA ) );
@@ -158,7 +154,6 @@
Attributes dummySchema = new AttributesImpl( "objectClass", "top" );
dummySchema.get( "objectClass" ).add( MetaSchemaConstants.META_SCHEMA_OC );
dummySchema.put( "cn", DUMMY_SCHEMA );
- dummySchema.put( MetaSchemaConstants.M_OWNER_AT, "uid=admin,ou=system" );
dummySchema.put( MetaSchemaConstants.M_DEPENDENCIES_AT, TEST_SCHEMA );
try
@@ -242,7 +237,6 @@
Attributes dummySchema = new AttributesImpl( "objectClass", "top" );
dummySchema.get( "objectClass" ).add( MetaSchemaConstants.META_SCHEMA_OC );
dummySchema.put( "cn", DUMMY_SCHEMA );
- dummySchema.put( MetaSchemaConstants.M_OWNER_AT, "uid=admin,ou=system" );
dummySchema.put( MetaSchemaConstants.M_DEPENDENCIES_AT, "missing" );
try
@@ -369,7 +363,6 @@
Attributes dummySchema = new AttributesImpl( "objectClass", "top" );
dummySchema.get( "objectClass" ).add( MetaSchemaConstants.META_SCHEMA_OC );
dummySchema.put( "cn", DUMMY_SCHEMA );
- dummySchema.put( MetaSchemaConstants.M_OWNER_AT, "uid=admin,ou=system" );
dummySchema.put( MetaSchemaConstants.M_DEPENDENCIES_AT, TEST_SCHEMA );
super.schemaRoot.createSubcontext( "cn=" + DUMMY_SCHEMA, dummySchema );
@@ -489,5 +482,89 @@
catch( LdapNameNotFoundException e )
{
}
+ }
+
+
+ // -----------------------------------------------------------------------
+ // Dependency Modify Tests
+ // -----------------------------------------------------------------------
+
+
+ /**
+ * Checks to make sure the addition of an undefined schema to the dependencies
+ * of an existing schema fail with an UNWILLING_TO_PERFORM result code.
+ */
+ public void testRejectAddBogusDependency() throws Exception
+ {
+ ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ Attribute attr = new AttributeImpl( "m-dependencies", "bogus" );
+ mods[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attr );
+
+ try
+ {
+ schemaRoot.modifyAttributes( "cn=" + TEST_SCHEMA, mods );
+ fail( "Should not be able to add bogus dependency to schema" );
+ }
+ catch ( LdapOperationNotSupportedException e )
+ {
+ assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
+ }
+ }
+
+
+ /**
+ * Checks to make sure the addition of an defined yet disabled schema to the
+ * dependencies of an existing enabled schema fails with an UNWILLING_TO_PERFORM
+ * result code. You must enable the dependency to add it or disable the schema
+ * depending on it to add it.
+ */
+ public void testRejectAddOfDisabledDependencyToEnabledSchema() throws Exception
+ {
+ enableSchema( TEST_SCHEMA );
+ ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ Attribute attr = new AttributeImpl( "m-dependencies", "mozilla" );
+ mods[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attr );
+
+ try
+ {
+ schemaRoot.modifyAttributes( "cn=" + TEST_SCHEMA, mods );
+ fail( "Should not be able to add disabled dependency to schema" );
+ }
+ catch ( LdapOperationNotSupportedException e )
+ {
+ assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, e.getResultCode() );
+ }
+ }
+
+
+ /**
+ * Checks to make sure the addition of an defined yet disabled schema to the
+ * dependencies of an existing disabled schema succeeds.
+ */
+ public void testAddOfDisabledDependencyToDisabledSchema() throws Exception
+ {
+ ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ Attribute attr = new AttributeImpl( "m-dependencies", "mozilla" );
+ mods[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attr );
+ schemaRoot.modifyAttributes( "cn=" + TEST_SCHEMA, mods );
+ Attributes attrs = schemaRoot.getAttributes( "cn=" + TEST_SCHEMA );
+ Attribute dependencies = attrs.get( "m-dependencies" );
+ assertTrue( dependencies.contains( "mozilla" ) );
+ }
+
+
+ /**
+ * Checks to make sure the addition of an defined yet enabled schema to the
+ * dependencies of an existing disabled schema succeeds.
+ */
+ public void testAddOfEnabledDependencyToDisabledSchema() throws Exception
+ {
+ ModificationItemImpl[] mods = new ModificationItemImpl[1];
+ Attribute attr = new AttributeImpl( "m-dependencies", "java" );
+ mods[0] = new ModificationItemImpl( DirContext.ADD_ATTRIBUTE, attr );
+ schemaRoot.modifyAttributes( "cn=" + TEST_SCHEMA, mods );
+ Attributes attrs = schemaRoot.getAttributes( "cn=" + TEST_SCHEMA );
+ Attribute dependencies = attrs.get( "m-dependencies" );
+ assertTrue( dependencies.contains( "java" ) );
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java?view=diff&rev=502723&r1=502722&r2=502723
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
Fri Feb 2 12:22:31 2007
@@ -34,7 +34,6 @@
import org.apache.directory.server.constants.SystemSchemaConstants;
import org.apache.directory.server.core.ServerUtils;
import org.apache.directory.server.schema.bootstrap.Schema;
-import org.apache.directory.server.schema.registries.OidRegistry;
import org.apache.directory.server.schema.registries.Registries;
import org.apache.directory.server.schema.registries.SchemaObjectRegistry;
import org.apache.directory.shared.ldap.exception.LdapInvalidNameException;
@@ -91,11 +90,29 @@
public void modify( LdapDN name, int modOp, Attributes mods, Attributes entry, Attributes
targetEntry )
throws NamingException
{
- Attribute disabledInMods = ServerUtils.getAttribute( disabledAT, mods );
+ Attribute disabledInMods = AttributeUtils.getAttribute( mods, disabledAT );
if ( disabledInMods != null )
{
disable( name, modOp, disabledInMods, ServerUtils.getAttribute( disabledAT, entry
) );
}
+
+ // check if the new schema is enabled or disabled
+ boolean isEnabled = false;
+ Attribute disabled = AttributeUtils.getAttribute( targetEntry, this.disabledAT );
+ if ( disabled == null )
+ {
+ isEnabled = true;
+ }
+ else if ( ! disabled.get().equals( "TRUE" ) )
+ {
+ isEnabled = true;
+ }
+
+ Attribute dependencies = AttributeUtils.getAttribute( mods, dependenciesAT );
+ if ( dependencies != null )
+ {
+ checkForDependencies( isEnabled, targetEntry );
+ }
}
@@ -111,16 +128,30 @@
public void modify( LdapDN name, ModificationItemImpl[] mods, Attributes entry, Attributes
targetEntry )
throws NamingException
{
- OidRegistry registry = globalRegistries.getOidRegistry();
Attribute disabledInEntry = AttributeUtils.getAttribute( entry, disabledAT );
+ ModificationItemImpl disabledModification = AttributeUtils.getModificationItem( mods,
disabledAT );
+ if ( disabledModification != null )
+ {
+ disable( name, disabledModification.getModificationOp(), disabledModification.getAttribute(),
+ disabledInEntry );
+ }
- for ( int ii = 0; ii < mods.length; ii++ )
+ // check if the new schema is enabled or disabled
+ boolean isEnabled = false;
+ Attribute disabled = AttributeUtils.getAttribute( targetEntry, this.disabledAT );
+ if ( disabled == null )
{
- String id = registry.getOid( mods[ii].getAttribute().getID() );
- if ( id.equals( disabledAT.getOid() ) )
- {
- disable( name, mods[ii].getModificationOp(), mods[ii].getAttribute(), disabledInEntry
);
- }
+ isEnabled = true;
+ }
+ else if ( ! disabled.get().equals( "TRUE" ) )
+ {
+ isEnabled = true;
+ }
+
+ Attribute dependencies = AttributeUtils.getAttribute( mods, dependenciesAT );
+ if ( dependencies != null )
+ {
+ checkForDependencies( isEnabled, targetEntry );
}
}
@@ -426,7 +457,7 @@
/**
* Checks to make sure the dependencies either exist for disabled metaSchemas,
- * or exist and are loaded (enabled) for enabled metaSchemas being added.
+ * or exist and are loaded (enabled) for enabled metaSchemas.
*
* @param isEnabled whether or not the new metaSchema is enabled
* @param entry the Attributes for the new metaSchema object
@@ -452,8 +483,8 @@
if ( ! loaded.containsKey( dependency ) )
{
throw new LdapOperationNotSupportedException(
- "Unwilling to add enabled schema with disabled or missing dependencies:
" + dependency,
- ResultCodeEnum.UNWILLING_TO_PERFORM );
+ "Unwilling to perform operation on enabled schema with disabled or
missing dependencies: "
+ + dependency, ResultCodeEnum.UNWILLING_TO_PERFORM );
}
}
}
@@ -466,7 +497,7 @@
if ( ! allSchemas.contains( dependency ) )
{
throw new LdapOperationNotSupportedException(
- "Unwilling to add schema with missing dependencies: " + dependency,
+ "Unwilling to perform operation on schema with missing dependencies:
" + dependency,
ResultCodeEnum.UNWILLING_TO_PERFORM );
}
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java?view=diff&rev=502723&r1=502722&r2=502723
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaEntityFactory.java
Fri Feb 2 12:22:31 2007
@@ -97,12 +97,12 @@
}
name = ( String ) entry.get( SystemSchemaConstants.CN_AT ).get();
- if ( entry.get( MetaSchemaConstants.M_OWNER_AT ) == null )
+ if ( entry.get( SystemSchemaConstants.CREATORS_NAME_AT ) == null )
{
throw new NullPointerException( "entry must have a valid "
- + MetaSchemaConstants.M_OWNER_AT + " attribute" );
+ + SystemSchemaConstants.CREATORS_NAME_AT + " attribute" );
}
- owner = ( String ) entry.get( MetaSchemaConstants.M_OWNER_AT ).get();
+ owner = ( String ) entry.get( SystemSchemaConstants.CREATORS_NAME_AT ).get();
if ( entry.get( MetaSchemaConstants.M_DISABLED_AT ) != null )
{
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java?view=diff&rev=502723&r1=502722&r2=502723
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartitionDao.java
Fri Feb 2 12:22:31 2007
@@ -161,7 +161,8 @@
return schemaNames;
}
-
+ private static final String[] SCHEMA_ATTRIBUTES = new String[] {
+ "creatorsName", "m-dependencies", "objectClass", "cn", "m-disabled" };
private NamingEnumeration listSchemas() throws NamingException
{
LdapDN base = new LdapDN( "ou=schema" );
@@ -169,6 +170,7 @@
ExprNode filter = new SimpleNode( oidRegistry.getOid( "objectClass" ), "metaSchema",
AssertionEnum.EQUALITY );
SearchControls searchControls = new SearchControls();
searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
+ searchControls.setReturningAttributes( SCHEMA_ATTRIBUTES );
return partition.search( base, new HashMap(), filter, searchControls );
}
Modified: directory/apacheds/trunk/schema-bootstrap/src/main/schema/apachemeta.schema
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/schema-bootstrap/src/main/schema/apachemeta.schema?view=diff&rev=502723&r1=502722&r2=502723
==============================================================================
--- directory/apacheds/trunk/schema-bootstrap/src/main/schema/apachemeta.schema (original)
+++ directory/apacheds/trunk/schema-bootstrap/src/main/schema/apachemeta.schema Fri Feb 2
12:22:31 2007
@@ -51,7 +51,6 @@
# | 1.3.6.1.4.1.18060.0.4.0.2.6 | m-must |
# | 1.3.6.1.4.1.18060.0.4.0.2.7 | m-may |
# | 1.3.6.1.4.1.18060.0.4.0.2.8 | m-typeObjectClass |
-# | 1.3.6.1.4.1.18060.0.4.0.2.9 | m-extensionObjectClass |
# | 1.3.6.1.4.1.18060.0.4.0.2.10 | m-supAttributeType |
# | 1.3.6.1.4.1.18060.0.4.0.2.11 | m-equality |
# | 1.3.6.1.4.1.18060.0.4.0.2.12 | m-ordering |
@@ -61,27 +60,19 @@
# | 1.3.6.1.4.1.18060.0.4.0.2.16 | m-collective |
# | 1.3.6.1.4.1.18060.0.4.0.2.17 | m-noUserModification |
# | 1.3.6.1.4.1.18060.0.4.0.2.18 | m-usage |
-# | 1.3.6.1.4.1.18060.0.4.0.2.19 | m-extensionAttributeType |
# | 1.3.6.1.4.1.18060.0.4.0.2.20 | m-ruleId |
# | 1.3.6.1.4.1.18060.0.4.0.2.21 | m-form |
# | 1.3.6.1.4.1.18060.0.4.0.2.22 | m-supDITStructureRule |
-# | 1.3.6.1.4.1.18060.0.4.0.2.23 | m-extensionDITStructureRule |
# | 1.3.6.1.4.1.18060.0.4.0.2.24 | m-oc |
-# | 1.3.6.1.4.1.18060.0.4.0.2.25 | m-extensionNameForm |
# | 1.3.6.1.4.1.18060.0.4.0.2.26 | m-aux |
# | 1.3.6.1.4.1.18060.0.4.0.2.27 | m-not |
-# | 1.3.6.1.4.1.18060.0.4.0.2.28 | m-extensionDITContentRule |
# | 1.3.6.1.4.1.18060.0.4.0.2.29 | m-applies |
-# | 1.3.6.1.4.1.18060.0.4.0.2.30 | m-extensionMatchingRuleUse |
# | 1.3.6.1.4.1.18060.0.4.0.2.31 | m-matchingRuleSyntax |
# | 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 | x-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 |
# | 1.3.6.1.4.1.18060.0.4.0.2.37 | m-disabled |
# | 1.3.6.1.4.1.18060.0.4.0.2.38 | m-dependencies |
-# | 1.3.6.1.4.1.18060.0.4.0.2.39 | m-owner |
# +------------------------------+-----------------------------+
#
# +------------------------------+-----------------------------+
@@ -142,7 +133,7 @@
STRUCTURAL
MUST m-oid
MAY ( m-name $ m-obsolete $ m-supObjectClass $ m-typeObjectClass $ m-must $
- m-may $ m-extensionObjectClass )
+ m-may )
)
# --- metaAttributeType objectclass -------------------------------------------
@@ -179,7 +170,7 @@
STRUCTURAL
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 )
+ m-noUserModification $ m-usage )
)
# --- metaSyntax objectclass --------------------------------------------------
@@ -196,7 +187,6 @@
DESC 'meta definition of the Syntax object'
SUP metaTop
STRUCTURAL
- MAY m-extensionSyntax
)
# --- metaMatchingRule objectclass --------------------------------------------
@@ -216,7 +206,7 @@
SUP metaTop
STRUCTURAL
MUST m-syntax
- MAY ( m-name $ m-obsolete $ m-extensionMatchingRule )
+ MAY ( m-name $ m-obsolete )
)
# --- metaDITStructureRule objectclass ----------------------------------------
@@ -240,8 +230,7 @@
SUP top
STRUCTURAL
MUST ( m-ruleId $ m-form )
- MAY ( m-name $ m-obsolete $ m-supDITStructureRule $
- m-extensionDITStructureRule )
+ MAY ( m-name $ m-obsolete $ m-supDITStructureRule )
)
# --- metaNameForm objectclass ------------------------------------------------
@@ -262,7 +251,7 @@
SUP metaTop
STRUCTURAL
MUST ( m-oc $ m-must )
- MAY ( m-name $ m-obsolete $ m-may $ m-extensionNameForm )
+ MAY ( m-name $ m-obsolete $ m-may )
)
# --- metaMatchingRuleUse objectclass -----------------------------------------
@@ -281,7 +270,7 @@
SUP metaTop
STRUCTURAL
MUST m-applies
- MAY ( m-name $ m-obsolete $ m-extensionMatchingRuleUse )
+ MAY ( m-name $ m-obsolete )
)
# --- metaDITContentRule objectclass ------------------------------------------
@@ -302,8 +291,7 @@
DESC 'meta definition of the DITContentRule object'
SUP metaTop
STRUCTURAL
- MAY ( m-name $ m-obsolete $ m-aux $ m-must $ m-may $ m-not $
- m-extensionDITContentRule )
+ MAY ( m-name $ m-obsolete $ m-aux $ m-must $ m-may $ m-not )
)
# --- metaSyntaxChecker objectclass -------------------------------------------
@@ -323,7 +311,7 @@
SUP top
STRUCTURAL
MUST ( cn )
- MAY ( m-disabled $ m-dependencies $ m-owner )
+ MAY ( m-disabled $ m-dependencies )
)
# --- metaNormalizer objectclass ----------------------------------------------
@@ -409,13 +397,6 @@
SINGLE-VALUE
)
-# --- 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 ----------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.10 NAME 'm-supAttributeType'
DESC 'The list of superior'
@@ -488,13 +469,6 @@
SINGLE-VALUE
)
-# --- m-extensionAttributeType AttributeType ----------------------------------
-attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.19 NAME 'm-extensionAttributeType'
- DESC 'Extension for attributeType'
- EQUALITY caseIgnoreMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-)
-
# --- m-ruleId AttributeType --------------------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.20 NAME 'm-ruleId'
DESC 'The rule ID'
@@ -516,13 +490,6 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.36
)
-# --- m-extensionDITStructureRule AttributeType -------------------------------
-attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.23 NAME 'm-extensionDITStructureRule'
- DESC 'Extensions for DITStructureRule'
- EQUALITY caseIgnoreMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-)
-
# --- m-oc AttributeType ------------------------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.24 NAME 'm-oc'
DESC 'The structural ObjectClass'
@@ -530,13 +497,6 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.38
)
-# --- m-extensionNameForm AttributeType ---------------------------------------
-attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.25 NAME 'm-extensionNameForm'
- DESC 'Extensions for NameForm'
- EQUALITY caseIgnoreMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-)
-
# --- m-aux AttributeType -----------------------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.26 NAME 'm-aux'
DESC 'List of auxiliary ObjectClasses'
@@ -551,13 +511,6 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.38
)
-# --- m-extensionDITContentRule AttributeType ---------------------------------
-attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.28 NAME 'm-extensionDITContentRule'
- DESC 'Extensions for DITContentRule'
- EQUALITY caseIgnoreMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-)
-
# --- m-applies AttributeType -------------------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.29 NAME 'm-applies'
DESC 'List of attribute types the matching rule applies to'
@@ -565,13 +518,6 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.38
)
-# --- m-extensionMatchingRuleUse AttributeType --------------------------------
-attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.30 NAME 'm-extensionMatchingRuleUse'
- DESC 'Extensions for MatchingRuleUse'
- EQUALITY caseIgnoreMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-)
-
# --- m-matchingRuleSyntax AttributeType --------------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.31 NAME 'm-matchingRuleSyntax'
DESC 'The matchingRule attribute syntax '
@@ -603,20 +549,6 @@
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
-)
-
# --- m-disabled AttributeType -----------------------------------
attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.37 NAME 'm-disabled'
DESC 'Used as a marker for schemas to enable or disable them.'
@@ -631,14 +563,4 @@
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
)
-
-# --- m-owner AttributeType -----------------------------------
-attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.39 NAME 'm-owner'
- DESC 'The owner of this schema.'
- EQUALITY distinguishedNameMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
- SINGLE-VALUE
-)
-
-
|