From 8368f9ae15d65cda433652abcddd2ddbf61024a0 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 02 Aug 2016 07:18:12 +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/NewEntryTask.java | 33 ++-------------------------------
1 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
index b19edb3..b7d137e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -21,18 +21,14 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.Set;
import java.util.TreeSet;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
import javax.swing.SwingUtilities;
import javax.swing.tree.TreePath;
import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.adapter.server3x.Converters;
import org.forgerock.opendj.ldap.DN;
import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.browser.BrowserController;
@@ -44,7 +40,6 @@
import org.opends.guitools.controlpanel.ui.nodes.BasicNode;
import org.opends.guitools.controlpanel.ui.nodes.BrowserNodeInfo;
import org.opends.guitools.controlpanel.util.Utilities;
-import org.opends.server.config.ConfigConstants;
import org.opends.server.types.Entry;
/** The task launched when we must create an entry. */
@@ -169,29 +164,6 @@
conn = getInfo().getConnection();
useAdminCtx = true;
}
- BasicAttributes attrs = new BasicAttributes();
- BasicAttribute objectclass =
- new BasicAttribute(ConfigConstants.ATTR_OBJECTCLASS);
- for (String oc : newEntry.getObjectClasses().values())
- {
- objectclass.add(oc);
- }
- attrs.put(objectclass);
- for (org.opends.server.types.Attribute attr : newEntry.getAttributes())
- {
- Set<ByteString> values = new LinkedHashSet<>();
- Iterator<ByteString> it = attr.iterator();
- while (it.hasNext())
- {
- values.add(it.next());
- }
- BasicAttribute a = new BasicAttribute(attr.getAttributeDescription().toString());
- for (ByteString value : values)
- {
- a.add(value.toByteArray());
- }
- attrs.put(a);
- }
SwingUtilities.invokeLater(new Runnable()
{
@@ -206,8 +178,7 @@
}
});
- conn.getLdapContext().createSubcontext(Utilities.getJNDIName(newEntry.getName().toString()),
- attrs);
+ conn.getConnection().add(Converters.from(newEntry));
SwingUtilities.invokeLater(new Runnable()
{
--
Gitblit v1.10.0