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 6BBF8D520 for ; Wed, 15 May 2013 13:04:59 +0000 (UTC) Received: (qmail 88557 invoked by uid 500); 15 May 2013 13:04:58 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 88463 invoked by uid 500); 15 May 2013 13:04:57 -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 88415 invoked by uid 99); 15 May 2013 13:04:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 May 2013 13:04:55 +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; Wed, 15 May 2013 13:04:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0E88923888E4; Wed, 15 May 2013 13:04:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1482801 - 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: Wed, 15 May 2013 13:04:33 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130515130434.0E88923888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed May 15 13:04:33 2013 New Revision: 1482801 URL: http://svn.apache.org/r1482801 Log: Added some AT for TLS and the SSL/TLS trustManagers 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.936.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.937.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.938.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.904.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.936.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.936.ldif?rev=1482801&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.936.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.936.ldif Wed May 15 13:04:33 2013 @@ -0,0 +1,12 @@ +dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.936,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.936 +m-name: ads-delegateTls +m-description: Tells if the authenticator will use StartTLS +m-syntax: 1.3.6.1.4.1.1466.115.121.1.7 +m-equality: booleanMatch +m-singlevalue: TRUE +m-length: 0 +creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=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.937.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.937.ldif?rev=1482801&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.937.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.937.ldif Wed May 15 13:04:33 2013 @@ -0,0 +1,12 @@ +dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.937,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.937 +m-name: ads-delegateSslTrustManager +m-description: FQCN of the TrustManager to use to validate the SSL communication +m-syntax: 1.3.6.1.4.1.1466.115.121.1.15 +m-equality: caseExactMatch +m-singlevalue: TRUE +m-length: 0 +creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=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.938.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.938.ldif?rev=1482801&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.938.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.938.ldif Wed May 15 13:04:33 2013 @@ -0,0 +1,12 @@ +dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.938,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.938 +m-name: ads-delegateTlsTrustManager +m-description: FQCN of the TrustManager to use to validate the startTls communication +m-syntax: 1.3.6.1.4.1.1466.115.121.1.15 +m-equality: caseExactMatch +m-singlevalue: TRUE +m-length: 0 +creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=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.904.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.904.ldif?rev=1482801&r1=1482800&r2=1482801&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.904.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.904.ldif Wed May 15 13:04:33 2013 @@ -11,4 +11,7 @@ m-must: ads-delegateHost m-must: ads-delegatePort m-must: ads-delegateBaseDn m-may: ads-delegateSsl +m-may: ads-delegateTls +m-may: ads-delegateSslTrustManager +m-may: ads-delegateTlsTrustManager creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=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=1482801&r1=1482800&r2=1482801&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 Wed May 15 13:04:33 2013 @@ -156,14 +156,14 @@ public class SchemaManagerEnableDisableL assertEquals( 0, disabled.size() ); assertTrue( schemaManager.getErrors().isEmpty() ); - assertEquals( 419, schemaManager.getAttributeTypeRegistry().size() ); + assertEquals( 422, schemaManager.getAttributeTypeRegistry().size() ); assertEquals( 48, schemaManager.getComparatorRegistry().size() ); assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() ); assertEquals( 48, schemaManager.getNormalizerRegistry().size() ); assertEquals( 120, schemaManager.getObjectClassRegistry().size() ); assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() ); assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() ); - assertEquals( 660, schemaManager.getGlobalOidRegistry().size() ); + assertEquals( 663, 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( 446, schemaManager.getAttributeTypeRegistry().size() ); + assertEquals( 449, schemaManager.getAttributeTypeRegistry().size() ); assertEquals( 49, schemaManager.getComparatorRegistry().size() ); assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() ); assertEquals( 49, schemaManager.getNormalizerRegistry().size() ); assertEquals( 133, schemaManager.getObjectClassRegistry().size() ); assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() ); assertEquals( 75, schemaManager.getLdapSyntaxRegistry().size() ); - assertEquals( 703, schemaManager.getGlobalOidRegistry().size() ); + assertEquals( 706, 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( 419, schemaManager.getAttributeTypeRegistry().size() ); + assertEquals( 422, schemaManager.getAttributeTypeRegistry().size() ); assertEquals( 48, schemaManager.getComparatorRegistry().size() ); assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() ); assertEquals( 48, schemaManager.getNormalizerRegistry().size() ); assertEquals( 120, schemaManager.getObjectClassRegistry().size() ); assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() ); assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() ); - assertEquals( 660, schemaManager.getGlobalOidRegistry().size() ); + assertEquals( 663, 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( 493, schemaManager.getAttributeTypeRegistry().size() ); + assertEquals( 496, schemaManager.getAttributeTypeRegistry().size() ); assertEquals( 49, schemaManager.getComparatorRegistry().size() ); assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() ); assertEquals( 49, schemaManager.getNormalizerRegistry().size() ); assertEquals( 144, schemaManager.getObjectClassRegistry().size() ); assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() ); assertEquals( 75, schemaManager.getLdapSyntaxRegistry().size() ); - assertEquals( 761, schemaManager.getGlobalOidRegistry().size() ); + assertEquals( 764, schemaManager.getGlobalOidRegistry().size() ); assertEquals( 14, schemaManager.getRegistries().getLoadedSchemas().size() ); assertNotNull( schemaManager.getRegistries().getLoadedSchema( "samba" ) );