From 39db72786ec179e67e3c1c0c71a2e93672999ea5 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 03 Dec 2009 18:04:49 +0000
Subject: [PATCH] Split SDK from server code and add build/packaging infrastructure.
---
sdk/src/org/opends/sdk/tools/LDAPSearch.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/sdk/src/org/opends/sdk/tools/LDAPSearch.java b/sdk/src/org/opends/sdk/tools/LDAPSearch.java
index bc443df..e792a0d 100644
--- a/sdk/src/org/opends/sdk/tools/LDAPSearch.java
+++ b/sdk/src/org/opends/sdk/tools/LDAPSearch.java
@@ -29,9 +29,8 @@
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.tools.ToolConstants.*;
-import static org.opends.server.util.ServerConstants.*;
+import static com.sun.opends.sdk.util.Messages.*;
+import static org.opends.sdk.tools.ToolConstants.*;
import java.io.*;
import java.util.ArrayList;
@@ -39,7 +38,6 @@
import java.util.List;
import java.util.StringTokenizer;
-import org.opends.messages.Message;
import org.opends.sdk.*;
import org.opends.sdk.controls.*;
import org.opends.sdk.ldif.EntryWriter;
@@ -53,7 +51,8 @@
import org.opends.sdk.util.ByteString;
import org.opends.sdk.util.LocalizedIllegalArgumentException;
import org.opends.sdk.util.StaticUtils;
-import org.opends.server.util.cli.ConsoleApplication;
+
+import com.sun.opends.sdk.util.Message;
@@ -83,7 +82,8 @@
{
entryCount++;
- Control control = entry.getControl(OID_ENTRY_CHANGE_NOTIFICATION);
+ Control control = entry
+ .getControl(EntryChangeNotificationControl.OID_ENTRY_CHANGE_NOTIFICATION);
if (control != null
&& control instanceof EntryChangeNotificationControl)
{
@@ -96,7 +96,8 @@
println(INFO_LDAPSEARCH_PSEARCH_PREVIOUS_DN.get(previousDN));
}
}
- control = entry.getControl(OID_ACCOUNT_USABLE_CONTROL);
+ control = entry
+ .getControl(AccountUsabilityControl.OID_ACCOUNT_USABLE_CONTROL);
if (control != null
&& control instanceof AccountUsabilityControl.Response)
{
--
Gitblit v1.10.0