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/util/Utilities.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
index 160e745..c41e612 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
@@ -2119,7 +2119,7 @@
* or the provided credentials do not have enough rights.
* @throws ConfigReadException if there is an error reading the configuration.
*/
- public static ConnectionWrapper getAdminDirContext(ControlPanelInfo controlInfo, DN bindDN, String pwd)
+ public static ConnectionWrapper getAdminConnection(ControlPanelInfo controlInfo, DN bindDN, String pwd)
throws IOException, ConfigReadException
{
return createConnection(controlInfo.getAdminConnectorHostPort(), LDAPS, bindDN, pwd, controlInfo);
@@ -2138,7 +2138,7 @@
* or the provided credentials do not have enough rights.
* @throws ConfigReadException if there is an error reading the configuration.
*/
- public static ConnectionWrapper getUserDataDirContext(ControlPanelInfo controlInfo,
+ public static ConnectionWrapper getUserDataConnection(ControlPanelInfo controlInfo,
DN bindDN, String pwd) throws IOException, ConfigReadException
{
if (controlInfo.connectUsingStartTLS())
@@ -2413,7 +2413,7 @@
}
Long l = Long.parseLong(monitoringValue);
Date date = new Date(l);
- return ConfigFromDirContext.formatter.format(date);
+ return ConfigFromConnection.formatter.format(date);
}
else if (attr.isTime())
{
@@ -2427,8 +2427,8 @@
{
try
{
- Date date = ConfigFromDirContext.utcParser.parse(monitoringValue);
- return ConfigFromDirContext.formatter.format(date);
+ Date date = ConfigFromConnection.utcParser.parse(monitoringValue);
+ return ConfigFromConnection.formatter.format(date);
}
catch (Throwable t)
{
--
Gitblit v1.10.0