From f0a048d41a13eca4cba405da9403c2469ca3d1ea Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Tue, 05 May 2015 14:18:24 +0000
Subject: [PATCH] OPENDJ-1849 CR-6835 Remove references to JE from pluggable backend

---
 opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java |   33 +++++++++++++--------------------
 1 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java
index 511e287..6bc539f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVIndex.java
@@ -26,7 +26,7 @@
  */
 package org.opends.server.backends.jeb;
 
-import static org.opends.messages.JebMessages.*;
+import static org.opends.messages.BackendMessages.*;
 import static org.opends.server.util.StaticUtils.*;
 
 import java.util.Iterator;
@@ -138,9 +138,8 @@
     }
     catch(Exception e)
     {
-      LocalizableMessage msg = ERR_JEB_CONFIG_VLV_INDEX_BAD_FILTER.get(
-          config.getFilter(), name, stackTraceToSingleLineString(e));
-      throw new ConfigException(msg);
+      throw new ConfigException(ERR_CONFIG_VLV_INDEX_BAD_FILTER.get(
+          config.getFilter(), name, stackTraceToSingleLineString(e)));
     }
 
     String[] sortAttrs = config.getSortOrder().split(" ");
@@ -167,16 +166,14 @@
       }
       catch(Exception e)
       {
-        throw new ConfigException(ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortKeys[i], name));
+        throw new ConfigException(ERR_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortKeys[i], name));
       }
 
       AttributeType attrType =
           DirectoryServer.getAttributeType(sortAttrs[i].toLowerCase());
       if(attrType == null)
       {
-        LocalizableMessage msg =
-            ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortAttrs[i], name);
-        throw new ConfigException(msg);
+        throw new ConfigException(ERR_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortAttrs[i], name));
       }
       sortKeys[i] = new SortKey(attrType, ascending[i]);
       orderingRules[i] = attrType.getOrderingMatchingRule();
@@ -1233,10 +1230,8 @@
     }
     catch(Exception e)
     {
-      LocalizableMessage msg = ERR_JEB_CONFIG_VLV_INDEX_BAD_FILTER.get(
-              cfg.getFilter(), name,
-              stackTraceToSingleLineString(e));
-      unacceptableReasons.add(msg);
+      unacceptableReasons.add(ERR_CONFIG_VLV_INDEX_BAD_FILTER.get(
+              cfg.getFilter(), name, stackTraceToSingleLineString(e)));
       return false;
     }
 
@@ -1264,15 +1259,14 @@
       }
       catch(Exception e)
       {
-        unacceptableReasons.add(ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortKeys[i], name));
+        unacceptableReasons.add(ERR_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortKeys[i], name));
         return false;
       }
 
       AttributeType attrType = DirectoryServer.getAttributeType(sortAttrs[i].toLowerCase());
       if(attrType == null)
       {
-        LocalizableMessage msg = ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortAttrs[i], name);
-        unacceptableReasons.add(msg);
+        unacceptableReasons.add(ERR_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortAttrs[i], name));
         return false;
       }
       sortKeys[i] = new SortKey(attrType, ascending[i]);
@@ -1326,8 +1320,7 @@
       }
       catch(Exception e)
       {
-        ccr.addMessage(ERR_JEB_CONFIG_VLV_INDEX_BAD_FILTER.get(
-            config.getFilter(), name, stackTraceToSingleLineString(e)));
+        ccr.addMessage(ERR_CONFIG_VLV_INDEX_BAD_FILTER.get(config.getFilter(), name, stackTraceToSingleLineString(e)));
         ccr.setResultCodeIfSuccess(ResultCode.INVALID_ATTRIBUTE_SYNTAX);
       }
     }
@@ -1359,7 +1352,7 @@
         }
         catch(Exception e)
         {
-          ccr.addMessage(ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortKeys[i], name));
+          ccr.addMessage(ERR_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortKeys[i], name));
           ccr.setResultCodeIfSuccess(ResultCode.INVALID_ATTRIBUTE_SYNTAX);
         }
 
@@ -1367,7 +1360,7 @@
             DirectoryServer.getAttributeType(sortAttrs[i].toLowerCase());
         if(attrType == null)
         {
-          ccr.addMessage(ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortKeys[i], name));
+          ccr.addMessage(ERR_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortKeys[i], name));
           ccr.setResultCodeIfSuccess(ResultCode.INVALID_ATTRIBUTE_SYNTAX);
         }
         else
@@ -1405,7 +1398,7 @@
     if (ccr.adminActionRequired())
     {
       trusted = false;
-      ccr.addMessage(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(name));
+      ccr.addMessage(NOTE_INDEX_ADD_REQUIRES_REBUILD.get(name));
       try
       {
         state.putIndexTrustState(null, this, false);

--
Gitblit v1.10.0