You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2011/04/04 12:20:04 UTC
svn commit: r1088537 - in /directory/shared/trunk/ldap/schema/data/src:
main/resources/
main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/
main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/
test/java/org/apache/directory/shared...
Author: kayyagari
Date: Mon Apr 4 10:20:04 2011
New Revision: 1088537
URL: http://svn.apache.org/viewvc?rev=1088537&view=rev
Log:
o removed the potentially consfusing config attributes ads-replProvider, ads-enableReplProvider and ads-replConsumer from ads-ldapServer objectclass
o changed ads-replLastSentCsn to optional attribute (there is no way that con be given at the time of configurating a consumer)
o added an optional ads-replConsumerImpl attribute
o renamed ads-replConsumer to ads-replConsumerImpl and removed the m-supattributetype option
o renamed ads-replProvider to ads-replReqHandler
o fixed the wrong syntax, order and mathing rule values of ads-replSearchScope
o added a new container ads-replConsumers
o updated the testcase
Added:
directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.307.ldif
Modified:
directory/shared/trunk/ldap/schema/data/src/main/resources/schema-all.ldif
directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.310.ldif
directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.821.ldif
directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.832.ldif
directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif
directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.805.ldif
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java
Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema-all.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema-all.ldif?rev=1088537&r1=1088536&r2=1088537&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema-all.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema-all.ldif Mon Apr 4 10:20:04 2011
@@ -2666,7 +2666,7 @@ m-may: ads-saslPrincipal
m-may: ads-saslRealms
m-may: ads-keystoreFile
m-may: ads-certificatePassword
-m-may: ads-replProvider
+m-may: ads-replReqHandler
m-may: ads-replConsumer
m-may: ads-saslMechHandlers
m-may: ads-extendedOpHandlers
Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.307.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.307.ldif?rev=1088537&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.307.ldif (added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.307.ldif Mon Apr 4 10:20:04 2011
@@ -0,0 +1,15 @@
+version: 1
+dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.307,ou=attributeTypes,cn=adsconfig,ou=schema
+objectclass: metaTop
+objectclass: metaAttributeType
+objectclass: top
+m-name: ads-replConsumers
+m-oid: 1.3.6.1.4.1.18060.0.4.1.2.307
+m-description: The replication consumers of this server instance
+m-supattributetype: ads-compositeElement
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
+m-substr: caseExactSubstringsMatch
+m-ordering: caseExactOrderingMatch
+m-equality: caseExactMatch
+m-length: 0
+creatorsname: uid=admin,ou=system
Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.310.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.310.ldif?rev=1088537&r1=1088536&r2=1088537&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.310.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.310.ldif Mon Apr 4 10:20:04 2011
@@ -3,14 +3,13 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.310,
m-ordering: caseExactOrderingMatch
m-singlevalue: TRUE
m-oid: 1.3.6.1.4.1.18060.0.4.1.2.310
-m-description: The reference to the Replication Consumer
+m-description: The FQCN of the replication consumer/client handler
m-substr: caseExactSubstringsMatch
-m-supattributetype: ads-compositeElement
objectclass: top
objectclass: metaTop
objectclass: metaAttributeType
m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-replConsumer
+m-name: ads-replConsumerImpl
creatorsname: uid=admin,ou=system
m-equality: caseExactMatch
m-length: 0
Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.821.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.821.ldif?rev=1088537&r1=1088536&r2=1088537&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.821.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.821.ldif Mon Apr 4 10:20:04 2011
@@ -1,6 +1,6 @@
version: 1
dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.821,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: integerOrderingMatch
+m-ordering: caseExactOrderingMatch
m-singlevalue: TRUE
m-oid: 1.3.6.1.4.1.18060.0.4.1.2.821
m-description: the search scope of the replication
@@ -10,5 +10,5 @@ objectclass: top
m-syntax: 1.3.6.1.4.1.18060.0.4.1.0.10
m-name: ads-replSearchScope
creatorsname: uid=admin,ou=system
-m-equality: integerMatch
+m-equality: caseExactMatch
m-length: 0
Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.832.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.832.ldif?rev=1088537&r1=1088536&r2=1088537&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.832.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.832.ldif Mon Apr 4 10:20:04 2011
@@ -3,14 +3,14 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.832,
m-ordering: caseExactOrderingMatch
m-singlevalue: TRUE
m-oid: 1.3.6.1.4.1.18060.0.4.1.2.832
-m-description: Reference to the replication provider
+m-description: FQCN of the replication replication request handler on a master/provider
m-substr: caseExactSubstringsMatch
m-supattributetype: ads-compositeElement
objectclass: top
objectclass: metaAttributeType
objectclass: metaTop
m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-replProvider
+m-name: ads-replReqHandler
creatorsname: uid=admin,ou=system
m-equality: caseExactMatch
m-length: 0
Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.300.ldif?rev=1088537&r1=1088536&r2=1088537&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif Mon Apr 4 10:20:04 2011
@@ -16,8 +16,7 @@ m-may: ads-saslPrincipal
m-may: ads-saslRealms
m-may: ads-keystoreFile
m-may: ads-certificatePassword
-m-may: ads-replProvider
-m-may: ads-replConsumer
+m-may: ads-replReqHandler
m-may: ads-saslMechHandlers
m-may: ads-extendedOpHandlers
-m-may: ads-enableReplProvider
+m-may: ads-replConsumers
Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.805.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.805.ldif?rev=1088537&r1=1088536&r2=1088537&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.805.ldif (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.805.ldif Mon Apr 4 10:20:04 2011
@@ -4,7 +4,7 @@ m-must: ads-replConsumerId
m-must: ads-dsReplicaId
m-must: ads-replAliasDerefMode
m-must: ads-searchBaseDN
-m-must: ads-replLastSentCsn
+m-may: ads-replLastSentCsn
m-must: ads-replSearchScope
m-must: ads-replSearchFilter
m-oid: 1.3.6.1.4.1.18060.0.4.1.3.805
@@ -19,3 +19,4 @@ m-may: ads-replRefreshNPersist
m-may: ads-replUseTls
m-may: ads-replStrictCertValidation
m-may: ads-replPeerCertificate
+m-may: ads-replConsumerImpl
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=1088537&r1=1088536&r2=1088537&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 Mon Apr 4 10:20:04 2011
@@ -155,14 +155,14 @@ public class SchemaManagerEnableDisableL
assertEquals( 0, disabled.size() );
assertTrue( schemaManager.getErrors().isEmpty() );
- assertEquals( 424, schemaManager.getAttributeTypeRegistry().size() );
+ assertEquals( 425, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 48, schemaManager.getComparatorRegistry().size() );
assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
assertEquals( 122, schemaManager.getObjectClassRegistry().size() );
assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 668, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 669, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -200,14 +200,14 @@ public class SchemaManagerEnableDisableL
assertNotNull( schemaManager.lookupAttributeTypeRegistry( "gecos" ) );
assertTrue( schemaManager.getErrors().isEmpty() );
- assertEquals( 451, schemaManager.getAttributeTypeRegistry().size() );
+ assertEquals( 452, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 49, schemaManager.getComparatorRegistry().size() );
assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
assertEquals( 135, schemaManager.getObjectClassRegistry().size() );
assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 75, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 711, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 712, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 13, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNotNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -240,14 +240,14 @@ public class SchemaManagerEnableDisableL
}
assertTrue( schemaManager.getErrors().isEmpty() );
- assertEquals( 424, schemaManager.getAttributeTypeRegistry().size() );
+ assertEquals( 425, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 48, schemaManager.getComparatorRegistry().size() );
assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
assertEquals( 122, schemaManager.getObjectClassRegistry().size() );
assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 668, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 669, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -292,14 +292,14 @@ public class SchemaManagerEnableDisableL
assertNotNull( schemaManager.lookupAttributeTypeRegistry( "gecos" ) );
assertTrue( schemaManager.getErrors().isEmpty() );
- assertEquals( 488, schemaManager.getAttributeTypeRegistry().size() );
+ assertEquals( 489, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 49, schemaManager.getComparatorRegistry().size() );
assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
assertEquals( 146, schemaManager.getObjectClassRegistry().size() );
assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 75, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 759, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 760, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 14, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNotNull( schemaManager.getRegistries().getLoadedSchema( "samba" ) );