You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/02/28 14:51:39 UTC

svn commit: r1294656 [2/2] - in /directory/shared/trunk/ldap/schema/data/src: main/resources/schema/ou=schema/cn=samba/ou=attributetypes/ main/resources/schema/ou=schema/cn=samba/ou=objectclasses/ test/java/org/apache/directory/shared/ldap/schemaloader/

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=samba/ou=objectclasses/m-oid=1.3.6.1.4.1.7165.2.2.7.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsamba/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.7165.2.2.7.ldif?rev=1294656&r1=1294655&r2=1294656&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=samba/ou=objectclasses/m-oid=1.3.6.1.4.1.7165.2.2.7.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=samba/ou=objectclasses/m-oid=1.3.6.1.4.1.7165.2.2.7.ldif Tue Feb 28 13:51:37 2012
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.7165.2.2.7,ou=objectClasses,cn=samba,ou=schema
-m-must: uidNumber
-m-must: gidNumber
 m-oid: 1.3.6.1.4.1.7165.2.2.7
-m-supobjectclass: top
+m-name: sambaUnixIdPool
 m-description: Pool for allocating UNIX uids/gids
-objectclass: metaObjectClass
-objectclass: metaTop
 objectclass: top
-m-name: sambaUnixIdPool
+objectclass: metaTop
+objectclass: metaObjectClass
+m-supobjectclass: top
 m-typeobjectclass: AUXILIARY
+m-must: gidNumber
+m-must: uidNumber
 creatorsname: uid=admin,ou=system

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=samba/ou=objectclasses/m-oid=1.3.6.1.4.1.7165.2.2.8.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsamba/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.7165.2.2.8.ldif?rev=1294656&r1=1294655&r2=1294656&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=samba/ou=objectclasses/m-oid=1.3.6.1.4.1.7165.2.2.8.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=samba/ou=objectclasses/m-oid=1.3.6.1.4.1.7165.2.2.8.ldif Tue Feb 28 13:51:37 2012
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.7165.2.2.8,ou=objectClasses,cn=samba,ou=schema
-m-must: sambaSID
 m-oid: 1.3.6.1.4.1.7165.2.2.8
-m-obsolete: FALSE
-m-supobjectclass: top
+m-name: sambaIdmapEntry
 m-description: Mapping from a SID to an ID
-objectclass: metaObjectClass
-objectclass: metaTop
 objectclass: top
-m-name: sambaIdmapEntry
+objectclass: metaTop
+objectclass: metaObjectClass
+m-obsolete: FALSE
+m-supobjectclass: top
 m-typeobjectclass: AUXILIARY
-creatorsname: uid=admin,ou=system
-m-may: uidNumber
+m-must: sambaSID
 m-may: gidNumber
+m-may: uidNumber
+creatorsname: uid=admin,ou=system

Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=samba/ou=objectclasses/m-oid=1.3.6.1.4.1.7165.2.2.9.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dsamba/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.7165.2.2.9.ldif?rev=1294656&r1=1294655&r2=1294656&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=samba/ou=objectclasses/m-oid=1.3.6.1.4.1.7165.2.2.9.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=samba/ou=objectclasses/m-oid=1.3.6.1.4.1.7165.2.2.9.ldif Tue Feb 28 13:51:37 2012
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.7165.2.2.9,ou=objectClasses,cn=samba,ou=schema
-m-must: sambaSID
 m-oid: 1.3.6.1.4.1.7165.2.2.9
-m-obsolete: FALSE
-m-supobjectclass: top
+m-name: sambaSidEntry
 m-description: Structural Class for a SID
-objectclass: metaObjectClass
-objectclass: metaTop
 objectclass: top
-m-name: sambaSidEntry
+objectclass: metaTop
+objectclass: metaObjectClass
+m-obsolete: FALSE
+m-supobjectclass: top
 m-typeobjectclass: STRUCTURAL
+m-must: sambaSID
 creatorsname: uid=admin,ou=system

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=1294656&r1=1294655&r2=1294656&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 Tue Feb 28 13:51:37 2012
@@ -293,14 +293,14 @@ public class SchemaManagerEnableDisableL
         assertNotNull( schemaManager.lookupAttributeTypeRegistry( "gecos" ) );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 491, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 501, 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( 759, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 769, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 14, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "samba" ) );