From 664eac71955fcceba752801c55b091a197546b84 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 19:09:24 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
index 95b557a..42cc3a8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ControlPanelInfo.java
@@ -54,7 +54,7 @@
import org.opends.guitools.controlpanel.task.Task;
import org.opends.guitools.controlpanel.task.Task.State;
import org.opends.guitools.controlpanel.task.Task.Type;
-import org.opends.guitools.controlpanel.util.ConfigFromDirContext;
+import org.opends.guitools.controlpanel.util.ConfigFromConnection;
import org.opends.guitools.controlpanel.util.ConfigFromFile;
import org.opends.guitools.controlpanel.util.ConfigReader;
import org.opends.guitools.controlpanel.util.Utilities;
@@ -316,7 +316,7 @@
* @throws LdapException
* if there is a problem updating the connection pool.
*/
- public void setUserDataDirContext(ConnectionWrapper conn) throws LdapException
+ public void setUserDataConnection(ConnectionWrapper conn) throws LdapException
{
if (userDataConn != null)
{
@@ -334,7 +334,7 @@
*
* @return the connection to be used by the ControlPanelInfo to retrieve user data.
*/
- public ConnectionWrapper getUserDataDirContext()
+ public ConnectionWrapper getUserDataConnection()
{
return userDataConn;
}
@@ -453,7 +453,7 @@
{
if (isLocal)
{
- connWrapper = Utilities.getAdminDirContext(this, lastWorkingBindDN, lastWorkingBindPwd);
+ connWrapper = Utilities.getAdminConnection(this, lastWorkingBindDN, lastWorkingBindPwd);
}
else if (lastRemoteHostPort != null)
{
@@ -507,13 +507,13 @@
if (reader != null)
{
- desc.setAuthenticated(reader instanceof ConfigFromDirContext);
+ desc.setAuthenticated(reader instanceof ConfigFromConnection);
desc.setJavaVersion(reader.getJavaVersion());
desc.setOpenConnections(reader.getOpenConnections());
desc.setTaskEntries(reader.getTaskEntries());
- if (reader instanceof ConfigFromDirContext)
+ if (reader instanceof ConfigFromConnection)
{
- ConfigFromDirContext rCtx = (ConfigFromDirContext)reader;
+ ConfigFromConnection rCtx = (ConfigFromConnection)reader;
desc.setRootMonitor(rCtx.getRootMonitor());
desc.setEntryCachesMonitor(rCtx.getEntryCaches());
desc.setJvmMemoryUsageMonitor(rCtx.getJvmMemoryUsage());
@@ -565,7 +565,7 @@
private ConfigReader newRemoteConfigReader()
{
- ConfigFromDirContext reader = new ConfigFromDirContext();
+ ConfigFromConnection reader = new ConfigFromConnection();
reader.setIsLocal(isLocal);
reader.readConfiguration(connWrapper);
return reader;
--
Gitblit v1.10.0