From 45690fbc42773415ef034419ed3f27d2974b78e1 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 21 Nov 2012 23:24:40 +0000
Subject: [PATCH] Fix OPENDJ-649: Add supportedTLSCiphers and supportedTLSProtocols to RootDSE and system monitor
---
opends/src/server/org/opends/server/core/DirectoryServer.java | 43 ++++++++++++-------------------------------
1 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/DirectoryServer.java b/opends/src/server/org/opends/server/core/DirectoryServer.java
index 2ee46ad..db60db4 100644
--- a/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -57,6 +57,7 @@
import org.opends.messages.Message;
import org.opends.messages.MessageDescriptor;
+import org.opends.server.admin.AdministrationConnector;
import org.opends.server.admin.AdministrationDataSync;
import org.opends.server.admin.ClassLoaderProvider;
import org.opends.server.admin.server.ServerManagementContext;
@@ -1252,28 +1253,23 @@
entryCacheConfigManager = new EntryCacheConfigManager();
entryCacheConfigManager.initializeDefaultEntryCache();
- // Initialize the administration connector.
+ // Initialize the administration connector self signed certificate if
+ // needed and do this before initializing the key managers so that it is
+ // picked up.
if (startConnectionHandlers)
{
- initializeAdministrationConnector();
+ AdministrationConnector.createSelfSignedCertificateIfNeeded();
}
- // Initialize the key manager provider.
+ // Initialize the key manager provider.
keyManagerProviderConfigManager = new KeyManagerProviderConfigManager();
keyManagerProviderConfigManager.initializeKeyManagerProviders();
-
- // Initialize the extension.
- extensionConfigManager = new ExtensionConfigManager();
- extensionConfigManager.initializeExtensions();
-
-
// Initialize the trust manager provider.
trustManagerProviderConfigManager =
new TrustManagerProviderConfigManager();
trustManagerProviderConfigManager.initializeTrustManagerProviders();
-
// Initialize the certificate mapper.
certificateMapperConfigManager = new CertificateMapperConfigManager();
certificateMapperConfigManager.initializeCertificateMappers();
@@ -1360,6 +1356,12 @@
// Load and initialize the user plugins.
pluginConfigManager.initializeUserPlugins(null);
+
+ // Initialize the extensions.
+ extensionConfigManager = new ExtensionConfigManager();
+ extensionConfigManager.initializeExtensions();
+
+
// Initialize any synchronization providers that may be defined.
if (!environmentConfig.disableSynchronization())
{
@@ -2738,27 +2740,6 @@
/**
- * Initializes the administration connector for the Directory Server.
- *
- * @throws ConfigException If a configuration problem is identified while
- * initializing the administration connector.
- *
- * @throws InitializationException If a problem occurs while initializing
- * the administration connector that is not
- * related to the server configuration.
- */
- public void initializeAdministrationConnector()
- throws ConfigException, InitializationException
- {
- if (connectionHandlerConfigManager == null) {
- connectionHandlerConfigManager = new ConnectionHandlerConfigManager();
- }
- connectionHandlerConfigManager.initializeAdministrationConnectorConfig();
- }
-
-
-
- /**
* Initializes the subentry manager for the Directory Server.
* Note that the subentry manager initialization should be
* done before any dependent components initialization and
--
Gitblit v1.10.0