From dffb44b1a41bd742e94ac0bc715c83523f73b7c9 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 24 Jul 2006 16:49:58 +0000
Subject: [PATCH] Update the synchronization configuration to - put changelog configuration below cn=Multimaster Synchronization,cn=Synchronization Providers,cn=config - use ds-cfg-changelog-server-id and ds-cfg-directory-server-id instead of ds-cfg-server-id - don't require the ds-cfg-changelog-server attribute in changelog configuration (ds-cfg-synchronization-changelog-server-config objectclass)

---
 opendj-sdk/opends/src/server/org/opends/server/synchronization/SynchronizationDomain.java |   19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/synchronization/SynchronizationDomain.java b/opendj-sdk/opends/src/server/org/opends/server/synchronization/SynchronizationDomain.java
index 18b46f8..a37fe14 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/synchronization/SynchronizationDomain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/synchronization/SynchronizationDomain.java
@@ -61,15 +61,12 @@
 import org.opends.server.types.SynchronizationProviderResult;
 
 /**
- *  This class implements the multi-master functionality.
- * - use the preOperation phase to add information necessary for the
- *   synchronization to the entry in the database (unique identifier,
- *   historical information, change number)
- *   TODO : implementation not started yet
- * - use the postOperation plugin phase to forward the changes
- *   to the centralized changelog of the synchronization
- *
- *   STATUS : This is a work in progress feature
+ *  This class implements the bulk part of the.of the Directory Server side
+ *  of the synchronization code.
+ *  It contains the root method for publishing a change,
+ *  processing a change received from the changelog service,
+ *  handle conflict resolution,
+ *  handle protocol messages from the changelog server.
  */
 public class SynchronizationDomain extends DirectoryThread
        implements ConfigurableComponent
@@ -117,11 +114,9 @@
 
   private DN configDn;
 
-  static String CHANGELOG_DN = "cn=Changelog Server, cn=config";
   static String CHANGELOG_SERVER_ATTR = "ds-cfg-changelog-server";
   static String BASE_DN_ATTR = "ds-cfg-synchronization-dn";
-  static String SERVER_ID_ATTR = "ds-cfg-server-id";
-  static String CHANGELOG_PORT_ATTR = "ds-cfg-changelog-port";
+  static String SERVER_ID_ATTR = "ds-cfg-directory-server-id";
   static String RECEIVE_STATUS = "ds-cfg-receive-status";
   static String MAX_RECEIVE_QUEUE = "ds-cfg-max-receive-queue";
   static String MAX_RECEIVE_DELAY = "ds-cfg-max-receive-delay";

--
Gitblit v1.10.0