From 0f88b78b378ac39f0c9ad5d2926404497d5bf4c9 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 19:04:23 +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/quicksetup/ui/CertificateDialog.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CertificateDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CertificateDialog.java
index 9704d8c..6396293 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CertificateDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/CertificateDialog.java
@@ -36,8 +36,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.naming.ldap.LdapName;
-import javax.naming.ldap.Rdn;
 import javax.swing.Box;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -55,6 +53,7 @@
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.LocalizableMessageBuilder;
 import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.DN;
 import org.opends.quicksetup.UserDataCertificateException;
 import org.opends.quicksetup.event.MinimumSizeComponentListener;
 
@@ -663,9 +662,8 @@
     String name = cert.getSubjectX500Principal().getName();
     try
     {
-      LdapName dn = new LdapName(name);
-      Rdn rdn = dn.getRdn(0);
-      return rdn.getValue().toString();
+      DN dn = DN.valueOf(name);
+      return dn.rdn().getFirstAVA().getAttributeValue().toString();
     }
     catch (Throwable t)
     {

--
Gitblit v1.10.0