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/protocols/jmx/RmiConnector.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java b/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
index a258e98..59fdc4b 100644
--- a/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
+++ b/opends/src/server/org/opends/server/protocols/jmx/RmiConnector.java
@@ -44,6 +44,7 @@
import org.opends.server.api.KeyManagerProvider;
import org.opends.server.config.JMXMBean;
+import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.NullKeyManagerProvider;
import static org.opends.server.loggers.debug.DebugLogger.debugCaught;
@@ -207,7 +208,7 @@
*/
private void startCommonRegistry() throws Exception
{
- int registryPort = jmxConnectionHandler.listenPort;
+ int registryPort = jmxConnectionHandler.getListenPort();
//
// create our local RMI registry if it does not exist already
@@ -294,7 +295,7 @@
// ---------------------
DirectoryRMIClientSocketFactory rmiClientSockeyFactory = null;
DirectoryRMIServerSocketFactory rmiServerSockeyFactory = null;
- if (jmxConnectionHandler.useSSL)
+ if (jmxConnectionHandler.isUseSSL())
{
if (debugEnabled())
{
@@ -307,14 +308,15 @@
//
// Get a Server socket factory
KeyManager[] keyManagers;
- KeyManagerProvider provider = jmxConnectionHandler.keyManagerProvider;
- if (provider == null)
- {
+ KeyManagerProvider provider = DirectoryServer
+ .getKeyManagerProvider(jmxConnectionHandler
+ .getKeyManagerProviderDN());
+ if (provider == null) {
keyManagers = new NullKeyManagerProvider().getKeyManagers();
}
else
{
- String nickname = jmxConnectionHandler.sslServerCertNickname;
+ String nickname = jmxConnectionHandler.getSSLServerCertNickname();
if (nickname == null)
{
keyManagers = provider.getKeyManagers();
@@ -374,7 +376,7 @@
// Create the JMX Service URL
String uri = "org.opends.server.protocols.jmx.client-unknown";
String serviceUrl = "service:jmx:rmi:///jndi/rmi://"
- + registryClientAddress + ":" + jmxConnectionHandler.listenPort
+ + registryClientAddress + ":" + jmxConnectionHandler.getListenPort()
+ "/" + uri;
JMXServiceURL url = new JMXServiceURL(serviceUrl);
--
Gitblit v1.10.0