From 0bd0fe4197cc72c8fed4d520d043d618b2ff9301 Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Fri, 27 Apr 2007 07:09:14 +0000
Subject: [PATCH] This is is the last part of the replication renaming (issue 1090) and is the renaming of the configuration.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 19d1c80..2eeb7d3 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -178,7 +178,7 @@
// Add config entries to the current DS server based on :
// Add the replication plugin: synchroPluginEntry & synchroPluginStringDN
// Add synchroServerEntry
- // Add changeLogEntry
+ // Add replServerEntry
configureReplication();
taskInitFromS2 = TestCaseUtils.makeEntry(
@@ -220,8 +220,8 @@
+ "ds-cfg-changelog-server-id: 1\n"
+ "ds-cfg-window-size: " + WINDOW_SIZE + "\n"
+ "ds-cfg-changelog-max-queue-size: " + CHANGELOG_QUEUE_SIZE;
- changeLogEntry = TestCaseUtils.entryFromLdifString(changeLogLdif);
- changeLogEntry = null;
+ replServerEntry = TestCaseUtils.entryFromLdifString(changeLogLdif);
+ replServerEntry = null;
}
@@ -824,7 +824,7 @@
connectServer1ToChangelog(changelog1ID);
if (server2 == null)
- server2 = openChangelogSession(DN.decode("dc=example,dc=com"),
+ server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
Thread.sleep(2000);
@@ -880,7 +880,7 @@
addTestEntriesToDB();
if (server2 == null)
- server2 = openChangelogSession(DN.decode("dc=example,dc=com"),
+ server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
Thread.sleep(3000);
@@ -916,7 +916,7 @@
// S1 is the server we are running in, S2 is simulated by a broker
if (server2 == null)
- server2 = openChangelogSession(DN.decode("dc=example,dc=com"),
+ server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
Thread.sleep(1000);
@@ -956,10 +956,10 @@
// S1 is the server we are running in, S2 and S3 are simulated by brokers
if (server2==null)
- server2 = openChangelogSession(DN.decode("dc=example,dc=com"),
+ server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
- ReplicationBroker server3 = openChangelogSession(DN.decode("dc=example,dc=com"),
+ ReplicationBroker server3 = openReplicationSession(DN.decode("dc=example,dc=com"),
server3ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
Thread.sleep(1000);
@@ -997,7 +997,7 @@
// S1 is the server we are running in, S2 is simulated by a broker
if (server2==null)
- server2 = openChangelogSession(DN.decode("dc=example,dc=com"),
+ server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
server2ID, 100, getChangelogPort(changelog1ID), 1000, emptyOldChanges);
// Creates config to synchronize suffix
@@ -1180,7 +1180,7 @@
// connected to changelog2
if (server2 == null)
{
- server2 = openChangelogSession(DN.decode("dc=example,dc=com"),
+ server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
server2ID, 100, getChangelogPort(changelog2ID), 1000, emptyOldChanges);
}
@@ -1226,7 +1226,7 @@
// Connect a broker acting as server 2 to changelog2
if (server2 == null)
{
- server2 = openChangelogSession(DN.decode("dc=example,dc=com"),
+ server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
server2ID, 100, getChangelogPort(changelog2ID),
1000, emptyOldChanges);
}
@@ -1359,7 +1359,7 @@
// Connect a broker acting as server 2 to changelog2
if (server2 == null)
{
- server2 = openChangelogSession(DN.decode("dc=example,dc=com"),
+ server2 = openReplicationSession(DN.decode("dc=example,dc=com"),
server2ID, 100, getChangelogPort(changelog1ID),
1000, emptyOldChanges);
}
--
Gitblit v1.10.0