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/ReplicationDomain.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java b/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
index 38149a0..3f3649e 100644
--- a/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java
@@ -58,8 +58,8 @@
import java.io.OutputStream;
import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.meta.MultimasterDomainCfgDefn.*;
-import org.opends.server.admin.std.server.MultimasterDomainCfg;
+import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn.*;
+import org.opends.server.admin.std.server.ReplicationDomainCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.Backend;
import org.opends.server.api.DirectoryThread;
@@ -130,7 +130,7 @@
* handle protocol messages from the replicationServer.
*/
public class ReplicationDomain extends DirectoryThread
- implements ConfigurationChangeListener<MultimasterDomainCfg>,
+ implements ConfigurationChangeListener<ReplicationDomainCfg>,
AlertGenerator
{
/**
@@ -339,7 +339,7 @@
* @param configuration The configuration of this ReplicationDomain.
* @throws ConfigException In case of invalid configuration.
*/
- public ReplicationDomain(MultimasterDomainCfg configuration)
+ public ReplicationDomain(ReplicationDomainCfg configuration)
throws ConfigException
{
super("replication flush");
@@ -347,7 +347,7 @@
// Read the configuration parameters.
replicationServers = configuration.getReplicationServer();
serverId = (short) configuration.getServerId();
- baseDN = configuration.getReplicationDN();
+ baseDN = configuration.getBaseDN();
maxReceiveQueue = configuration.getMaxReceiveQueue();
maxReceiveDelay = (int) configuration.getMaxReceiveDelay();
maxSendQueue = configuration.getMaxSendQueue();
@@ -3310,10 +3310,10 @@
* @return true if the configuration is acceptable, false other wise.
*/
public static boolean isConfigurationAcceptable(
- MultimasterDomainCfg configuration, List<Message> unacceptableReasons)
+ ReplicationDomainCfg configuration, List<Message> unacceptableReasons)
{
// Check that there is not already a domain with the same DN
- DN dn = configuration.getReplicationDN();
+ DN dn = configuration.getBaseDN();
if (MultimasterReplication.findDomain(dn,null) != null)
{
Message message = ERR_SYNC_INVALID_DN.get();
@@ -3335,7 +3335,7 @@
* {@inheritDoc}
*/
public ConfigChangeResult applyConfigurationChange(
- MultimasterDomainCfg configuration)
+ ReplicationDomainCfg configuration)
{
// server id and base dn are readonly.
// isolationPolicy can be set immediately and will apply
@@ -3360,7 +3360,7 @@
* {@inheritDoc}
*/
public boolean isConfigurationChangeAcceptable(
- MultimasterDomainCfg configuration, List<Message> unacceptableReasons)
+ ReplicationDomainCfg configuration, List<Message> unacceptableReasons)
{
return true;
}
--
Gitblit v1.10.0