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/NewVLVIndexPanel.java | 29 ++---------------------------
1 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
index 10bf54e..bd3e309 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
@@ -59,12 +59,8 @@
import org.opends.server.admin.client.ldap.LDAPManagementContext;
import org.opends.server.admin.std.client.BackendCfgClient;
import org.opends.server.admin.std.client.BackendVLVIndexCfgClient;
-import org.opends.server.admin.std.client.LocalDBBackendCfgClient;
-import org.opends.server.admin.std.client.LocalDBVLVIndexCfgClient;
import org.opends.server.admin.std.client.PluggableBackendCfgClient;
import org.opends.server.admin.std.meta.BackendVLVIndexCfgDefn;
-import org.opends.server.admin.std.meta.LocalDBVLVIndexCfgDefn;
-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;
@@ -305,12 +301,6 @@
{
final ManagementContext mCtx = LDAPManagementContext.createFromContext(JNDIDirContextAdaptor.adapt(ctx));
final BackendCfgClient backend = mCtx.getRootConfiguration().getBackend(backendName.getText());
-
- if (backend instanceof LocalDBBackendCfgClient)
- {
- createLocalDBVLVIndexOnline((LocalDBBackendCfgClient) backend);
- return;
- }
createBackendVLVIndexOnline((PluggableBackendCfgClient) backend);
}
@@ -328,21 +318,6 @@
Utilities.throwFirstFrom(exceptions);
}
- @RemoveOnceLocalDBBackendIsPluggable
- private void createLocalDBVLVIndexOnline(final LocalDBBackendCfgClient backend) throws OpenDsException
- {
- final List<PropertyException> exceptions = new ArrayList<>();
- final LocalDBVLVIndexCfgClient index =
- backend.createLocalDBVLVIndex(LocalDBVLVIndexCfgDefn.getInstance(), name.getText(), exceptions);
-
- index.setFilter(filterValue);
- index.setSortOrder(sortOrderStringValue);
- index.setBaseDN(DN.valueOf(getBaseDN()));
- index.setScope(VLVIndexDescriptor.getLocalDBVLVIndexScope(getScope()));
- index.commit();
- Utilities.throwFirstFrom(exceptions);
- }
-
@Override
protected String getCommandLinePath()
{
@@ -408,7 +383,7 @@
private List<String> getDSConfigCommandLineArguments()
{
final List<String> args = new ArrayList<>();
- args.add("create-local-db-vlv-index");
+ args.add("create-backend-vlv-index");
args.add("--backend-name");
args.add(backendID);
args.add("--type");
@@ -424,7 +399,7 @@
args.add("filter:" + filterValue);
args.add("--set");
- args.add("scope:" + VLVIndexDescriptor.getLocalDBVLVIndexScope(searchScope));
+ args.add("scope:" + VLVIndexDescriptor.getBackendVLVIndexScope(searchScope));
args.add("--set");
args.add("sort-order:" + sortOrderStringValue);
--
Gitblit v1.10.0