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/server/org/opends/server/tools/LDAPSearchOptions.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java
index 7fde8e5..a88e133 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearchOptions.java
@@ -28,11 +28,11 @@
import java.io.PrintStream;
-import org.opends.server.types.DereferencePolicy;
+import org.forgerock.opendj.ldap.DereferenceAliasesPolicy;
import org.forgerock.opendj.ldap.SearchScope;
import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.types.DereferencePolicy.*;
+import static org.forgerock.opendj.ldap.DereferenceAliasesPolicy.*;
import static org.forgerock.opendj.ldap.SearchScope.*;
@@ -44,7 +44,7 @@
public class LDAPSearchOptions extends LDAPToolOptions
{
- private DereferencePolicy dereferencePolicy = NEVER_DEREF_ALIASES;
+ private DereferenceAliasesPolicy dereferencePolicy = NEVER;
private SearchScope searchScope = WHOLE_SUBTREE;
private int sizeLimit = 0;
private int timeLimit = 0;
@@ -165,19 +165,19 @@
{
if(policy == null)
{
- dereferencePolicy = NEVER_DEREF_ALIASES;
+ dereferencePolicy = NEVER;
} else if(policy.equals("never"))
{
- dereferencePolicy = NEVER_DEREF_ALIASES;
+ dereferencePolicy = NEVER;
} else if(policy.equals("always"))
{
- dereferencePolicy = DEREF_ALWAYS;
+ dereferencePolicy = ALWAYS;
} else if (policy.equals("search"))
{
- dereferencePolicy = DEREF_IN_SEARCHING;
+ dereferencePolicy = IN_SEARCHING;
} else if (policy.equals("find"))
{
- dereferencePolicy = DEREF_FINDING_BASE_OBJECT;
+ dereferencePolicy = FINDING_BASE;
} else
{
err.println("Invalid deref alias specified:" + policy);
@@ -191,7 +191,7 @@
*
* @return The alias dereference policy.
*/
- public DereferencePolicy getDereferencePolicy()
+ public DereferenceAliasesPolicy getDereferencePolicy()
{
return dereferencePolicy;
}
--
Gitblit v1.10.0