From 71ebb3724c79a7d1218c36f080acd6ee162b9cd2 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Thu, 26 Apr 2007 06:31:01 +0000
Subject: [PATCH] Rename the class with names containing synchronization or changelog. Replace most of the changelog occurences with replication server. (issue 1090)
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index c59b206..396f922 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -40,7 +40,7 @@
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
import org.opends.server.replication.common.ServerState;
-import org.opends.server.replication.plugin.ChangelogBroker;
+import org.opends.server.replication.plugin.ReplicationBroker;
import org.opends.server.replication.plugin.PersistentServerState;
import org.opends.server.schema.IntegerSyntax;
import org.opends.server.core.DeleteOperation;
@@ -115,10 +115,10 @@
}
/**
- * Open a changelog session to the local Changelog server.
+ * Open a replicationServer session to the local ReplicationServer.
*
*/
- protected ChangelogBroker openChangelogSession(
+ protected ReplicationBroker openChangelogSession(
final DN baseDn, short serverId, int window_size,
int port, int timeout, boolean emptyOldChanges)
throws Exception, SocketException
@@ -129,7 +129,7 @@
else
state = new ServerState();
- ChangelogBroker broker = new ChangelogBroker(
+ ReplicationBroker broker = new ReplicationBroker(
state, baseDn, serverId, 0, 0, 0, 0, window_size, 0);
ArrayList<String> servers = new ArrayList<String>(1);
servers.add("localhost:" + port);
@@ -137,7 +137,7 @@
if (timeout != 0)
broker.setSoTimeout(timeout);
TestCaseUtils.sleep(100); // give some time to the broker to connect
- // to the changelog server.
+ // to the replicationServer.
if (emptyOldChanges)
{
/*
@@ -162,15 +162,15 @@
}
/**
- * Open a new session to the Changelog Server
+ * Open a new session to the ReplicationServer
* starting with a given ServerState.
*/
- protected ChangelogBroker openChangelogSession(
+ protected ReplicationBroker openChangelogSession(
final DN baseDn, short serverId, int window_size,
int port, int timeout, ServerState state)
throws Exception, SocketException
{
- ChangelogBroker broker = new ChangelogBroker(
+ ReplicationBroker broker = new ReplicationBroker(
state, baseDn, serverId, 0, 0, 0, 0, window_size, 0);
ArrayList<String> servers = new ArrayList<String>(1);
servers.add("localhost:" + port);
@@ -182,10 +182,11 @@
}
/**
- * Open a changelog session with flow control to the local Changelog server.
+ * Open a replicationServer session with flow control to the local
+ * ReplicationServer.
*
*/
- protected ChangelogBroker openChangelogSession(
+ protected ReplicationBroker openChangelogSession(
final DN baseDn, short serverId, int window_size,
int port, int timeout, int maxSendQueue, int maxRcvQueue,
boolean emptyOldChanges)
@@ -197,7 +198,7 @@
else
state = new ServerState();
- ChangelogBroker broker = new ChangelogBroker(
+ ReplicationBroker broker = new ReplicationBroker(
state, baseDn, serverId, maxRcvQueue, 0,
maxSendQueue, 0, window_size, 0);
ArrayList<String> servers = new ArrayList<String>(1);
@@ -336,7 +337,7 @@
"Unable to add the Multimaster replication plugin");
- // Add the changelog server
+ // Add the replication server
DirectoryServer.getConfigHandler().addEntry(changeLogEntry, null);
assertNotNull(DirectoryServer.getConfigEntry(changeLogEntry.getDN()),
"Unable to add the changeLog server");
--
Gitblit v1.10.0