From cad7abf78a831586b43f185d4abd5f30265a3058 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:35 +0000
Subject: [PATCH] Remove the "configClass" tools argument
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
index b0588f6..f0147cb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigReader.java
@@ -32,7 +32,6 @@
import org.opends.guitools.controlpanel.datamodel.VLVSortOrder;
import org.opends.guitools.controlpanel.task.OfflineUpdateException;
import org.forgerock.opendj.server.config.meta.AdministrationConnectorCfgDefn;
-import org.opends.server.core.ConfigurationBackend;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.tasks.TaskEntry;
import org.forgerock.opendj.ldap.DN;
@@ -52,10 +51,6 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/**
- * The class used to read the configuration from a file.
- */
- public static String configClassName;
- /**
* The configuration file full path (-INSTANCE_ROOT-/config/config.ldif).
* of the installation of the control panel.
*/
@@ -79,7 +74,6 @@
Utilities.getInstanceRootDirectory(installRoot).getAbsolutePath();
configFile = instanceRoot + File.separator + "config" + File.separator +
"config.ldif";
- configClassName = ConfigurationBackend.class.getName();
try
{
DirectoryEnvironmentConfig env = DirectoryServer.getEnvironmentConfig();
@@ -87,7 +81,7 @@
DirectoryServer instance = DirectoryServer.getInstance();
DirectoryServer.bootstrapClient();
DirectoryServer.initializeJMX();
- instance.initializeConfiguration(configClassName, configFile);
+ instance.initializeConfiguration(configFile);
instance.initializeSchema();
}
catch (Throwable t)
--
Gitblit v1.10.0