From 60cf8aa539572be17e02b83fa89c6326dfb0fd21 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 05 Feb 2014 15:38:53 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1303 - Replaced org.opends.server.util.args by com.forgerock.opendj.cli classes. - Deleted test cases as they are already ported in the opendj-cli module.
---
opendj3-server-dev/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java b/opendj3-server-dev/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java
index 94fa19c..430aec1 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java
@@ -40,6 +40,13 @@
import org.opends.server.admin.client.cli.SecureConnectionCliArgs;
import org.opends.server.types.OpenDsException;
+import com.forgerock.opendj.cli.Argument;
+import com.forgerock.opendj.cli.ArgumentException;
+import com.forgerock.opendj.cli.ArgumentParser;
+import com.forgerock.opendj.cli.ArgumentGroup;
+import com.forgerock.opendj.cli.FileBasedArgument;
+import com.forgerock.opendj.cli.StringArgument;
+
import java.util.LinkedList;
import java.util.LinkedHashSet;
import java.util.concurrent.atomic.AtomicInteger;
@@ -373,7 +380,14 @@
ui.populateLDAPOptions(options),
ui.getConnectTimeout(),
out, err);
- } catch (OpenDsException e) {
+ } catch (ArgumentException e) {
+ if ((e.getCause() != null) && (e.getCause().getCause() != null) &&
+ e.getCause().getCause() instanceof SSLException) {
+ err.println(ERR_TASKINFO_LDAP_EXCEPTION_SSL.get(ui.getHostName(), ui.getPortNumber()));
+ } else {
+ err.println(e.getMessageObject());
+ }
+ } catch (OpenDsException e) {
if ((e.getCause() != null) && (e.getCause().getCause() != null) &&
e.getCause().getCause() instanceof SSLException) {
err.println(ERR_TASKINFO_LDAP_EXCEPTION_SSL.get(ui.getHostName(), ui.getPortNumber()));
--
Gitblit v1.10.0