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/replicationcli/ReplicationCliMain.java | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
index 21d34c3..a12b707 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/replicationcli/ReplicationCliMain.java
@@ -1884,8 +1884,8 @@
JNDIDirContextAdaptor.adapt(ctx));
RootCfgClient root = mCtx.getRootConfiguration();
- MultimasterSynchronizationProviderCfgClient sync = null;
- sync = (MultimasterSynchronizationProviderCfgClient)
+ ReplicationSynchronizationProviderCfgClient sync = null;
+ sync = (ReplicationSynchronizationProviderCfgClient)
root.getSynchronizationProvider("Multimaster Synchronization");
/*
* Configure the replication server.
@@ -4255,10 +4255,10 @@
/*
* Configure Synchronization plugin.
*/
- MultimasterSynchronizationProviderCfgClient sync = null;
+ ReplicationSynchronizationProviderCfgClient sync = null;
try
{
- sync = (MultimasterSynchronizationProviderCfgClient)
+ sync = (ReplicationSynchronizationProviderCfgClient)
root.getSynchronizationProvider("Multimaster Synchronization");
}
catch (ManagedObjectNotFoundException monfe)
@@ -4268,12 +4268,12 @@
}
if (sync == null)
{
- MultimasterSynchronizationProviderCfgDefn provider =
- MultimasterSynchronizationProviderCfgDefn.getInstance();
+ ReplicationSynchronizationProviderCfgDefn provider =
+ ReplicationSynchronizationProviderCfgDefn.getInstance();
sync = root.createSynchronizationProvider(provider,
"Multimaster Synchronization",
new ArrayList<DefaultBehaviorException>());
- sync.setJavaImplementationClass(
+ sync.setJavaClass(
org.opends.server.replication.plugin.MultimasterReplication.class.
getName());
sync.setEnabled(Boolean.TRUE);
@@ -4353,8 +4353,8 @@
JNDIDirContextAdaptor.adapt(ctx));
RootCfgClient root = mCtx.getRootConfiguration();
- MultimasterSynchronizationProviderCfgClient sync =
- (MultimasterSynchronizationProviderCfgClient)
+ ReplicationSynchronizationProviderCfgClient sync =
+ (ReplicationSynchronizationProviderCfgClient)
root.getSynchronizationProvider("Multimaster Synchronization");
boolean mustCommit = false;
ReplicationServerCfgClient replicationServer = sync.getReplicationServer();
@@ -4447,26 +4447,26 @@
JNDIDirContextAdaptor.adapt(ctx));
RootCfgClient root = mCtx.getRootConfiguration();
- MultimasterSynchronizationProviderCfgClient sync =
- (MultimasterSynchronizationProviderCfgClient)
+ ReplicationSynchronizationProviderCfgClient sync =
+ (ReplicationSynchronizationProviderCfgClient)
root.getSynchronizationProvider("Multimaster Synchronization");
- String[] domainNames = sync.listMultimasterDomains();
+ String[] domainNames = sync.listReplicationDomains();
if (domainNames == null)
{
domainNames = new String[]{};
}
- MultimasterDomainCfgClient[] domains =
- new MultimasterDomainCfgClient[domainNames.length];
+ ReplicationDomainCfgClient[] domains =
+ new ReplicationDomainCfgClient[domainNames.length];
for (int i=0; i<domains.length; i++)
{
- domains[i] = sync.getMultimasterDomain(domainNames[i]);
+ domains[i] = sync.getReplicationDomain(domainNames[i]);
}
- MultimasterDomainCfgClient domain = null;
+ ReplicationDomainCfgClient domain = null;
String domainName = null;
for (int i=0; i<domains.length && (domain == null); i++)
{
- if (Utils.areDnsEqual(baseDN, domains[i].getReplicationDN().toString()))
+ if (Utils.areDnsEqual(baseDN, domains[i].getBaseDN().toString()))
{
domain = domains[i];
domainName = domainNames[i];
@@ -4478,11 +4478,11 @@
int domainId = InstallerHelper.getReplicationId(usedReplicationDomainIds);
usedReplicationDomainIds.add(domainId);
domainName = InstallerHelper.getDomainName(domainNames, domainId);
- domain = sync.createMultimasterDomain(
- MultimasterDomainCfgDefn.getInstance(), domainName,
+ domain = sync.createReplicationDomain(
+ ReplicationDomainCfgDefn.getInstance(), domainName,
new ArrayList<DefaultBehaviorException>());
domain.setServerId(domainId);
- domain.setReplicationDN(DN.decode(baseDN));
+ domain.setBaseDN(DN.decode(baseDN));
domain.setReplicationServer(replicationServers);
mustCommit = true;
}
@@ -4779,10 +4779,10 @@
ManagementContext mCtx = LDAPManagementContext.createFromContext(
JNDIDirContextAdaptor.adapt(ctx));
RootCfgClient root = mCtx.getRootConfiguration();
- MultimasterSynchronizationProviderCfgClient sync = null;
+ ReplicationSynchronizationProviderCfgClient sync = null;
try
{
- sync = (MultimasterSynchronizationProviderCfgClient)
+ sync = (ReplicationSynchronizationProviderCfgClient)
root.getSynchronizationProvider("Multimaster Synchronization");
}
catch (ManagedObjectNotFoundException monfe)
@@ -4793,17 +4793,17 @@
}
if (sync != null)
{
- 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]);
for (String baseDN : baseDNs)
{
lastBaseDN = baseDN;
- if (Utils.areDnsEqual(domain.getReplicationDN().toString(),
+ if (Utils.areDnsEqual(domain.getBaseDN().toString(),
baseDN))
{
printProgressMessage(formatter.getFormattedWithPoints(
@@ -4824,7 +4824,7 @@
if (replServer != null)
{
LOG.log(Level.INFO, "Updating references in domain " +
- domain.getReplicationDN()+" on " + hostPort + ".");
+ domain.getBaseDN()+" on " + hostPort + ".");
replServers.remove(replServer);
if (replServers.size() > 0)
{
@@ -4833,7 +4833,7 @@
}
else
{
- sync.removeMultimasterDomain(domainNames[i]);
+ sync.removeReplicationDomain(domainNames[i]);
sync.commit();
}
}
@@ -4900,10 +4900,10 @@
ManagementContext mCtx = LDAPManagementContext.createFromContext(
JNDIDirContextAdaptor.adapt(ctx));
RootCfgClient root = mCtx.getRootConfiguration();
- MultimasterSynchronizationProviderCfgClient sync = null;
+ ReplicationSynchronizationProviderCfgClient sync = null;
try
{
- sync = (MultimasterSynchronizationProviderCfgClient)
+ sync = (ReplicationSynchronizationProviderCfgClient)
root.getSynchronizationProvider("Multimaster Synchronization");
}
catch (ManagedObjectNotFoundException monfe)
@@ -4914,19 +4914,19 @@
}
if (sync != null)
{
- 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]);
- if (Utils.areDnsEqual(domain.getReplicationDN().toString(), baseDN))
+ ReplicationDomainCfgClient domain =
+ sync.getReplicationDomain(domainNames[i]);
+ if (Utils.areDnsEqual(domain.getBaseDN().toString(), baseDN))
{
printProgressMessage(formatter.getFormattedWithPoints(
INFO_REPLICATION_DISABLING_BASEDN.get(baseDN,
hostPort)));
- sync.removeMultimasterDomain(domainNames[i]);
+ sync.removeReplicationDomain(domainNames[i]);
sync.commit();
printProgressMessage(formatter.getFormattedDone());
--
Gitblit v1.10.0