directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1094784 - in /directory/shared/trunk/ldap/schema/data/src: main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/ main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/ test/java/org/apache/directory/shared/ldap/schemaloader/
Date Mon, 18 Apr 2011 21:46:53 GMT
Author: kayyagari
Date: Mon Apr 18 21:46:53 2011
New Revision: 1094784

URL: http://svn.apache.org/viewvc?rev=1094784&view=rev
Log:
o renamed the composite element 'ads-passwordPolicy' to 'ads-passwordPolicies'
o removed a duplicate AT with the name ads-passwordPolicy (this also fixes a warning logged
during server startup)
o updated the test

Removed:
    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.118.ldif
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.313.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.100.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/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.313.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.313.ldif?rev=1094784&r1=1094783&r2=1094784&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.313.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.313.ldif
Mon Apr 18 21:46:53 2011
@@ -1,16 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.313,ou=attributeTypes,cn=adsconfig,ou=schema
 m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.313
-m-description: The PasswordPolicy configuration
+m-description: The PasswordPolicy configurations
 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-passwordPolicy
+m-name: ads-passwordPolicies
 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.100.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.100.ldif?rev=1094784&r1=1094783&r2=1094784&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.100.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.100.ldif
Mon Apr 18 21:46:53 2011
@@ -22,4 +22,4 @@ m-may: ads-dsMaxPDUSize
 m-may: ads-dsPasswordHidden
 m-may: ads-dsSyncPeriodMillis
 m-may: ads-dsTestEntries
-m-may: ads-passwordPolicy
+m-may: ads-passwordPolicies

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=1094784&r1=1094783&r2=1094784&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 18 21:46:53 2011
@@ -162,7 +162,7 @@ public class SchemaManagerEnableDisableL
         assertEquals( 122, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 669, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 668, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -207,7 +207,7 @@ public class SchemaManagerEnableDisableL
         assertEquals( 135, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 75, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 712, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 711, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 13, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -247,7 +247,7 @@ public class SchemaManagerEnableDisableL
         assertEquals( 122, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 669, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 668, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -299,7 +299,7 @@ public class SchemaManagerEnableDisableL
         assertEquals( 146, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 75, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 760, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 759, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 14, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "samba" ) );



Mime
View raw message