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/tools/tasks/TaskTool.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java b/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java
index 16ab2a2..d0deb88 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java
@@ -27,29 +27,32 @@
package org.opends.server.tools.tasks;
-import org.opends.server.util.args.Argument;
-import org.opends.server.util.args.BooleanArgument;
-import org.opends.server.util.args.LDAPConnectionArgumentParser;
-import org.opends.server.util.args.ArgumentException;
-import org.opends.server.util.args.StringArgument;
-import org.opends.server.util.args.ArgumentGroup;
-import org.opends.server.util.cli.CLIException;
+import com.forgerock.opendj.cli.Argument;
+import com.forgerock.opendj.cli.ArgumentGroup;
+import com.forgerock.opendj.cli.ArgumentException;
+import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.StringArgument;
+import com.forgerock.opendj.cli.CLIException;
import static org.opends.server.util.StaticUtils.wrapText;
import static org.opends.server.util.StaticUtils.getExceptionMessage;
import static org.opends.server.util.ServerConstants.MAX_LINE_WIDTH;
+
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.tools.LDAPConnection;
import org.opends.server.tools.LDAPConnectionException;
+
import static org.opends.server.tools.ToolConstants.*;
import org.opends.server.types.LDAPException;
import org.opends.server.types.OpenDsException;
+import org.opends.server.util.args.LDAPConnectionArgumentParser;
import org.opends.server.core.DirectoryServer;
import org.opends.server.admin.client.cli.TaskScheduleArgs;
import org.opends.server.backends.task.TaskState;
import org.opends.server.backends.task.FailedDependencyAction;
import org.forgerock.i18n.LocalizableMessage;
+
import static org.opends.messages.ToolMessages.*;
import static org.opends.messages.TaskMessages.*;
@@ -349,6 +352,10 @@
}
}
ret = 0;
+ } catch (ArgumentException e) {
+ LocalizableMessage message = e.getMessageObject();
+ if (err != null) err.println(wrapText(message, MAX_LINE_WIDTH));
+ ret = 1;
} catch (LDAPConnectionException e) {
LocalizableMessage message;
if (isWrongPortException(e,
--
Gitblit v1.10.0