From 1b29f765bdfe3705c1b88fcdbb4fa923682e9678 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 23 Apr 2007 13:38:48 +0000
Subject: [PATCH] This integrates the multi-master synchronization with the new admin framework (issue 1477) and makes possible to dynamically add or remove changelog server and synchronization domains in a running server (issue 639).

---
 opends/src/server/org/opends/server/core/DirectoryServer.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/DirectoryServer.java b/opends/src/server/org/opends/server/core/DirectoryServer.java
index 2472675..64dd31c 100644
--- a/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -49,6 +49,7 @@
 
 import org.opends.server.admin.ClassLoaderProvider;
 import org.opends.server.admin.std.server.PasswordValidatorCfg;
+import org.opends.server.admin.std.server.SynchronizationProviderCfg;
 import org.opends.server.api.*;
 import org.opends.server.api.plugin.PluginType;
 import org.opends.server.api.plugin.StartupPluginResult;
@@ -334,7 +335,8 @@
 
   // The set of synchronization providers that have been registered with the
   // Directory Server.
-  private CopyOnWriteArrayList<SynchronizationProvider>
+  private
+    CopyOnWriteArrayList<SynchronizationProvider<SynchronizationProviderCfg>>
                synchronizationProviders;
 
   // The set of virtual attributes defined in the server.
@@ -630,7 +632,8 @@
     directoryServer.shutdownListeners =
          new CopyOnWriteArrayList<ServerShutdownListener>();
     directoryServer.synchronizationProviders =
-         new CopyOnWriteArrayList<SynchronizationProvider>();
+         new CopyOnWriteArrayList<SynchronizationProvider
+                                 <SynchronizationProviderCfg>>();
     directoryServer.supportedControls = new TreeSet<String>();
     directoryServer.supportedFeatures = new TreeSet<String>();
     directoryServer.virtualAttributes =
@@ -7187,8 +7190,9 @@
    * @return  The set of synchronization providers that have been registered
    *          with the Directory Server.
    */
-  public static CopyOnWriteArrayList<SynchronizationProvider>
-              getSynchronizationProviders()
+  public static
+    CopyOnWriteArrayList<SynchronizationProvider<SynchronizationProviderCfg>>
+      getSynchronizationProviders()
   {
     return directoryServer.synchronizationProviders;
   }
@@ -7200,8 +7204,8 @@
    *
    * @param  provider  The synchronization provider to register.
    */
-  public static void registerSynchronizationProvider(SynchronizationProvider
-                                                          provider)
+  public static void registerSynchronizationProvider(
+      SynchronizationProvider<SynchronizationProviderCfg> provider)
   {
     directoryServer.synchronizationProviders.add(provider);
   }

--
Gitblit v1.10.0