From d04fb0f282e0fd9a4bc80d3f9d5ee15506a3b83b Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 08 Dec 2008 08:03:33 +0000
Subject: [PATCH] Merge the replication-service branch with the OpenDS trunk
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
index 06c1deb..f73adac 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
@@ -39,11 +39,11 @@
import org.opends.server.api.SynchronizationProvider;
import org.opends.server.backends.MemoryBackend;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.replication.common.ChangeNumberGenerator;
import org.opends.server.replication.plugin.DomainFakeCfg;
import org.opends.server.replication.plugin.MultimasterReplication;
-import org.opends.server.replication.plugin.ReplicationBroker;
-import org.opends.server.replication.plugin.ReplicationDomain;
+import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.server.replication.protocol.AddMsg;
import org.opends.server.replication.protocol.DeleteMsg;
import org.opends.server.replication.protocol.ModifyDNMsg;
@@ -90,7 +90,7 @@
public void addModDelDependencyTest() throws Exception
{
ReplicationServer replServer = null;
- ReplicationDomain domain = null;
+ LDAPReplicationDomain domain = null;
DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
SynchronizationProvider replicationPlugin = null;
short brokerId = 2;
@@ -255,7 +255,7 @@
public void moddnDelDependencyTest() throws Exception
{
ReplicationServer replServer = null;
- ReplicationDomain domain = null;
+ LDAPReplicationDomain domain = null;
DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
SynchronizationProvider replicationPlugin = null;
short brokerId = 2;
@@ -302,7 +302,7 @@
Thread.sleep(2000);
domain = MultimasterReplication.createNewDomain(domainConf);
replicationPlugin.completeSynchronizationProvider();
-
+
ReplicationBroker broker =
openReplicationSession(baseDn, brokerId, 1000, replServerPort, 1000,
false, CLEAN_DB_GENERATION_ID);
@@ -330,7 +330,7 @@
assertTrue(found, "The initial entry add failed");
- // disable the domain to make sure that the messages are
+ // disable the domain to make sure that the messages are
// all sent in a row.
domain.disable();
@@ -413,7 +413,7 @@
public void addDelAddDependencyTest() throws Exception
{
ReplicationServer replServer = null;
- ReplicationDomain domain = null;
+ LDAPReplicationDomain domain = null;
DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
SynchronizationProvider replicationPlugin = null;
short brokerId = 2;
@@ -546,7 +546,7 @@
public void addModdnDependencyTest() throws Exception
{
ReplicationServer replServer = null;
- ReplicationDomain domain = null;
+ LDAPReplicationDomain domain = null;
DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
SynchronizationProvider replicationPlugin = null;
short brokerId = 2;
@@ -555,7 +555,7 @@
int AddSequenceLength = 30;
cleanDB();
-
+
try
{
--
Gitblit v1.10.0