From 61936a7099192c2f3d2814a3ca5e0646ef37675c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 18 Feb 2014 11:43:01 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support

---
 opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
index 4d27fc7..6f3fecc 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
+++ b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
@@ -48,7 +48,7 @@
 import org.opends.server.protocols.ldap.SearchResultEntryProtocolOp;
 import org.opends.server.tools.LDAPConnection;
 import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.types.DereferencePolicy;
+import org.forgerock.opendj.ldap.DereferenceAliasesPolicy;
 import org.opends.server.types.LDAPException;
 import org.opends.server.types.RawFilter;
 import org.forgerock.opendj.ldap.SearchScope;
@@ -495,19 +495,19 @@
 
     LDAPFilter filter = createFilter(searchRequest.getFilter());
 
-    DereferencePolicy derefPolicy = DereferencePolicy.NEVER_DEREF_ALIASES;
+    DereferenceAliasesPolicy derefPolicy = DereferenceAliasesPolicy.NEVER;
     String derefStr = searchRequest.getDerefAliases().toLowerCase();
     if (derefStr.equals("derefinsearching"))
     {
-      derefPolicy = DereferencePolicy.DEREF_IN_SEARCHING;
+      derefPolicy = DereferenceAliasesPolicy.IN_SEARCHING;
     }
     else if (derefStr.equals("dereffindingbaseobj"))
     {
-      derefPolicy = DereferencePolicy.DEREF_FINDING_BASE_OBJECT;
+      derefPolicy = DereferenceAliasesPolicy.FINDING_BASE;
     }
     else if (derefStr.equals("derefalways"))
     {
-      derefPolicy = DereferencePolicy.DEREF_ALWAYS;
+      derefPolicy = DereferenceAliasesPolicy.ALWAYS;
     }
 
     SearchScope scope = SearchScope.WHOLE_SUBTREE;

--
Gitblit v1.10.0