From c6772b9cf6b2cb14b1b8127dcf4ec22f9ec9513c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 08 Aug 2016 12:07:05 +0000
Subject: [PATCH] OPENDJ-3203 Control-panel: creating a new base dn does not complete
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 76 +++++++------------------------------
1 files changed, 15 insertions(+), 61 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 3dda6d7..d96a65e 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
@@ -32,7 +32,6 @@
import java.util.Enumeration;
import java.util.HashSet;
import java.util.LinkedHashSet;
-import java.util.LinkedList;
import java.util.List;
import java.util.Set;
import java.util.SortedSet;
@@ -62,11 +61,9 @@
import org.forgerock.opendj.ldap.DN;
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;
import org.forgerock.opendj.server.config.client.RootCfgClient;
-import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn;
import org.forgerock.opendj.server.config.meta.BackendIndexCfgDefn.IndexType;
+import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.datamodel.BackendDescriptor;
import org.opends.guitools.controlpanel.datamodel.BaseDNDescriptor;
import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
@@ -82,7 +79,7 @@
import org.opends.quicksetup.installer.InstallerHelper;
import org.opends.quicksetup.util.Utils;
import org.opends.server.tools.BackendCreationHelper;
-import org.opends.server.tools.BackendCreationHelper.DefaultIndex;
+import org.opends.server.tools.BackendCreationHelper.CreateIndex;
import org.opends.server.tools.BackendTypeHelper;
import org.opends.server.tools.BackendTypeHelper.BackendTypeUIAdapter;
import org.opends.server.tools.ImportLDIF;
@@ -863,12 +860,6 @@
});
performTask();
- printTaskDone();
- if (isNewBackend())
- {
- createAdditionalIndexes();
- }
- refreshProgressBar();
}
private void updateConfigurationOffline() throws Exception
@@ -877,8 +868,6 @@
try
{
performTask();
- printTaskDone();
- refreshProgressBar();
}
finally
{
@@ -907,12 +896,17 @@
{
printCreateNewBackendProgress(backendName);
createBackend(backendName);
+ printTaskDone();
+ displayCreateAdditionalIndexesDsConfigCmdLine();
+ printTaskDone();
}
else
{
printCreateNewBaseDNProgress(backendName);
addNewBaseDN(backendName);
+ printTaskDone();
}
+ refreshProgressBar();
}
private void createBackend(String backendName) throws Exception
@@ -923,7 +917,7 @@
}
else
{
- createBackendOnline(backendName);
+ createBackendOnline(backendName, getInfo().getConnection());
}
}
@@ -940,10 +934,10 @@
}
}
- private void createBackendOnline(String backendName) throws Exception
+ private void createBackendOnline(String backendName, ConnectionWrapper conn) throws Exception
{
Set<DN> baseDNs = Collections.singleton(DN.valueOf(newBaseDN));
- BackendCreationHelper.createBackendOffline(backendName, baseDNs, getSelectedBackendType().getBackend());
+ BackendCreationHelper.createBackendOnline(backendName, baseDNs, getSelectedBackendType().getBackend(), conn);
}
private RootCfgClient getRootConfigurationClient() throws LdapException
@@ -987,33 +981,6 @@
}
}
- private void createAdditionalIndexes() throws Exception
- {
- final String backendName = getBackendName();
- displayCreateAdditionalIndexesDsConfigCmdLine();
- final RootCfgClient root = getRootConfigurationClient();
- addBackendDefaultIndexes((PluggableBackendCfgClient) root.getBackend(backendName));
- displayCreateAdditionalIndexesDone();
- }
-
- private void addBackendDefaultIndexes(PluggableBackendCfgClient backendCfgClient) throws Exception
- {
- for (DefaultIndex defaultIndex : BackendCreationHelper.DEFAULT_INDEXES)
- {
- final BackendIndexCfgClient index = backendCfgClient.createBackendIndex(
- BackendIndexCfgDefn.getInstance(), defaultIndex.getName(), null);
-
- final List<IndexType> indexTypes = new LinkedList<>();
- indexTypes.add(IndexType.EQUALITY);
- if (defaultIndex.shouldCreateSubstringIndex())
- {
- indexTypes.add(IndexType.SUBSTRING);
- }
- index.setIndexType(indexTypes);
- index.commit();
- }
- }
-
private void printCreateNewBaseDNProgress(final String backendName) throws OpenDsException
{
SwingUtilities.invokeLater(new Runnable()
@@ -1060,9 +1027,9 @@
private void displayCreateAdditionalIndexesDsConfigCmdLine()
{
final List<List<String>> argsArray = new ArrayList<>();
- for (DefaultIndex defaultIndex : BackendCreationHelper.DEFAULT_INDEXES)
+ for (CreateIndex index : BackendCreationHelper.DEFAULT_INDEXES)
{
- argsArray.add(getCreateIndexCommandLineArguments(defaultIndex));
+ argsArray.add(getCreateIndexCommandLineArguments(index));
}
final StringBuilder sb = new StringBuilder();
@@ -1086,7 +1053,7 @@
});
}
- private List<String> getCreateIndexCommandLineArguments(final DefaultIndex defaultIndex)
+ private List<String> getCreateIndexCommandLineArguments(final CreateIndex index)
{
final List<String> args = new ArrayList<>();
args.add("create-backend-index");
@@ -1095,10 +1062,10 @@
args.add("--type");
args.add("generic");
args.add("--index-name");
- args.add(defaultIndex.getName());
+ args.add(index.getName());
args.add("--set");
args.add("index-type:" + IndexType.EQUALITY);
- if (defaultIndex.shouldCreateSubstringIndex())
+ if (index.shouldCreateSubstringIndex())
{
args.add("--set");
args.add("index-type:" + IndexType.SUBSTRING);
@@ -1110,19 +1077,6 @@
return args;
}
- private void displayCreateAdditionalIndexesDone()
- {
- SwingUtilities.invokeLater(new Runnable()
- {
- @Override
- public void run()
- {
- getProgressDialog().appendProgressHtml(
- Utilities.getProgressDone(ColorAndFontConstants.progressFont) + "<br><br>");
- }
- });
- }
-
/**
* Creates the data in the new base DN.
*
--
Gitblit v1.10.0