You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/02/15 09:03:28 UTC
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

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 );
     }