From a052caad0008ede711b0c43d9955eccc3bb858ba 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.
---
opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
index 3c9163a..8d16c30 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -53,9 +53,9 @@
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
import org.opends.server.admin.client.ldap.LDAPManagementContext;
-import org.opends.server.admin.std.client.MultimasterDomainCfgClient;
+import org.opends.server.admin.std.client.ReplicationDomainCfgClient;
import
-org.opends.server.admin.std.client.MultimasterSynchronizationProviderCfgClient;
+org.opends.server.admin.std.client.ReplicationSynchronizationProviderCfgClient;
import org.opends.server.admin.std.client.ReplicationServerCfgClient;
import org.opends.server.admin.std.client.RootCfgClient;
import org.opends.server.core.DirectoryServer;
@@ -1789,8 +1789,8 @@
ManagementContext mCtx = LDAPManagementContext.createFromContext(
JNDIDirContextAdaptor.adapt(ctx));
RootCfgClient root = mCtx.getRootConfiguration();
- MultimasterSynchronizationProviderCfgClient sync =
- (MultimasterSynchronizationProviderCfgClient)
+ ReplicationSynchronizationProviderCfgClient sync =
+ (ReplicationSynchronizationProviderCfgClient)
root.getSynchronizationProvider("Multimaster Synchronization");
if (sync.hasReplicationServer())
{
@@ -1827,13 +1827,13 @@
}
}
}
- String[] domainNames = sync.listMultimasterDomains();
+ String[] domainNames = sync.listReplicationDomains();
if (domainNames != null)
{
for (int i=0; i<domainNames.length; i++)
{
- MultimasterDomainCfgClient domain =
- sync.getMultimasterDomain(domainNames[i]);
+ ReplicationDomainCfgClient domain =
+ sync.getReplicationDomain(domainNames[i]);
Set<String> replServers = domain.getReplicationServer();
if (replServers != null)
{
@@ -1850,7 +1850,7 @@
if (replServer != null)
{
LOG.log(Level.INFO, "Updating references in domain " +
- domain.getReplicationDN()+" on " + serverDisplay + ".");
+ domain.getBaseDN()+" on " + serverDisplay + ".");
replServers.remove(replServer);
if (replServers.size() > 0)
{
@@ -1859,7 +1859,7 @@
}
else
{
- sync.removeMultimasterDomain(domainNames[i]);
+ sync.removeReplicationDomain(domainNames[i]);
sync.commit();
}
}
--
Gitblit v1.10.0