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/SchemaReplicationTest.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
index a85d8b4..2cef676 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
@@ -69,7 +69,7 @@
private ArrayList<Modification> rcvdMods = null;
- private int changelogPort;
+ private int replServerPort;
/**
* Set up the environment for performing the tests in this Class.
@@ -86,7 +86,7 @@
// find a free port for the replicationServer
ServerSocket socket = TestCaseUtils.bindFreePort();
- changelogPort = socket.getLocalPort();
+ replServerPort = socket.getLocalPort();
socket.close();
// Create an internal connection
@@ -100,25 +100,25 @@
+ synchroStringDN;
// Change log
- String changeLogStringDN = "cn=Changelog Server, " + synchroPluginStringDN;
- String changeLogLdif = "dn: " + changeLogStringDN + "\n"
+ String replServerLdif =
+ "dn: " + "cn=Replication Server, " + synchroPluginStringDN + "\n"
+ "objectClass: top\n"
- + "objectClass: ds-cfg-synchronization-changelog-server-config\n"
- + "cn: Changelog Server\n"
- + "ds-cfg-changelog-port: " + changelogPort + "\n"
- + "ds-cfg-changelog-server-id: 1\n";
- changeLogEntry = TestCaseUtils.entryFromLdifString(changeLogLdif);
+ + "objectClass: ds-cfg-replication-server-config\n"
+ + "cn: Replication Server\n"
+ + "ds-cfg-replication-server-port: " + replServerPort + "\n"
+ + "ds-cfg-replication-server-id: 1\n";
+ replServerEntry = TestCaseUtils.entryFromLdifString(replServerLdif);
// suffix synchronized
- String synchroServerLdif =
+ String domainLdif =
"dn: cn=example, cn=domains, " + synchroPluginStringDN + "\n"
+ "objectClass: top\n"
- + "objectClass: ds-cfg-synchronization-provider-config\n"
+ + "objectClass: ds-cfg-replication-domain-config\n"
+ "cn: example\n"
+ "ds-cfg-synchronization-dn: cn=schema\n"
- + "ds-cfg-changelog-server: localhost:" + changelogPort + "\n"
+ + "ds-cfg-replication-server: localhost:" + replServerPort + "\n"
+ "ds-cfg-directory-server-id: 1\n";
- synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
+ synchroServerEntry = TestCaseUtils.entryFromLdifString(domainLdif);
configureReplication();
}
@@ -137,7 +137,7 @@
final DN baseDn = DN.decode("cn=schema");
ReplicationBroker broker =
- openChangelogSession(baseDn, (short) 2, 100, changelogPort, 5000, true);
+ openReplicationSession(baseDn, (short) 2, 100, replServerPort, 5000, true);
try
{
@@ -223,7 +223,7 @@
final DN baseDn = DN.decode("cn=schema");
ReplicationBroker broker =
- openChangelogSession(baseDn, (short) 2, 100, changelogPort, 5000, true);
+ openReplicationSession(baseDn, (short) 2, 100, replServerPort, 5000, true);
ChangeNumberGenerator gen = new ChangeNumberGenerator((short)2, 0);
@@ -257,7 +257,7 @@
final DN baseDn = DN.decode("cn=schema");
ReplicationBroker broker =
- openChangelogSession(baseDn, (short) 3, 100, changelogPort, 5000, true);
+ openReplicationSession(baseDn, (short) 3, 100, replServerPort, 5000, true);
// create a schema change Notification
AttributeType attrType =
--
Gitblit v1.10.0