From 2173aa3140a1a35176921dfb8f2f9278b6973d73 Mon Sep 17 00:00:00 2001 From: jvergara <jvergara@localhost> Date: Mon, 12 Nov 2007 04:26:49 +0000 Subject: [PATCH] Update the dsreplication command-line to be consistent with dsconfig in the use of menus and in the order that questions to connect to the servers. Update the upgrade to use the same menus as the other command-lines. Do some minor changes in the uninstall command-line in order to be more consistent with dsconfig in the order where the connection parameters are provided. Fix a bug in ApplicationTrustManager related to the accepted certificates when there is a mismatch between the certificate and the host name. Do some refactorization of the code and remove the CliApplicationHelper class so that we use ConsoleApplication everywhere. --- opends/src/messages/messages/admin_tool.properties | 70 ++++++++++------------------------- 1 files changed, 20 insertions(+), 50 deletions(-) diff --git a/opends/src/messages/messages/admin_tool.properties b/opends/src/messages/messages/admin_tool.properties index f21a510..0832225 100644 --- a/opends/src/messages/messages/admin_tool.properties +++ b/opends/src/messages/messages/admin_tool.properties @@ -121,22 +121,10 @@ INFO_CLI_DO_YOU_WANT_TO_CONTINUE=Do you want to continue? INFO_CLI_NUMBER_PROMPT=Enter a number or press Enter to accept the default INFO_CLI_INVALID_RESPONSE=Invalid response -INFO_CLI_YES_LONG=yes -INFO_CLI_YES_SHORT=y -INFO_CLI_NO_LONG=no -INFO_CLI_NO_SHORT=n INFO_CLOSE_BUTTON_UNINSTALL_TOOLTIP=Close Uninstall Window INFO_CONFIRM_CLOSE_UNINSTALL_MSG=OpenDS Uninstall has not yet completed.%nAre \ you sure you want to close the Uninstall Window? INFO_CONFIRM_CLOSE_UNINSTALL_TITLE=Confirmation Required -INFO_CLI_ACCEPT_CERTIFICATE_LONG=accept -INFO_CLI_ACCEPT_CERTIFICATE_SHORT=a -INFO_CLI_REJECT_CERTIFICATE_LONG=reject -INFO_CLI_REJECT_CERTIFICATE_SHORT=r -INFO_CLI_VIEW_CERTIFICATE_LONG=view -INFO_CLI_VIEW_CERTIFICATE_SHORT=v -INFO_CLI_ACCEPT_CERTIFICATE_PROMPT=Do you want to accept, view or reject the \ -certificate? INFO_CONFIRM_RESTART_MESSAGE=Are you sure you want to Restart the Directory \ Server? INFO_CONFIRM_RESTART_TITLE=Confirmation Required @@ -473,6 +461,8 @@ communication with the source server INFO_DESCRIPTION_INITIALIZE_REPLICATION_STARTTLS_SOURCE=Use StartTLS to \ secure communication with the source server +INFO_REPLICATION_INITIALIZE_PROTOCOL_SOURCE=How do you want to connect to the \ + source server? INFO_DESCRIPTION_INITIALIZE_REPLICATION_HOST_DESTINATION=Directory server \ hostname or IP address of the destination server whose contents will be \ initialized @@ -556,55 +546,34 @@ MILD_ERR_ERROR_CONNECTING_TO_SERVER_PROMPT_AGAIN=Could not connect to the \ Directory Server %s with the provided credentials.%nError details: %s%n%n\ Provide again the required information to connect to the server: +INFO_REPLICATION_ENABLE_HOST1_CONNECTION_PARAMETERS=>>>> Specify OpenDS LDAP \ + connection parameters for the first server INFO_REPLICATION_ENABLE_HOSTNAME1_PROMPT=Host name of the first server INFO_REPLICATION_ENABLE_PORT1_PROMPT=LDAP port of the first server +INFO_REPLICATION_ENABLE_PROTOCOL1=How do you want to connect to the first \ + server? INFO_REPLICATION_ENABLE_REPLICATIONPORT1_PROMPT=Replication port for the first \ server (the port must be free) -INFO_REPLICATION_ENABLE_SECURE1_PROMPT=Use encrypted communication with \ - replication port %s for the first server? +INFO_REPLICATION_ENABLE_SECURE1_PROMPT=Do want replication to use encrypted \ + communication when connecting to replication port %s on the first server? INFO_REPLICATION_ENABLE_BINDDN1_PROMPT=Bind DN for the first server INFO_REPLICATION_ENABLE_PASSWORD1_PROMPT=Password for %s on the first server: -INFO_REPLICATION_ENABLE_USESSL1_PROMPT=Use SSL to connect to the first server? -INFO_REPLICATION_ENABLE_USESTARTTLS1_PROMPT=Use StartTLS to connect to the \ - first server? +INFO_REPLICATION_ENABLE_HOST2_CONNECTION_PARAMETERS=>>>> Specify OpenDS LDAP \ + connection parameters for the second server INFO_REPLICATION_ENABLE_HOSTNAME2_PROMPT=Host name of the second server INFO_REPLICATION_ENABLE_PORT2_PROMPT=LDAP port of the second server +INFO_REPLICATION_ENABLE_PROTOCOL2=How do you want to connect to the second \ + server? INFO_REPLICATION_ENABLE_REPLICATIONPORT2_PROMPT=Replication port for the \ second server (the port must be free) -INFO_REPLICATION_ENABLE_SECURE2_PROMPT=Use encrypted communication with \ - replication port %s for the second server? +INFO_REPLICATION_ENABLE_SECURE2_PROMPT=Do want replication to use encrypted \ + communication when connecting to replication port %s on the second server? INFO_REPLICATION_ENABLE_BINDDN2_PROMPT=Bind DN for the second server INFO_REPLICATION_ENABLE_PASSWORD2_PROMPT=Password for %s on the second server: -INFO_REPLICATION_ENABLE_USESSL2_PROMPT=Use SSL to connect to the second server? -INFO_REPLICATION_ENABLE_USESTARTTLS2_PROMPT=Use StartTLS to connect to the \ - second server? -INFO_REPLICATION_INITIALIZE_HOSTNAMESOURCE_PROMPT=Host name of the source \ - server -INFO_REPLICATION_INITIALIZE_PORTSOURCE_PROMPT=LDAP port of the source server -INFO_REPLICATION_INITIALIZE_USESSLSOURCE_PROMPT=Use SSL to connect to the \ - source server? -INFO_REPLICATION_INITIALIZE_USESTARTTLSSOURCE_PROMPT=Use StartTLS to connect \ - to the source server? -INFO_REPLICATION_DISABLE_HOSTNAME_PROMPT=Host name of the server -INFO_REPLICATION_DISABLE_PORT_PROMPT=LDAP port of the server -INFO_REPLICATION_DISABLE_BINDDN_PROMPT=Global Administrator User ID (or bind \ - DN if no Global Administrator is defined) -INFO_REPLICATION_DISABLE_PASSWORD_PROMPT=Password for %s: -INFO_REPLICATION_INITIALIZE_ALL_HOSTNAME_PROMPT=Host name of the server -INFO_REPLICATION_INITIALIZE_ALL_PORT_PROMPT=LDAP port of the server -INFO_REPLICATION_STATUS_HOSTNAME_PROMPT=Host name of the server -INFO_REPLICATION_STATUS_PORT_PROMPT=LDAP port of the server -INFO_REPLICATION_INITIALIZE_HOSTNAMEDESTINATION_PROMPT=Host name of the \ - destination server -INFO_REPLICATION_INITIALIZE_PORTDESTINATION_PROMPT=LDAP port of the \ - destination server -INFO_REPLICATION_INITIALIZE_USESSLDESTINATION_PROMPT=Use SSL to connect to \ - the destination server? -INFO_REPLICATION_INITIALIZE_USESTARTTLSDESTINATION_PROMPT=Use StartTLS to \ - connect to the destination server? -INFO_CLI_USESSL_PROMPT=Use SSL to connect? -INFO_CLI_INVALID_PORT=The provided value is not a valid port -INFO_CLI_USESTARTTLS_PROMPT=Use StartTLS to connect? +INFO_REPLICATION_INITIALIZE_SOURCE_CONNECTION_PARAMETERS=>>>> Specify OpenDS \ + LDAP connection parameters for the source server +INFO_REPLICATION_INITIALIZE_DESTINATION_CONNECTION_PARAMETERS=>>>> Specify \ + OpenDS LDAP connection parameters for the destination server SEVERE_ERR_NO_SUFFIXES_AVAILABLE_TO_ENABLE_REPLICATION=There are no base DNs \ available to enable replication between the two servers. INFO_ALREADY_REPLICATED_SUFFIXES=The following base DNs are already replicated \ @@ -747,4 +716,5 @@ INFO_REPLICATION_STATUS_SECURITY_ENABLED=Enabled INFO_REPLICATION_STATUS_SECURITY_DISABLED=Disabled INFO_REPLICATION_CRITICAL_ERROR_DETAILS=Details: %s - + + -- Gitblit v1.10.0