From 35af51f9683f5ef8cec66baca7b89aa1e1cbc44e Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Fri, 11 May 2007 23:27:30 +0000
Subject: [PATCH] Issue 1532: Remove ConfigEntry from Backend API. (DS-1532)
---
opends/src/server/org/opends/server/tools/BackendToolUtils.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/BackendToolUtils.java b/opends/src/server/org/opends/server/tools/BackendToolUtils.java
index cfb0214..0965381 100644
--- a/opends/src/server/org/opends/server/tools/BackendToolUtils.java
+++ b/opends/src/server/org/opends/server/tools/BackendToolUtils.java
@@ -43,6 +43,9 @@
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.loggers.ErrorLogger.*;
import static org.opends.server.util.StaticUtils.*;
+import org.opends.server.admin.std.server.BackendCfg;
+import org.opends.server.admin.std.server.RootCfg;
+import org.opends.server.admin.server.ServerManagementContext;
import java.util.ArrayList;
import java.util.List;
@@ -66,12 +69,13 @@
* @return 0 if everything went fine. 1 if an error occurred.
*
*/
+ @SuppressWarnings("unchecked")
public static int getBackends(ArrayList<Backend> backendList,
- ArrayList<ConfigEntry> entryList,
- ArrayList<List<DN>> dnList)
+ ArrayList<BackendCfg> entryList,
+ ArrayList<List<DN>> dnList)
{
// Get the base entry for all backend configuration.
- DN backendBaseDN = null;
+ DN backendBaseDN;
try
{
backendBaseDN = DN.decode(DN_BACKEND_BASE);
@@ -94,7 +98,7 @@
return 1;
}
- ConfigEntry baseEntry = null;
+ ConfigEntry baseEntry;
try
{
baseEntry = DirectoryServer.getConfigEntry(backendBaseDN);
@@ -120,11 +124,12 @@
// Iterate through the immediate children, attempting to parse them as
// backends.
+ RootCfg root = ServerManagementContext.getInstance().getRootConfiguration();
for (ConfigEntry configEntry : baseEntry.getChildren().values())
{
// Get the backend ID attribute from the entry. If there isn't one, then
// skip the entry.
- String backendID = null;
+ String backendID;
try
{
int msgID = MSGID_CONFIG_BACKEND_ATTR_DESCRIPTION_BACKEND_ID;
@@ -164,7 +169,7 @@
// Get the backend class name attribute from the entry. If there isn't
// one, then just skip the entry.
- String backendClassName = null;
+ String backendClassName;
try
{
int msgID = MSGID_CONFIG_BACKEND_ATTR_DESCRIPTION_CLASS;
@@ -201,7 +206,7 @@
return 1;
}
- Class backendClass = null;
+ Class backendClass;
try
{
backendClass = Class.forName(backendClassName);
@@ -217,11 +222,14 @@
return 1;
}
- Backend backend = null;
+ Backend backend;
+ BackendCfg cfg;
try
{
backend = (Backend) backendClass.newInstance();
backend.setBackendID(backendID);
+ cfg = root.getBackend(backendID);
+ backend.configureBackend(cfg);
}
catch (Exception e)
{
@@ -271,7 +279,7 @@
backendList.add(backend);
- entryList.add(configEntry);
+ entryList.add(cfg);
dnList.add(baseDNs);
}
return 0;
--
Gitblit v1.10.0