directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1243035 - in /directory/shared/trunk/ldap/schema/data/src: main/java/org/apache/directory/shared/ldap/schemaloader/ main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/ main/resources/schema/ou=schema/cn=apachemeta/ou=objectcla...
Date Sat, 11 Feb 2012 11:50:37 GMT
Author: elecharny
Date: Sat Feb 11 11:50:35 2012
New Revision: 1243035

URL: http://svn.apache.org/viewvc?rev=1243035&view=rev
Log:
o Added the missing x-schema AT
o Added x-schema in the metaTop OC may
o Fixed the tests accordingly to the addition of x-schema AT
o Removed the read of the x-not-human-readable value in the SchemaEntityFactory : it's read while processing the extensions
o Cleaned up the apacheMeta AT ldif files

Added:
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.35.ldif
Modified:
    directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.1.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.10.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.11.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.12.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.13.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.14.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.15.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.16.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.17.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.18.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.2.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.20.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.21.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.22.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.24.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.26.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.27.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.29.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.3.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.31.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.32.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.33.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.34.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.37.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.38.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.39.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.4.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.5.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.6.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.7.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.8.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.0.3.1.ldif
    directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java
    directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java
    directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Sat Feb 11 11:50:35 2012
@@ -703,16 +703,6 @@ public class SchemaEntityFactory impleme
         // Create the new LdapSyntax instance
         LdapSyntax syntax = new LdapSyntax( oid );
 
-        // The isHumanReadable field
-        Attribute mHumanReadable = entry.get( MetaSchemaConstants.X_NOT_HUMAN_READABLE_AT );
-
-        if ( mHumanReadable != null )
-        {
-            String val = mHumanReadable.getString();
-            syntax.setHumanReadable( val.toUpperCase().equals( "FALSE" ) );
-            syntax.setHasHumanReadableFlag();
-        }
-
         // Common properties
         setSchemaObjectProperties( syntax, entry, schema );
 
@@ -1113,15 +1103,6 @@ public class SchemaEntityFactory impleme
             schemaObject.setEnabled( schema != null && schema.isEnabled() );
         }
 
-        // The isReadOnly field
-        Attribute mIsReadOnly = entry.get( MetaSchemaConstants.M_NO_USER_MODIFICATION_AT );
-
-        if ( mIsReadOnly != null )
-        {
-            String val = mIsReadOnly.getString();
-            schemaObject.setReadOnly( val.equalsIgnoreCase( "TRUE" ) );
-        }
-
         // The specification field
         /*
          * TODO : create the M_SPECIFICATION_AT
@@ -1136,23 +1117,52 @@ public class SchemaEntityFactory impleme
         // The schemaName field
         schemaObject.setSchemaName( schema.getSchemaName() );
 
-        // The extensions field
-        /*
-         * TODO create the M_EXTENSION_AT AT
-        EntryAttribute extensions = entry.get( MetaSchemaConstants.M_EXTENSION_AT );
+        // The extensions fields
+        // X-SCHEMA
+        Attribute xSchema = entry.get( MetaSchemaConstants.X_SCHEMA_AT );
         
-        if ( extensions != null )
+        if ( xSchema != null )
         {
-            List<String> extensions = new ArrayList<String>();
+            String schemaName = xSchema.getString();
             
-            for ( Value<?> extension:extensions )
+            if ( !schema.getSchemaName().equalsIgnoreCase( schemaName ) )
             {
-                values.add( extension() );
+               LOG.warn( "Schema (" + schema.getSchemaName() + ") and X-SCHEMA ("
+                   + schemaName + ") are different : " + entry );
             }
             
-            so.setExtensions( values );
+            schemaObject.addExtension( MetaSchemaConstants.X_SCHEMA_AT, schemaName );
+        }
+        
+        // X-NOT-HUMAN-READABLE
+        Attribute xNotHumanReadable = entry.get( MetaSchemaConstants.X_NOT_HUMAN_READABLE_AT );
+        
+        if ( xNotHumanReadable != null )
+        {
+            String value = xNotHumanReadable.getString();
+            
+            schemaObject.addExtension( MetaSchemaConstants.X_NOT_HUMAN_READABLE_AT, value );
+        }
+        
+        // X-READ-ONLY
+        Attribute xReadOnly = entry.get( MetaSchemaConstants.X_READ_ONLY_AT );
+        
+        if ( xReadOnly != null )
+        {
+            String value = xReadOnly.getString();
+            
+            schemaObject.addExtension( MetaSchemaConstants.X_READ_ONLY_AT, value );
+        }
+        
+        // X-ENABLED
+        Attribute xEnabled = entry.get( MetaSchemaConstants.X_ENABLED_AT );
+        
+        if ( xEnabled != null )
+        {
+            String value = xEnabled.getString();
+            
+            schemaObject.addExtension( MetaSchemaConstants.X_ENABLED_AT, value );
         }
-        */
     }
 
 

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.1.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.1.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.1.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.1.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.1,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.1
-m-obsolete: FALSE
+m-name: m-oid
 m-description: The Object Identifier
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.18060.0.4.0.0.2
+m-equality: objectIdentifierMatch
 m-usage: USER_APPLICATIONS
-m-name: m-oid
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: objectIdentifierMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.10.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.10.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.10.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.10.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.10,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.10
-m-obsolete: FALSE
+m-name: m-supAttributeType
 m-description: The list of superior
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.38
+m-equality: nameOrNumericIdMatch
 m-usage: USER_APPLICATIONS
-m-name: m-supAttributeType
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: nameOrNumericIdMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.11.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.11.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.11.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.11.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.11,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.11
-m-obsolete: FALSE
+m-name: m-equality
 m-description: Equality matching rule
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.38
+m-equality: nameOrNumericIdMatch
 m-usage: USER_APPLICATIONS
-m-name: m-equality
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: nameOrNumericIdMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.12.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.12.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.12.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.12.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.12,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.12
-m-obsolete: FALSE
+m-name: m-ordering
 m-description: Ordering matching rule
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.38
+m-equality: nameOrNumericIdMatch
 m-usage: USER_APPLICATIONS
-m-name: m-ordering
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: nameOrNumericIdMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.13.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.13.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.13.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.13.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.13,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.13
-m-obsolete: FALSE
+m-name: m-substr
 m-description: Substring matching rule
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.38
+m-equality: nameOrNumericIdMatch
 m-usage: USER_APPLICATIONS
-m-name: m-substr
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: nameOrNumericIdMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.14.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.14.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.14.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.14.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.14,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.14
-m-obsolete: FALSE
+m-name: m-syntax
 m-description: The syntax OID for attributeTypes and matchingRules
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.18060.0.4.0.0.2
+m-equality: nameOrNumericIdMatch
 m-usage: USER_APPLICATIONS
-m-name: m-syntax
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: nameOrNumericIdMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.15.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.15.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.15.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.15.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.15,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.15
-m-obsolete: FALSE
+m-name: m-singleValue
 m-description: The attribute is single valued
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+m-equality: booleanMatch
 m-usage: USER_APPLICATIONS
-m-name: m-singleValue
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: booleanMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.16.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.16.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.16.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.16.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.16,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.16
-m-obsolete: FALSE
+m-name: m-collective
 m-description: The attribute is collective
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+m-equality: booleanMatch
 m-usage: USER_APPLICATIONS
-m-name: m-collective
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: booleanMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.17.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.17.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.17.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.17.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.17,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.17
-m-obsolete: FALSE
+m-name: m-noUserModification
 m-description: The attribute is protected
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+m-equality: booleanMatch
 m-usage: USER_APPLICATIONS
-m-name: m-noUserModification
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: booleanMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.18.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.18.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.18.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.18.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.18,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.18
-m-obsolete: FALSE
+m-name: m-usage
 m-description: Usage type of an attributeType
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
+m-equality: caseIgnoreMatch
 m-usage: USER_APPLICATIONS
-m-name: m-usage
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: caseIgnoreMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.2.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.2.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.2.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.2.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.2,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.2
-m-obsolete: FALSE
+m-name: m-name
 m-description: The Object name
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.18060.0.4.0.0.6
+m-equality: caseIgnoreMatch
 m-usage: USER_APPLICATIONS
-m-name: m-name
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: caseIgnoreMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.20.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.20.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.20.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.20.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.20,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.20
-m-obsolete: FALSE
+m-name: m-ruleId
 m-description: The rule ID
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.18060.0.4.0.0.4
+m-equality: ruleIdMatch
 m-usage: USER_APPLICATIONS
-m-name: m-ruleId
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: ruleIdMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.21.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.21.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.21.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.21.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.21,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.21
-m-obsolete: FALSE
+m-name: m-form
 m-description: The name form associated with this DITStructure rule
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.38
+m-equality: caseIgnoreMatch
 m-usage: USER_APPLICATIONS
-m-name: m-form
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: caseIgnoreMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.22.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.22.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.22.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.22.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.22,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.22
-m-obsolete: FALSE
+m-name: m-supDITStructureRule
 m-description: The list of superiors
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.36
+m-equality: supDITStructureRuleMatch
 m-usage: USER_APPLICATIONS
-m-name: m-supDITStructureRule
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: supDITStructureRuleMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.24.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.24.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.24.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.24.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.24,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.24
-m-obsolete: FALSE
+m-name: m-oc
 m-description: The structural ObjectClass
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.38
+m-equality: numericOidMatch
 m-usage: USER_APPLICATIONS
-m-name: m-oc
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: numericOidMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.26.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.26.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.26.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.26.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.26,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.26
-m-obsolete: FALSE
+m-name: m-aux
 m-description: List of auxiliary ObjectClasses
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.38
+m-equality: numericOidMatch
 m-usage: USER_APPLICATIONS
-m-name: m-aux
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: numericOidMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.27.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.27.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.27.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.27.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.27,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.27
-m-obsolete: FALSE
+m-name: m-not
 m-description: List of precluded attribute types
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.38
+m-equality: numericOidMatch
 m-usage: USER_APPLICATIONS
-m-name: m-not
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: numericOidMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.29.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.29.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.29.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.29.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.29,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.29
-m-obsolete: FALSE
+m-name: m-applies
 m-description: List of attribute types the matching rule applies to
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.38
+m-equality: numericOidMatch
 m-usage: USER_APPLICATIONS
-m-name: m-applies
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: numericOidMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.3.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.3.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.3.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.3.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.3,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.3
-m-obsolete: FALSE
+m-name: m-description
 m-description: meta descriptive information
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.15
+m-equality: caseIgnoreMatch
 m-usage: USER_APPLICATIONS
-m-name: m-description
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: caseIgnoreMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.31.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.31.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.31.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.31.ldif Sat Feb 11 11:50:35 2012
@@ -1,15 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.31,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
-m-oid: 1.3.6.1.4.1.18060.0.4.0.2.31
-m-obsolete: FALSE
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
 objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
+m-oid: 1.3.6.1.4.1.18060.0.4.0.2.31
+m-name: m-matchingRuleSyntax
+m-description: The MatchingRule Syntax
 m-syntax: 1.3.6.1.4.1.18060.0.4.0.0.2
+m-equality: numericOidMatch
 m-usage: USER_APPLICATIONS
-m-name: m-matchingRuleSyntax
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: numericOidMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.32.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.32.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.32.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.32.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.32,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.32
-m-obsolete: FALSE
+m-name: m-fqcn
 m-description: The fully qualified class name of a code based schema entity
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
+m-equality: caseExactMatch
 m-usage: USER_APPLICATIONS
-m-name: m-fqcn
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: caseExactMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.33.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.33.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.33.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.33.ldif Sat Feb 11 11:50:35 2012
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.33,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.33
-m-obsolete: FALSE
+m-name: m-bytecode
 m-description: The Java bytecode for a code based schema entity
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.5
 m-usage: USER_APPLICATIONS
-m-name: m-bytecode
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.34.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.34.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.34.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.34.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.34,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.34
-m-obsolete: FALSE
+m-name: x-not-human-readable
 m-description: whether or not a syntax is human readable
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+m-equality: booleanMatch
 m-usage: USER_APPLICATIONS
-m-name: x-not-human-readable
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: booleanMatch

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.35.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.35.ldif?rev=1243035&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.35.ldif (added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.35.ldif Sat Feb 11 11:50:35 2012
@@ -0,0 +1,16 @@
+version: 1
+dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.35,ou=attributeTypes,cn=apachemeta,ou=schema
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
+m-oid: 1.3.6.1.4.1.18060.0.4.0.2.35
+m-name: x-schema
+m-description: Stores the name of the schema 
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.15
+m-equality: caseIgnoreMatch
+m-usage: USER_APPLICATIONS
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
+creatorsname: uid=admin,ou=system

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.37.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.37.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.37.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.37.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.37,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.37
-m-obsolete: FALSE
+m-name: m-disabled
 m-description: Used as a marker for schemas to enable or disable them.
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+m-equality: booleanMatch
 m-usage: USER_APPLICATIONS
-m-name: m-disabled
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: booleanMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.38.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.38.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.38.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.38.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.38,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.38
-m-obsolete: FALSE
+m-name: m-dependencies
 m-description: The dependencies of a schema: other schema names.
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.15
+m-equality: caseIgnoreMatch
 m-usage: USER_APPLICATIONS
-m-name: m-dependencies
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: caseIgnoreMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.39.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.39.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.39.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.39.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.39,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.39
-m-obsolete: FALSE
+m-name: m-length
 m-description: The maximum length for an attribute value.
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.18060.0.4.0.0.4
+m-equality: caseIgnoreMatch
 m-usage: USER_APPLICATIONS
-m-name: m-length
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: caseIgnoreMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.4.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.4.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.4.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.4.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.4,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.4
-m-obsolete: FALSE
+m-name: m-obsolete
 m-description: The type is obsolete
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+m-equality: booleanMatch
 m-usage: USER_APPLICATIONS
-m-name: m-obsolete
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: booleanMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.5.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.5.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.5.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.5.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.5,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.5
-m-obsolete: FALSE
+m-name: m-supObjectClass
 m-description: The list of superiors
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.38
+m-equality: nameOrNumericIdMatch
 m-usage: USER_APPLICATIONS
-m-name: m-supObjectClass
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: nameOrNumericIdMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.6.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.6.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.6.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.6.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.6,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.6
-m-obsolete: FALSE
+m-name: m-must
 m-description: The list of mandatory ATs
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.38
+m-equality: nameOrNumericIdMatch
 m-usage: USER_APPLICATIONS
-m-name: m-must
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: nameOrNumericIdMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.7.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.7.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.7.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.7.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.7,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.7
-m-obsolete: FALSE
+m-name: m-may
 m-description: The list of authorized ATs
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.38
+m-equality: nameOrNumericIdMatch
 m-usage: USER_APPLICATIONS
-m-name: m-may
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: nameOrNumericIdMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.8.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.0.2.8.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.8.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.0.2.8.ldif Sat Feb 11 11:50:35 2012
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.0.2.8,ou=attributeTypes,cn=apachemeta,ou=schema
-m-collective: FALSE
-m-singlevalue: TRUE
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-oid: 1.3.6.1.4.1.18060.0.4.0.2.8
-m-obsolete: FALSE
+m-name: m-typeObjectClass
 m-description: The objectclass type
-m-nousermodification: FALSE
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
 m-syntax: 1.3.6.1.4.1.18060.0.4.0.0.1
+m-equality: objectClassTypeMatch
 m-usage: USER_APPLICATIONS
-m-name: m-typeObjectClass
+m-singlevalue: TRUE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: FALSE
 creatorsname: uid=admin,ou=system
-m-equality: objectClassTypeMatch

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.0.3.1.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapachemeta/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.0.3.1.ldif?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.0.3.1.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apachemeta/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.0.3.1.ldif Sat Feb 11 11:50:35 2012
@@ -12,3 +12,4 @@ m-name: metaTop
 m-typeobjectclass: ABSTRACT
 creatorsname: uid=admin,ou=system
 m-may: m-description
+m-may: x-schema

Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java Sat Feb 11 11:50:35 2012
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.shared.ldap.schemaloader;
 
@@ -51,7 +51,7 @@ import com.mycila.junit.concurrent.Concu
 
 
 /**
- * A test class for SchemaManager enable/disable and loadAllEnbled() methods. 
+ * A test class for SchemaManager enable/disable and loadAllEnbled() methods.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
@@ -156,14 +156,14 @@ public class SchemaManagerEnableDisableL
         assertEquals( 0, disabled.size() );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 426, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 427, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 48, schemaManager.getComparatorRegistry().size() );
         assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
         assertEquals( 120, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 667, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 668, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -201,14 +201,14 @@ public class SchemaManagerEnableDisableL
         assertNotNull( schemaManager.lookupAttributeTypeRegistry( "gecos" ) );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 453, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 454, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 49, schemaManager.getComparatorRegistry().size() );
         assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
         assertEquals( 133, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 75, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 710, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 711, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 13, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -241,14 +241,14 @@ public class SchemaManagerEnableDisableL
         }
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 426, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 427, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 48, schemaManager.getComparatorRegistry().size() );
         assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
         assertEquals( 120, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 667, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 668, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -293,14 +293,14 @@ public class SchemaManagerEnableDisableL
         assertNotNull( schemaManager.lookupAttributeTypeRegistry( "gecos" ) );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 490, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 491, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 49, schemaManager.getComparatorRegistry().size() );
         assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
         assertEquals( 144, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 75, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 758, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 759, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 14, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "samba" ) );

Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java Sat Feb 11 11:50:35 2012
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.shared.ldap.schemaloader;
 
@@ -58,8 +58,8 @@ import org.junit.Test;
  *  Studio API :
  *     boolean loadRelaxed( Schema... schemas ) throws Exception
  *     boolean loadRelaxed( String... schemas ) throws Exception
- *     boolean loadAllEnabledRelaxed() throws Exception 
- *     
+ *     boolean loadAllEnabledRelaxed() throws Exception
+ * 
  * We check the resulting number of SchemaObjects in the registries. Those number are :
  * 
  * Apache :
@@ -71,12 +71,12 @@ import org.junit.Test;
  *   SC :   3
  *   S  :   7
  *   OID:  85
- *   
+ * 
  * ApacheDns :
  *   AT :  16
  *   OC :  11
  *   OID:  27
- *   
+ * 
  * ApacheMeta :
  *   AT :  31
  *   C  :   5
@@ -214,7 +214,7 @@ public class SchemaManagerLoadTest
     // Test the load( String... schemaName) method
     //-------------------------------------------------------------------------
     /**
-     * test loading the "system" schema 
+     * test loading the "system" schema
      */
     @Test
     public void testLoadSystem() throws Exception
@@ -313,14 +313,14 @@ public class SchemaManagerLoadTest
         assertTrue( schemaManager.load( "apacheMeta" ) );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 69, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 70, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 40, schemaManager.getComparatorRegistry().size() );
         assertEquals( 40, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 40, schemaManager.getNormalizerRegistry().size() );
         assertEquals( 22, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 63, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 64, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 195, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 196, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );

Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java?rev=1243035&r1=1243034&r2=1243035&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java Sat Feb 11 11:50:35 2012
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.shared.ldap.schemaloader;
 
@@ -106,7 +106,7 @@ public class SchemaManagerLoadWithDepsTe
     // Test the load( String... schemaName) method
     //-------------------------------------------------------------------------
     /**
-     * test loading the "system" schema 
+     * test loading the "system" schema
      */
     @Test
     public void testLoadSystem() throws Exception
@@ -198,14 +198,14 @@ public class SchemaManagerLoadWithDepsTe
         schemaManager.loadWithDeps( "apacheMeta" );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 69, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 70, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 40, schemaManager.getComparatorRegistry().size() );
         assertEquals( 40, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 40, schemaManager.getNormalizerRegistry().size() );
         assertEquals( 22, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 63, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 64, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 195, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 196, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 2, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -254,14 +254,14 @@ public class SchemaManagerLoadWithDepsTe
         schemaManager.loadWithDeps( "other" );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 178, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 179, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 48, schemaManager.getComparatorRegistry().size() );
         assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
         assertEquals( 66, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 66, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 71, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 363, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 364, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 5, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );



Mime
View raw message