From c18591b0bb075c240849ec5d2520a0442dca330d Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Tue, 05 Apr 2016 10:09:16 +0000
Subject: [PATCH] Refactor initialization in tools for OPENDJ-2616 Support protection of pluggable backend data at rest
---
opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java | 131 ++-----------------------------------------
1 files changed, 8 insertions(+), 123 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
index 1906a11..72ed8d4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
@@ -40,10 +40,8 @@
import org.opends.server.api.Backend;
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.api.plugin.PluginType;
-import org.opends.server.core.CoreConfigManager;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
-import org.opends.server.core.PluginConfigManager;
import org.opends.server.loggers.ErrorLogPublisher;
import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.JDKLogging;
@@ -495,75 +493,21 @@
PrintStream err) {
- // Perform the initial bootstrap of the Directory Server and process the configuration.
- DirectoryServer directoryServer = DirectoryServer.getInstance();
if (initializeServer)
{
+ DirectoryServer.InitializationBuilder ib;
try
{
- DirectoryServer.bootstrapClient();
- DirectoryServer.initializeJMX();
+ new DirectoryServer.InitializationBuilder(configFile.getValue())
+ .requireCryptoServices()
+ .requireUserPlugins(PluginType.LDIF_IMPORT)
+ .initialize();
}
- catch (Exception e)
+ catch (InitializationException e)
{
- printWrappedText(err, ERR_SERVER_BOOTSTRAP_ERROR.get(getExceptionMessage(e)));
+ printWrappedText(err, ERR_CANNOT_INITIALIZE_SERVER_COMPONENTS.get(e.getLocalizedMessage()));
return 1;
}
-
- try
- {
- directoryServer.initializeConfiguration(configFile.getValue());
- }
- catch (InitializationException ie)
- {
- printWrappedText(err, ERR_CANNOT_LOAD_CONFIG.get(ie.getMessage()));
- return 1;
- }
- catch (Exception e)
- {
- printWrappedText(err, ERR_CANNOT_LOAD_CONFIG.get(getExceptionMessage(e)));
- return 1;
- }
-
-
-
- // Initialize the Directory Server schema elements.
- try
- {
- directoryServer.initializeSchema();
- }
- catch (Exception e)
- {
- printWrappedText(err, ERR_CANNOT_LOAD_SCHEMA.get(getMessage(e)));
- return 1;
- }
-
-
- // Initialize the Directory Server core configuration.
- try
- {
- CoreConfigManager coreConfigManager = new CoreConfigManager(directoryServer.getServerContext());
- coreConfigManager.initializeCoreConfig();
- }
- catch (Exception e)
- {
- printWrappedText(err, ERR_CANNOT_INITIALIZE_CORE_CONFIG.get(getMessage(e)));
- return 1;
- }
-
-
- // Initialize the Directory Server crypto manager.
- try
- {
- directoryServer.initializeCryptoManager();
- }
- catch (Exception e)
- {
- printWrappedText(err, ERR_CANNOT_INITIALIZE_CRYPTO_MANAGER.get(getMessage(e)));
- return 1;
- }
-
-
if (! quietMode.isPresent())
{
try
@@ -577,68 +521,9 @@
{
err.println("Error installing the custom error logger: " +
stackTraceToSingleLineString(e));
+ return 1;
}
}
-
- // Initialize the root DNs.
- try
- {
- directoryServer.initializeRootDNConfigManager();
- }
- catch (Exception e)
- {
- printWrappedText(err, ERR_CANNOT_INITIALIZE_ROOTDN_MANAGER.get(getMessage(e)));
- return 1;
- }
-
- // Initialize the plugin manager.
- try
- {
- HashSet<PluginType> pluginTypes = new HashSet<>(1);
- directoryServer.initializePlugins(pluginTypes);
- }
- catch (Exception e)
- {
- printWrappedText(err, ERR_LDIFIMPORT_CANNOT_INITIALIZE_PLUGINS.get(getMessage(e)));
- return 1;
- }
-
- // Initialize the subentry manager.
- try
- {
- directoryServer.initializeSubentryManager();
- }
- catch (InitializationException ie)
- {
- printWrappedText(err, ERR_CANNOT_INITIALIZE_SUBENTRY_MANAGER.get(ie.getMessage()));
- return 1;
- }
-
- // Initialize all the password policy information.
- try
- {
- directoryServer.initializeAuthenticationPolicyComponents();
- }
- catch (Exception e)
- {
- printWrappedText(err, ERR_LDIFIMPORT_CANNOT_INITIALIZE_PWPOLICY.get(getMessage(e)));
- return 1;
- }
- }
-
- // Make sure that the plugin initialization is performed.
- try
- {
- HashSet<PluginType> pluginTypes = new HashSet<>(1);
- pluginTypes.add(PluginType.LDIF_IMPORT);
- PluginConfigManager pluginConfigManager =
- DirectoryServer.getPluginConfigManager();
- pluginConfigManager.initializeUserPlugins(pluginTypes);
- }
- catch (Exception e)
- {
- printWrappedText(err, ERR_LDIFIMPORT_CANNOT_INITIALIZE_PLUGINS.get(getMessage(e)));
- return 1;
}
// See if there were any user-defined sets of include/exclude attributes or
--
Gitblit v1.10.0