From 61dfebf3a3931588ff5d5d4b17dcea60c1e6f197 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 18:35:35 +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/task/ModifyEntryTask.java | 2 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java | 11 ++++++-----
opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java | 2 +-
opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPathSerializer.java | 5 +++--
opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/package-info.java | 13 ++-----------
opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java | 2 +-
6 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPathSerializer.java b/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPathSerializer.java
index 624109d..9158f12 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPathSerializer.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/ManagedObjectPathSerializer.java
@@ -12,6 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
package org.forgerock.opendj.config;
@@ -19,8 +20,8 @@
* A strategy for serializing managed object paths.
* <p>
* This interface provides a generic means for serializing managed object paths
- * into application specific forms. For example, a JNDI client would use this
- * interface to construct <code>LdapName</code> objects from a path. Similarly,
+ * into application specific forms. For example, a client would use this
+ * interface to construct {@code DN} objects from a path. Similarly,
* on the server side, a serialization strategy is used to construct
* <code>DN</code> instances from a path.
* <p>
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/package-info.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/package-info.java
index 78640dc..7322a02 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/package-info.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ldap/package-info.java
@@ -12,16 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2016 ForgeRock AS.
*/
-
-
-
-/**
- * LDAP configuration transport implementation.
- * <p>
- * This implementation uses JNDI for all communication. It is expected
- * that, at some point in the future, we will replace this implementation
- * with our own LDAP client SDK based implementation.
- */
+/** LDAP configuration transport implementation. */
package org.forgerock.opendj.config.client.ldap;
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
index adb0f16..9fceb80 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
@@ -289,7 +289,7 @@
* Constructor of the ADSContext.
*
* @param connectionWrapper
- * provide connection either via JNDI or Ldap Connection
+ * provide an Ldap Connection
*/
public ADSContext(ConnectionWrapper connectionWrapper)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
index a5e1baa..477e901 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContextHelper.java
@@ -131,7 +131,7 @@
@param serverProperties Properties of the server being registered to which
the instance key entry belongs.
@param serverEntryDn The server's ADS entry DN.
- @throws ADSContextException In case some JNDI operation fails or there is a
+ @throws ADSContextException In case some LDAP operation fails or there is a
problem getting the instance public key certificate ID.
*/
void registerInstanceKeyCertificate(ConnectionWrapper conn, Map<ServerProperty, Object> serverProperties,
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
index 37d01c0..aefdafe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
@@ -489,7 +489,7 @@
searchForCustomFilter(remoteDn, conn);
}
- String filter = getJNDIFilter(url);
+ String filter = getFilter(url);
SearchRequest request = newSearchRequest(remoteDn, url.getScope(), filter, controller.getAttrsForBlackSearch())
.setSizeLimit(controller.getMaxChildren());
@@ -915,12 +915,13 @@
}
/**
- * Returns the filter to be used in a JNDI request based on the information
- * of an LDAP URL.
- * @param url the LDAP URL.
+ * Returns the filter to be used in a LDAP request based on the information of an LDAP URL.
+ *
+ * @param url
+ * the LDAP URL.
* @return the filter.
*/
- private String getJNDIFilter(LDAPURL url)
+ private String getFilter(LDAPURL url)
{
String filter = url.getRawFilter();
if (filter == null)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
index e1136ec..1ee977b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -79,7 +79,7 @@
* @param info the control panel information.
* @param dlg the progress dialog where the task progress will be displayed.
* @param newEntry the entry containing the new values.
- * @param oldEntry the old entry as we retrieved using JNDI.
+ * @param oldEntry the old entry as we retrieved using LDAP.
* @param controller the BrowserController.
* @param path the TreePath corresponding to the node in the tree that we
* want to modify.
--
Gitblit v1.10.0