From 7e6a2d6cd3a9b95acb001a3f37437893067bca27 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 30 Jul 2007 15:53:44 +0000
Subject: [PATCH] The following modifications are done in order to be able to handle properly secure connections in both the status command-line and the status panel.  Some options to specify a keystore, a trustore, etc. have been added to the status command-line so that is consistent with the other command-lines that use LDAP.  As for these command-lines if the user does not specify to use Start TLS or LDAPS, the command-line will try to use LDAP to connect. But if there is no LDAP port enabled, the command-line will try to connect to the LDAPS port.

---
 opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/resources/Resources.properties |   23 ++++-------------------
 1 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/resources/Resources.properties b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/resources/Resources.properties
index 631c493..0256a03 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/resources/Resources.properties
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/resources/Resources.properties
@@ -101,33 +101,18 @@
 undefined-protocol-label=-Unknown-
 error-reading-config-file=Error reading the configuration file.
 could-not-find-valid-ldapurl=Error reading the configuration file.\n\
-This could be caused because there is not an enabled LDAP port to retrieve \
-monitoring information or because you do not have read rights on the \
+This could be caused because there is not an enabled LDAP port for the \
+specified connection parameters or because you do not have read rights on the \
 configuration file.
 number-entries-multiple-suffixes-in-db={0} (for all base DNs in {1})
-error-reading-config-ldap=Error reading data from server.  Try \
-re-authenticating.\nDetails: {0}
+error-reading-config-ldap=Error reading data from server.  Verify the \
+authentication information provided.\nDetails: {0}
 no-dbs-found=-No LDAP Databases Found-
 no-listeners-found=-No Listener Ports Found-
 suffix-replicated-label=Enabled
 suffix-not-replicated-label=Disabled
 
 #
-# Progress Dialog
-#
-close-progress-button-tooltip=Close Progress Dialog
-progress-title=Progress
-summary-starting=Starting Server...
-summary-stopping=Stopping Server...
-summary-start-error=An error occurred Starting Server.  Check 'Details' text \
-area for more information.
-summary-stop-error=An error occurred Stopping Server.  Check 'Details' text \
-area for more information.
-error-starting-server-code=Error Starting Directory Server.  Error code: {0}.
-summary-start-success=OpenDS Started Successfully.
-summary-stop-success=OpenDS Stopped Successfully.
-
-#
 # Confirmation messages
 #
 confirm-stop-message=Are you sure you want to Stop the Directory Server?

--
Gitblit v1.10.0