From 81909cf43111e8499c583395b66e96b6b74e6ab9 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 21 Feb 2014 13:50:22 +0000
Subject: [PATCH] Checkpoint OPENDJ-1343 Migrate dsconfig / OPENDJ-1303 "opendj-cli" - replaced arguments by CLI sdk CommonArguments.(Basic only, riskless to conflicting arguments) - reverted modifications on InstallDS/InstallDSArgumentParser about getDirectoryManagerPassword. - removed from toolconstants 'description' / 'memberName' (unused)
---
opendj3-server-dev/src/server/org/opends/server/util/EMailMessage.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/EMailMessage.java b/opendj3-server-dev/src/server/org/opends/server/util/EMailMessage.java
index dddfb8b..b0256bb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/EMailMessage.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/EMailMessage.java
@@ -37,6 +37,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
+
import javax.activation.DataHandler;
import javax.activation.FileDataSource;
import javax.mail.MessagingException;
@@ -52,9 +53,11 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
import static org.opends.messages.ToolMessages.*;
@@ -549,8 +552,7 @@
argParser.addArgument(attachFile);
- showUsage = new BooleanArgument("help", 'H', "help",
- INFO_EMAIL_HELP_DESCRIPTION.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage);
}
--
Gitblit v1.10.0