directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1484018 - in /directory/shared/trunk/ldap/schema/data/src: main/resources/schema/ou=schema/ main/resources/schema/ou=schema/cn=rfc2307bis/ main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/ main/resources/schema/ou=schema/cn=...
Date Fri, 17 May 2013 22:39:52 GMT
Author: elecharny
Date: Fri May 17 22:39:51 2013
New Revision: 1484018

URL: http://svn.apache.org/r1484018
Log:
Added the rfc2307bis schema (DIRSERVER-1203)

Added:
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.28.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.29.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.30.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.31.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.32.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=comparators.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=ditcontentrules.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=ditstructurerules.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=matchingrules.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=matchingruleuse.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=nameforms.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=normalizers.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses/
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses/m-oid=1.3.6.1.1.1.2.14.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses/m-oid=1.3.6.1.1.1.2.15.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses/m-oid=1.3.6.1.4.1.5322.13.1.1.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=syntaxcheckers.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=syntaxes.ldif
    directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/ou=rfc2307bis.ldif
Modified:
    directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java
    directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dattributetypes.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,6 @@
+version: 1
+dn: ou=attributeTypes,cn=rfc2307bis,ou=schema
+ou: attributetypes
+objectclass: organizationalUnit
+objectclass: top
+creatorsname: uid=admin,ou=system

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.28.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dattributetypes/m-oid%3D1.3.6.1.1.1.1.28.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.28.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.28.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,12 @@
+version: 1
+dn: m-oid=1.3.6.1.1.1.1.28, ou=attributeTypes, cn=rfc2307bis, ou=schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.3.6.1.1.1.1.28
+m-name: nisPublicKey
+m-description: NIS public key
+m-equality: octetStringMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.40
+m-length: 0
+m-singleValue: TRUE

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.29.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dattributetypes/m-oid%3D1.3.6.1.1.1.1.29.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.29.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.29.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,11 @@
+dn: m-oid=1.3.6.1.1.1.1.29, ou=attributeTypes, cn=rfc2307bis, ou=schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.3.6.1.1.1.1.29
+m-name: nisSecretKey
+m-description: NIS secret key
+m-equality: octetStringMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.40
+m-length: 0
+m-singleValue: TRUE

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.30.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dattributetypes/m-oid%3D1.3.6.1.1.1.1.30.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.30.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.30.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,10 @@
+dn: m-oid=1.3.6.1.1.1.1.30, ou=attributeTypes, cn=rfc2307bis, ou=schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.3.6.1.1.1.1.30
+m-name: nisDomain
+m-description: NIS domain
+m-equality: caseIgnoreIA5Match
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
+m-length: 0
\ No newline at end of file

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.31.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dattributetypes/m-oid%3D1.3.6.1.1.1.1.31.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.31.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.31.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,12 @@
+dn: m-oid=1.3.6.1.1.1.1.31, ou=attributeTypes, cn=rfc2307bis, ou=schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.3.6.1.1.1.1.31
+m-name: automountMapName
+m-description: automount Map Name
+m-equality: caseExactIA5Match
+m-substr: caseExactIA5SubstringsMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
+m-length: 0
+m-singleValue: TRUE

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.32.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dattributetypes/m-oid%3D1.3.6.1.1.1.1.32.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.32.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=attributetypes/m-oid=1.3.6.1.1.1.1.32.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,12 @@
+dn: m-oid=1.3.6.1.1.1.1.32, ou=attributeTypes, cn=rfc2307bis, ou=schema
+objectclass: metaAttributeType
+objectclass: metaTop
+objectclass: top
+m-oid: 1.3.6.1.1.1.1.32
+m-name: automountKey
+m-description: Automount Key value
+m-equality: caseExactIA5Match
+m-substr: caseExactIA5SubstringsMatch
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.26
+m-length: 0
+m-singleValue: TRUE

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=comparators.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dcomparators.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=comparators.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=comparators.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,6 @@
+version: 1
+dn: ou=comparators,cn=rfc2307bis,ou=schema
+ou: comparators
+objectclass: organizationalUnit
+objectclass: top
+creatorsname: uid=admin,ou=system

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=ditcontentrules.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dditcontentrules.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=ditcontentrules.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=ditcontentrules.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,6 @@
+version: 1
+dn: ou=ditContentRules,cn=rfc2307bis,ou=schema
+ou: ditcontentrules
+objectclass: organizationalUnit
+objectclass: top
+creatorsname: uid=admin,ou=system

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=ditstructurerules.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dditstructurerules.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=ditstructurerules.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=ditstructurerules.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,6 @@
+version: 1
+dn: ou=ditStructureRules,cn=rfc2307bis,ou=schema
+ou: ditstructurerules
+objectclass: organizationalUnit
+objectclass: top
+creatorsname: uid=admin,ou=system

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=matchingrules.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dmatchingrules.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=matchingrules.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=matchingrules.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,6 @@
+version: 1
+dn: ou=matchingRules,cn=rfc2307bis,ou=schema
+ou: matchingrules
+objectclass: organizationalUnit
+objectclass: top
+creatorsname: uid=admin,ou=system

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=matchingruleuse.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dmatchingruleuse.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=matchingruleuse.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=matchingruleuse.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,6 @@
+version: 1
+dn: ou=matchingRuleUse,cn=rfc2307bis,ou=schema
+ou: matchingruleuse
+objectclass: organizationalUnit
+objectclass: top
+creatorsname: uid=admin,ou=system

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=nameforms.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dnameforms.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=nameforms.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=nameforms.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,6 @@
+version: 1
+dn: ou=nameForms,cn=rfc2307bis,ou=schema
+ou: nameforms
+objectclass: organizationalUnit
+objectclass: top
+creatorsname: uid=admin,ou=system

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=normalizers.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dnormalizers.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=normalizers.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=normalizers.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,6 @@
+version: 1
+dn: ou=normalizers,cn=rfc2307bis,ou=schema
+ou: normalizers
+objectclass: organizationalUnit
+objectclass: top
+creatorsname: uid=admin,ou=system

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dobjectclasses.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,6 @@
+version: 1
+dn: ou=objectClasses,cn=rfc2307bis,ou=schema
+ou: objectClasses
+objectclass: organizationalUnit
+objectclass: top
+creatorsname: uid=admin,ou=system

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses/m-oid=1.3.6.1.1.1.2.14.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dobjectclasses/m-oid%3D1.3.6.1.1.1.2.14.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses/m-oid=1.3.6.1.1.1.2.14.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses/m-oid=1.3.6.1.1.1.2.14.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,14 @@
+dn: m-oid=1.3.6.1.1.1.2.14, ou=objectClasses, cn=rfc2307bis, ou=schema
+objectclass: metaObjectClass
+objectclass: metaTop
+objectclass: top
+m-oid: 1.3.6.1.1.1.2.14
+m-name: nisKeyObject
+m-description: An object with a public and secret key
+m-supObjectClass: top
+m-typeObjectClass: AUXILIARY
+m-must: cn
+m-must: nisPublicKey
+m-must: nisSecretKey
+m-may: uidNumber
+m-may: description

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses/m-oid=1.3.6.1.1.1.2.15.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dobjectclasses/m-oid%3D1.3.6.1.1.1.2.15.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses/m-oid=1.3.6.1.1.1.2.15.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses/m-oid=1.3.6.1.1.1.2.15.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,10 @@
+dn: m-oid=1.3.6.1.1.1.2.15, ou=objectClasses, cn=rfc2307bis, ou=schema
+objectclass: metaObjectClass
+objectclass: metaTop
+objectclass: top
+m-oid: 1.3.6.1.1.1.2.15
+m-name: nisDomainObject
+m-description: Associates a NIS domain with a naming context
+m-supObjectClass: top
+m-typeObjectClass: AUXILIARY
+m-must: nisDomain

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses/m-oid=1.3.6.1.4.1.5322.13.1.1.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.5322.13.1.1.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses/m-oid=1.3.6.1.4.1.5322.13.1.1.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=objectclasses/m-oid=1.3.6.1.4.1.5322.13.1.1.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,8 @@
+dn: m-oid=1.3.6.1.4.1.5322.13.1.1, ou=objectClasses, cn=rfc2307bis, ou=schema
+objectclass: metaObjectClass
+objectclass: metaTop
+objectclass: top
+m-oid: 1.3.6.1.4.1.5322.13.1.1
+m-name: namedObject
+m-supObjectClass: top
+m-may: cn

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=syntaxcheckers.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dsyntaxcheckers.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=syntaxcheckers.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=syntaxcheckers.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,6 @@
+version: 1
+dn: ou=syntaxCheckers,cn=rfc2307bis,ou=schema
+ou: syntaxcheckers
+objectclass: organizationalUnit
+objectclass: top
+creatorsname: uid=admin,ou=system

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=syntaxes.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Drfc2307bis/ou%3Dsyntaxes.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=syntaxes.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=rfc2307bis/ou=syntaxes.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,6 @@
+version: 1
+dn: ou=syntaxes,cn=rfc2307bis,ou=schema
+ou: syntaxes
+objectclass: organizationalUnit
+objectclass: top
+creatorsname: uid=admin,ou=system

Added: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/ou=rfc2307bis.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/ou%3Drfc2307bis.ldif?rev=1484018&view=auto
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/ou=rfc2307bis.ldif
(added)
+++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/ou=rfc2307bis.ldif
Fri May 17 22:39:51 2013
@@ -0,0 +1,12 @@
+# Generated by Apache Directory Studio on December 20, 2009 11:41:54 PM
+
+# SCHEMA "RFC2307BIS"
+dn: cn=rfc2307bis, ou=schema
+objectclass: metaSchema
+objectclass: top
+cn: rfc2307bis
+m-disabled: TRUE
+m-dependencies: system
+m-dependencies: core
+m-dependencies: nis
+creatorsname: uid=admin,ou=system

Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java?rev=1484018&r1=1484017&r2=1484018&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java
(original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java
Fri May 17 22:39:51 2013
@@ -127,7 +127,7 @@ public class SchemaManagerEnableDisableL
     // Test the loadAllEnabled() method
     //-------------------------------------------------------------------------
     /**
-     * Tst the loadEnabled() method
+     * Test the loadEnabled() method
      */
     @Test
     public void testLoadAllEnabled() throws Exception
@@ -195,22 +195,26 @@ public class SchemaManagerEnableDisableL
         schemaManager.loadAllEnabled();
 
         assertTrue( schemaManager.enable( "nis" ) );
+        assertTrue( schemaManager.enable( "rfc2307bis" ) );
         assertTrue( schemaManager.isEnabled( "nis" ) );
+        assertTrue( schemaManager.isEnabled( "rfc2307bis" ) );
 
         assertNotNull( schemaManager.lookupAttributeTypeRegistry( "gecos" ) );
+        assertNotNull( schemaManager.lookupAttributeTypeRegistry( "automountMapName" ) );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
-        assertEquals( 449, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 454, schemaManager.getAttributeTypeRegistry().size() );
         assertEquals( 49, schemaManager.getComparatorRegistry().size() );
         assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() );
         assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
-        assertEquals( 133, schemaManager.getObjectClassRegistry().size() );
+        assertEquals( 136, schemaManager.getObjectClassRegistry().size() );
         assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() );
         assertEquals( 75, schemaManager.getLdapSyntaxRegistry().size() );
-        assertEquals( 706, schemaManager.getGlobalOidRegistry().size() );
+        assertEquals( 714, schemaManager.getGlobalOidRegistry().size() );
 
-        assertEquals( 13, schemaManager.getRegistries().getLoadedSchemas().size() );
+        assertEquals( 14, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
+        assertNotNull( schemaManager.getRegistries().getLoadedSchema( "rfc2307bis" ) );
     }
 
 

Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java?rev=1484018&r1=1484017&r2=1484018&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java
(original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java
Fri May 17 22:39:51 2013
@@ -30,22 +30,21 @@ import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-
 import org.apache.directory.api.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.api.ldap.model.schema.SchemaManager;
 import org.apache.directory.api.ldap.model.schema.registries.DefaultSchema;
 import org.apache.directory.api.ldap.model.schema.registries.Schema;
 import org.apache.directory.api.ldap.schemaextractor.SchemaLdifExtractor;
 import org.apache.directory.api.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
-import org.apache.directory.api.ldap.schemaloader.LdifSchemaLoader;
 import org.apache.directory.api.ldap.schemamanager.impl.DefaultSchemaManager;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * A test class for SchemaManager loadWithDeps() method. We test those methods here :
@@ -418,6 +417,35 @@ public class SchemaManagerLoadWithDepsTe
 
 
     /**
+     * test loading the "rfc2307bis" schema, which depends on "system", "nis" and "core",
+     * but is disabled
+     */
+    @Test
+    public void testLoadRfc2307Bis() throws Exception
+    {
+        LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
+        SchemaManager schemaManager = new DefaultSchemaManager( loader );
+
+        schemaManager.loadWithDeps( "rfc2307bis" );
+
+        assertTrue( schemaManager.getErrors().isEmpty() );
+        assertEquals( 0, schemaManager.getAttributeTypeRegistry().size() );
+        assertEquals( 0, schemaManager.getComparatorRegistry().size() );
+        assertEquals( 0, schemaManager.getMatchingRuleRegistry().size() );
+        assertEquals( 0, schemaManager.getNormalizerRegistry().size() );
+        assertEquals( 0, schemaManager.getObjectClassRegistry().size() );
+        assertEquals( 0, schemaManager.getSyntaxCheckerRegistry().size() );
+        assertEquals( 0, schemaManager.getLdapSyntaxRegistry().size() );
+        assertEquals( 0, schemaManager.getGlobalOidRegistry().size() );
+
+        assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
+        assertNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
+        assertNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
+    }
+
+
+    /**
      * Test loading a wrong schema
      */
     @Test



Mime
View raw message