From c30a14be35ba387e61b960740f6afc1b9774bb3d Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:34 +0000
Subject: [PATCH] Add ConnectionWrapper to replace all uses of InitialLdapContext

---
 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index 3b48b0b..f4a8850 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -77,9 +77,7 @@
 import org.opends.quicksetup.Installation;
 import org.opends.quicksetup.installer.InstallerHelper;
 import org.opends.quicksetup.util.Utils;
-import org.forgerock.opendj.config.AdminException;
-import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
-import org.forgerock.opendj.config.client.ldap.LDAPManagementContext;
+import org.forgerock.opendj.ldap.LdapException;
 import org.forgerock.opendj.server.config.client.BackendCfgClient;
 import org.forgerock.opendj.server.config.client.BackendIndexCfgClient;
 import org.forgerock.opendj.server.config.client.PluggableBackendCfgClient;
@@ -87,8 +85,8 @@
 import org.forgerock.opendj.server.config.meta.BackendCfgDefn;
 import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn;
 import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn.IndexType;
+import org.opends.server.core.ConfigurationHandler;
 import org.opends.server.core.DirectoryServer;
-import org.opends.server.extensions.ConfigFileHandler;
 import org.opends.server.tools.BackendCreationHelper;
 import org.opends.server.tools.BackendCreationHelper.DefaultIndex;
 import org.opends.server.tools.BackendTypeHelper;
@@ -853,7 +851,7 @@
       return args;
     }
 
-    private void updateConfigurationOnline() throws OpenDsException
+    private void updateConfigurationOnline() throws Exception
     {
       SwingUtilities.invokeLater(new Runnable()
       {
@@ -876,7 +874,7 @@
       refreshProgressBar();
     }
 
-    private void updateConfigurationOffline() throws OpenDsException
+    private void updateConfigurationOffline() throws Exception
     {
       boolean configHandlerUpdated = false;
       try
@@ -887,7 +885,7 @@
           DirectoryServer.deregisterBaseDN(DN.valueOf("cn=config"));
         }
         DirectoryServer.getInstance().initializeConfiguration(
-            ConfigFileHandler.class.getName(), ConfigReader.configFile);
+            ConfigurationHandler.class.getName(), ConfigReader.configFile);
         getInfo().setMustDeregisterConfig(true);
         configHandlerUpdated = true;
 
@@ -919,7 +917,7 @@
       });
     }
 
-    private void performTask() throws OpenDsException
+    private void performTask() throws Exception
     {
       final String backendName = getBackendName();
       if (isNewBackend())
@@ -934,7 +932,7 @@
       }
     }
 
-    private void createBackend(String backendName) throws OpenDsException
+    private void createBackend(String backendName) throws Exception
     {
       if (!isServerRunning())
       {
@@ -959,11 +957,11 @@
     }
 
     @RemoveOnceNewConfigFrameworkIsUsed("Use BackendCreationHelper.createBackend(...)")
-    private void createBackendOnline(String backendName) throws OpenDsException
+    private void createBackendOnline(String backendName) throws Exception
     {
       final RootCfgClient root = getRootConfigurationClient();
       final BackendCfgClient backend =
-          root.createBackend(getSelectedBackendType().getLegacyConfigurationFrameworkBackend(), backendName, null);
+          root.createBackend(getSelectedBackendType().getBackend(), backendName, null);
       backend.setEnabled(true);
       backend.setBaseDN(Collections.singleton(DN.valueOf(newBaseDN)));
       backend.setBackendId(backendName);
@@ -971,13 +969,12 @@
       backend.commit();
     }
 
-    private RootCfgClient getRootConfigurationClient()
+    private RootCfgClient getRootConfigurationClient() throws LdapException
     {
-      final JNDIDirContextAdaptor jndiContext = JNDIDirContextAdaptor.adapt(getInfo().getDirContext());
-      return LDAPManagementContext.createFromContext(jndiContext).getRootConfiguration();
+      return getInfo().getConnection().getRootConfiguration();
     }
 
-    private void addNewBaseDN(String backendName) throws OpenDsException
+    private void addNewBaseDN(String backendName) throws Exception
     {
       if (!isServerRunning())
       {
@@ -1014,7 +1011,7 @@
       }
     }
 
-    private void createAdditionalIndexes() throws OpenDsException
+    private void createAdditionalIndexes() throws Exception
     {
       final String backendName = getBackendName();
       displayCreateAdditionalIndexesDsConfigCmdLine();
@@ -1023,7 +1020,7 @@
       displayCreateAdditionalIndexesDone();
     }
 
-    private void addBackendDefaultIndexes(PluggableBackendCfgClient backendCfgClient) throws AdminException
+    private void addBackendDefaultIndexes(PluggableBackendCfgClient backendCfgClient) throws Exception
     {
       for (DefaultIndex defaultIndex : BackendCreationHelper.DEFAULT_INDEXES)
       {

--
Gitblit v1.10.0