svn commit: r497220 - in /directory/trunks/apacheds: core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java schema-bootstrap/src/main/schema/apachemeta.schema

[ak...@apache.org]

Author: akarasulu
Date: Wed Jan 17 14:50:59 2007
New Revision: 497220

URL: http://svn.apache.org/viewvc?view=rev&rev=497220
Log:
fixing a couple bugs in meta schema and schema handler for new schema creation

Modified:
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
    directory/trunks/apacheds/schema-bootstrap/src/main/schema/apachemeta.schema

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java?view=diff&rev=497220&r1=497219&r2=497220
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java (original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/schema/MetaSchemaHandler.java Wed Jan 17 14:50:59 2007
@@ -186,9 +186,11 @@
     {
         LdapDN parentDn = ( LdapDN ) name.clone();
         parentDn.remove( parentDn.size() - 1 );
-        if ( parentDn.toNormName().equals( OU_OID + "=schema" ) )
+        parentDn.normalize( globalRegistries.getAttributeTypeRegistry().getNormalizerMapping() );
+        if ( ! parentDn.toNormName().equals( OU_OID + "=schema" ) )
         {
-            throw new LdapInvalidNameException( "The parent dn of a schema should be ou=schema.", 
+            throw new LdapInvalidNameException( "The parent dn of a schema should be " + OU_OID 
+                + "=schema and not: " + parentDn.toNormName(), 
                 ResultCodeEnum.NAMING_VIOLATION );
         }
     }

Modified: directory/trunks/apacheds/schema-bootstrap/src/main/schema/apachemeta.schema
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/schema-bootstrap/src/main/schema/apachemeta.schema?view=diff&rev=497220&r1=497219&r2=497220
==============================================================================
--- directory/trunks/apacheds/schema-bootstrap/src/main/schema/apachemeta.schema (original)
+++ directory/trunks/apacheds/schema-bootstrap/src/main/schema/apachemeta.schema Wed Jan 17 14:50:59 2007
@@ -320,10 +320,10 @@
 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'
-    SUP metaTop
+    SUP top
     STRUCTURAL
-    MUST ( cn $ m-owner )
-    MAY ( m-disabled $ m-dependencies )
+    MUST ( cn )
+    MAY ( m-disabled $ m-dependencies $ m-owner )
 )
 
 # --- metaNormalizer objectclass ----------------------------------------------