From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.

---
 opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java b/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
index c7adf93..001484d 100644
--- a/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
+++ b/opends/src/server/org/opends/server/replication/plugin/MultimasterReplication.java
@@ -36,8 +36,8 @@
 import org.opends.messages.Message;
 import org.opends.server.admin.server.ConfigurationAddListener;
 import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.std.server.MultimasterDomainCfg;
-import org.opends.server.admin.std.server.MultimasterSynchronizationProviderCfg;
+import org.opends.server.admin.std.server.ReplicationDomainCfg;
+import org.opends.server.admin.std.server.ReplicationSynchronizationProviderCfg;
 import org.opends.server.api.Backend;
 import org.opends.server.api.BackupTaskListener;
 import org.opends.server.api.ExportTaskListener;
@@ -79,9 +79,9 @@
  * as pre-op, conflictRsolution, and post-op.
  */
 public class MultimasterReplication
-       extends SynchronizationProvider<MultimasterSynchronizationProviderCfg>
-       implements ConfigurationAddListener<MultimasterDomainCfg>,
-                  ConfigurationDeleteListener<MultimasterDomainCfg>,
+       extends SynchronizationProvider<ReplicationSynchronizationProviderCfg>
+       implements ConfigurationAddListener<ReplicationDomainCfg>,
+                  ConfigurationDeleteListener<ReplicationDomainCfg>,
                   BackupTaskListener, RestoreTaskListener, ImportTaskListener,
                   ExportTaskListener
 {
@@ -163,7 +163,7 @@
    * @throws ConfigException When the configuration is not valid.
    */
   public static ReplicationDomain createNewDomain(
-      MultimasterDomainCfg configuration)
+      ReplicationDomainCfg configuration)
       throws ConfigException
   {
     ReplicationDomain domain;
@@ -189,7 +189,7 @@
    */
   @Override
   public void initializeSynchronizationProvider(
-      MultimasterSynchronizationProviderCfg configuration)
+      ReplicationSynchronizationProviderCfg configuration)
   throws ConfigException
   {
     domains.clear();
@@ -197,13 +197,13 @@
 
     // Register as an add and delete listener with the root configuration so we
     // can be notified if Multimaster domain entries are added or removed.
-    configuration.addMultimasterDomainAddListener(this);
-    configuration.addMultimasterDomainDeleteListener(this);
+    configuration.addReplicationDomainAddListener(this);
+    configuration.addReplicationDomainDeleteListener(this);
 
     //  Create the list of domains that are already defined.
-    for (String name : configuration.listMultimasterDomains())
+    for (String name : configuration.listReplicationDomains())
     {
-      MultimasterDomainCfg domain = configuration.getMultimasterDomain(name);
+      ReplicationDomainCfg domain = configuration.getReplicationDomain(name);
       createNewDomain(domain);
     }
 
@@ -231,7 +231,7 @@
    * {@inheritDoc}
    */
   public boolean isConfigurationAddAcceptable(
-      MultimasterDomainCfg configuration, List<Message> unacceptableReasons)
+      ReplicationDomainCfg configuration, List<Message> unacceptableReasons)
   {
     return ReplicationDomain.isConfigurationAcceptable(
       configuration, unacceptableReasons);
@@ -241,7 +241,7 @@
    * {@inheritDoc}
    */
   public ConfigChangeResult applyConfigurationAdd(
-     MultimasterDomainCfg configuration)
+     ReplicationDomainCfg configuration)
   {
     try
     {
@@ -579,9 +579,9 @@
    * {@inheritDoc}
    */
   public ConfigChangeResult applyConfigurationDelete(
-      MultimasterDomainCfg configuration)
+      ReplicationDomainCfg configuration)
   {
-    deleteDomain(configuration.getReplicationDN());
+    deleteDomain(configuration.getBaseDN());
 
     return new ConfigChangeResult(ResultCode.SUCCESS, false);
   }
@@ -590,7 +590,7 @@
    * {@inheritDoc}
    */
   public boolean isConfigurationDeleteAcceptable(
-      MultimasterDomainCfg configuration, List<Message> unacceptableReasons)
+      ReplicationDomainCfg configuration, List<Message> unacceptableReasons)
   {
     return true;
   }

--
Gitblit v1.10.0