From 087cf569ae8c80453d6f0926bda8c0aad8a93598 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 24 Feb 2014 10:11:29 +0000
Subject: [PATCH] Checkpoint for OPENDJ-1303 "opendj-cli" - Replaced some argument names by their long identifier.toLowerCase() (in CommonArguments ). - Replaced "trustAll" -> CommonArguments.getTrustAll() - Replaced "showUsage"/"help" -> CommonArguments.getShowUsage() - Renamed sslBlindTrust by trustAll in LDAPPasswordModify.java - Added OPTION_LONG_RESTART to ArgumentConstants. - Replaced "restart" string in StopDS.java by OPTION_LONG_RESTART. - Replaced argument declaration by CommonArguments.getRestart().
---
opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
index 8914617..b518c26 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
@@ -49,9 +49,11 @@
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.EmbeddedUtils;
import org.opends.server.util.PasswordReader;
+
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.FileBasedArgument;
import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
@@ -148,7 +150,7 @@
// Create the arguments that will be used by this program.
BooleanArgument provideDNForAuthzID;
BooleanArgument showUsage;
- BooleanArgument sslBlindTrust;
+ BooleanArgument trustAll;
BooleanArgument useSSL;
BooleanArgument useStartTLS;
FileBasedArgument bindPWFile;
@@ -303,11 +305,8 @@
argParser.addArgument(currentPWFile);
- sslBlindTrust =
- new BooleanArgument("blindtrust", 'X', "trustAll",
- INFO_LDAPPWMOD_DESCRIPTION_BLIND_TRUST.get());
- sslBlindTrust.setPropertyName("trustAll");
- argParser.addArgument(sslBlindTrust);
+ trustAll = CommonArguments.getTrustAll();
+ argParser.addArgument(trustAll);
sslKeyStore =
@@ -400,9 +399,7 @@
argParser.addArgument(connectTimeout);
- showUsage = new BooleanArgument("help", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage, out);
}
@@ -623,7 +620,7 @@
clientAlias = null;
}
SSLConnectionFactory sslConnectionFactory = new SSLConnectionFactory();
- sslConnectionFactory.init(sslBlindTrust.isPresent(),
+ sslConnectionFactory.init(trustAll.isPresent(),
sslKeyStore.getValue(), keyPIN, clientAlias,
sslTrustStore.getValue(), trustPIN);
connectionOptions.setSSLConnectionFactory(sslConnectionFactory);
--
Gitblit v1.10.0