From 6bd13ae6e0e4cea50b69c22526822de99bf4ac3f Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Fri, 12 Oct 2007 12:48:38 +0000
Subject: [PATCH] Fix for issue #2207 (setup/ADS does not add registered server in group"ALL")
---
opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java
index 87b584a..23e6373 100644
--- a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java
+++ b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliServer.java
@@ -550,6 +550,27 @@
serverProperties.put(prop, arg);
}
+ /**
+ * The INSTANCE_KEY_ID used to identify the server key ID.
+ */
+ {
+ ServerProperty prop = ServerProperty.INSTANCE_KEY_ID;
+ String attName = prop.getAttributeName();
+ StringArgument arg = new StringArgument(attName, null, prop
+ .getAttributeName(), false, false, true, "", null, null, null);
+ serverProperties.put(prop, arg);
+ }
+
+ /**
+ * The INSTANCE_PUBLIC_KEY_CERTIFICATE associated to the server.
+ */
+ {
+ ServerProperty prop = ServerProperty.INSTANCE_PUBLIC_KEY_CERTIFICATE;
+ String attName = prop.getAttributeName();
+ StringArgument arg = new StringArgument(attName, null, prop
+ .getAttributeName(), false, false, true, "", null, null, null);
+ serverProperties.put(prop, arg);
+ }
}
/**
@@ -600,9 +621,7 @@
adsCtx = new ADSContext(ctx);
adsCtx.registerServer(map);
- // Add this server in the default "all-servers" group.
- returnCode = DsFrameworkCliServerGroup.addServerTogroup(adsCtx,
- ADSContext.ALL_SERVERGROUP_NAME, map);
+ returnCode = SUCCESSFUL;
}
else
// -----------------------
--
Gitblit v1.10.0