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 511B74DC1 for ; Tue, 21 Jun 2011 13:21:21 +0000 (UTC) Received: (qmail 78522 invoked by uid 500); 21 Jun 2011 13:21:21 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 78488 invoked by uid 500); 21 Jun 2011 13:21:21 -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 78481 invoked by uid 99); 21 Jun 2011 13:21:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jun 2011 13:21:21 +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; Tue, 21 Jun 2011 13:21:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 27AA2238896F; Tue, 21 Jun 2011 13:20:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1137994 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Date: Tue, 21 Jun 2011 13:20:58 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110621132058.27AA2238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Tue Jun 21 13:20:57 2011 New Revision: 1137994 URL: http://svn.apache.org/viewvc?rev=1137994&view=rev Log: o add the available controls to the RootDSE dynamically (DIRSERVER-1626) Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=1137994&r1=1137993&r2=1137994&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Tue Jun 21 13:20:57 2011 @@ -173,20 +173,6 @@ public class DefaultPartitionNexus exten rootDSE.put( SchemaConstants.SUPPORTED_FEATURES_AT, SchemaConstants.FEATURE_ALL_OPERATIONAL_ATTRIBUTES ); rootDSE.put( SchemaConstants.SUPPORTED_EXTENSION_AT, NoticeOfDisconnect.EXTENSION_OID ); - // Add the supported controls - rootDSE.put( SchemaConstants.SUPPORTED_CONTROL_AT, - PersistentSearch.OID, - EntryChange.OID, - Subentries.OID, - ManageDsaIT.OID, - Cascade.OID, - PagedResults.OID, - // Replication controls - SyncDoneValue.OID, - SyncInfoValue.OID, - SyncRequestValue.OID, - SyncStateValue.OID ); - // Add the objectClasses rootDSE.put( SchemaConstants.OBJECT_CLASS_AT, SchemaConstants.TOP_OC, SchemaConstants.EXTENSIBLE_OBJECT_OC ); @@ -222,7 +208,13 @@ public class DefaultPartitionNexus exten return; } - //this.directoryService = directoryService; + // Add the supported controls + Iterator ctrlOidItr = directoryService.getLdapCodecService().registeredControls(); + while ( ctrlOidItr.hasNext() ) + { + rootDSE.add( SchemaConstants.SUPPORTED_CONTROL_AT, ctrlOidItr.next() ); + } + schemaManager = directoryService.getSchemaManager(); ENTRY_CSN_AT = schemaManager.getAttributeType( SchemaConstants.ENTRY_CSN_AT ); OBJECT_CLASS_AT = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT );