directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1029075 [2/2] - in /directory/shared/trunk/ldap-schema: ./ src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/ src/main/resources/ src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/ src/main/resources/schem...
Date Sat, 30 Oct 2010 14:04:37 GMT
Modified: directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.802.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.802.ldif?rev=1029075&r1=1029074&r2=1029075&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.802.ldif
(original)
+++ directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.802.ldif
Sat Oct 30 14:04:35 2010
@@ -1,16 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.802, ou=objectClasses, cn=adsconfig, ou=sche
  ma
-createtimestamp: 20100111145218Z
-m-must: ads-ldapServerExtendedOpHandlerClass
-m-must: ads-extendedOpId
-m-oid: 1.3.6.1.4.1.18060.0.4.1.3.802
-entrycsn: 20100111202218.409000Z#000000#000#000000
-m-description: Extended operation handler
 objectclass: metaObjectClass
 objectclass: metaTop
 objectclass: top
-m-name: ads-ldapServerExtendedOpHandler
+m-name: ads-extendedOpHandler
+m-oid: 1.3.6.1.4.1.18060.0.4.1.3.802
+m-description: Extended operation handler
+m-supobjectclass: ads-base
+createtimestamp: 20100111145218Z
 creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-m-may: ads-enabled
-m-may: description
+entrycsn: 20100111202218.409000Z#000000#000#000000
+m-must: ads-extendedOpHandlerClass
+m-must: ads-extendedOpId

Modified: directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.803.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.803.ldif?rev=1029075&r1=1029074&r2=1029075&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.803.ldif
(original)
+++ directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.803.ldif
Sat Oct 30 14:04:35 2010
@@ -1,17 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.803, ou=objectClasses, cn=adsconfig, ou=sche
  ma
-createtimestamp: 20100116052129Z
-m-must: ads-httpWarFile
-m-must: ads-id
-m-oid: 1.3.6.1.4.1.18060.0.4.1.3.803
-entrycsn: 20100116105129.549000Z#000000#000#000000
-m-description: a web app
 objectclass: metaObjectClass
 objectclass: metaTop
 objectclass: top
 m-name: ads-httpWebApp
+m-oid: 1.3.6.1.4.1.18060.0.4.1.3.803
+m-description: a web app
+m-supobjectclass: ads-base
+createtimestamp: 20100116052129Z
 creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+entrycsn: 20100116105129.549000Z#000000#000#000000
+m-must: ads-httpWarFile
+m-must: ads-id
 m-may: ads-httpAppCtxPath
-m-may: description
-m-may: ads-enabled

Modified: directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.804.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.804.ldif?rev=1029075&r1=1029074&r2=1029075&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.804.ldif
(original)
+++ directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.804.ldif
Sat Oct 30 14:04:35 2010
@@ -1,17 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.804, ou=objectClasses, cn=adsconfig, ou=sche
  ma
-createtimestamp: 20100116052129Z
-m-must: ads-serverId
-m-oid: 1.3.6.1.4.1.18060.0.4.1.3.804
-entrycsn: 20100116105129.573000Z#000000#000#000000
-m-description: integrated jetty http server
-objectclass: metaObjectClass
-objectclass: metaTop
 objectclass: top
+objectclass: metaTop
+objectclass: metaObjectClass
 m-name: ads-httpServer
+m-oid: 1.3.6.1.4.1.18060.0.4.1.3.804
+m-description: integrated jetty http server
+m-supobjectclass: ads-server
+createtimestamp: 20100116052129Z
 creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
-m-may: ads-systemPort
+entrycsn: 20100116105129.573000Z#000000#000#000000
 m-may: ads-httpConfFile
-m-may: ads-enabled
-m-may: description
+m-may: ads-httpwebApps

Modified: directory/shared/trunk/ldap-schema/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/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=1029075&r1=1029074&r2=1029075&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/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/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
Sat Oct 30 14:04:35 2010
@@ -3,10 +3,14 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.805,
 objectclass: metaObjectClass
 objectclass: metaTop
 objectclass: top
-m-oid: 1.3.6.1.4.1.18060.0.4.1.3.805
-entrycsn: 20100509111949.005000Z#000000#000#000000
 m-name: ads-replConsumer
+m-oid: 1.3.6.1.4.1.18060.0.4.1.3.805
 m-description: class to hold a replication consumer details
+m-supobjectclass: ads-base
+createtimestamp: 20100116052129Z
+creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+entrycsn: 20100509111949.005000Z#000000#000#000000
+m-must: ads-replConsumerId
 m-must: ads-dsReplicaId
 m-must: ads-replAliasDerefMode
 m-must: ads-searchBaseDN
@@ -17,4 +21,3 @@ m-may: ads-replRefreshNPersist
 m-may: ads-replUseTls
 m-may: ads-replStrictCertValidation
 m-may: ads-replPeerCertificate
-m-may: description

Modified: directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.806.ldif?rev=1029075&r1=1029074&r2=1029075&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif
(original)
+++ directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif
Sat Oct 30 14:04:35 2010
@@ -3,16 +3,20 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.806,
 objectclass: metaObjectClass
 objectclass: metaTop
 objectclass: top
-m-oid: 1.3.6.1.4.1.18060.0.4.1.3.806
-entrycsn: 20100511145902.546000Z#000000#000#000000
 m-name: ads-replProvider
+m-oid: 1.3.6.1.4.1.18060.0.4.1.3.806
 m-description: replication provider configuration
+m-supobjectclass: ads-base
+entrycsn: 20100511145902.546000Z#000000#000#000000
+createtimestamp: 20100116052129Z
+creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+m-must: ads-replProviderId
 m-must: ads-dsReplicaId
 m-must: ads-searchBaseDN
 m-must: ads-replProvHostName
+m-must: ads-replProvPort
 m-may: ads-replAliasDerefMode
 m-may: ads-replAttribute
-m-may: ads-replProvPort
 m-may: ads-replRefreshInterval
 m-may: ads-replRefreshNPersist
 m-may: ads-replSearchScope
@@ -22,5 +26,3 @@ m-may: ads-replSearchTimeOut
 m-may: ads-replUserDn
 m-may: ads-replUserPassword
 m-may: ads-replCookie
-m-may: ads-enabled
-m-may: description

Modified: directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=pwdpolicy/ou=objectclasses/m-oid=1.3.6.1.4.1.42.2.27.8.2.1.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dpwdpolicy/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.42.2.27.8.2.1.ldif?rev=1029075&r1=1029074&r2=1029075&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=pwdpolicy/ou=objectclasses/m-oid=1.3.6.1.4.1.42.2.27.8.2.1.ldif
(original)
+++ directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=pwdpolicy/ou=objectclasses/m-oid=1.3.6.1.4.1.42.2.27.8.2.1.ldif
Sat Oct 30 14:04:35 2010
@@ -1,14 +1,17 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.42.2.27.8.2.1,ou=objectClasses,cn=pwdpolicy,ou=schema
-m-must: pwdAttribute
-m-oid: 1.3.6.1.4.1.42.2.27.8.2.1
 m-supObjectClass: top
 objectclass: metaObjectClass
 objectclass: metaTop
 objectclass: top
 m-name: pwdPolicy
+m-oid: 1.3.6.1.4.1.42.2.27.8.2.1
+m-description: class to hold the PasswordPolicy parameters
 m-typeObjectClass: AUXILIARY
 creatorsName: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
+createtimestamp: 20100116052129Z
+entrycsn: 20100509111949.005000Z#000000#000#000000
+m-must: pwdAttribute
 m-may: pwdMinAge
 m-may: pwdMaxAge
 m-may: pwdInHistory
@@ -28,4 +31,3 @@ m-may: pwdSafeModify
 m-may: pwdMinDelay
 m-may: pwdMaxDelay
 m-may: pwdMaxIdle
-m-may: ads-enabled

Modified: directory/shared/trunk/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java?rev=1029075&r1=1029074&r2=1029075&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java
(original)
+++ directory/shared/trunk/ldap-schema/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java
Sat Oct 30 14:04:35 2010
@@ -152,14 +152,14 @@ public class SchemaManagerEnableDisableL
         assertEquals( 0, disabled.size() );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 393, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 420, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 48, schemaManager.getComparatorRegistry().size() );
         assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 114, schemaManager.getObjectClassRegistry().size() );
+        assertEquals( 116, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 66, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 71, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 626, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 656, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -197,14 +197,14 @@ public class SchemaManagerEnableDisableL
         assertNotNull( schemaManager.lookupAttributeTypeRegistry( "gecos" ) );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 420, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 447, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 49, schemaManager.getComparatorRegistry().size() );
         assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 127, schemaManager.getObjectClassRegistry().size() );
+        assertEquals( 129, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 669, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 699, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 13, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -237,14 +237,14 @@ public class SchemaManagerEnableDisableL
         }
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 393, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 420, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 48, schemaManager.getComparatorRegistry().size() );
         assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 114, schemaManager.getObjectClassRegistry().size() );
+        assertEquals( 116, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 66, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 71, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 626, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 656, schemaManager.getGlobalOidRegistry().size() );
 
         assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );



Mime
View raw message