external-software/github_OpenIdentityPlatform_OpenDJ.git

			@@ -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,