directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1052129 - in /directory/shared/branches/shared-AP/ldap-schema/src: main/resources/schema/ou=schema/cn=apache/ou=attributetypes/ test/java/org/apache/directory/shared/ldap/schema/loader/ldif/
Date Thu, 23 Dec 2010 01:43:52 GMT
Author: elecharny
Date: Thu Dec 23 01:43:52 2010
New Revision: 1052129

URL: http://svn.apache.org/viewvc?rev=1052129&view=rev
Log:
Added the four AT used to reference the subentry UUID in entries

Added:
    directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.56.ldif
    directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.57.ldif
    directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.58.ldif
    directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.59.ldif
Modified:
    directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.1.16.4.ldif
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadTest.java
    directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadWithDepsTest.java

Modified: directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.1.16.4.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dattributetypes/m-oid%3D1.3.6.1.1.16.4.ldif?rev=1052129&r1=1052128&r2=1052129&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.1.16.4.ldif
(original)
+++ directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.1.16.4.ldif
Thu Dec 23 01:43:52 2010
@@ -1,17 +1,17 @@
 version: 1
 dn: m-oid=1.3.6.1.1.16.4,ou=attributeTypes,cn=apache,ou=schema
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
+m-oid: 1.3.6.1.1.16.4
+m-name: entryUUID
+m-description: UUID of the entry
+m-syntax: 1.3.6.1.1.16.1
+m-equality: uuidMatch
+m-ordering: uuidOrderingMatch
 m-singlevalue: TRUE
 m-obsolete: FALSE
-m-description: UUID of the entry
 m-usage: DIRECTORY_OPERATION
-creatorsname: uid=admin,ou=system
-m-ordering: uuidOrderingMatch
 m-collective: FALSE
-m-oid: 1.3.6.1.1.16.4
 m-nousermodification: TRUE
-m-syntax: 1.3.6.1.1.16.1
-objectclass: metaAttributeType
-objectclass: metaTop
-objectclass: top
-m-name: entryUUID
-m-equality: uuidMatch
+creatorsname: uid=admin,ou=system

Added: directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.56.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.56.ldif?rev=1052129&view=auto
==============================================================================
--- directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.56.ldif
(added)
+++ directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.56.ldif
Thu Dec 23 01:43:52 2010
@@ -0,0 +1,17 @@
+version: 1
+dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.56,ou=attributeTypes,cn=apache,ou=schema
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
+m-oid: 1.3.6.1.4.1.18060.0.4.1.2.56
+m-name: CollectiveAttributeSubentriesUUID
+m-description: UUIDs of the associated CollectiveAttribute subentries
+m-syntax: 1.3.6.1.1.16.1
+m-equality: uuidMatch
+m-ordering: uuidOrderingMatch
+m-obsolete: FALSE
+m-usage: DIRECTORY_OPERATION
+m-collective: FALSE
+m-singlevalue: FALSE
+m-nousermodification: TRUE
+creatorsname: uid=admin,ou=system

Added: directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.57.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.57.ldif?rev=1052129&view=auto
==============================================================================
--- directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.57.ldif
(added)
+++ directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.57.ldif
Thu Dec 23 01:43:52 2010
@@ -0,0 +1,17 @@
+version: 1
+dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.57,ou=attributeTypes,cn=apache,ou=schema
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
+m-oid: 1.3.6.1.4.1.18060.0.4.1.2.57
+m-name: AccessControlSubentriesUUID
+m-description: UUIDs of the associated AccessControl subentries
+m-syntax: 1.3.6.1.1.16.1
+m-equality: uuidMatch
+m-ordering: uuidOrderingMatch
+m-obsolete: FALSE
+m-usage: DIRECTORY_OPERATION
+m-collective: FALSE
+m-singlevalue: FALSE
+m-nousermodification: TRUE
+creatorsname: uid=admin,ou=system

Added: directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.58.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.58.ldif?rev=1052129&view=auto
==============================================================================
--- directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.58.ldif
(added)
+++ directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.58.ldif
Thu Dec 23 01:43:52 2010
@@ -0,0 +1,17 @@
+version: 1
+dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.58,ou=attributeTypes,cn=apache,ou=schema
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
+m-oid: 1.3.6.1.4.1.18060.0.4.1.2.58
+m-name: TriggerExecutionSubentriesUUID
+m-description: UUIDs of the associated TriggerExecution subentries
+m-syntax: 1.3.6.1.1.16.1
+m-equality: uuidMatch
+m-ordering: uuidOrderingMatch
+m-obsolete: FALSE
+m-usage: DIRECTORY_OPERATION
+m-collective: FALSE
+m-singlevalue: FALSE
+m-nousermodification: TRUE
+creatorsname: uid=admin,ou=system

Added: directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.59.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.59.ldif?rev=1052129&view=auto
==============================================================================
--- directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.59.ldif
(added)
+++ directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.59.ldif
Thu Dec 23 01:43:52 2010
@@ -0,0 +1,17 @@
+version: 1
+dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.59,ou=attributeTypes,cn=apache,ou=schema
+objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
+m-oid: 1.3.6.1.4.1.18060.0.4.1.2.59
+m-name: SubSchemaSubentryUUID
+m-description: UUIDs of the associated SubSchema subentry
+m-syntax: 1.3.6.1.1.16.1
+m-equality: uuidMatch
+m-ordering: uuidOrderingMatch
+m-obsolete: FALSE
+m-usage: DIRECTORY_OPERATION
+m-collective: FALSE
+m-singlevalue: TRUE
+m-nousermodification: TRUE
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java?rev=1052129&r1=1052128&r2=1052129&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java
(original)
+++ directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java
Thu Dec 23 01:43:52 2010
@@ -153,14 +153,14 @@ public class SchemaManagerEnableDisableL
         assertEquals( 0, disabled.size() );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 429, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 433, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 48, schemaManager.getComparatorRegistry().size() );
         assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
         assertEquals( 122, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 66, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 71, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 671, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 675, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -198,14 +198,14 @@ public class SchemaManagerEnableDisableL
         assertNotNull( schemaManager.lookupAttributeTypeRegistry( "gecos" ) );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 456, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 460, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 49, schemaManager.getComparatorRegistry().size() );
         assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
         assertEquals( 135, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 714, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 718, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 13, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -238,14 +238,14 @@ public class SchemaManagerEnableDisableL
         }
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 429, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 433, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 48, schemaManager.getComparatorRegistry().size() );
         assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
         assertEquals( 122, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 66, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 71, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 671, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 675, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -290,14 +290,14 @@ public class SchemaManagerEnableDisableL
         assertNotNull( schemaManager.lookupAttributeTypeRegistry( "gecos" ) );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 493, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 497, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 49, schemaManager.getComparatorRegistry().size() );
         assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
         assertEquals( 146, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 762, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 766, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 14, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "samba" ) );

Modified: directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadTest.java?rev=1052129&r1=1052128&r2=1052129&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadTest.java
(original)
+++ directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadTest.java
Thu Dec 23 01:43:52 2010
@@ -284,14 +284,14 @@ public class SchemaManagerLoadTest
         assertTrue( schemaManager.load( "apache" ) );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 151, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 155, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 43, schemaManager.getComparatorRegistry().size() );
         assertEquals( 43, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 43, schemaManager.getNormalizerRegistry().size() );
         assertEquals( 53, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 62, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 313, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 317, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );

Modified: directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadWithDepsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadWithDepsTest.java?rev=1052129&r1=1052128&r2=1052129&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadWithDepsTest.java
(original)
+++ directory/shared/branches/shared-AP/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadWithDepsTest.java
Thu Dec 23 01:43:52 2010
@@ -170,14 +170,14 @@ public class SchemaManagerLoadWithDepsTe
         schemaManager.loadWithDeps( "apache" );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 151, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 155, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 43, schemaManager.getComparatorRegistry().size() );
         assertEquals( 43, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 43, schemaManager.getNormalizerRegistry().size() );
         assertEquals( 53, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 62, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 313, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 317, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -254,14 +254,14 @@ public class SchemaManagerLoadWithDepsTe
         schemaManager.loadWithDeps( "other" );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 182, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 186, 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( 367, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 371, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 5, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );



Mime
View raw message