From 9ea7b3f8b3730a5be6c441ed1a6e52b00eb1233f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 10 Feb 2014 09:49:48 +0000
Subject: [PATCH] OPENDJ-1337 Remove all code related to dsframework
---
opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
index 6af3818..a598f7c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/client/cli/SecureConnectionCliParser.java
@@ -27,12 +27,6 @@
package org.opends.server.admin.client.cli;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.*;
-import static org.opends.server.tools.ToolConstants.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
@@ -41,13 +35,19 @@
import javax.net.ssl.KeyManager;
-import org.opends.admin.ads.util.ApplicationTrustManager;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.server.util.PasswordReader;
+
import com.forgerock.opendj.cli.*;
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.tools.ToolConstants.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
* This is a commodity class that can be used to check the arguments required
* to establish a secure connection in the command line. It can be used
@@ -371,7 +371,7 @@
buf.append(EOL);
}
buf.append(message);
- ret = CONFLICTING_ARGS.getReturnCode();
+ ret = 1;
}
return ret;
--
Gitblit v1.10.0