From a6ae8ced19f410e9949754c863ed33a0e4f85593 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 05 Nov 2007 13:15:21 +0000
Subject: [PATCH] Be consistent in the CLI and GUI setup concerning the default LDAP ports proposed. The code of the command-line CLI has been updated to propose free ports.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java | 2 +-
opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java | 12 ++++++++----
opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java | 15 +++++++++++++--
3 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java
index b56b232..37d5227 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/UserData.java
@@ -548,7 +548,7 @@
* @return the free port of type X636 if it is available and we can use and -1
* if not.
*/
- static int getDefaultSslPort(int defaultLdapPort)
+ public static int getDefaultSslPort(int defaultLdapPort)
{
int defaultPort = -1;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
index f10572c..fc2e68d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
@@ -39,6 +39,7 @@
import org.opends.messages.Message;
import org.opends.quicksetup.Constants;
import org.opends.quicksetup.Installation;
+import org.opends.quicksetup.UserData;
import org.opends.quicksetup.util.Utils;
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.util.SetupUtils;
@@ -209,10 +210,15 @@
INFO_INSTALLDS_DESCRIPTION_SAMPLE_DATA.get());
addArgument(sampleDataArg);
+ int defaultPort = UserData.getDefaultPort();
+ if (defaultPort == -1)
+ {
+ defaultPort = 389;
+ }
ldapPortArg = new IntegerArgument(
"ldapport", OPTION_SHORT_PORT,
"ldapPort", false, false,
- true, OPTION_VALUE_PORT, 389,
+ true, OPTION_VALUE_PORT, defaultPort,
null, true, 1, true, 65535,
INFO_INSTALLDS_DESCRIPTION_LDAPPORT.get());
addArgument(ldapPortArg);
@@ -274,10 +280,15 @@
INFO_INSTALLDS_DESCRIPTION_ENABLE_STARTTLS.get());
addArgument(enableStartTLSArg);
+ int defaultSecurePort = UserData.getDefaultSslPort(defaultPort);
+ if (defaultSecurePort == -1)
+ {
+ defaultSecurePort = 636;
+ }
ldapsPortArg = new IntegerArgument(
"ldapsport", OPTION_SHORT_USE_SSL,
"ldapsPort", false, false,
- true, OPTION_VALUE_PORT, 636,
+ true, OPTION_VALUE_PORT, defaultSecurePort,
null, true, 1, true, 65535,
INFO_INSTALLDS_DESCRIPTION_LDAPSPORT.get());
addArgument(ldapsPortArg);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java b/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
index f90e1ed..3ea34bb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
@@ -463,7 +463,8 @@
throws CLIException {
while (true) {
if (defaultValue != null) {
- prompt = Message.raw(prompt.toString()+EOL+"["+defaultValue+"]:");
+ prompt = INFO_PROMPT_SINGLE_DEFAULT.get(prompt.toString(),
+ defaultValue);
}
String response = readLineOfInput(prompt);
@@ -549,9 +550,12 @@
};
- println();
- return readValidatedInput(INFO_LDAP_CONN_PROMPT_PORT_NUMBER
- .get(defaultValue), callback);
+ if (defaultValue != -1) {
+ prompt = INFO_PROMPT_SINGLE_DEFAULT.get(prompt.toString(),
+ String.valueOf(defaultValue));
+ }
+
+ return readValidatedInput(prompt, callback);
}
/**
--
Gitblit v1.10.0