From 8f434776744e26ae11fe4d7e395837f62461dc59 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 29 Jan 2014 11:57:22 +0000
Subject: [PATCH] OPENDJ-1303 Split out CLI support from opendj-ldap-toolkit into a separate Maven module, "opendj-cli" - Add dependency to opendj-cli module. - Classes modified in order to take into account this change. - Fixed comments.
---
opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java | 53 ++++++++++++++++++++++++++---------------------------
1 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
index 63aa356..bfe2b17 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
@@ -22,14 +22,14 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions copyright 2011-2014 ForgeRock AS
*/
-
package com.forgerock.opendj.ldap.tools;
-import static com.forgerock.opendj.ldap.tools.ToolConstants.*;
+import static com.forgerock.opendj.cli.CliConstants.*;
import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
-import static com.forgerock.opendj.ldap.tools.Utils.filterExitCode;
+import static com.forgerock.opendj.ldap.tools.Utils.setDefaultPerfToolProperties;
+import static com.forgerock.opendj.cli.Utils.filterExitCode;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -39,6 +39,16 @@
import java.util.concurrent.atomic.AtomicLong;
import org.forgerock.i18n.LocalizableMessage;
+
+import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
+import com.forgerock.opendj.cli.ConsoleApplication;
+import com.forgerock.opendj.cli.ArgumentParser;
+import com.forgerock.opendj.cli.ArgumentException;
+import com.forgerock.opendj.cli.IntegerArgument;
+import com.forgerock.opendj.cli.MultiChoiceArgument;
+import com.forgerock.opendj.cli.StringArgument;
+
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.ConnectionFactory;
import org.forgerock.opendj.ldap.DereferenceAliasesPolicy;
@@ -362,8 +372,7 @@
}
private int run(final String[] args) {
- // Create the command-line argument parser for use with this
- // program.
+ // Create the command-line argument parser for use with this program.
final LocalizableMessage toolDescription = INFO_AUTHRATE_TOOL_DESCRIPTION.get();
final ArgumentParser argParser =
new ArgumentParser(AuthRate.class.getName(), toolDescription, false, true, 0, 0,
@@ -382,27 +391,20 @@
IntegerArgument invalidCredPercent;
try {
- Utils.setDefaultPerfToolProperties();
+ setDefaultPerfToolProperties();
connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this);
runner = new BindPerformanceRunner(argParser, this);
- propertiesFileArgument =
- new StringArgument("propertiesFilePath", null, OPTION_LONG_PROP_FILE_PATH,
- false, false, true, INFO_PROP_FILE_PATH_PLACEHOLDER.get(), null, null,
- INFO_DESCRIPTION_PROP_FILE_PATH.get());
+ propertiesFileArgument = CommonArguments.getPropertiesFileArgument();
argParser.addArgument(propertiesFileArgument);
argParser.setFilePropertiesArgument(propertiesFileArgument);
- noPropertiesFileArgument =
- new BooleanArgument("noPropertiesFileArgument", null, OPTION_LONG_NO_PROP_FILE,
- INFO_DESCRIPTION_NO_PROP_FILE.get());
+ noPropertiesFileArgument = CommonArguments.getNoPropertiesFileArgument();
argParser.addArgument(noPropertiesFileArgument);
argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
- showUsage =
- new BooleanArgument("showUsage", OPTION_SHORT_HELP, OPTION_LONG_HELP,
- INFO_DESCRIPTION_SHOWUSAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage, getOutputStream());
@@ -439,9 +441,7 @@
invalidCredPercent.setPropertyName("invalidPassword");
argParser.addArgument(invalidCredPercent);
- verbose =
- new BooleanArgument("verbose", 'v', "verbose", INFO_DESCRIPTION_VERBOSE.get());
- verbose.setPropertyName("verbose");
+ verbose = CommonArguments.getVerbose();
argParser.addArgument(verbose);
scriptFriendly =
@@ -459,8 +459,8 @@
try {
argParser.parseArguments(args);
- // If we should just display usage or version information,
- // then print it and exit.
+ /* If we should just display usage or version information,
+ then print it and exit.*/
if (argParser.usageOrVersionDisplayed()) {
return 0;
}
@@ -482,9 +482,9 @@
final List<String> attributes = new LinkedList<String>();
final ArrayList<String> filterAndAttributeStrings = argParser.getTrailingArguments();
if (filterAndAttributeStrings.size() > 0) {
- // the list of trailing arguments should be structured as follow:
- // the first trailing argument is considered the filter, the other
- // as attributes.
+ /*The list of trailing arguments should be structured as follow:
+ the first trailing argument is considered the filter, the other
+ as attributes.*/
runner.filter = filterAndAttributeStrings.remove(0);
// The rest are attributes
@@ -503,8 +503,7 @@
return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue();
}
- // Try it out to make sure the format string and data sources
- // match.
+ // Try it out to make sure the format string and data sources match.
final Object[] data = DataSource.generateData(runner.getDataSources(), null);
try {
if (runner.baseDN != null && runner.filter != null) {
--
Gitblit v1.10.0