From 323e0dc5c8261046be9b77441f430eb75b495576 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Wed, 03 Oct 2007 11:46:50 +0000
Subject: [PATCH] Modifications related to issue https://opends.dev.java.net/issues/show_bug.cgi?id=582
---
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java | 62 +++++++
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java | 24 ++
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java | 22 ++
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java | 44 +++++
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java | 72 ++++++---
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java | 40 +++++
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java | 39 ++++
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java | 44 +++++
opendj-sdk/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java | 36 ++++
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java | 56 +++++++
10 files changed, 412 insertions(+), 27 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java
index 3940bd8..12bdde7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPCompare.java
@@ -365,6 +365,8 @@
StringArgument saslOptions = null;
StringArgument trustStorePath = null;
StringArgument trustStorePassword = null;
+ StringArgument propertiesFileArgument = null;
+ BooleanArgument noPropertiesFileArgument = null;
ArrayList<String> dnStrings = new ArrayList<String> ();
String attributeType = null;
@@ -379,32 +381,50 @@
try
{
+ propertiesFileArgument = new StringArgument("propertiesFilePath",
+ null, OPTION_LONG_PROP_FILE_PATH,
+ false, false, true, OPTION_VALUE_PROP_FILE_PATH, null, null,
+ INFO_DESCRIPTION_PROP_FILE_PATH.get());
+ argParser.addArgument(propertiesFileArgument);
+ argParser.setFilePropertiesArgument(propertiesFileArgument);
+
+ noPropertiesFileArgument = new BooleanArgument(
+ "noPropertiesFileArgument", null, OPTION_LONG_NO_PROP_FILE,
+ INFO_DESCRIPTION_NO_PROP_FILE.get());
+ argParser.addArgument(noPropertiesFileArgument);
+ argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
+
hostName = new StringArgument("host", OPTION_SHORT_HOST,
OPTION_LONG_HOST, false, false, true,
OPTION_VALUE_HOST, "localhost", null,
INFO_DESCRIPTION_HOST.get());
+ hostName.setPropertyName(OPTION_LONG_HOST);
argParser.addArgument(hostName);
port = new IntegerArgument("port", OPTION_SHORT_PORT,
OPTION_LONG_PORT, false, false, true,
OPTION_VALUE_PORT, 389, null,
INFO_DESCRIPTION_PORT.get());
+ port.setPropertyName(OPTION_LONG_PORT);
argParser.addArgument(port);
useSSL = new BooleanArgument("useSSL", OPTION_SHORT_USE_SSL,
OPTION_LONG_USE_SSL,
INFO_DESCRIPTION_USE_SSL.get());
+ useSSL.setPropertyName(OPTION_LONG_USE_SSL);
argParser.addArgument(useSSL);
startTLS = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
OPTION_LONG_START_TLS,
INFO_DESCRIPTION_START_TLS.get());
+ startTLS.setPropertyName(OPTION_LONG_START_TLS);
argParser.addArgument(startTLS);
bindDN = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
OPTION_LONG_BINDDN, false, false, true,
OPTION_VALUE_BINDDN, null, null,
INFO_DESCRIPTION_BINDDN.get());
+ bindDN.setPropertyName(OPTION_LONG_BINDDN);
argParser.addArgument(bindDN);
bindPassword = new StringArgument("bindPassword", OPTION_SHORT_BINDPWD,
@@ -413,6 +433,7 @@
OPTION_VALUE_BINDPWD,
null, null,
INFO_DESCRIPTION_BINDPASSWORD.get());
+ bindPassword.setPropertyName(OPTION_LONG_BINDPWD);
argParser.addArgument(bindPassword);
bindPasswordFile =
@@ -422,18 +443,21 @@
false, false,
OPTION_VALUE_BINDPWD_FILE, null,
null, INFO_DESCRIPTION_BINDPASSWORDFILE.get());
+ bindPasswordFile.setPropertyName(OPTION_LONG_BINDPWD_FILE);
argParser.addArgument(bindPasswordFile);
filename = new StringArgument("filename", OPTION_SHORT_FILENAME,
OPTION_LONG_FILENAME, false, false,
true, OPTION_VALUE_FILENAME, null, null,
INFO_COMPARE_DESCRIPTION_FILENAME.get());
+ filename.setPropertyName(OPTION_LONG_FILENAME);
argParser.addArgument(filename);
saslExternal =
new BooleanArgument("useSASLExternal", 'r',
"useSASLExternal",
INFO_DESCRIPTION_USE_SASL_EXTERNAL.get());
+ saslExternal.setPropertyName("useSASLExternal");
argParser.addArgument(saslExternal);
saslOptions = new StringArgument("saslOption", OPTION_SHORT_SASLOPTION,
@@ -441,10 +465,12 @@
true, true,
OPTION_VALUE_SASLOPTION, null, null,
INFO_DESCRIPTION_SASL_PROPERTIES.get());
+ saslOptions.setPropertyName(OPTION_LONG_SASLOPTION);
argParser.addArgument(saslOptions);
trustAll = new BooleanArgument("trustAll", 'X', "trustAll",
INFO_DESCRIPTION_TRUSTALL.get());
+ trustAll.setPropertyName("trustAll");
argParser.addArgument(trustAll);
keyStorePath = new StringArgument("keyStorePath",
@@ -454,6 +480,7 @@
OPTION_VALUE_KEYSTOREPATH,
null, null,
INFO_DESCRIPTION_KEYSTOREPATH.get());
+ keyStorePath.setPropertyName(OPTION_LONG_KEYSTOREPATH);
argParser.addArgument(keyStorePath);
keyStorePassword = new StringArgument("keyStorePassword",
@@ -461,6 +488,7 @@
OPTION_LONG_KEYSTORE_PWD, false, false,
true, "{keyStorePassword}", null, null,
INFO_DESCRIPTION_KEYSTOREPASSWORD.get());
+ keyStorePassword.setPropertyName(OPTION_LONG_KEYSTORE_PWD);
argParser.addArgument(keyStorePassword);
keyStorePasswordFile =
@@ -471,12 +499,14 @@
OPTION_VALUE_KEYSTORE_PWD_FILE,
null, null,
INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE.get());
+ keyStorePasswordFile.setPropertyName(OPTION_LONG_KEYSTORE_PWD_FILE);
argParser.addArgument(keyStorePasswordFile);
certNickname =
new StringArgument("certnickname", 'N', "certNickname",
false, false, true, "{nickname}", null,
null, INFO_DESCRIPTION_CERT_NICKNAME.get());
+ certNickname.setPropertyName("certNickname");
argParser.addArgument(certNickname);
trustStorePath =
@@ -487,6 +517,7 @@
OPTION_VALUE_TRUSTSTOREPATH,
null, null,
INFO_DESCRIPTION_TRUSTSTOREPATH.get());
+ trustStorePath.setPropertyName(OPTION_LONG_TRUSTSTOREPATH);
argParser.addArgument(trustStorePath);
trustStorePassword =
@@ -495,6 +526,7 @@
false, false, true,
OPTION_VALUE_TRUSTSTORE_PWD, null,
null, INFO_DESCRIPTION_TRUSTSTOREPASSWORD.get());
+ trustStorePassword.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD);
argParser.addArgument(trustStorePassword);
trustStorePasswordFile =
@@ -504,18 +536,21 @@
OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE.get());
+ trustStorePasswordFile.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD_FILE);
argParser.addArgument(trustStorePasswordFile);
assertionFilter = new StringArgument("assertionfilter", null,
OPTION_LONG_ASSERTION_FILE, false, false, true,
OPTION_VALUE_ASSERTION_FILE, null, null,
INFO_DESCRIPTION_ASSERTION_FILTER.get());
+ assertionFilter.setPropertyName(OPTION_LONG_ASSERTION_FILE);
argParser.addArgument(assertionFilter);
controlStr =
new StringArgument("control", 'J', "control", false, true, true,
"{controloid[:criticality[:value|::b64value|:<filePath]]}",
null, null, INFO_DESCRIPTION_CONTROLS.get());
+ controlStr.setPropertyName("control");
argParser.addArgument(controlStr);
version = new IntegerArgument("version", OPTION_SHORT_PROTOCOL_VERSION,
@@ -523,26 +558,31 @@
false, false, true,
OPTION_VALUE_PROTOCOL_VERSION,
3, null, INFO_DESCRIPTION_VERSION.get());
+ version.setPropertyName(OPTION_LONG_PROTOCOL_VERSION);
argParser.addArgument(version);
encodingStr = new StringArgument("encoding", 'i', "encoding",
false, false,
true, "{encoding}", null, null,
INFO_DESCRIPTION_ENCODING.get());
+ encodingStr.setPropertyName("encoding");
argParser.addArgument(encodingStr);
continueOnError = new BooleanArgument("continueOnError", 'c',
"continueOnError",
INFO_DESCRIPTION_CONTINUE_ON_ERROR.get());
+ continueOnError.setPropertyName("continueOnError");
argParser.addArgument(continueOnError);
noop = new BooleanArgument("no-op", OPTION_SHORT_DRYRUN,
OPTION_LONG_DRYRUN,
INFO_DESCRIPTION_NOOP.get());
argParser.addArgument(noop);
+ noop.setPropertyName(OPTION_LONG_DRYRUN);
verbose = new BooleanArgument("verbose", 'v', "verbose",
INFO_DESCRIPTION_VERBOSE.get());
+ verbose.setPropertyName("verbose");
argParser.addArgument(verbose);
showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java
index 79fcaa2..35eb456 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPDelete.java
@@ -343,6 +343,8 @@
StringArgument saslOptions = null;
StringArgument trustStorePath = null;
StringArgument trustStorePassword = null;
+ StringArgument propertiesFileArgument = null;
+ BooleanArgument noPropertiesFileArgument = null;
Reader rdr = null;
ArrayList<String> dnStrings = new ArrayList<String> ();
@@ -353,32 +355,50 @@
false, true, 0, 1, "\"DN\"");
try
{
+ propertiesFileArgument = new StringArgument("propertiesFilePath",
+ null, OPTION_LONG_PROP_FILE_PATH,
+ false, false, true, OPTION_VALUE_PROP_FILE_PATH, null, null,
+ INFO_DESCRIPTION_PROP_FILE_PATH.get());
+ argParser.addArgument(propertiesFileArgument);
+ argParser.setFilePropertiesArgument(propertiesFileArgument);
+
+ noPropertiesFileArgument = new BooleanArgument(
+ "noPropertiesFileArgument", null, OPTION_LONG_NO_PROP_FILE,
+ INFO_DESCRIPTION_NO_PROP_FILE.get());
+ argParser.addArgument(noPropertiesFileArgument);
+ argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
+
hostName = new StringArgument("host", OPTION_SHORT_HOST,
OPTION_LONG_HOST, false, false, true,
OPTION_VALUE_HOST, "localhost", null,
INFO_DESCRIPTION_HOST.get());
+ hostName.setPropertyName(OPTION_LONG_HOST);
argParser.addArgument(hostName);
port = new IntegerArgument("port", OPTION_SHORT_PORT,
OPTION_LONG_PORT, false, false, true,
OPTION_VALUE_PORT, 389, null,
INFO_DESCRIPTION_PORT.get());
+ port.setPropertyName(OPTION_LONG_PORT);
argParser.addArgument(port);
useSSL = new BooleanArgument("useSSL", OPTION_SHORT_USE_SSL,
OPTION_LONG_USE_SSL,
INFO_DESCRIPTION_USE_SSL.get());
+ useSSL.setPropertyName(OPTION_LONG_USE_SSL);
argParser.addArgument(useSSL);
startTLS = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
OPTION_LONG_START_TLS,
INFO_DESCRIPTION_START_TLS.get());
+ startTLS.setPropertyName(OPTION_LONG_START_TLS);
argParser.addArgument(startTLS);
bindDN = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
OPTION_LONG_BINDDN, false, false, true,
OPTION_VALUE_BINDDN, null, null,
INFO_DESCRIPTION_BINDDN.get());
+ bindDN.setPropertyName(OPTION_LONG_BINDPWD);
argParser.addArgument(bindDN);
bindPassword = new StringArgument("bindPassword", OPTION_SHORT_BINDPWD,
@@ -387,6 +407,7 @@
OPTION_VALUE_BINDPWD,
null, null,
INFO_DESCRIPTION_BINDPASSWORD.get());
+ bindPassword.setPropertyName(OPTION_LONG_BINDPWD);
argParser.addArgument(bindPassword);
bindPasswordFile =
@@ -395,6 +416,7 @@
false, false,
OPTION_VALUE_BINDPWD_FILE, null,
null, INFO_DESCRIPTION_BINDPASSWORDFILE.get());
+ bindPasswordFile.setPropertyName(OPTION_LONG_BINDPWD_FILE);
argParser.addArgument(bindPasswordFile);
filename = new StringArgument("filename", OPTION_SHORT_FILENAME,
@@ -407,6 +429,7 @@
new BooleanArgument("useSASLExternal", 'r',
"useSASLExternal",
INFO_DESCRIPTION_USE_SASL_EXTERNAL.get());
+ saslExternal.setPropertyName("useSASLExternal");
argParser.addArgument(saslExternal);
saslOptions = new StringArgument(
@@ -415,10 +438,12 @@
false, true, true,
OPTION_VALUE_SASLOPTION, null,
null, INFO_DESCRIPTION_SASL_PROPERTIES.get());
+ saslOptions.setPropertyName(OPTION_LONG_SASLOPTION);
argParser.addArgument(saslOptions);
trustAll = new BooleanArgument("trustAll", 'X', "trustAll",
INFO_DESCRIPTION_TRUSTALL.get());
+ trustAll.setPropertyName("trustAll");
argParser.addArgument(trustAll);
keyStorePath = new StringArgument("keyStorePath",
@@ -428,6 +453,7 @@
OPTION_VALUE_KEYSTOREPATH,
null, null,
INFO_DESCRIPTION_KEYSTOREPATH.get());
+ keyStorePath.setPropertyName(OPTION_LONG_KEYSTOREPATH);
argParser.addArgument(keyStorePath);
keyStorePassword =
@@ -438,6 +464,7 @@
true, OPTION_VALUE_KEYSTORE_PWD,
null, null,
INFO_DESCRIPTION_KEYSTOREPASSWORD.get());
+ keyStorePassword.setPropertyName(OPTION_LONG_KEYSTORE_PWD);
argParser.addArgument(keyStorePassword);
keyStorePasswordFile =
@@ -448,12 +475,14 @@
OPTION_VALUE_KEYSTORE_PWD_FILE,
null, null,
INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE.get());
+ keyStorePasswordFile.setPropertyName(OPTION_LONG_KEYSTORE_PWD_FILE);
argParser.addArgument(keyStorePasswordFile);
certNickname = new StringArgument(
"certnickname", 'N', "certNickname",
false, false, true, "{nickname}", null,
null, INFO_DESCRIPTION_CERT_NICKNAME.get());
+ certNickname.setPropertyName("certNickname");
argParser.addArgument(certNickname);
trustStorePath = new StringArgument(
@@ -464,6 +493,7 @@
OPTION_VALUE_TRUSTSTOREPATH,
null, null,
INFO_DESCRIPTION_TRUSTSTOREPATH.get());
+ trustStorePath.setPropertyName(OPTION_LONG_TRUSTSTOREPATH);
argParser.addArgument(trustStorePath);
trustStorePassword =
@@ -472,6 +502,7 @@
false, false, true,
OPTION_VALUE_TRUSTSTORE_PWD, null,
null, INFO_DESCRIPTION_TRUSTSTOREPASSWORD.get());
+ trustStorePassword.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD);
argParser.addArgument(trustStorePassword);
trustStorePasswordFile =
@@ -481,42 +512,50 @@
OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE.get());
+ trustStorePasswordFile.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD_FILE);
argParser.addArgument(trustStorePasswordFile);
deleteSubtree =
new BooleanArgument("deleteSubtree", 'x', "deleteSubtree",
INFO_DELETE_DESCRIPTION_DELETE_SUBTREE.get());
+ deleteSubtree.setPropertyName("deleteSubtree");
argParser.addArgument(deleteSubtree);
controlStr =
new StringArgument("control", 'J', "control", false, true, true,
"{controloid[:criticality[:value|::b64value|:<fileurl]]}",
null, null, INFO_DESCRIPTION_CONTROLS.get());
+ controlStr.setPropertyName("control");
argParser.addArgument(controlStr);
version = new IntegerArgument("version", OPTION_SHORT_PROTOCOL_VERSION,
OPTION_LONG_PROTOCOL_VERSION, false, false,
true, OPTION_VALUE_PROTOCOL_VERSION, 3,
null, INFO_DESCRIPTION_VERSION.get());
+ version.setPropertyName(OPTION_LONG_PROTOCOL_VERSION);
argParser.addArgument(version);
encodingStr = new StringArgument("encoding", 'i',
OPTION_LONG_ENCODING, false,
false, true, "{encoding}", null, null,
INFO_DESCRIPTION_ENCODING.get());
+ encodingStr.setPropertyName(OPTION_LONG_ENCODING);
argParser.addArgument(encodingStr);
continueOnError =
new BooleanArgument("continueOnError", 'c', "continueOnError",
INFO_DESCRIPTION_CONTINUE_ON_ERROR.get());
+ continueOnError.setPropertyName("continueOnError");
argParser.addArgument(continueOnError);
noop = new BooleanArgument("no-op", OPTION_SHORT_DRYRUN,
OPTION_LONG_DRYRUN, INFO_DESCRIPTION_NOOP.get());
+ noop.setPropertyName(OPTION_LONG_DRYRUN);
argParser.addArgument(noop);
verbose = new BooleanArgument("verbose", 'v', "verbose",
INFO_DESCRIPTION_VERBOSE.get());
+ verbose.setPropertyName("verbose");
argParser.addArgument(verbose);
showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
index afe54d3..d5143b1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPModify.java
@@ -644,6 +644,8 @@
StringArgument saslOptions = null;
StringArgument trustStorePath = null;
StringArgument trustStorePassword = null;
+ StringArgument propertiesFileArgument = null;
+ BooleanArgument noPropertiesFileArgument = null;
// Create the command-line argument parser for use with this program.
Message toolDescription = INFO_LDAPMODIFY_TOOL_DESCRIPTION.get();
@@ -651,32 +653,50 @@
false);
try
{
+ propertiesFileArgument = new StringArgument("propertiesFilePath",
+ null, OPTION_LONG_PROP_FILE_PATH,
+ false, false, true, OPTION_VALUE_PROP_FILE_PATH, null, null,
+ INFO_DESCRIPTION_PROP_FILE_PATH.get());
+ argParser.addArgument(propertiesFileArgument);
+ argParser.setFilePropertiesArgument(propertiesFileArgument);
+
+ noPropertiesFileArgument = new BooleanArgument(
+ "noPropertiesFileArgument", null, OPTION_LONG_NO_PROP_FILE,
+ INFO_DESCRIPTION_NO_PROP_FILE.get());
+ argParser.addArgument(noPropertiesFileArgument);
+ argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
+
hostName = new StringArgument("host", OPTION_SHORT_HOST,
OPTION_LONG_HOST, false, false, true,
OPTION_VALUE_HOST, "localhost", null,
INFO_DESCRIPTION_HOST.get());
+ hostName.setPropertyName(OPTION_LONG_HOST);
argParser.addArgument(hostName);
port = new IntegerArgument("port", OPTION_SHORT_PORT,
OPTION_LONG_PORT, false, false, true,
OPTION_VALUE_PORT, 389, null,
INFO_DESCRIPTION_PORT.get());
+ port.setPropertyName(OPTION_LONG_PORT);
argParser.addArgument(port);
useSSL = new BooleanArgument("useSSL", OPTION_SHORT_USE_SSL,
OPTION_LONG_USE_SSL,
INFO_DESCRIPTION_USE_SSL.get());
+ useSSL.setPropertyName(OPTION_LONG_USE_SSL);
argParser.addArgument(useSSL);
startTLS = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
OPTION_LONG_START_TLS,
INFO_DESCRIPTION_START_TLS.get());
+ startTLS.setPropertyName(OPTION_LONG_START_TLS);
argParser.addArgument(startTLS);
bindDN = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
OPTION_LONG_BINDDN, false, false, true,
OPTION_VALUE_BINDDN, null, null,
INFO_DESCRIPTION_BINDDN.get());
+ bindDN.setPropertyName(OPTION_LONG_BINDDN);
argParser.addArgument(bindDN);
bindPassword = new StringArgument("bindPassword", OPTION_SHORT_BINDPWD,
@@ -685,6 +705,7 @@
OPTION_VALUE_BINDPWD,
null, null,
INFO_DESCRIPTION_BINDPASSWORD.get());
+ bindPassword.setPropertyName(OPTION_LONG_BINDPWD);
argParser.addArgument(bindPassword);
bindPasswordFile =
@@ -694,6 +715,7 @@
false, false,
OPTION_VALUE_BINDPWD_FILE, null,
null, INFO_DESCRIPTION_BINDPASSWORDFILE.get());
+ bindPasswordFile.setPropertyName(OPTION_VALUE_BINDPWD_FILE);
argParser.addArgument(bindPasswordFile);
defaultAdd = new BooleanArgument(
@@ -705,12 +727,14 @@
OPTION_LONG_FILENAME, false, false,
true, OPTION_VALUE_FILENAME, null, null,
INFO_LDAPMODIFY_DESCRIPTION_FILENAME.get());
+ filename.setPropertyName(OPTION_LONG_FILENAME);
argParser.addArgument(filename);
saslExternal = new BooleanArgument(
"useSASLExternal", 'r',
"useSASLExternal",
INFO_DESCRIPTION_USE_SASL_EXTERNAL.get());
+ saslExternal.setPropertyName("useSASLExternal");
argParser.addArgument(saslExternal);
saslOptions = new StringArgument("saslOption", OPTION_SHORT_SASLOPTION,
@@ -718,10 +742,12 @@
true, true,
OPTION_VALUE_SASLOPTION, null, null,
INFO_DESCRIPTION_SASL_PROPERTIES.get());
+ saslOptions.setPropertyName(OPTION_LONG_SASLOPTION);
argParser.addArgument(saslOptions);
trustAll = new BooleanArgument("trustAll", 'X', "trustAll",
INFO_DESCRIPTION_TRUSTALL.get());
+ trustAll.setPropertyName("trustAll");
argParser.addArgument(trustAll);
keyStorePath = new StringArgument("keyStorePath",
@@ -731,6 +757,7 @@
OPTION_VALUE_KEYSTOREPATH,
null, null,
INFO_DESCRIPTION_KEYSTOREPATH.get());
+ keyStorePath.setPropertyName(OPTION_LONG_KEYSTOREPATH);
argParser.addArgument(keyStorePath);
keyStorePassword =
@@ -742,6 +769,7 @@
OPTION_VALUE_KEYSTORE_PWD,
null, null,
INFO_DESCRIPTION_KEYSTOREPASSWORD.get());
+ keyStorePassword.setPropertyName(OPTION_LONG_KEYSTORE_PWD);
argParser.addArgument(keyStorePassword);
keyStorePasswordFile =
@@ -751,12 +779,14 @@
false, false, OPTION_VALUE_KEYSTORE_PWD_FILE,
null, null,
INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE.get());
+ keyStorePasswordFile.setPropertyName(OPTION_LONG_KEYSTORE_PWD_FILE);
argParser.addArgument(keyStorePasswordFile);
certNickname = new StringArgument(
"certnickname", 'N', "certNickname",
false, false, true, "{nickname}", null,
null, INFO_DESCRIPTION_CERT_NICKNAME.get());
+ certNickname.setPropertyName("certNickname");
argParser.addArgument(certNickname);
trustStorePath = new StringArgument(
@@ -767,6 +797,7 @@
OPTION_VALUE_TRUSTSTOREPATH,
null, null,
INFO_DESCRIPTION_TRUSTSTOREPATH.get());
+ trustStorePath.setPropertyName(OPTION_LONG_TRUSTSTOREPATH);
argParser.addArgument(trustStorePath);
trustStorePassword =
@@ -775,6 +806,7 @@
false, false, true,
OPTION_VALUE_TRUSTSTORE_PWD, null,
null, INFO_DESCRIPTION_TRUSTSTOREPASSWORD.get());
+ trustStorePassword.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD);
argParser.addArgument(trustStorePassword);
trustStorePasswordFile =
@@ -784,6 +816,7 @@
OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE.get());
+ trustStorePasswordFile.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD_FILE);
argParser.addArgument(trustStorePasswordFile);
proxyAuthzID = new StringArgument("proxy_authzid",
@@ -792,12 +825,14 @@
false, true,
OPTION_VALUE_PROXYAUTHID, null, null,
INFO_DESCRIPTION_PROXY_AUTHZID.get());
+ proxyAuthzID.setPropertyName(OPTION_LONG_PROXYAUTHID);
argParser.addArgument(proxyAuthzID);
reportAuthzID = new BooleanArgument(
"reportauthzid", 'E',
"reportAuthzID",
INFO_DESCRIPTION_REPORT_AUTHZID.get());
+ reportAuthzID.setPropertyName("reportAuthzID");
argParser.addArgument(reportAuthzID);
assertionFilter = new StringArgument(
@@ -808,6 +843,7 @@
OPTION_VALUE_ASSERTION_FILE,
null, null,
INFO_DESCRIPTION_ASSERTION_FILTER.get());
+ assertionFilter.setPropertyName(OPTION_LONG_ASSERTION_FILE);
argParser.addArgument(assertionFilter);
preReadAttributes = new StringArgument(
@@ -815,6 +851,7 @@
"preReadAttributes", false, false,
true, "{attrList}", null, null,
INFO_DESCRIPTION_PREREAD_ATTRS.get());
+ preReadAttributes.setPropertyName("preReadAttributes");
argParser.addArgument(preReadAttributes);
postReadAttributes = new StringArgument(
@@ -823,12 +860,14 @@
false, true, "{attrList}", null,
null,
INFO_DESCRIPTION_POSTREAD_ATTRS.get());
+ postReadAttributes.setPropertyName("postReadAttributes");
argParser.addArgument(postReadAttributes);
controlStr =
new StringArgument("control", 'J', "control", false, true, true,
"{controloid[:criticality[:value|::b64value|:<fileurl]]}",
null, null, INFO_DESCRIPTION_CONTROLS.get());
+ controlStr.setPropertyName("control");
argParser.addArgument(controlStr);
version = new IntegerArgument("version", OPTION_SHORT_PROTOCOL_VERSION,
@@ -836,26 +875,31 @@
false, false, true,
OPTION_VALUE_PROTOCOL_VERSION, 3, null,
INFO_DESCRIPTION_VERSION.get());
+ version.setPropertyName(OPTION_LONG_PROTOCOL_VERSION);
argParser.addArgument(version);
encodingStr = new StringArgument("encoding", 'i', "encoding",
false, false,
true, "{encoding}", null, null,
INFO_DESCRIPTION_ENCODING.get());
+ encodingStr.setPropertyName("encoding");
argParser.addArgument(encodingStr);
continueOnError = new BooleanArgument("continueOnError", 'c',
"continueOnError",
INFO_DESCRIPTION_CONTINUE_ON_ERROR.get());
+ continueOnError.setPropertyName("continueOnError");
argParser.addArgument(continueOnError);
noop = new BooleanArgument("no-op", OPTION_SHORT_DRYRUN,
OPTION_LONG_DRYRUN,
INFO_DESCRIPTION_NOOP.get());
+ noop.setPropertyName(OPTION_LONG_DRYRUN);
argParser.addArgument(noop);
verbose = new BooleanArgument("verbose", 'v', "verbose",
INFO_DESCRIPTION_VERBOSE.get());
+ verbose.setPropertyName("verbose");
argParser.addArgument(verbose);
showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java
index a9fcd18..454a43f 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPPasswordModify.java
@@ -186,6 +186,8 @@
StringArgument sslKeyStorePIN;
StringArgument sslTrustStore;
StringArgument sslTrustStorePIN;
+ StringArgument propertiesFileArgument;
+ BooleanArgument noPropertiesFileArgument;
// Initialize the argument parser.
@@ -195,10 +197,24 @@
try
{
+ propertiesFileArgument = new StringArgument("propertiesFilePath",
+ null, OPTION_LONG_PROP_FILE_PATH,
+ false, false, true, OPTION_VALUE_PROP_FILE_PATH, null, null,
+ INFO_DESCRIPTION_PROP_FILE_PATH.get());
+ argParser.addArgument(propertiesFileArgument);
+ argParser.setFilePropertiesArgument(propertiesFileArgument);
+
+ noPropertiesFileArgument = new BooleanArgument(
+ "noPropertiesFileArgument", null, OPTION_LONG_NO_PROP_FILE,
+ INFO_DESCRIPTION_NO_PROP_FILE.get());
+ argParser.addArgument(noPropertiesFileArgument);
+ argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
+
ldapHost = new StringArgument("ldaphost", OPTION_SHORT_HOST,
OPTION_LONG_HOST, false, false,
true, OPTION_VALUE_HOST, "127.0.0.1", null,
INFO_LDAPPWMOD_DESCRIPTION_HOST.get());
+ ldapHost.setPropertyName(OPTION_LONG_HOST);
argParser.addArgument(ldapHost);
@@ -208,18 +224,21 @@
true, OPTION_VALUE_PORT, 389,
null, true, 1, true,
65535, INFO_LDAPPWMOD_DESCRIPTION_PORT.get());
+ ldapPort.setPropertyName(OPTION_LONG_PORT);
argParser.addArgument(ldapPort);
useSSL = new BooleanArgument("usessl", OPTION_SHORT_USE_SSL,
OPTION_LONG_USE_SSL,
INFO_LDAPPWMOD_DESCRIPTION_USE_SSL.get());
+ useSSL.setPropertyName(OPTION_LONG_USE_SSL);
argParser.addArgument(useSSL);
useStartTLS = new BooleanArgument("usestarttls", OPTION_SHORT_START_TLS,
OPTION_LONG_START_TLS,
INFO_LDAPPWMOD_DESCRIPTION_USE_STARTTLS.get());
+ useStartTLS.setPropertyName(OPTION_LONG_START_TLS);
argParser.addArgument(useStartTLS);
@@ -227,6 +246,7 @@
OPTION_LONG_BINDDN, false, false, true,
OPTION_VALUE_BINDDN, null, null,
INFO_LDAPPWMOD_DESCRIPTION_BIND_DN.get());
+ bindDN.setPropertyName(OPTION_LONG_BINDDN);
argParser.addArgument(bindDN);
@@ -234,6 +254,7 @@
OPTION_LONG_BINDPWD, false, false,
true, OPTION_VALUE_BINDPWD, null, null,
INFO_LDAPPWMOD_DESCRIPTION_BIND_PW.get());
+ bindPW.setPropertyName(OPTION_LONG_BINDPWD);
argParser.addArgument(bindPW);
@@ -242,24 +263,28 @@
OPTION_LONG_BINDPWD_FILE, false,
false, OPTION_VALUE_BINDPWD_FILE, null, null,
INFO_LDAPPWMOD_DESCRIPTION_BIND_PW_FILE.get());
+ bindPWFile.setPropertyName(OPTION_LONG_BINDPWD_FILE);
argParser.addArgument(bindPWFile);
authzID = new StringArgument("authzid", 'a', "authzID", false, false,
true, "{authzID}", null, null,
INFO_LDAPPWMOD_DESCRIPTION_AUTHZID.get());
+ authzID.setPropertyName("authzID");
argParser.addArgument(authzID);
provideDNForAuthzID =
new BooleanArgument("providednforauthzid", 'A',"provideDNForAuthzID",
INFO_LDAPPWMOD_DESCRIPTION_PROVIDE_DN_FOR_AUTHZID.get());
+ provideDNForAuthzID.setPropertyName("provideDNForAuthzID");
argParser.addArgument(provideDNForAuthzID);
newPW = new StringArgument("newpw", 'n', "newPassword", false, false,
true, "{newPassword}", null, null,
INFO_LDAPPWMOD_DESCRIPTION_NEWPW.get());
+ newPW.setPropertyName("newPassword");
argParser.addArgument(newPW);
@@ -267,6 +292,7 @@
"newpwfile", 'N', "newPasswordFile",
false, false, "{file}", null, null,
INFO_LDAPPWMOD_DESCRIPTION_NEWPWFILE.get());
+ newPWFile.setPropertyName("newPasswordFile");
argParser.addArgument(newPWFile);
@@ -274,6 +300,7 @@
new StringArgument("currentpw", 'c', "currentPassword", false, false,
true, "{currentPassword}", null, null,
INFO_LDAPPWMOD_DESCRIPTION_CURRENTPW.get());
+ currentPW.setPropertyName("currentPassword");
argParser.addArgument(currentPW);
@@ -282,12 +309,14 @@
"currentpwfile", 'C', "currentPasswordFile",
false, false, "{file}", null, null,
INFO_LDAPPWMOD_DESCRIPTION_CURRENTPWFILE.get());
+ currentPWFile.setPropertyName("currentPasswordFile");
argParser.addArgument(currentPWFile);
sslBlindTrust =
new BooleanArgument("blindtrust", 'X', "trustAll",
INFO_LDAPPWMOD_DESCRIPTION_BLIND_TRUST.get());
+ sslBlindTrust.setPropertyName("trustAll");
argParser.addArgument(sslBlindTrust);
@@ -296,6 +325,7 @@
OPTION_LONG_KEYSTOREPATH, false, false,
true, OPTION_VALUE_KEYSTOREPATH, null, null,
INFO_LDAPPWMOD_DESCRIPTION_KEYSTORE.get());
+ sslKeyStore.setPropertyName(OPTION_LONG_KEYSTOREPATH);
argParser.addArgument(sslKeyStore);
@@ -307,6 +337,7 @@
OPTION_VALUE_KEYSTORE_PWD,
null, null,
INFO_LDAPPWMOD_DESCRIPTION_KEYSTORE_PIN.get());
+ sslKeyStorePIN.setPropertyName(OPTION_LONG_KEYSTORE_PWD);
argParser.addArgument(sslKeyStorePIN);
@@ -318,6 +349,7 @@
false, false, OPTION_VALUE_KEYSTORE_PWD_FILE,
null, null,
INFO_LDAPPWMOD_DESCRIPTION_KEYSTORE_PINFILE.get());
+ sslKeyStorePINFile.setPropertyName(OPTION_LONG_KEYSTORE_PWD_FILE);
argParser.addArgument(sslKeyStorePINFile);
@@ -328,6 +360,7 @@
false, true,
OPTION_VALUE_TRUSTSTOREPATH, null, null,
INFO_LDAPPWMOD_DESCRIPTION_TRUSTSTORE.get());
+ sslTrustStore.setPropertyName(OPTION_LONG_TRUSTSTOREPATH);
argParser.addArgument(sslTrustStore);
@@ -337,6 +370,7 @@
false, false, true,
OPTION_VALUE_TRUSTSTORE_PWD, null, null,
INFO_LDAPPWMOD_DESCRIPTION_TRUSTSTORE_PIN.get());
+ sslTrustStorePIN.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD);
argParser.addArgument(sslTrustStorePIN);
@@ -346,6 +380,7 @@
OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
OPTION_VALUE_TRUSTSTORE_PWD_FILE, null,
null, INFO_LDAPPWMOD_DESCRIPTION_TRUSTSTORE_PINFILE.get());
+ sslTrustStorePINFile.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD_FILE);
argParser.addArgument(sslTrustStorePINFile);
@@ -353,6 +388,7 @@
new StringArgument("control", 'J', "control", false, true, true,
"{controloid[:criticality[:value|::b64value|:<fileurl]]}",
null, null, INFO_DESCRIPTION_CONTROLS.get());
+ controlStr.setPropertyName("control");
argParser.addArgument(controlStr);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java
index 36f6259..8fb3f2d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/LDAPSearch.java
@@ -681,6 +681,8 @@
StringArgument vlvDescriptor = null;
StringArgument effectiveRightsUser = null;
StringArgument effectiveRightsAttrs = null;
+ StringArgument propertiesFileArgument = null;
+ BooleanArgument noPropertiesFileArgument = null;
// Create the command-line argument parser for use with this program.
@@ -691,32 +693,50 @@
try
{
+ propertiesFileArgument = new StringArgument("propertiesFilePath",
+ null, OPTION_LONG_PROP_FILE_PATH,
+ false, false, true, OPTION_VALUE_PROP_FILE_PATH, null, null,
+ INFO_DESCRIPTION_PROP_FILE_PATH.get());
+ argParser.addArgument(propertiesFileArgument);
+ argParser.setFilePropertiesArgument(propertiesFileArgument);
+
+ noPropertiesFileArgument = new BooleanArgument(
+ "noPropertiesFileArgument", null, OPTION_LONG_NO_PROP_FILE,
+ INFO_DESCRIPTION_NO_PROP_FILE.get());
+ argParser.addArgument(noPropertiesFileArgument);
+ argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
+
hostName = new StringArgument("host", OPTION_SHORT_HOST,
OPTION_LONG_HOST, false, false, true,
OPTION_VALUE_HOST, "localhost", null,
INFO_DESCRIPTION_HOST.get());
+ hostName.setPropertyName(OPTION_LONG_HOST);
argParser.addArgument(hostName);
port = new IntegerArgument("port", OPTION_SHORT_PORT,
OPTION_LONG_PORT, false, false, true,
OPTION_VALUE_PORT, 389, null,
INFO_DESCRIPTION_PORT.get());
+ port.setPropertyName(OPTION_LONG_PORT);
argParser.addArgument(port);
useSSL = new BooleanArgument("useSSL", OPTION_SHORT_USE_SSL,
OPTION_LONG_USE_SSL,
INFO_DESCRIPTION_USE_SSL.get());
+ useSSL.setPropertyName(OPTION_LONG_USE_SSL);
argParser.addArgument(useSSL);
startTLS = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS,
OPTION_LONG_START_TLS,
INFO_DESCRIPTION_START_TLS.get());
+ startTLS.setPropertyName(OPTION_LONG_START_TLS);
argParser.addArgument(startTLS);
bindDN = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
OPTION_LONG_BINDDN, false, false, true,
OPTION_VALUE_BINDDN, null, null,
INFO_DESCRIPTION_BINDDN.get());
+ bindDN.setPropertyName(OPTION_LONG_BINDDN);
argParser.addArgument(bindDN);
bindPassword = new StringArgument("bindPassword", OPTION_SHORT_BINDPWD,
@@ -725,6 +745,7 @@
OPTION_VALUE_BINDPWD,
null, null,
INFO_DESCRIPTION_BINDPASSWORD.get());
+ bindPassword.setPropertyName(OPTION_LONG_BINDPWD);
argParser.addArgument(bindPassword);
bindPasswordFile =
@@ -733,30 +754,35 @@
false, false,
OPTION_VALUE_BINDPWD_FILE, null,
null, INFO_DESCRIPTION_BINDPASSWORDFILE.get());
+ bindPasswordFile.setPropertyName(OPTION_LONG_BINDPWD_FILE);
argParser.addArgument(bindPasswordFile);
baseDN = new StringArgument("baseDN", OPTION_SHORT_BASEDN,
OPTION_LONG_BASEDN, true, false, true,
OPTION_VALUE_BASEDN, null, null,
INFO_SEARCH_DESCRIPTION_BASEDN.get());
+ baseDN.setPropertyName(OPTION_LONG_BASEDN);
argParser.addArgument(baseDN);
searchScope = new StringArgument(
"searchScope", 's', "searchScope", false,
false, true, "{searchScope}", null, null,
INFO_SEARCH_DESCRIPTION_SEARCH_SCOPE.get());
+ searchScope.setPropertyName("searchScope");
argParser.addArgument(searchScope);
filename = new StringArgument("filename", OPTION_SHORT_FILENAME,
OPTION_LONG_FILENAME, false, false,
true, OPTION_VALUE_FILENAME, null, null,
INFO_SEARCH_DESCRIPTION_FILENAME.get());
+ searchScope.setPropertyName(OPTION_LONG_FILENAME);
argParser.addArgument(filename);
saslExternal = new BooleanArgument(
"useSASLExternal", 'r',
"useSASLExternal",
INFO_DESCRIPTION_USE_SASL_EXTERNAL.get());
+ saslExternal.setPropertyName("useSASLExternal");
argParser.addArgument(saslExternal);
saslOptions = new StringArgument("saslOption", OPTION_SHORT_SASLOPTION,
@@ -764,10 +790,12 @@
true, true,
OPTION_VALUE_SASLOPTION, null, null,
INFO_DESCRIPTION_SASL_PROPERTIES.get());
+ saslOptions.setPropertyName(OPTION_LONG_SASLOPTION);
argParser.addArgument(saslOptions);
trustAll = new BooleanArgument("trustAll", 'X', "trustAll",
INFO_DESCRIPTION_TRUSTALL.get());
+ trustAll.setPropertyName("trustAll");
argParser.addArgument(trustAll);
keyStorePath = new StringArgument("keyStorePath",
@@ -775,6 +803,7 @@
OPTION_LONG_KEYSTOREPATH, false, false, true,
OPTION_VALUE_KEYSTOREPATH, null, null,
INFO_DESCRIPTION_KEYSTOREPATH.get());
+ keyStorePath.setPropertyName(OPTION_LONG_KEYSTOREPATH);
argParser.addArgument(keyStorePath);
keyStorePassword = new StringArgument("keyStorePassword",
@@ -782,6 +811,7 @@
OPTION_LONG_KEYSTORE_PWD, false, false,
true, OPTION_VALUE_KEYSTORE_PWD, null, null,
INFO_DESCRIPTION_KEYSTOREPASSWORD.get());
+ keyStorePassword.setPropertyName(OPTION_LONG_KEYSTORE_PWD);
argParser.addArgument(keyStorePassword);
keyStorePasswordFile =
@@ -792,12 +822,15 @@
OPTION_VALUE_KEYSTORE_PWD_FILE,
null, null,
INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE.get());
+ keyStorePasswordFile.setPropertyName(OPTION_LONG_KEYSTORE_PWD_FILE);
argParser.addArgument(keyStorePasswordFile);
certNickname = new StringArgument(
- "certnickname", 'N', "certNickname",
+ "certnickname", OPTION_SHORT_CERT_NICKNAME,
+ OPTION_LONG_CERT_NICKNAME,
false, false, true, "{nickname}", null,
null, INFO_DESCRIPTION_CERT_NICKNAME.get());
+ certNickname.setPropertyName(OPTION_LONG_CERT_NICKNAME);
argParser.addArgument(certNickname);
trustStorePath = new StringArgument("trustStorePath",
@@ -806,6 +839,7 @@
false, false, true,
OPTION_VALUE_TRUSTSTOREPATH, null, null,
INFO_DESCRIPTION_TRUSTSTOREPATH.get());
+ trustStorePath.setPropertyName(OPTION_LONG_TRUSTSTOREPATH);
argParser.addArgument(trustStorePath);
trustStorePassword =
@@ -814,6 +848,7 @@
false, false, true, OPTION_VALUE_TRUSTSTORE_PWD,
null,
null, INFO_DESCRIPTION_TRUSTSTOREPASSWORD.get());
+ trustStorePassword.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD);
argParser.addArgument(trustStorePassword);
trustStorePasswordFile =
@@ -823,6 +858,7 @@
OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE.get());
+ trustStorePasswordFile.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD_FILE);
argParser.addArgument(trustStorePasswordFile);
proxyAuthzID = new StringArgument("proxy_authzid",
@@ -831,23 +867,27 @@
false, true,
OPTION_VALUE_PROXYAUTHID, null, null,
INFO_DESCRIPTION_PROXY_AUTHZID.get());
+ proxyAuthzID.setPropertyName(OPTION_LONG_PROXYAUTHID);
argParser.addArgument(proxyAuthzID);
reportAuthzID = new BooleanArgument(
"reportauthzid", 'E', OPTION_LONG_REPORT_AUTHZ_ID,
INFO_DESCRIPTION_REPORT_AUTHZID.get());
+ reportAuthzID.setPropertyName(OPTION_LONG_REPORT_AUTHZ_ID);
argParser.addArgument(reportAuthzID);
usePasswordPolicyControl = new BooleanArgument(
"usepwpolicycontrol", null,
OPTION_LONG_USE_PW_POLICY_CTL,
INFO_DESCRIPTION_USE_PWP_CONTROL.get());
+ usePasswordPolicyControl.setPropertyName(OPTION_LONG_USE_PW_POLICY_CTL);
argParser.addArgument(usePasswordPolicyControl);
pSearchInfo = new StringArgument("psearchinfo", 'C', "persistentSearch",
false, false, true,
"ps[:changetype[:changesonly[:entrychgcontrols]]]",
null, null, INFO_DESCRIPTION_PSEARCH_INFO.get());
+ pSearchInfo.setPropertyName("persistentSearch");
argParser.addArgument(pSearchInfo);
simplePageSize = new IntegerArgument(
@@ -856,6 +896,7 @@
"{numEntries}", 1000, null, true, 1,
false, 0,
INFO_DESCRIPTION_SIMPLE_PAGE_SIZE.get());
+ simplePageSize.setPropertyName("simplePageSize");
argParser.addArgument(simplePageSize);
assertionFilter = new StringArgument(
@@ -865,6 +906,7 @@
true, OPTION_VALUE_ASSERTION_FILE,
null, null,
INFO_DESCRIPTION_ASSERTION_FILTER.get());
+ assertionFilter.setPropertyName(OPTION_LONG_ASSERTION_FILE);
argParser.addArgument(assertionFilter);
matchedValuesFilter = new StringArgument(
@@ -872,12 +914,14 @@
"matchedValuesFilter", false, true, true,
"{filter}", null, null,
INFO_DESCRIPTION_MATCHED_VALUES_FILTER.get());
+ matchedValuesFilter.setPropertyName("matchedValuesFilter");
argParser.addArgument(matchedValuesFilter);
sortOrder = new StringArgument(
"sortorder", 'S', "sortOrder", false,
false, true, "{sortOrder}", null, null,
INFO_DESCRIPTION_SORT_ORDER.get());
+ sortOrder.setPropertyName("sortOrder");
argParser.addArgument(sortOrder);
vlvDescriptor =
@@ -886,19 +930,23 @@
false, true,
"{before:after:index:count | before:after:value}",
null, null, INFO_DESCRIPTION_VLV.get());
+ vlvDescriptor.setPropertyName("virtualListView");
argParser.addArgument(vlvDescriptor);
controlStr =
new StringArgument("control", 'J', "control", false, true, true,
"{controloid[:criticality[:value|::b64value|:<fileurl]]}",
null, null, INFO_DESCRIPTION_CONTROLS.get());
+ controlStr.setPropertyName("control");
argParser.addArgument(controlStr);
+
effectiveRightsUser =
new StringArgument("effectiveRightsUser",
OPTION_SHORT_EFFECTIVERIGHTSUSER,
OPTION_LONG_EFFECTIVERIGHTSUSER, false, false, true,
"{authzid}", null, null,
INFO_DESCRIPTION_EFFECTIVERIGHTS_USER.get( ));
+ effectiveRightsUser.setPropertyName(OPTION_LONG_EFFECTIVERIGHTSUSER);
argParser.addArgument(effectiveRightsUser);
effectiveRightsAttrs =
@@ -907,59 +955,71 @@
OPTION_LONG_EFFECTIVERIGHTSATTR, false, true, true,
"{attribute}", null, null,
INFO_DESCRIPTION_EFFECTIVERIGHTS_ATTR.get( ));
+ effectiveRightsAttrs.setPropertyName(OPTION_LONG_EFFECTIVERIGHTSATTR);
argParser.addArgument(effectiveRightsAttrs);
version = new IntegerArgument("version", OPTION_SHORT_PROTOCOL_VERSION,
OPTION_LONG_PROTOCOL_VERSION, false, false,
true, OPTION_VALUE_PROTOCOL_VERSION, 3,
null, INFO_DESCRIPTION_VERSION.get());
+ version.setPropertyName(OPTION_LONG_PROTOCOL_VERSION);
argParser.addArgument(version);
encodingStr = new StringArgument("encoding", 'i', "encoding", false,
false, true, "{encoding}", null, null,
INFO_DESCRIPTION_ENCODING.get());
+ encodingStr.setPropertyName("encoding");
argParser.addArgument(encodingStr);
dereferencePolicy =
new StringArgument("derefpolicy", 'a', "dereferencePolicy", false,
false, true, "{dereferencePolicy}", null, null,
INFO_SEARCH_DESCRIPTION_DEREFERENCE_POLICY.get());
+ dereferencePolicy.setPropertyName("dereferencePolicy");
argParser.addArgument(dereferencePolicy);
typesOnly = new BooleanArgument("typesOnly", 'A', "typesOnly",
INFO_DESCRIPTION_TYPES_ONLY.get());
+ typesOnly.setPropertyName("typesOnly");
argParser.addArgument(typesOnly);
sizeLimit = new IntegerArgument("sizeLimit", 'z', "sizeLimit", false,
false, true, "{sizeLimit}", 0, null,
INFO_SEARCH_DESCRIPTION_SIZE_LIMIT.get());
+ sizeLimit.setPropertyName("sizeLimit");
argParser.addArgument(sizeLimit);
timeLimit = new IntegerArgument("timeLimit", 'l', "timeLimit", false,
false, true, "{timeLimit}", 0, null,
INFO_SEARCH_DESCRIPTION_TIME_LIMIT.get());
+ timeLimit.setPropertyName("timeLimit");
argParser.addArgument(timeLimit);
dontWrap = new BooleanArgument("dontwrap", 'T',
"dontWrap",
INFO_DESCRIPTION_DONT_WRAP.get());
+ dontWrap.setPropertyName("dontWrap");
argParser.addArgument(dontWrap);
countEntries = new BooleanArgument("countentries", null, "countEntries",
INFO_DESCRIPTION_COUNT_ENTRIES.get());
+ countEntries.setPropertyName("countEntries");
argParser.addArgument(countEntries);
continueOnError =
new BooleanArgument("continueOnError", 'c', "continueOnError",
INFO_DESCRIPTION_CONTINUE_ON_ERROR.get());
+ continueOnError.setPropertyName("continueOnError");
argParser.addArgument(continueOnError);
noop = new BooleanArgument("noop", OPTION_SHORT_DRYRUN,
OPTION_LONG_DRYRUN, INFO_DESCRIPTION_NOOP.get());
+ noop.setPropertyName(OPTION_LONG_DRYRUN);
argParser.addArgument(noop);
verbose = new BooleanArgument("verbose", 'v', "verbose",
INFO_DESCRIPTION_VERBOSE.get());
+ verbose.setPropertyName("verbose");
argParser.addArgument(verbose);
showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
index 20f67c1..3c322f7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
@@ -400,6 +400,7 @@
"-V", "2",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o:test",
"o=test"
};
@@ -427,6 +428,7 @@
"-V", "3",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o:test",
"o=test"
};
@@ -454,6 +456,7 @@
"-V", "3",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o:nottest",
"o=test"
};
@@ -482,6 +485,7 @@
"-X",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o:test",
"o=test"
};
@@ -513,6 +517,7 @@
"-P", trustStorePath,
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o:test",
"o=test"
};
@@ -541,6 +546,7 @@
"-X",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o:test",
"o=test"
};
@@ -572,6 +578,7 @@
"-P", trustStorePath,
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o:test",
"o=test"
};
@@ -625,6 +632,7 @@
"-K", keyStorePath,
"-W", "password",
"-P", trustStorePath,
+ "--noPropertiesFile",
"-r",
"cn:Test User",
"cn=Test User,o=test"
@@ -680,6 +688,7 @@
"-W", "password",
"-N", "client-cert",
"-P", trustStorePath,
+ "--noPropertiesFile",
"-r",
"cn:Test User",
"cn=Test User,o=test"
@@ -735,6 +744,7 @@
"-W", "password",
"-N", "invalid",
"-P", trustStorePath,
+ "--noPropertiesFile",
"-r",
"cn:Test User",
"cn=Test User,o=test"
@@ -789,6 +799,7 @@
"-K", keyStorePath,
"-W", "password",
"-P", trustStorePath,
+ "--noPropertiesFile",
"-r",
"cn:Test User",
"cn=Test User,o=test"
@@ -840,6 +851,7 @@
"-o", "mech=CRAM-MD5",
"-o", "authid=u:test.user",
"-w", "password",
+ "--noPropertiesFile",
"givenName:Test",
"uid=test.user,o=test"
};
@@ -892,6 +904,7 @@
"-o", "authzid=u:test.user",
"-o", "realm=o=test",
"-w", "password",
+ "--noPropertiesFile",
"givenName:Test",
"uid=test.user,o=test"
};
@@ -939,6 +952,7 @@
"-o", "mech=PLAIN",
"-o", "authid=dn:cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"givenName:Test",
"uid=test.user,o=test"
};
@@ -967,6 +981,7 @@
"-V", "3",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o::" + Base64.encode("test".getBytes("UTF-8")),
"o=test"
};
@@ -995,6 +1010,7 @@
"-V", "3",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o::***invalidencoding***",
"o=test"
};
@@ -1028,6 +1044,7 @@
"-V", "3",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o:<" + f.getAbsolutePath(),
"o=test"
};
@@ -1054,6 +1071,7 @@
"-V", "3",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o:<does.not.exist",
"o=test"
};
@@ -1083,6 +1101,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--assertionFilter", "(o=test)",
+ "--noPropertiesFile",
"o:test",
"o=test"
};
@@ -1112,6 +1131,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--assertionFilter", "(o=notAMatch)",
+ "--noPropertiesFile",
"o:test",
"o=test"
};
@@ -1149,6 +1169,7 @@
"-w", "password",
"-c",
"-f", path,
+ "--noPropertiesFile",
"o:test",
};
@@ -1178,6 +1199,7 @@
"-w", "password",
"-c",
"-f", "does.not.exist",
+ "--noPropertiesFile",
"o:test",
};
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
index c4369fb..37196cb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
@@ -344,6 +344,7 @@
"-V", "2",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o=test"
};
@@ -370,6 +371,7 @@
"-V", "3",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o=test"
};
@@ -397,6 +399,7 @@
"-X",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o=test"
};
@@ -427,6 +430,7 @@
"-P", trustStorePath,
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o=test"
};
@@ -454,6 +458,7 @@
"-X",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o=test"
};
@@ -484,6 +489,7 @@
"-P", trustStorePath,
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o=test"
};
@@ -513,6 +519,7 @@
"-o", "mech=PLAIN",
"-o", "authid=dn:cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o=test"
};
@@ -539,6 +546,7 @@
"-V", "3",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"cn=Does Not Exist,o=test"
};
@@ -565,6 +573,7 @@
"-V", "3",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"malformed"
};
@@ -612,6 +621,7 @@
"-V", "3",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"o=test"
};
@@ -637,6 +647,7 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-D", "cn=Directory Manager",
"-j", validPasswordFile,
+ "--noPropertiesFile",
"o=test"
};
@@ -662,6 +673,7 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-D", "cn=Directory Manager",
"-j", invalidPasswordFile,
+ "--noPropertiesFile",
"o=test"
};
@@ -688,6 +700,7 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-D", "cn=Directory Manager",
"-j", "does.not.exist",
+ "--noPropertiesFile",
"o=test"
};
@@ -744,7 +757,8 @@
"-D", "cn=Directory Manager",
"-j", validPasswordFile,
"-c",
- "-f", path
+ "-f", path,
+ "--noPropertiesFile"
};
LDAPDelete.mainDelete(args, false, null, null);
@@ -755,7 +769,7 @@
/**
* Tests a subtree delete operation.
*
- * @throws Exception If an unexpectd problem occurs.
+ * @throws Exception If an unexpected problem occurs.
*/
@Test()
public void testSubtreeDelete()
@@ -790,6 +804,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-x",
+ "--noPropertiesFile",
"o=test"
};
@@ -836,6 +851,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-J", "subtreedelete:true",
+ "--noPropertiesFile",
"o=test"
};
@@ -862,6 +878,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-n",
+ "--noPropertiesFile",
"o=test"
};
@@ -888,6 +905,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-J", OID_LDAP_NOOP_OPENLDAP_ASSIGNED + ":true",
+ "--noPropertiesFile",
"o=test"
};
@@ -916,6 +934,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-J", "no-op:true",
+ "--noPropertiesFile",
"o=test"
};
@@ -945,6 +964,7 @@
"-w", "password",
"-J", OID_MANAGE_DSAIT_CONTROL + ":false",
"-J", OID_SUBTREE_DELETE_CONTROL + ":true",
+ "--noPropertiesFile",
"o=test"
};
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
index 94368c0..ce077bf 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
@@ -361,6 +361,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-V", "2",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -387,6 +388,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-V", "3",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -414,6 +416,7 @@
"-X",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -444,6 +447,7 @@
"-P", trustStorePath,
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -471,6 +475,7 @@
"-X",
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -501,6 +506,7 @@
"-P", trustStorePath,
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -554,6 +560,7 @@
"-W", "password",
"-P", trustStorePath,
"-r",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -608,6 +615,7 @@
"-N", "client-cert",
"-P", trustStorePath,
"-r",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -662,6 +670,7 @@
"-N", "invalid",
"-P", trustStorePath,
"-r",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -715,6 +724,7 @@
"-W", "password",
"-P", trustStorePath,
"-r",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -815,6 +825,7 @@
"-o", "authzid=u:test.user",
"-o", "realm=o=test",
"-w", "password",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -839,6 +850,7 @@
"-o", "mech=PLAIN",
"-o", "authid=dn:cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -865,6 +877,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--dry-run",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -898,6 +911,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--dry-run",
+ "--noPropertiesFile",
"-f", path
};
@@ -928,6 +942,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--dry-run",
+ "--noPropertiesFile",
"-f", path
};
@@ -960,6 +975,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--dry-run",
+ "--noPropertiesFile",
"-f", path
};
@@ -986,6 +1002,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-J", OID_LDAP_NOOP_OPENLDAP_ASSIGNED + ":true",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -1014,6 +1031,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-J", "no-op:true",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -1048,6 +1066,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-J", OID_LDAP_NOOP_OPENLDAP_ASSIGNED + ":true",
+ "--noPropertiesFile",
"-f", path
};
@@ -1083,6 +1102,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-J", "no-op:true",
+ "--noPropertiesFile",
"-f", path
};
@@ -1114,6 +1134,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-J", OID_LDAP_NOOP_OPENLDAP_ASSIGNED + ":true",
+ "--noPropertiesFile",
"-f", path
};
@@ -1146,6 +1167,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-J", "no-op:true",
+ "--noPropertiesFile",
"-f", path
};
@@ -1192,6 +1214,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-J", OID_LDAP_NOOP_OPENLDAP_ASSIGNED + ":true",
+ "--noPropertiesFile",
"-f", path
};
@@ -1239,6 +1262,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-J", "no-op:true",
+ "--noPropertiesFile",
"-f", path
};
@@ -1267,6 +1291,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--assertionFilter", "(o=test)",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -1294,6 +1319,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--assertionFilter", "(o=foo)",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -1324,6 +1350,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--assertionFilter", "(o=test)",
+ "--noPropertiesFile",
"-f", path
};
@@ -1369,6 +1396,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--assertionFilter", "(ou=People)",
+ "--noPropertiesFile",
"-f", path
};
@@ -1396,6 +1424,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--preReadAttributes", "o",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -1423,6 +1452,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--preReadAttributes", "o,objectClass",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -1453,6 +1483,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--preReadAttributes", "o",
+ "--noPropertiesFile",
"-f", path
};
@@ -1498,6 +1529,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--preReadAttributes", "o",
+ "--noPropertiesFile",
"-f", path
};
@@ -1525,6 +1557,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--postReadAttributes", "o",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -1552,6 +1585,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--postReadAttributes", "o,objectClass",
+ "--noPropertiesFile",
"-f", modifyFilePath
};
@@ -1586,6 +1620,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--postReadAttributes", "o",
+ "--noPropertiesFile",
"-f", path
};
@@ -1631,6 +1666,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--postReadAttributes", "o",
+ "--noPropertiesFile",
"-f", path
};
@@ -1663,6 +1699,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"--postReadAttributes", "o,objectClass",
+ "--noPropertiesFile",
"-f", path
};
@@ -1695,6 +1732,7 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"-f", path
};
@@ -1727,6 +1765,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-a",
+ "--noPropertiesFile",
"-f", path
};
@@ -1764,6 +1803,7 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"-f", path
};
@@ -1799,6 +1839,7 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"-f", path
};
@@ -1831,6 +1872,7 @@
"-w", "password",
"-J", OID_MANAGE_DSAIT_CONTROL + ":false",
"-J", OID_SUBTREE_DELETE_CONTROL + ":true",
+ "--noPropertiesFile",
"-f", path
};
@@ -1890,6 +1932,7 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-c",
+ "--noPropertiesFile",
"-f", path
};
@@ -1925,6 +1968,7 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-D", "cn=Directory Manager",
"-w", "password",
+ "--noPropertiesFile",
"-f", path
};
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
index bc84b18..47ac5b8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
@@ -380,7 +380,8 @@
"-D", "uid=test.user,o=test",
"-w", "password",
"-c", "password",
- "-n", "newPassword"
+ "-n", "newPassword",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -409,7 +410,8 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-D", "uid=test.user,o=test",
"-w", "password",
- "-n", "newPassword"
+ "-n", "newPassword",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -438,7 +440,8 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-D", "uid=test.user,o=test",
"-w", "password",
- "-c", "password"
+ "-c", "password",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -466,7 +469,8 @@
"-h", "127.0.0.1",
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-D", "uid=test.user,o=test",
- "-w", "password"
+ "-w", "password",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -497,7 +501,8 @@
"-w", "password",
"-a", "u:test.user",
"-c", "password",
- "-n", "newPassword"
+ "-n", "newPassword",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -528,7 +533,8 @@
"-w", "password",
"-A",
"-c", "password",
- "-n", "newPassword"
+ "-n", "newPassword",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -559,7 +565,8 @@
"-D", "uid=test.user,o=test",
"-w", "password",
"-A",
- "-n", "newPassword"
+ "-n", "newPassword",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -588,7 +595,8 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-a", "dn:uid=test.user,o=test",
"-c", "password",
- "-n", "newPassword"
+ "-n", "newPassword",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -616,7 +624,8 @@
"-h", "127.0.0.1",
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-a", "dn:uid=test.user,o=test",
- "-c", "password"
+ "-c", "password",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -645,7 +654,8 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-a", "dn:uid=test.user,o=test",
- "-n", "newPassword"
+ "-n", "newPassword",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -673,7 +683,8 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-D", "cn=Directory Manager",
"-w", "password",
- "-a", "dn:uid=test.user,o=test"
+ "-a", "dn:uid=test.user,o=test",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -703,7 +714,8 @@
"-X",
"-a", "dn:uid=test.user,o=test",
"-c", "password",
- "-n", "newPassword"
+ "-n", "newPassword",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -736,7 +748,8 @@
"-P", trustStorePath,
"-a", "dn:uid=test.user,o=test",
"-c", "password",
- "-n", "newPassword"
+ "-n", "newPassword",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -767,7 +780,8 @@
"-X",
"-a", "dn:uid=test.user,o=test",
"-c", "password",
- "-n", "newPassword"
+ "-n", "newPassword",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -801,7 +815,8 @@
"-P", trustStorePath,
"-a", "dn:uid=test.user,o=test",
"-c", "password",
- "-n", "newPassword"
+ "-n", "newPassword",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -831,7 +846,8 @@
"-D", "cn=Directory Manager",
"-j", currentPasswordFile,
"-a", "dn:uid=test.user,o=test",
- "-N", newPasswordFile
+ "-N", newPasswordFile,
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -860,7 +876,8 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-a", "u:test.user",
"-C", currentPasswordFile,
- "-N", newPasswordFile
+ "-N", newPasswordFile,
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -888,7 +905,8 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-a", "dn:invalid",
- "-n", "newPassword"
+ "-n", "newPassword",
+ "--noPropertiesFile"
};
assertFalse(LDAPPasswordModify.mainPasswordModify(args, false, null,
@@ -916,7 +934,8 @@
"-D", "cn=Directory Manager",
"-w", "password",
"-a", "dn:cn=Does Not Exist,o=test",
- "-n", "newPassword"
+ "-n", "newPassword",
+ "--noPropertiesFile"
};
assertFalse(LDAPPasswordModify.mainPasswordModify(args, false, null,
@@ -959,7 +978,8 @@
"-w", "password",
"-a", "dn:uid=test.user,o=test",
"-n", "newPassword",
- "-J", "pwpolicy:true"
+ "-J", "pwpolicy:true",
+ "--noPropertiesFile"
};
assertFalse(LDAPPasswordModify.mainPasswordModify(args, false, null,
@@ -990,7 +1010,8 @@
"-w", "password",
"-a", "dn:uid=test.user,o=test",
"-n", "newPassword",
- "-J", "1.2.3.4:true"
+ "-J", "1.2.3.4:true",
+ "--noPropertiesFile"
};
assertFalse(LDAPPasswordModify.mainPasswordModify(args, false, null, null)
@@ -1021,7 +1042,8 @@
"-w", "password",
"-a", "dn:uid=test.user,o=test",
"-n", "newPassword",
- "-J", OID_LDAP_NOOP_OPENLDAP_ASSIGNED + ":true"
+ "-J", OID_LDAP_NOOP_OPENLDAP_ASSIGNED + ":true",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -1052,7 +1074,8 @@
"-w", "password",
"-a", "dn:uid=test.user,o=test",
"-n", "newPassword",
- "-J", "noop:true"
+ "-J", "noop:true",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
@@ -1084,7 +1107,8 @@
"-a", "dn:uid=test.user,o=test",
"-n", "newPassword",
"-J", OID_LDAP_NOOP_OPENLDAP_ASSIGNED + ":true",
- "-J", OID_PASSWORD_POLICY_CONTROL + ":true"
+ "-J", OID_PASSWORD_POLICY_CONTROL + ":true",
+ "--noPropertiesFile"
};
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
index 2fa306d..51baac1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
@@ -534,6 +534,7 @@
"-w", "password",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -557,6 +558,7 @@
"-w", "password",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -580,6 +582,7 @@
"-w", "password",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -605,6 +608,7 @@
"-b", "",
"-s", "base",
"--dry-run",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -630,6 +634,7 @@
"-b", "",
"-s", "invalid",
"--dry-run",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -652,6 +657,7 @@
"-X",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -677,6 +683,7 @@
"-P", trustStorePath,
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -699,6 +706,7 @@
"-X",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -724,6 +732,7 @@
"-P", trustStorePath,
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -778,6 +787,7 @@
"-r",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -833,6 +843,7 @@
"-r",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -888,6 +899,7 @@
"-r",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -942,6 +954,7 @@
"-r",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -992,6 +1005,7 @@
"-w", "password",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1044,6 +1058,7 @@
"-w", "password",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1092,6 +1107,7 @@
"-w", "password",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1114,6 +1130,7 @@
"-w", "password",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1136,6 +1153,7 @@
"-w", "wrongPassword",
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1161,6 +1179,7 @@
"-j", validPasswordFile,
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1186,6 +1205,7 @@
"-j", invalidPasswordFile,
"-b", "",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1206,6 +1226,7 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-b", "malformed",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1226,6 +1247,7 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-b", "o=does not exist",
"-s", "base",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1272,6 +1294,7 @@
"-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
"-b", "o=test",
"-s", scope,
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1319,6 +1342,7 @@
"-b", "o=test",
"-s", "base",
"-a", derefPolicy,
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1343,6 +1367,7 @@
"-b", "o=test",
"-s", "base",
"-A",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1367,6 +1392,7 @@
"-b", "o=test",
"-s", "base",
"--reportAuthzID",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1393,6 +1419,7 @@
"-b", "o=test",
"-s", "base",
"--reportAuthzID",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1419,6 +1446,7 @@
"-b", "o=test",
"-s", "base",
"--usePasswordPolicyControl",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1445,6 +1473,7 @@
"-b", "o=test",
"-s", "base",
"-J", OID_ACCOUNT_USABLE_CONTROL + ":true",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1472,6 +1501,7 @@
"-b", "o=test",
"-s", "base",
"-J", "accountusable:true",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1498,6 +1528,7 @@
"-b", "o=test",
"-s", "base",
"--assertionFilter", "(objectClass=top)",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1524,6 +1555,7 @@
"-b", "o=test",
"-s", "base",
"--assertionFilter", "(objectClass=doesNotMatch)",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1550,6 +1582,7 @@
"-b", "o=test",
"-s", "base",
"--matchedValuesFilter", "(objectClass=*person)",
+ "--noPropertiesFile",
"(objectClass=*)",
"objectClass"
};
@@ -1591,6 +1624,7 @@
"-b", "o=test",
"-s", "sub",
"--countEntries",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1605,6 +1639,7 @@
"-b", "o=test",
"-s", "sub",
"--countEntries",
+ "--noPropertiesFile",
"-J", OID_LDAP_SUBENTRIES + ":true",
"(objectClass=*)"
};
@@ -1620,6 +1655,7 @@
"-b", "o=test",
"-s", "sub",
"--countEntries",
+ "--noPropertiesFile",
"-J", "subentries:true",
"(objectClass=*)"
};
@@ -1651,6 +1687,7 @@
"-s", "base",
"-J", OID_ACCOUNT_USABLE_CONTROL + ":true",
"-J", OID_MANAGE_DSAIT_CONTROL + ":false",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1706,6 +1743,7 @@
"-s", "one",
"--simplePageSize", "2",
"--countEntries",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1830,6 +1868,7 @@
"-S", "givenName",
"--simplePageSize", "2",
"--countEntries",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1843,6 +1882,7 @@
"-s", "sub",
"-S", "givenName",
"--countEntries",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1904,6 +1944,7 @@
"-b", "dc=example,dc=com",
"-s", "sub",
"-S", "givenName",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -1964,6 +2005,7 @@
"-b", "dc=example,dc=com",
"-s", "sub",
"-S", "-givenName",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2024,6 +2066,7 @@
"-b", "dc=example,dc=com",
"-s", "sub",
"-S", "givenName:caseExactOrderingMatch",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2084,6 +2127,7 @@
"-b", "dc=example,dc=com",
"-s", "sub",
"-S", "sn,givenName",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2144,6 +2188,7 @@
"-b", "dc=example,dc=com",
"-s", "sub",
"-S", "sn,-givenName",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2172,6 +2217,7 @@
"-b", "dc=example,dc=com",
"-s", "sub",
"-S", "",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2201,6 +2247,7 @@
"-b", "dc=example,dc=com",
"-s", "sub",
"-S", "-,sn",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2230,6 +2277,7 @@
"-b", "dc=example,dc=com",
"-s", "sub",
"-S", "-sn:",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2258,6 +2306,7 @@
"-b", "dc=example,dc=com",
"-s", "sub",
"-S", "undefined",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2287,6 +2336,7 @@
"-b", "dc=example,dc=com",
"-s", "sub",
"-S", "givenName:undefined",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2314,6 +2364,7 @@
"-b", "dc=example,dc=com",
"-s", "sub",
"-G", "0:9:1:0",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2345,6 +2396,7 @@
"-S", "sn,givenName",
"--simplePageSize", "2",
"-G", "0:3:1:0",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2373,6 +2425,7 @@
"-s", "sub",
"-S", "sn,givenName",
"-G", "invalid",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2401,6 +2454,7 @@
"-s", "sub",
"-S", "sn,givenName",
"-G", "invalid:9:invalid",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2429,6 +2483,7 @@
"-s", "sub",
"-S", "sn,givenName",
"-G", "invalid:9:1:0",
+ "--noPropertiesFile",
"(objectClass=*)"
};
@@ -2552,6 +2607,7 @@
"-s", "sub",
"-S", "givenName",
"-G", "1:3:1:0",
+ "--noPropertiesFile",
"(objectClass=*)"
};
--
Gitblit v1.10.0