From 2a1a1bec32261f04e304eea6c7a1f045a3bedba5 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 02 Aug 2013 14:31:00 +0000
Subject: [PATCH] serviceId => baseDN (To make the code less confusing)
---
opends/src/server/org/opends/server/replication/service/ReplicationMonitor.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/service/ReplicationMonitor.java b/opends/src/server/org/opends/server/replication/service/ReplicationMonitor.java
index 3966c4b..863b1d7 100644
--- a/opends/src/server/org/opends/server/replication/service/ReplicationMonitor.java
+++ b/opends/src/server/org/opends/server/replication/service/ReplicationMonitor.java
@@ -27,19 +27,14 @@
*/
package org.opends.server.replication.service;
-import java.util.Collection;
-
import java.util.ArrayList;
-
+import java.util.Collection;
import java.util.Map;
+
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeBuilder;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValues;
-import org.opends.server.types.Attributes;
+import org.opends.server.types.*;
/**
* Class used to generate monitoring information for the replication.
@@ -77,7 +72,7 @@
{
return "Directory server DS(" + domain.getServerId() + ") "
+ domain.getLocalUrl() + ",cn="
- + domain.getServiceID().replace(',', '_').replace('=', '_')
+ + domain.getBaseDNString().replace(',', '_').replace('=', '_')
+ ",cn=Replication";
}
@@ -95,7 +90,7 @@
ArrayList<Attribute> attributes = new ArrayList<Attribute>();
/* get the base dn */
- Attribute attr = Attributes.create("domain-name", domain.getServiceID());
+ Attribute attr = Attributes.create("domain-name", domain.getBaseDNString());
attributes.add(attr);
/* get the base dn */
--
Gitblit v1.10.0