From 145ab517b749e464dd80ac6726d49a044cc054b0 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 21 Jan 2015 10:38:03 +0000
Subject: [PATCH] OPENDJ-1749 dsconfig does not work anymore and always reports the same error (conflict on short options)
---
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
index 9521e92..99611dd 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java
@@ -185,7 +185,7 @@
useSSLArg = CommonArguments.getUseSSL();
if (!alwaysSSL) {
- argumentParser.addArgument(useSSLArg);
+ argumentParser.addLdapConnectionArgument(useSSLArg);
} else {
// simulate that the useSSL arg has been given in the CLI
useSSLArg.setPresent(true);
@@ -193,7 +193,7 @@
useStartTLSArg = CommonArguments.getStartTLS();
if (!alwaysSSL) {
- argumentParser.addArgument(useStartTLSArg);
+ argumentParser.addLdapConnectionArgument(useStartTLSArg);
}
String defaultHostName;
@@ -203,7 +203,7 @@
defaultHostName = "Unknown (" + e + ")";
}
hostNameArg = CommonArguments.getHostName(defaultHostName);
- argumentParser.addArgument(hostNameArg);
+ argumentParser.addLdapConnectionArgument(hostNameArg);
LocalizableMessage portDescription = INFO_DESCRIPTION_PORT.get();
if (alwaysSSL) {
@@ -211,43 +211,43 @@
}
portArg = CommonArguments.getPort(defaultPort, portDescription);
- argumentParser.addArgument(portArg);
+ argumentParser.addLdapConnectionArgument(portArg);
bindNameArg = CommonArguments.getBindDN(defaultBindDN);
- argumentParser.addArgument(bindNameArg);
+ argumentParser.addLdapConnectionArgument(bindNameArg);
bindPasswordArg = CommonArguments.getBindPassword();
- argumentParser.addArgument(bindPasswordArg);
+ argumentParser.addLdapConnectionArgument(bindPasswordArg);
bindPasswordFileArg = CommonArguments.getBindPasswordFile();
- argumentParser.addArgument(bindPasswordFileArg);
+ argumentParser.addLdapConnectionArgument(bindPasswordFileArg);
saslOptionArg = CommonArguments.getSASL();
- argumentParser.addArgument(saslOptionArg);
+ argumentParser.addLdapConnectionArgument(saslOptionArg);
trustAllArg = CommonArguments.getTrustAll();
- argumentParser.addArgument(trustAllArg);
+ argumentParser.addLdapConnectionArgument(trustAllArg);
trustStorePathArg = CommonArguments.getTrustStorePath();
- argumentParser.addArgument(trustStorePathArg);
+ argumentParser.addLdapConnectionArgument(trustStorePathArg);
trustStorePasswordArg = CommonArguments.getTrustStorePassword();
- argumentParser.addArgument(trustStorePasswordArg);
+ argumentParser.addLdapConnectionArgument(trustStorePasswordArg);
trustStorePasswordFileArg = CommonArguments.getTrustStorePasswordFile();
- argumentParser.addArgument(trustStorePasswordFileArg);
+ argumentParser.addLdapConnectionArgument(trustStorePasswordFileArg);
keyStorePathArg = CommonArguments.getKeyStorePath();
- argumentParser.addArgument(keyStorePathArg);
+ argumentParser.addLdapConnectionArgument(keyStorePathArg);
keyStorePasswordArg = CommonArguments.getKeyStorePassword();
- argumentParser.addArgument(keyStorePasswordArg);
+ argumentParser.addLdapConnectionArgument(keyStorePasswordArg);
keyStorePasswordFileArg = CommonArguments.getKeyStorePasswordFile();
- argumentParser.addArgument(keyStorePasswordFileArg);
+ argumentParser.addLdapConnectionArgument(keyStorePasswordFileArg);
certNicknameArg = CommonArguments.getCertNickName();
- argumentParser.addArgument(certNicknameArg);
+ argumentParser.addLdapConnectionArgument(certNicknameArg);
reportAuthzIDArg = CommonArguments.getReportAuthzId();
argumentParser.addArgument(reportAuthzIDArg);
--
Gitblit v1.10.0