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/pluggable/DN2URI.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
index c16bbb1..7eedf3f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2URI.java
@@ -26,7 +26,7 @@
*/
package org.opends.server.backends.pluggable;
-import static org.opends.messages.JebMessages.*;
+import static org.opends.messages.BackendMessages.*;
import static org.opends.server.util.ServerConstants.*;
import java.util.ArrayList;
@@ -34,7 +34,6 @@
import java.util.List;
import java.util.Set;
-import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteSequenceReader;
@@ -496,9 +495,8 @@
}
// Throw a directory referral exception containing the URIs.
- LocalizableMessage msg = NOTE_JEB_REFERRAL_RESULT_MESSAGE.get(referralDN);
throw new DirectoryException(
- ResultCode.REFERRAL, msg, referralDN, URIList, null);
+ ResultCode.REFERRAL, NOTE_REFERRAL_RESULT_MESSAGE.get(referralDN), referralDN, URIList, null);
}
/**
@@ -613,7 +611,7 @@
// We have found a subordinate referral.
// Make sure the referral is within scope.
if (searchOp.getScope() == SearchScope.SINGLE_LEVEL
- && JebFormat.findDNKeyParent(cursor.getKey()) != baseDN.length())
+ && DnKeyFormat.findDNKeyParent(cursor.getKey()) != baseDN.length())
{
continue;
}
@@ -698,6 +696,6 @@
private ByteString toKey(DN dn)
{
- return JebFormat.dnToDNKey(dn, prefixRDNComponents);
+ return DnKeyFormat.dnToDNKey(dn, prefixRDNComponents);
}
}
--
Gitblit v1.10.0