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/NewIndexPanel.java | 28 ++--------------------------
1 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
index 2ac6454..8c39258 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
@@ -63,12 +63,8 @@
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.meta.BackendIndexCfgDefn;
-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.types.AttributeType;
import org.opends.server.types.DN;
@@ -479,11 +475,6 @@
{
final ManagementContext mCtx = LDAPManagementContext.createFromContext(JNDIDirContextAdaptor.adapt(ctx));
final BackendCfgClient backend = mCtx.getRootConfiguration().getBackend(backendName.getText());
- if (backend instanceof LocalDBBackendCfgClient)
- {
- createLocalDBIndexOnline((LocalDBBackendCfgClient) backend);
- return;
- }
createBackendIndexOnline((PluggableBackendCfgClient) backend);
}
@@ -501,21 +492,6 @@
Utilities.throwFirstFrom(exceptions);
}
- @RemoveOnceLocalDBBackendIsPluggable
- private void createLocalDBIndexOnline(final LocalDBBackendCfgClient backend) throws OpenDsException
- {
- final List<PropertyException> exceptions = new ArrayList<>();
- final LocalDBIndexCfgClient index = backend.createLocalDBIndex(
- LocalDBIndexCfgDefn.getInstance(), attributeName, exceptions);
- index.setIndexType(IndexTypeDescriptor.toLocalDBIndexTypes(indexTypes));
- if (entryLimitValue != index.getIndexEntryLimit())
- {
- index.setIndexEntryLimit(entryLimitValue);
- }
- index.commit();
- Utilities.throwFirstFrom(exceptions);
- }
-
@Override
protected String getCommandLinePath()
{
@@ -578,7 +554,7 @@
private ArrayList<String> getDSConfigCommandLineArguments()
{
ArrayList<String> args = new ArrayList<>();
- args.add("create-local-db-index");
+ args.add("create-backend-index");
args.add("--backend-name");
args.add(backendName.getText());
args.add("--type");
@@ -590,7 +566,7 @@
for (IndexTypeDescriptor type : indexTypes)
{
args.add("--set");
- args.add("index-type:" + type.toLocalDBIndexType());
+ args.add("index-type:" + type.toBackendIndexType());
}
args.add("--set");
args.add("index-entry-limit:" + entryLimitValue);
--
Gitblit v1.10.0