external-software/github_OpenIdentityPlatform_OpenDJ.git

			@@ -655,7 +655,7 @@
			{
			propertiesFileArgument = new StringArgument("propertiesFilePath",
			null, OPTION_LONG_PROP_FILE_PATH,
			false, false, true, OPTION_VALUE_PROP_FILE_PATH, null, null,
			false, false, true, INFO_PROP_FILE_PATH_PLACEHOLDER.get(), null, null,
			INFO_DESCRIPTION_PROP_FILE_PATH.get());
			argParser.addArgument(propertiesFileArgument);
			argParser.setFilePropertiesArgument(propertiesFileArgument);
			@@ -668,14 +668,15 @@

			hostName = new StringArgument("host", OPTION_SHORT_HOST,
			OPTION_LONG_HOST, false, false, true,
			OPTION_VALUE_HOST, "localhost", null,
			INFO_HOST_PLACEHOLDER.get(), "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_PORT_PLACEHOLDER.get(), 389, null,
			INFO_DESCRIPTION_PORT.get());
			port.setPropertyName(OPTION_LONG_PORT);
			argParser.addArgument(port);
			@@ -694,7 +695,7 @@

			bindDN = new StringArgument("bindDN", OPTION_SHORT_BINDDN,
			OPTION_LONG_BINDDN, false, false, true,
			OPTION_VALUE_BINDDN, null, null,
			INFO_BINDDN_PLACEHOLDER.get(), null, null,
			INFO_DESCRIPTION_BINDDN.get());
			bindDN.setPropertyName(OPTION_LONG_BINDDN);
			argParser.addArgument(bindDN);
			@@ -702,7 +703,7 @@
			bindPassword = new StringArgument("bindPassword", OPTION_SHORT_BINDPWD,
			OPTION_LONG_BINDPWD,
			false, false, true,
			OPTION_VALUE_BINDPWD,
			INFO_BINDPWD_PLACEHOLDER.get(),
			null, null,
			INFO_DESCRIPTION_BINDPASSWORD.get());
			bindPassword.setPropertyName(OPTION_LONG_BINDPWD);
			@@ -713,9 +714,9 @@
			OPTION_SHORT_BINDPWD_FILE,
			OPTION_LONG_BINDPWD_FILE,
			false, false,
			OPTION_VALUE_BINDPWD_FILE, null,
			INFO_BINDPWD_FILE_PLACEHOLDER.get(), null,
			null, INFO_DESCRIPTION_BINDPASSWORDFILE.get());
			bindPasswordFile.setPropertyName(OPTION_VALUE_BINDPWD_FILE);
			bindPasswordFile.setPropertyName(OPTION_LONG_BINDPWD_FILE);
			argParser.addArgument(bindPasswordFile);

			defaultAdd = new BooleanArgument(
			@@ -725,7 +726,8 @@

			filename = new StringArgument("filename", OPTION_SHORT_FILENAME,
			OPTION_LONG_FILENAME, false, false,
			true, OPTION_VALUE_FILENAME, null, null,
			true, INFO_FILE_PLACEHOLDER.get(), null,
			null,
			INFO_LDAPMODIFY_DESCRIPTION_FILENAME.get());
			filename.setPropertyName(OPTION_LONG_FILENAME);
			argParser.addArgument(filename);
			@@ -740,7 +742,8 @@
			saslOptions = new StringArgument("saslOption", OPTION_SHORT_SASLOPTION,
			OPTION_LONG_SASLOPTION, false,
			true, true,
			OPTION_VALUE_SASLOPTION, null, null,
			INFO_SASL_OPTION_PLACEHOLDER.get(), null,
			null,
			INFO_DESCRIPTION_SASL_PROPERTIES.get());
			saslOptions.setPropertyName(OPTION_LONG_SASLOPTION);
			argParser.addArgument(saslOptions);
			@@ -754,7 +757,7 @@
			OPTION_SHORT_KEYSTOREPATH,
			OPTION_LONG_KEYSTOREPATH,
			false, false, true,
			OPTION_VALUE_KEYSTOREPATH,
			INFO_KEYSTOREPATH_PLACEHOLDER.get(),
			null, null,
			INFO_DESCRIPTION_KEYSTOREPATH.get());
			keyStorePath.setPropertyName(OPTION_LONG_KEYSTOREPATH);
			@@ -766,7 +769,7 @@
			OPTION_LONG_KEYSTORE_PWD,
			false, false,
			true,
			OPTION_VALUE_KEYSTORE_PWD,
			INFO_KEYSTORE_PWD_PLACEHOLDER.get(),
			null, null,
			INFO_DESCRIPTION_KEYSTOREPASSWORD.get());
			keyStorePassword.setPropertyName(OPTION_LONG_KEYSTORE_PWD);
			@@ -776,7 +779,8 @@
			new FileBasedArgument("keystorepasswordfile",
			OPTION_SHORT_KEYSTORE_PWD_FILE,
			OPTION_LONG_KEYSTORE_PWD_FILE,
			false, false, OPTION_VALUE_KEYSTORE_PWD_FILE,
			false, false,
			INFO_KEYSTORE_PWD_FILE_PLACEHOLDER.get(),
			null, null,
			INFO_DESCRIPTION_KEYSTOREPASSWORD_FILE.get());
			keyStorePasswordFile.setPropertyName(OPTION_LONG_KEYSTORE_PWD_FILE);
			@@ -784,7 +788,7 @@

			certNickname = new StringArgument(
			"certnickname", 'N', "certNickname",
			false, false, true, "{nickname}", null,
			false, false, true, INFO_NICKNAME_PLACEHOLDER.get(), null,
			null, INFO_DESCRIPTION_CERT_NICKNAME.get());
			certNickname.setPropertyName("certNickname");
			argParser.addArgument(certNickname);
			@@ -794,7 +798,7 @@
			OPTION_SHORT_TRUSTSTOREPATH,
			OPTION_LONG_TRUSTSTOREPATH,
			false, false, true,
			OPTION_VALUE_TRUSTSTOREPATH,
			INFO_TRUSTSTOREPATH_PLACEHOLDER.get(),
			null, null,
			INFO_DESCRIPTION_TRUSTSTOREPATH.get());
			trustStorePath.setPropertyName(OPTION_LONG_TRUSTSTOREPATH);
			@@ -804,7 +808,7 @@
			new StringArgument("trustStorePassword", null,
			OPTION_LONG_TRUSTSTORE_PWD ,
			false, false, true,
			OPTION_VALUE_TRUSTSTORE_PWD, null,
			INFO_TRUSTSTORE_PWD_PLACEHOLDER.get(), null,
			null, INFO_DESCRIPTION_TRUSTSTOREPASSWORD.get());
			trustStorePassword.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD);
			argParser.addArgument(trustStorePassword);
			@@ -814,7 +818,7 @@
			"truststorepasswordfile",
			OPTION_SHORT_TRUSTSTORE_PWD_FILE,
			OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false,
			OPTION_VALUE_TRUSTSTORE_PWD_FILE, null, null,
			INFO_TRUSTSTORE_PWD_FILE_PLACEHOLDER.get(), null, null,
			INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE.get());
			trustStorePasswordFile.setPropertyName(OPTION_LONG_TRUSTSTORE_PWD_FILE);
			argParser.addArgument(trustStorePasswordFile);
			@@ -823,7 +827,8 @@
			OPTION_SHORT_PROXYAUTHID,
			OPTION_LONG_PROXYAUTHID, false,
			false, true,
			OPTION_VALUE_PROXYAUTHID, null, null,
			INFO_PROXYAUTHID_PLACEHOLDER.get(),
			null, null,
			INFO_DESCRIPTION_PROXY_AUTHZID.get());
			proxyAuthzID.setPropertyName(OPTION_LONG_PROXYAUTHID);
			argParser.addArgument(proxyAuthzID);
			@@ -840,7 +845,7 @@
			OPTION_LONG_ASSERTION_FILE,
			false, false,
			true,
			OPTION_VALUE_ASSERTION_FILE,
			INFO_ASSERTION_FILTER_PLACEHOLDER.get(),
			null, null,
			INFO_DESCRIPTION_ASSERTION_FILTER.get());
			assertionFilter.setPropertyName(OPTION_LONG_ASSERTION_FILE);
			@@ -849,7 +854,7 @@
			preReadAttributes = new StringArgument(
			"prereadattrs", null,
			"preReadAttributes", false, false,
			true, "{attrList}", null, null,
			true, INFO_ATTRIBUTE_LIST_PLACEHOLDER.get(), null, null,
			INFO_DESCRIPTION_PREREAD_ATTRS.get());
			preReadAttributes.setPropertyName("preReadAttributes");
			argParser.addArgument(preReadAttributes);
			@@ -857,7 +862,7 @@
			postReadAttributes = new StringArgument(
			"postreadattrs", null,
			"postReadAttributes", false,
			false, true, "{attrList}", null,
			false, true, INFO_ATTRIBUTE_LIST_PLACEHOLDER.get(), null,
			null,
			INFO_DESCRIPTION_POSTREAD_ATTRS.get());
			postReadAttributes.setPropertyName("postReadAttributes");
			@@ -865,7 +870,7 @@

			controlStr =
			new StringArgument("control", 'J', "control", false, true, true,
			"{controloid[:criticality[:value\|::b64value\|:<fileurl]]}",
			INFO_LDAP_CONTROL_PLACEHOLDER.get(),
			null, null, INFO_DESCRIPTION_CONTROLS.get());
			controlStr.setPropertyName("control");
			argParser.addArgument(controlStr);
			@@ -873,14 +878,15 @@
			version = new IntegerArgument("version", OPTION_SHORT_PROTOCOL_VERSION,
			OPTION_LONG_PROTOCOL_VERSION,
			false, false, true,
			OPTION_VALUE_PROTOCOL_VERSION, 3, null,
			INFO_PROTOCOL_VERSION_PLACEHOLDER.get(), 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,
			true, INFO_ENCODING_PLACEHOLDER.get(),
			null, null,
			INFO_DESCRIPTION_ENCODING.get());
			encodingStr.setPropertyName("encoding");
			argParser.addArgument(encodingStr);