From 8196da2152209c8c628611aeeb4adae32079921e Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 25 Nov 2015 15:09:53 +0000
Subject: [PATCH] OPENDJ-2337 Remove old JE local-db backend code and JE changelog once we are happy with the new implementations
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 41 ++---------------------------------------
1 files changed, 2 insertions(+), 39 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 68e9879..32d5f32 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
@@ -90,15 +90,11 @@
import org.opends.server.admin.client.ldap.LDAPManagementContext;
import org.opends.server.admin.std.client.BackendCfgClient;
import org.opends.server.admin.std.client.BackendIndexCfgClient;
-import org.opends.server.admin.std.client.LocalDBBackendCfgClient;
-import org.opends.server.admin.std.client.LocalDBIndexCfgClient;
import org.opends.server.admin.std.client.PluggableBackendCfgClient;
import org.opends.server.admin.std.client.RootCfgClient;
import org.opends.server.admin.std.meta.BackendCfgDefn;
import org.opends.server.admin.std.meta.BackendIndexCfgDefn;
import org.opends.server.admin.std.meta.BackendIndexCfgDefn.IndexType;
-import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn;
-import org.opends.server.backends.jeb.RemoveOnceLocalDBBackendIsPluggable;
import org.opends.server.core.DirectoryServer;
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.tools.BackendCreationHelper;
@@ -1048,36 +1044,10 @@
final String backendName = getBackendName();
displayCreateAdditionalIndexesDsConfigCmdLine();
final RootCfgClient root = getRootConfigurationClient();
- if (isLocalDBBackend())
- {
- addJEDefaultIndexes((LocalDBBackendCfgClient) root.getBackend(backendName));
- }
- else
- {
- addBackendDefaultIndexes((PluggableBackendCfgClient) root.getBackend(backendName));
- }
+ addBackendDefaultIndexes((PluggableBackendCfgClient) root.getBackend(backendName));
displayCreateAdditionalIndexesDone();
}
- @RemoveOnceLocalDBBackendIsPluggable
- private void addJEDefaultIndexes(final LocalDBBackendCfgClient jeBackendCfgClient) throws AdminException
- {
- for (DefaultIndex defaultIndex : BackendCreationHelper.DEFAULT_INDEXES)
- {
- final LocalDBIndexCfgClient jeIndex =
- jeBackendCfgClient.createLocalDBIndex(LocalDBIndexCfgDefn.getInstance(), defaultIndex.getName(), null);
-
- final List<LocalDBIndexCfgDefn.IndexType> indexTypes = new LinkedList<>();
- indexTypes.add(LocalDBIndexCfgDefn.IndexType.EQUALITY);
- if (defaultIndex.shouldCreateSubstringIndex())
- {
- indexTypes.add(LocalDBIndexCfgDefn.IndexType.SUBSTRING);
- }
- jeIndex.setIndexType(indexTypes);
- jeIndex.commit();
- }
- }
-
private void addBackendDefaultIndexes(PluggableBackendCfgClient backendCfgClient) throws AdminException
{
for (DefaultIndex defaultIndex : BackendCreationHelper.DEFAULT_INDEXES)
@@ -1171,7 +1141,7 @@
private List<String> getCreateIndexCommandLineArguments(final DefaultIndex defaultIndex)
{
final List<String> args = new ArrayList<>();
- args.add(isLocalDBBackend() ? "create-local-db-index" : "create-backend-index");
+ args.add("create-backend-index");
args.add("--backend-name");
args.add(getBackendName());
args.add("--type");
@@ -1205,13 +1175,6 @@
});
}
- @RemoveOnceLocalDBBackendIsPluggable
- private boolean isLocalDBBackend()
- {
- return getSelectedBackendType().getBackend()
- instanceof org.forgerock.opendj.server.config.meta.LocalDBBackendCfgDefn;
- }
-
/**
* Creates the data in the new base DN.
*
--
Gitblit v1.10.0