Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6B64A10BF6 for ; Mon, 24 Nov 2014 14:31:23 +0000 (UTC) Received: (qmail 92311 invoked by uid 500); 24 Nov 2014 14:31:23 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 92272 invoked by uid 500); 24 Nov 2014 14:31:23 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 92263 invoked by uid 99); 24 Nov 2014 14:31:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Nov 2014 14:31:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Nov 2014 14:30:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AB8AE2388A4A; Mon, 24 Nov 2014 14:29:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1641401 - 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/api/ldap/schemaloader/ Date: Mon, 24 Nov 2014 14:29:57 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141124142957.AB8AE2388A4A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Mon Nov 24 14:29:57 2014 New Revision: 1641401 URL: http://svn.apache.org/r1641401 Log: Added four attributeTypes and modified the TcpTransport ObjectClass to support more SSL configuration 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.65.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.66.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.67.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.68.ldif 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.19.ldif directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/api/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java 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.65.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.65.ldif?rev=1641401&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.65.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.65.ldif Mon Nov 24 14:29:57 2014 @@ -0,0 +1,12 @@ +version: 1 +dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.65,ou=attributeTypes,cn=adsconfig,ou=schema +objectclass: top +objectclass: metaTop +objectclass: metaAttributeType +m-oid: 1.3.6.1.4.1.18060.0.4.1.2.65 +m-name: ads-needClientAuth +m-description: Tells if the client auth is needed +m-syntax: 1.3.6.1.4.1.1466.115.121.1.7 +m-singlevalue: TRUE +m-equality: booleanMatch +creatorsname: uid=admin,ou=system 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.66.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.66.ldif?rev=1641401&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.66.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.66.ldif Mon Nov 24 14:29:57 2014 @@ -0,0 +1,12 @@ +version: 1 +dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.66,ou=attributeTypes,cn=adsconfig,ou=schema +objectclass: top +objectclass: metaTop +objectclass: metaAttributeType +m-oid: 1.3.6.1.4.1.18060.0.4.1.2.66 +m-name: ads-wantClientAuth +m-description: Tells if the client auth is wanted +m-syntax: 1.3.6.1.4.1.1466.115.121.1.7 +m-equality: booleanMatch +m-singlevalue: TRUE +creatorsname: uid=admin,ou=system 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.67.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.67.ldif?rev=1641401&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.67.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.67.ldif Mon Nov 24 14:29:57 2014 @@ -0,0 +1,14 @@ +version: 1 +dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.67,ou=attributeTypes,cn=adsconfig,ou=schema +objectclass: top +objectclass: metaTop +objectclass: metaAttributeType +m-oid: 1.3.6.1.4.1.18060.0.4.1.2.67 +m-name: ads-enabledProtocol +m-description: Enabled SSL protocol +m-syntax: 1.3.6.1.4.1.1466.115.121.1.26 +m-equality: caseIgnoreOrderingMatch +m-ordering: caseExactOrderingMatch +m-substr: caseIgnoreIA5SubstringsMatch +m-singlevalue: FALSE +creatorsname: uid=admin,ou=system 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.68.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.68.ldif?rev=1641401&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.68.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.68.ldif Mon Nov 24 14:29:57 2014 @@ -0,0 +1,14 @@ +version: 1 +dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.68,ou=attributeTypes,cn=adsconfig,ou=schema +objectclass: top +objectclass: metaTop +objectclass: metaAttributeType +m-oid: 1.3.6.1.4.1.18060.0.4.1.2.68 +m-name: ads-enabledCipher +m-description: Enabled cipher +m-syntax: 1.3.6.1.4.1.1466.115.121.1.26 +m-equality: caseIgnoreOrderingMatch +m-ordering: caseExactOrderingMatch +m-substr: caseIgnoreIA5SubstringsMatch +m-singlevalue: FALSE +creatorsname: uid=admin,ou=system 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.19.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.19.ldif?rev=1641401&r1=1641400&r2=1641401&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.19.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.19.ldif Mon Nov 24 14:29:57 2014 @@ -7,4 +7,8 @@ objectclass: top objectclass: metaTop objectclass: metaObjectClass m-supobjectclass: ads-transport +m-may: ads-enabledProtocol +m-may: ads-enabledCipher +m-may: ads-wantClientAuth +m-may: ads-needClientAuth 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=1641401&r1=1641400&r2=1641401&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 Mon Nov 24 14:29:57 2014 @@ -156,14 +156,14 @@ public class SchemaManagerEnableDisableL assertEquals( 0, disabled.size() ); assertTrue( schemaManager.getErrors().isEmpty() ); - assertEquals( 423, schemaManager.getAttributeTypeRegistry().size() ); + assertEquals( 427, schemaManager.getAttributeTypeRegistry().size() ); assertEquals( 49, schemaManager.getComparatorRegistry().size() ); assertEquals( 55, schemaManager.getMatchingRuleRegistry().size() ); assertEquals( 48, schemaManager.getNormalizerRegistry().size() ); assertEquals( 122, schemaManager.getObjectClassRegistry().size() ); assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() ); assertEquals( 80, schemaManager.getLdapSyntaxRegistry().size() ); - assertEquals( 680, schemaManager.getGlobalOidRegistry().size() ); + assertEquals( 684, schemaManager.getGlobalOidRegistry().size() ); assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() ); assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) ); } @@ -203,14 +203,14 @@ public class SchemaManagerEnableDisableL assertNotNull( schemaManager.lookupAttributeTypeRegistry( "automountMapName" ) ); assertTrue( schemaManager.getErrors().isEmpty() ); - assertEquals( 455, schemaManager.getAttributeTypeRegistry().size() ); + assertEquals( 459, schemaManager.getAttributeTypeRegistry().size() ); assertEquals( 50, schemaManager.getComparatorRegistry().size() ); assertEquals( 56, schemaManager.getMatchingRuleRegistry().size() ); assertEquals( 49, schemaManager.getNormalizerRegistry().size() ); assertEquals( 138, schemaManager.getObjectClassRegistry().size() ); assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() ); assertEquals( 82, schemaManager.getLdapSyntaxRegistry().size() ); - assertEquals( 731, schemaManager.getGlobalOidRegistry().size() ); + assertEquals( 735, schemaManager.getGlobalOidRegistry().size() ); assertEquals( 14, schemaManager.getRegistries().getLoadedSchemas().size() ); assertNotNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) ); @@ -244,14 +244,14 @@ public class SchemaManagerEnableDisableL } assertTrue( schemaManager.getErrors().isEmpty() ); - assertEquals( 423, schemaManager.getAttributeTypeRegistry().size() ); + assertEquals( 427, schemaManager.getAttributeTypeRegistry().size() ); assertEquals( 49, schemaManager.getComparatorRegistry().size() ); assertEquals( 55, schemaManager.getMatchingRuleRegistry().size() ); assertEquals( 48, schemaManager.getNormalizerRegistry().size() ); assertEquals( 122, schemaManager.getObjectClassRegistry().size() ); assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() ); assertEquals( 80, schemaManager.getLdapSyntaxRegistry().size() ); - assertEquals( 680, schemaManager.getGlobalOidRegistry().size() ); + assertEquals( 684, schemaManager.getGlobalOidRegistry().size() ); assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() ); assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) ); @@ -296,14 +296,14 @@ public class SchemaManagerEnableDisableL assertNotNull( schemaManager.lookupAttributeTypeRegistry( "gecos" ) ); assertTrue( schemaManager.getErrors().isEmpty() ); - assertEquals( 497, schemaManager.getAttributeTypeRegistry().size() ); + assertEquals( 501, schemaManager.getAttributeTypeRegistry().size() ); assertEquals( 50, schemaManager.getComparatorRegistry().size() ); assertEquals( 56, schemaManager.getMatchingRuleRegistry().size() ); assertEquals( 49, schemaManager.getNormalizerRegistry().size() ); assertEquals( 146, schemaManager.getObjectClassRegistry().size() ); assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() ); assertEquals( 82, schemaManager.getLdapSyntaxRegistry().size() ); - assertEquals( 781, schemaManager.getGlobalOidRegistry().size() ); + assertEquals( 785, schemaManager.getGlobalOidRegistry().size() ); assertEquals( 14, schemaManager.getRegistries().getLoadedSchemas().size() ); assertNotNull( schemaManager.getRegistries().getLoadedSchema( "samba" ) );