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/src/guitools/org/opends/guitools/statuspanel/ConfigFromFile.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromFile.java b/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromFile.java
index 947c6a7..f3d1ce0 100644
--- a/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromFile.java
+++ b/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromFile.java
@@ -70,11 +70,11 @@
private final ObjectClass backendOc =
DirectoryServer.getObjectClass("ds-cfg-backend", true);
private final ObjectClass administrativeUserOc =
- DirectoryServer.getObjectClass("ds-cfg-root-dn", true);
+ DirectoryServer.getObjectClass("ds-cfg-root-dn-user", true);
private final ObjectClass syncProviderOc =
DirectoryServer.getObjectClass("ds-cfg-synchronization-provider", true);
private final ObjectClass replicationConfigOc =
- DirectoryServer.getObjectClass("ds-cfg-replication-domain-config", true);
+ DirectoryServer.getObjectClass("ds-cfg-replication-domain", true);
private DN replicationDomainDN;
private HashSet<ListenerDescriptor> listeners =
@@ -482,7 +482,7 @@
protocol = ListenerDescriptor.Protocol.LDAP;
}
boolean enabled = "true".equalsIgnoreCase(
- getFirstValue(entry, "ds-cfg-connection-handler-enabled"));
+ getFirstValue(entry, "ds-cfg-enabled"));
if (enabled)
{
state = ListenerDescriptor.State.ENABLED;
@@ -506,7 +506,7 @@
protocol = ListenerDescriptor.Protocol.JMX;
}
boolean enabled = "true".equalsIgnoreCase(
- getFirstValue(entry, "ds-cfg-connection-handler-enabled"));
+ getFirstValue(entry, "ds-cfg-enabled"));
if (enabled)
{
state = ListenerDescriptor.State.ENABLED;
@@ -585,7 +585,7 @@
if (!isConfigBackend(id))
{
- Set<String> baseDns = getValues(entry, "ds-cfg-backend-base-dn");
+ Set<String> baseDns = getValues(entry, "ds-cfg-base-dn");
TreeSet<BaseDNDescriptor> replicas = new TreeSet<BaseDNDescriptor>();
DatabaseDescriptor db = new DatabaseDescriptor(id, replicas, nEntries);
@@ -618,7 +618,7 @@
private void updateConfigWithSyncProviderEntry(Entry entry)
{
if ("true".equalsIgnoreCase(getFirstValue(entry,
- "ds-cfg-synchronization-provider-enabled")))
+ "ds-cfg-enabled")))
{
replicationConfigured = true;
}
@@ -686,7 +686,7 @@
}
if (entry.getDN().isDescendantOf(replicationDomainDN))
{
- replicatedSuffixes.addAll(getValues(entry, "ds-cfg-replication-dn"));
+ replicatedSuffixes.addAll(getValues(entry, "ds-cfg-base-dn"));
}
}
--
Gitblit v1.10.0