From b0e6be77d61a4c2cf27dfa8e84ab6a069fd709d6 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Mon, 11 Jun 2007 13:13:38 +0000
Subject: [PATCH] dsservice cli will be part on the opends.jar file (instead of the quicksetup one)
---
opends/src/server/org/opends/server/admin/client/cli/DsServiceCliMain.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/opends/src/ads/org/opends/admin/ads/DsServiceCliMain.java b/opends/src/server/org/opends/server/admin/client/cli/DsServiceCliMain.java
similarity index 93%
rename from opends/src/ads/org/opends/admin/ads/DsServiceCliMain.java
rename to opends/src/server/org/opends/server/admin/client/cli/DsServiceCliMain.java
index 445e51d..e73d342 100644
--- a/opends/src/ads/org/opends/admin/ads/DsServiceCliMain.java
+++ b/opends/src/server/org/opends/server/admin/client/cli/DsServiceCliMain.java
@@ -24,7 +24,7 @@
*
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
-package org.opends.admin.ads;
+package org.opends.server.admin.client.cli;
import java.io.OutputStream;
import java.io.PrintStream;
@@ -32,17 +32,19 @@
import javax.naming.NamingException;
import javax.naming.ldap.InitialLdapContext;
+import org.opends.admin.ads.ADSContext;
+import org.opends.admin.ads.ADSContextException;
import org.opends.admin.ads.util.ConnectionUtils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.NullOutputStream;
import org.opends.server.util.args.ArgumentException;
+import static org.opends.server.admin.client.cli.DsServiceCliReturnCode.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.messages.AdminMessages.*;
import static org.opends.server.messages.ToolMessages.*;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
-import static org.opends.admin.ads.DsServiceCliReturnCode.*;
/**
@@ -54,7 +56,7 @@
* The fully-qualified name of this class.
*/
private static final String CLASS_NAME =
- "org.opends.admin.ads.DsServiceCliMain";
+ "org.opends.server.admin.client.cli.DsServiceCliMain";
// The print stream to use for standard error.
private PrintStream err;
@@ -236,7 +238,12 @@
catch (ADSContextException e)
{
adsException = e;
- returnCode = e.error.getReturnCode();
+ returnCode = DsServiceCliReturnCode.getReturncodeFromAdsError(e
+ .getError());
+ if (returnCode == null)
+ {
+ returnCode = ReturnCode.ERROR_UNEXPECTED;
+ }
}
// deconnection
--
Gitblit v1.10.0