From feb5d90ec016c99712f19c5485cf7633cd38f111 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 23 Mar 2007 14:26:04 +0000
Subject: [PATCH] Merge admin framework from config-prototype-branch onto trunk.
---
opends/src/server/org/opends/server/core/BackendConfigManager.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/BackendConfigManager.java b/opends/src/server/org/opends/server/core/BackendConfigManager.java
index be51a4d..f150fd8 100644
--- a/opends/src/server/org/opends/server/core/BackendConfigManager.java
+++ b/opends/src/server/org/opends/server/core/BackendConfigManager.java
@@ -446,8 +446,7 @@
Backend backend;
try
{
- // FIXME -- Should we use a custom class loader for this?
- Class backendClass = Class.forName(className);
+ Class backendClass = DirectoryServer.loadClass(className);
backend = (Backend) backendClass.newInstance();
}
catch (Exception e)
@@ -890,8 +889,7 @@
try
{
- // FIXME -- Should we use a custom class loader for this?
- Class backendClass = Class.forName(className);
+ Class backendClass = DirectoryServer.loadClass(className);
if (! Backend.class.isAssignableFrom(backendClass))
{
msgID = MSGID_CONFIG_BACKEND_CLASS_NOT_BACKEND;
@@ -1270,8 +1268,7 @@
// implementation.
try
{
- // FIXME -- Should we use a custom class loader for this?
- Class backendClass = Class.forName(className);
+ Class backendClass = DirectoryServer.loadClass(className);
if (Backend.class.isAssignableFrom(backendClass))
{
// It appears to be a valid backend class. We'll return that the
@@ -1320,8 +1317,7 @@
{
try
{
- // FIXME -- Should we use a custom class loader for this?
- Class backendClass = Class.forName(className);
+ Class backendClass = DirectoryServer.loadClass(className);
backend = (Backend) backendClass.newInstance();
}
catch (Exception e)
@@ -1730,8 +1726,7 @@
Backend backend;
try
{
- // FIXME -- Should we use a custom class loader for this?
- Class backendClass = Class.forName(className);
+ Class backendClass = DirectoryServer.loadClass(className);
backend = (Backend) backendClass.newInstance();
}
catch (Exception e)
@@ -2107,8 +2102,7 @@
Backend backend;
try
{
- // FIXME -- Should we use a custom class loader for this?
- Class backendClass = Class.forName(className);
+ Class backendClass = DirectoryServer.loadClass(className);
backend = (Backend) backendClass.newInstance();
}
catch (Exception e)
@@ -2408,7 +2402,7 @@
{
int msgID = MSGID_CONFIG_BACKEND_CANNOT_REMOVE_BACKEND_WITH_SUBORDINATES;
messages.add(getMessage(msgID, String.valueOf(backendDN)));
- resultCode = resultCode.UNWILLING_TO_PERFORM;
+ resultCode = ResultCode.UNWILLING_TO_PERFORM;
return new ConfigChangeResult(resultCode, adminActionRequired, messages);
}
}
--
Gitblit v1.10.0