From 5ceb2e9601d2501d021d0c61188ec913076555a0 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.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java
index 032ae73..78abff2 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java
@@ -39,8 +39,8 @@
import org.opends.server.admin.std.meta.ConnectionHandlerCfgDefn;
import org.opends.server.admin.std.meta.GlobalCfgDefn;
import org.opends.server.admin.std.meta.LDAPConnectionHandlerCfgDefn;
-import org.opends.server.admin.std.meta.MultimasterDomainCfgDefn;
-import org.opends.server.admin.std.meta.MultimasterSynchronizationProviderCfgDefn;
+import org.opends.server.admin.std.meta.ReplicationDomainCfgDefn;
+import org.opends.server.admin.std.meta.ReplicationSynchronizationProviderCfgDefn;
import org.opends.server.admin.std.meta.RootCfgDefn;
import org.opends.server.admin.std.server.ConnectionHandlerCfg;
import org.opends.server.admin.std.server.GlobalCfg;
@@ -249,26 +249,26 @@
ManagedObjectPath<?, ?> root = ManagedObjectPath.emptyPath();
ManagedObjectPath<?, ?> mmr = root.child(RootCfgDefn.getInstance()
.getSynchronizationProvidersRelationDefinition(),
- MultimasterSynchronizationProviderCfgDefn.getInstance(), "MMR");
+ ReplicationSynchronizationProviderCfgDefn.getInstance(), "MMR");
ManagedObjectPath<?, ?> domain = mmr.child(
- MultimasterSynchronizationProviderCfgDefn.getInstance()
- .getMultimasterDomainsRelationDefinition(), "Domain");
+ ReplicationSynchronizationProviderCfgDefn.getInstance()
+ .getReplicationDomainsRelationDefinition(), "Domain");
assertFalse(domain.isEmpty());
assertEquals(domain.size(), 2);
assertEquals(domain.parent(), mmr);
assertEquals(domain.parent(2), root);
- assertEquals(domain.getManagedObjectDefinition(), MultimasterDomainCfgDefn
+ assertEquals(domain.getManagedObjectDefinition(), ReplicationDomainCfgDefn
.getInstance());
assertEquals(domain.getRelationDefinition(),
- MultimasterSynchronizationProviderCfgDefn.getInstance()
- .getMultimasterDomainsRelationDefinition());
+ ReplicationSynchronizationProviderCfgDefn.getInstance()
+ .getReplicationDomainsRelationDefinition());
assertEquals(
domain.toString(),
- "/relation=synchronization-provider+type=multimaster-synchronization-provider+name=MMR/relation=multimaster-domain+name=Domain");
+ "/relation=synchronization-provider+type=replication-synchronization-provider+name=MMR/relation=replication-domain+name=Domain");
assertEquals(
domain,
ManagedObjectPath
- .valueOf("/relation=synchronization-provider+type=multimaster-synchronization-provider+name=MMR/relation=multimaster-domain+name=Domain"));
+ .valueOf("/relation=synchronization-provider+type=replication-synchronization-provider+name=MMR/relation=replication-domain+name=Domain"));
}
/**
--
Gitblit v1.10.0