From a052caad0008ede711b0c43d9955eccc3bb858ba 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.
---
opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromLDAP.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromLDAP.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromLDAP.java
index 7dfd675..cbd8327 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromLDAP.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/ConfigFromLDAP.java
@@ -439,7 +439,7 @@
ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
ctls.setReturningAttributes(
new String[] {
- "ds-cfg-connection-handler-enabled",
+ "ds-cfg-enabled",
"ds-cfg-listen-address",
"ds-cfg-listen-port",
"ds-cfg-use-ssl",
@@ -472,7 +472,7 @@
ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
ctls.setReturningAttributes(
new String[] {
- "ds-cfg-synchronization-provider-enabled"
+ "ds-cfg-enabled"
});
String filter = "(objectclass=ds-cfg-synchronization-provider)";
@@ -488,7 +488,7 @@
SearchResult sr = (SearchResult)syncProviders.next();
if ("true".equalsIgnoreCase(getFirstValue(sr,
- "ds-cfg-synchronization-provider-enabled")))
+ "ds-cfg-enabled")))
{
replicationConfigured = true;
}
@@ -502,9 +502,9 @@
ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
ctls.setReturningAttributes(
new String[] {
- "ds-cfg-replication-dn"
+ "ds-cfg-base-dn"
});
- filter = "(objectclass=ds-cfg-replication-domain-config)";
+ filter = "(objectclass=ds-cfg-replication-domain)";
jndiName = new LdapName(
"cn=Multimaster Synchronization,cn=Synchronization Providers,cn=config");
@@ -517,7 +517,7 @@
{
SearchResult sr = (SearchResult)syncProviders.next();
- replicatedSuffixes.addAll(getValues(sr, "ds-cfg-replication-dn"));
+ replicatedSuffixes.addAll(getValues(sr, "ds-cfg-base-dn"));
}
}
catch (NameNotFoundException nse)
@@ -589,7 +589,7 @@
ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
ctls.setReturningAttributes(
new String[] {
- "ds-cfg-backend-base-dn",
+ "ds-cfg-base-dn",
"ds-cfg-backend-id"
});
String filter = "(objectclass=ds-cfg-backend)";
@@ -621,7 +621,7 @@
new String[] {
"ds-cfg-alternate-bind-dn"
});
- String filter = "(objectclass=ds-cfg-root-dn)";
+ String filter = "(objectclass=ds-cfg-root-dn-user)";
LdapName jndiName = new LdapName("cn=config");
NamingEnumeration users = ctx.search(jndiName, filter, ctls);
@@ -836,7 +836,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;
@@ -860,7 +860,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;
@@ -929,7 +929,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>();
int nEntries = getEntryCount(ctx, id);
--
Gitblit v1.10.0