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/ads/org/opends/admin/ads/ServerDescriptor.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java b/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
index a336fc7..35aebfb 100644
--- a/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
+++ b/opends/src/ads/org/opends/admin/ads/ServerDescriptor.java
@@ -534,7 +534,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",
@@ -565,7 +565,7 @@
getFirstValue(sr, "ds-cfg-use-ssl"));
boolean enabled = "true".equalsIgnoreCase(
- getFirstValue(sr, "ds-cfg-connection-handler-enabled"));
+ getFirstValue(sr, "ds-cfg-enabled"));
if (isSecure)
{
ldapsPorts.add(new Integer(port));
@@ -586,7 +586,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",
@@ -617,7 +617,7 @@
getFirstValue(sr, "ds-cfg-use-ssl"));
boolean enabled = "true".equalsIgnoreCase(
- getFirstValue(sr, "ds-cfg-connection-handler-enabled"));
+ getFirstValue(sr, "ds-cfg-enabled"));
if (isSecure)
{
jmxsPorts.add(new Integer(port));
@@ -638,7 +638,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)";
@@ -654,7 +654,7 @@
if (!isConfigBackend(id) || isSchemaBackend(id))
{
- Set<String> baseDns = getValues(sr, "ds-cfg-backend-base-dn");
+ Set<String> baseDns = getValues(sr, "ds-cfg-base-dn");
int nEntries = getEntryCount(ctx, id);
@@ -694,7 +694,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)";
@@ -710,7 +710,7 @@
SearchResult sr = (SearchResult)syncProviders.next();
if ("true".equalsIgnoreCase(getFirstValue(sr,
- "ds-cfg-synchronization-provider-enabled")))
+ "ds-cfg-enabled")))
{
replicationEnabled = true;
}
@@ -727,11 +727,11 @@
ctls.setSearchScope(SearchControls.SUBTREE_SCOPE);
ctls.setReturningAttributes(
new String[] {
- "ds-cfg-replication-dn",
+ "ds-cfg-base-dn",
"ds-cfg-replication-server",
- "ds-cfg-directory-server-id"
+ "ds-cfg-server-id"
});
- filter = "(objectclass=ds-cfg-replication-domain-config)";
+ filter = "(objectclass=ds-cfg-replication-domain)";
jndiName = new LdapName(
"cn=Multimaster Synchronization,cn=Synchronization Providers,cn=config");
@@ -745,10 +745,10 @@
SearchResult sr = (SearchResult)syncProviders.next();
int id = Integer.parseInt(
- getFirstValue(sr, "ds-cfg-directory-server-id"));
+ getFirstValue(sr, "ds-cfg-server-id"));
Set<String> replicationServers = getValues(sr,
"ds-cfg-replication-server");
- Set<String> dns = getValues(sr, "ds-cfg-replication-dn");
+ Set<String> dns = getValues(sr, "ds-cfg-base-dn");
oneDomainReplicated = dns.size() > 0;
for (String dn : dns)
{
@@ -779,10 +779,10 @@
ctls.setSearchScope(SearchControls.OBJECT_SCOPE);
ctls.setReturningAttributes(
new String[] {
- "ds-cfg-replication-server-port", "ds-cfg-replication-server",
+ "ds-cfg-replication-port", "ds-cfg-replication-server",
"ds-cfg-replication-server-id"
});
- filter = "(objectclass=ds-cfg-replication-server-config)";
+ filter = "(objectclass=ds-cfg-replication-server)";
jndiName = new LdapName("cn=Replication Server,cn=Multimaster "+
"Synchronization,cn=Synchronization Providers,cn=config");
@@ -799,7 +799,7 @@
desc.serverProperties.put(ServerProperty.IS_REPLICATION_SERVER,
Boolean.TRUE);
- String v = getFirstValue(sr, "ds-cfg-replication-server-port");
+ String v = getFirstValue(sr, "ds-cfg-replication-port");
desc.serverProperties.put(ServerProperty.REPLICATION_SERVER_PORT,
Integer.parseInt(v));
v = getFirstValue(sr, "ds-cfg-replication-server-id");
--
Gitblit v1.10.0