From 6c2e04c90410734dc61a340c1a73bc7c7864fe13 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 05 Sep 2007 02:02:17 +0000
Subject: [PATCH] Fixed some issues with the connection handling in the ReplicationCliMain, and improvded the messages when we prompt for the type of connection that the user wants to use to update configuration.

---
 opends/src/messages/messages/admin_tool.properties |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/opends/src/messages/messages/admin_tool.properties b/opends/src/messages/messages/admin_tool.properties
index 1c47e04..7dcca3e 100644
--- a/opends/src/messages/messages/admin_tool.properties
+++ b/opends/src/messages/messages/admin_tool.properties
@@ -534,25 +534,38 @@
  server (the port must be free)
 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_HOSTNAME2_PROMPT=Host name of the second server
 INFO_REPLICATION_ENABLE_PORT2_PROMPT=LDAP port of the second server
 INFO_REPLICATION_ENABLE_REPLICATIONPORT2_PROMPT=Replication port for the \
-second server (the port must be free)
+ second server (the port must be free)
 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)
+ DN if no Global Administrator is defined)
 INFO_REPLICATION_DISABLE_PASSWORD_PROMPT=Password for %s:
-
 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_BINDDN_PROMPT=Bind DN
 INFO_CLI_USESSL_PROMPT=Use SSL to connect?
 INFO_CLI_INVALID_PORT=The provided value is not a valid port
@@ -616,7 +629,9 @@
 INFO_REPLICATION_ENABLE_UPDATING_ADS_CONTENTS=Checking Registration information
 INFO_REPLICATION_ENABLE_CONFIGURING_REPLICATION_SERVER=Configuring Replication \
  port on server %s
-INFO_REPLICATION_ENABLE_CONFIGURING_BASEDN=Enabling Replication for baseDN %s \
+INFO_REPLICATION_ENABLE_CONFIGURING_BASEDN=Updating replication configuration \
+ for baseDN %s on server %s
+ INFO_REPLICATION_ENABLE_CONFIGURING_ADS=Updating Registration configuration \
  on server %s
 INFO_ENABLE_REPLICATION_INITIALIZING_ADS=Initializing Registration information \
  on server %s with the contents of server %s

--
Gitblit v1.10.0