From ccb19f150971f0c29516081940266263ee54b048 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 18 Dec 2014 14:58:44 +0000
Subject: [PATCH] OPENDJ-1602 (CR-5566) New pluggable storage based backend

---
 opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
index 56d16ce..5c4c648 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
@@ -49,8 +49,8 @@
 import org.opends.server.admin.server.ConfigurationAddListener;
 import org.opends.server.admin.server.ConfigurationChangeListener;
 import org.opends.server.admin.server.ConfigurationDeleteListener;
-import org.opends.server.admin.std.server.LocalDBIndexCfg;
-import org.opends.server.admin.std.server.LocalDBVLVIndexCfg;
+import org.opends.server.admin.std.server.BackendIndexCfg;
+import org.opends.server.admin.std.server.BackendVLVIndexCfg;
 import org.opends.server.admin.std.server.PersistitBackendCfg;
 import org.opends.server.api.Backend;
 import org.opends.server.api.ClientConnection;
@@ -175,12 +175,12 @@
    * indexes used within this entry container.
    */
   private class AttributeJEIndexCfgManager implements
-  ConfigurationAddListener<LocalDBIndexCfg>,
-  ConfigurationDeleteListener<LocalDBIndexCfg>
+  ConfigurationAddListener<BackendIndexCfg>,
+  ConfigurationDeleteListener<BackendIndexCfg>
   {
     /** {@inheritDoc} */
     @Override
-    public boolean isConfigurationAddAcceptable(final LocalDBIndexCfg cfg, List<LocalizableMessage> unacceptableReasons)
+    public boolean isConfigurationAddAcceptable(final BackendIndexCfg cfg, List<LocalizableMessage> unacceptableReasons)
     {
       try
       {
@@ -206,7 +206,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public ConfigChangeResult applyConfigurationAdd(final LocalDBIndexCfg cfg)
+    public ConfigChangeResult applyConfigurationAdd(final BackendIndexCfg cfg)
     {
       final ConfigChangeResult ccr = new ConfigChangeResult();
       try
@@ -238,7 +238,7 @@
     /** {@inheritDoc} */
     @Override
     public boolean isConfigurationDeleteAcceptable(
-        LocalDBIndexCfg cfg, List<LocalizableMessage> unacceptableReasons)
+        BackendIndexCfg cfg, List<LocalizableMessage> unacceptableReasons)
     {
       // TODO: validate more before returning true?
       return true;
@@ -246,7 +246,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public ConfigChangeResult applyConfigurationDelete(final LocalDBIndexCfg cfg)
+    public ConfigChangeResult applyConfigurationDelete(final BackendIndexCfg cfg)
     {
       final ConfigChangeResult ccr = new ConfigChangeResult();
 
@@ -283,13 +283,13 @@
    * used within this entry container.
    */
   private class VLVJEIndexCfgManager implements
-  ConfigurationAddListener<LocalDBVLVIndexCfg>,
-  ConfigurationDeleteListener<LocalDBVLVIndexCfg>
+  ConfigurationAddListener<BackendVLVIndexCfg>,
+  ConfigurationDeleteListener<BackendVLVIndexCfg>
   {
     /** {@inheritDoc} */
     @Override
     public boolean isConfigurationAddAcceptable(
-        LocalDBVLVIndexCfg cfg, List<LocalizableMessage> unacceptableReasons)
+        BackendVLVIndexCfg cfg, List<LocalizableMessage> unacceptableReasons)
     {
       try
       {
@@ -350,7 +350,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public ConfigChangeResult applyConfigurationAdd(final LocalDBVLVIndexCfg cfg)
+    public ConfigChangeResult applyConfigurationAdd(final BackendVLVIndexCfg cfg)
     {
       final ConfigChangeResult ccr = new ConfigChangeResult();
       try
@@ -381,7 +381,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public boolean isConfigurationDeleteAcceptable(LocalDBVLVIndexCfg cfg, List<LocalizableMessage> unacceptableReasons)
+    public boolean isConfigurationDeleteAcceptable(BackendVLVIndexCfg cfg, List<LocalizableMessage> unacceptableReasons)
     {
       // TODO: validate more before returning true?
       return true;
@@ -389,7 +389,7 @@
 
     /** {@inheritDoc} */
     @Override
-    public ConfigChangeResult applyConfigurationDelete(final LocalDBVLVIndexCfg cfg)
+    public ConfigChangeResult applyConfigurationDelete(final BackendVLVIndexCfg cfg)
     {
       final ConfigChangeResult ccr = new ConfigChangeResult();
       exclusiveLock.lock();
@@ -517,7 +517,7 @@
 
       for (String idx : config.listBackendIndexes())
       {
-        LocalDBIndexCfg indexCfg = config.getBackendIndex(idx);
+        BackendIndexCfg indexCfg = config.getBackendIndex(idx);
 
         AttributeIndex index = new AttributeIndex(indexCfg, this, txn);
         index.open(txn);
@@ -530,7 +530,7 @@
 
       for (String idx : config.listBackendVLVIndexes())
       {
-        LocalDBVLVIndexCfg vlvIndexCfg = config.getBackendVLVIndex(idx);
+        BackendVLVIndexCfg vlvIndexCfg = config.getBackendVLVIndex(idx);
 
         VLVIndex vlvIndex = new VLVIndex(vlvIndexCfg, state, storage, this, txn);
         vlvIndex.open(txn);

--
Gitblit v1.10.0