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/task/DeleteIndexTask.java | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
index c9decc4..e6545d2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
@@ -51,10 +51,8 @@
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
import org.opends.server.admin.client.ldap.LDAPManagementContext;
import org.opends.server.admin.std.client.BackendCfgClient;
-import org.opends.server.admin.std.client.LocalDBBackendCfgClient;
import org.opends.server.admin.std.client.PluggableBackendCfgClient;
import org.opends.server.admin.std.client.RootCfgClient;
-import org.opends.server.backends.jeb.RemoveOnceLocalDBBackendIsPluggable;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.opends.server.types.OpenDsException;
@@ -295,14 +293,7 @@
final RootCfgClient root = mCtx.getRootConfiguration();
final BackendCfgClient backend = root.getBackend(index.getBackend().getBackendID());
- if (backend instanceof LocalDBBackendCfgClient)
- {
- removeLocalDBIndex((LocalDBBackendCfgClient) backend, index);
- }
- else
- {
- removeBackendIndex((PluggableBackendCfgClient) backend, index);
- }
+ removeBackendIndex((PluggableBackendCfgClient) backend, index);
backend.commit();
}
@@ -320,21 +311,6 @@
}
}
- @RemoveOnceLocalDBBackendIsPluggable
- private void removeLocalDBIndex(final LocalDBBackendCfgClient backend, final AbstractIndexDescriptor index)
- throws OpenDsException
- {
- final String indexName = index.getName();
- if (isVLVIndex(index))
- {
- backend.removeLocalDBVLVIndex(indexName);
- }
- else
- {
- backend.removeLocalDBIndex(indexName);
- }
- }
-
@Override
protected String getCommandLinePath()
{
@@ -405,11 +381,11 @@
final List<String> args = new ArrayList<>();
if (isVLVIndex(index))
{
- args.add("delete-local-db-vlv-index");
+ args.add("delete-backend-vlv-index");
}
else
{
- args.add("delete-local-db-index");
+ args.add("delete-backend-index");
}
args.add("--backend-name");
args.add(index.getBackend().getBackendID());
--
Gitblit v1.10.0