From 5debc41ae39da4aad607a79ce79238904c62efa4 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 22 Jul 2009 10:57:48 +0000
Subject: [PATCH] If the setup happens in Windows, display whether the Windows service will be enabled or not in the summary at the end of the CLI interactive mode.
---
opendj-sdk/opends/src/messages/messages/tools.properties | 5 +++++
opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java | 32 ++++++++++++++++++++++++++------
2 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/tools.properties b/opendj-sdk/opends/src/messages/messages/tools.properties
index 8b5b912..36c0e51 100644
--- a/opendj-sdk/opends/src/messages/messages/tools.properties
+++ b/opendj-sdk/opends/src/messages/messages/tools.properties
@@ -2501,3 +2501,8 @@
SEVERE_ERR_TIMEOUT_DURING_STARTUP_1680=The timeout of '%d' seconds to start \
the server has been reached. You can use the argument '--%s' to increase \
this timeout
+INFO_INSTALLDS_ENABLE_WINDOWS_SERVICE_1681=Enable the server to run as a \
+ Windows Service
+INFO_INSTALLDS_DO_NOT_ENABLE_WINDOWS_SERVICE_1682=Do not enable the server to \
+ run as a Windows Service
+
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
index c9b4c6e..0d34fd4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -202,7 +202,11 @@
}
}
- private static final int LIMIT_KEYSTORE_PASSWORD_PROMPT = 7;
+ /**
+ * The maximum number of times that we should ask the user to provide the
+ * password to access to a keystore.
+ */
+ public static final int LIMIT_KEYSTORE_PASSWORD_PROMPT = 7;
// Different variables we use when the user decides to provide data again.
private NewSuffixOptions.Type lastResetPopulateOption = null;
@@ -1934,9 +1938,10 @@
* @param nicknameList the list that will be updated with the nicknames found
* in the keystore.
*/
- private void checkCertificateInKeystore(SecurityOptions.CertificateType type,
+ public static void checkCertificateInKeystore(
+ SecurityOptions.CertificateType type,
String path, String pwd, String certNickname,
- LinkedList<Message> errorMessages, LinkedList<String> nicknameList)
+ Collection<Message> errorMessages, Collection<String> nicknameList)
{
boolean errorWithPath = false;
if (type != SecurityOptions.CertificateType.PKCS11)
@@ -2263,7 +2268,8 @@
* @return <CODE>true</CODE> if any of the error messages provided corresponds
* to a problem with the key store path and <CODE>false</CODE> otherwise.
*/
- private boolean containsKeyStorePathErrorMessage(Collection<Message> msgs)
+ public static boolean containsKeyStorePathErrorMessage(
+ Collection<Message> msgs)
{
boolean found = false;
for (Message msg : msgs)
@@ -2293,7 +2299,8 @@
* @return <CODE>true</CODE> if any of the error messages provided corresponds
* to a problem with the key store password and <CODE>false</CODE> otherwise.
*/
- private boolean containsKeyStorePasswordErrorMessage(Collection<Message> msgs)
+ public static boolean containsKeyStorePasswordErrorMessage(
+ Collection<Message> msgs)
{
boolean found = false;
for (Message msg : msgs)
@@ -2324,7 +2331,8 @@
* to a problem with the certificate nickname and <CODE>false</CODE>
* otherwise.
*/
- private boolean containsCertNicknameErrorMessage(Collection<Message> msgs)
+ public static boolean containsCertNicknameErrorMessage(
+ Collection<Message> msgs)
{
boolean found = false;
for (Message msg : msgs)
@@ -2551,6 +2559,18 @@
println(INFO_INSTALLDS_DO_NOT_START_SERVER.get());
}
+ if (Utils.isWindows())
+ {
+ if (uData.getEnableWindowsService())
+ {
+ println(INFO_INSTALLDS_ENABLE_WINDOWS_SERVICE.get());
+ }
+ else
+ {
+ println(INFO_INSTALLDS_DO_NOT_ENABLE_WINDOWS_SERVICE.get());
+ }
+ }
+
println();
println();
--
Gitblit v1.10.0