Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 2176 invoked from network); 15 Feb 2009 08:03:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Feb 2009 08:03:52 -0000 Received: (qmail 20917 invoked by uid 500); 15 Feb 2009 08:03:52 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 20870 invoked by uid 500); 15 Feb 2009 08:03:52 -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 20861 invoked by uid 99); 15 Feb 2009 08:03:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Feb 2009 00:03:52 -0800 X-ASF-Spam-Status: No, hits=-1999.6 required=10.0 tests=ALL_TRUSTED,SUBJECT_FUZZY_TION 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; Sun, 15 Feb 2009 08:03:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E60132388995; Sun, 15 Feb 2009 08:03:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r744624 - in /directory/apacheds/trunk: core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java Date: Sun, 15 Feb 2009 08:03:28 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090215080328.E60132388995@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sun Feb 15 08:03:28 2009 New Revision: 744624 URL: http://svn.apache.org/viewvc?rev=744624&view=rev Log: Added the controls in the rootDSE and supported controls tables Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.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=744624&r1=744623&r2=744624&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 Sun Feb 15 08:03:28 2009 @@ -74,6 +74,10 @@ import org.apache.directory.shared.ldap.message.control.PagedSearchControl; import org.apache.directory.shared.ldap.message.control.PersistentSearchControl; import org.apache.directory.shared.ldap.message.control.SubentriesControl; +import org.apache.directory.shared.ldap.message.control.replication.SyncDoneValueControl; +import org.apache.directory.shared.ldap.message.control.replication.SyncInfoValueControl; +import org.apache.directory.shared.ldap.message.control.replication.SyncRequestValueControl; +import org.apache.directory.shared.ldap.message.control.replication.SyncStateValueControl; import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.AttributeType; @@ -170,13 +174,20 @@ rootDSE.put( SchemaConstants.SUPPORTED_EXTENSION_AT, NoticeOfDisconnect.EXTENSION_OID ); // Add the supported controls - rootDSE.put( SchemaConstants.SUPPORTED_CONTROL_AT, + rootDSE.put( + SchemaConstants.SUPPORTED_CONTROL_AT, PersistentSearchControl.CONTROL_OID, EntryChangeControl.CONTROL_OID, SubentriesControl.CONTROL_OID, ManageDsaITControl.CONTROL_OID, CascadeControl.CONTROL_OID, - PagedSearchControl.CONTROL_OID); + PagedSearchControl.CONTROL_OID, + // Replication controls + SyncDoneValueControl.CONTROL_OID, + SyncInfoValueControl.CONTROL_OID, + SyncRequestValueControl.CONTROL_OID, + SyncStateValueControl.CONTROL_OID + ); // Add the objectClasses rootDSE.put( SchemaConstants.OBJECT_CLASS_AT, Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java?rev=744624&r1=744623&r2=744624&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java Sun Feb 15 08:03:28 2009 @@ -70,6 +70,10 @@ import org.apache.directory.shared.ldap.message.control.PagedSearchControl; import org.apache.directory.shared.ldap.message.control.PersistentSearchControl; import org.apache.directory.shared.ldap.message.control.SubentriesControl; +import org.apache.directory.shared.ldap.message.control.replication.SyncDoneValueControl; +import org.apache.directory.shared.ldap.message.control.replication.SyncInfoValueControl; +import org.apache.directory.shared.ldap.message.control.replication.SyncRequestValueControl; +import org.apache.directory.shared.ldap.message.control.replication.SyncStateValueControl; import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect; import org.apache.directory.shared.ldap.util.StringTools; import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder; @@ -233,6 +237,11 @@ this.supportedControls.add( ManageDsaITControl.CONTROL_OID ); this.supportedControls.add( CascadeControl.CONTROL_OID ); this.supportedControls.add( PagedSearchControl.CONTROL_OID ); + // Replication controls + this.supportedControls.add( SyncDoneValueControl.CONTROL_OID ); + this.supportedControls.add( SyncInfoValueControl.CONTROL_OID ); + this.supportedControls.add( SyncRequestValueControl.CONTROL_OID ); + this.supportedControls.add( SyncStateValueControl.CONTROL_OID ); }