From 486ffa6d0abfa0b91dc7ab22ee71758b5eecfb88 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 26 Sep 2007 18:57:15 +0000
Subject: [PATCH] Fix for 2306: configure replication encryption on or off in dsreplication and setup-gui
---
opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
index 7df31a8..b46ca9d 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
@@ -356,7 +356,7 @@
SuffixesToReplicateOptions suf =
userInstallData.getSuffixesToReplicateOptions();
- Map<ServerDescriptor, Integer> remotePorts =
+ Map<ServerDescriptor, AuthenticationData> remotePorts =
userInstallData.getRemoteWithNoReplicationPort();
if ((repl.getType() == DataReplicationOptions.Type.IN_EXISTING_TOPOLOGY) &&
@@ -375,9 +375,19 @@
{
serverToConnectDisplay = "";
}
- buf.append(String.valueOf(
- userInstallData.getReplicationOptions()
- .getReplicationPort()));
+ String s;
+ if (userInstallData.getReplicationOptions().useSecureReplication())
+ {
+ s = INFO_SECURE_REPLICATION_PORT_LABEL.get(
+ String.valueOf(userInstallData.getReplicationOptions()
+ .getReplicationPort())).toString();
+ }
+ else
+ {
+ s = String.valueOf(userInstallData.getReplicationOptions()
+ .getReplicationPort());
+ }
+ buf.append(s);
TreeSet<Message> remoteServerLines = new TreeSet<Message>();
for (ServerDescriptor server : remotePorts.keySet())
{
@@ -390,8 +400,17 @@
{
serverDisplay = server.getHostPort(true);
}
- remoteServerLines.add(INFO_REMOTE_SERVER_REPLICATION_PORT.get(
- String.valueOf(remotePorts.get(server)),
+ AuthenticationData repPort = remotePorts.get(server);
+ if (repPort.useSecureConnection())
+ {
+ s = INFO_SECURE_REPLICATION_PORT_LABEL.get(
+ String.valueOf(repPort.getPort())).toString();
+ }
+ else
+ {
+ s = String.valueOf(repPort.getPort());
+ }
+ remoteServerLines.add(INFO_REMOTE_SERVER_REPLICATION_PORT.get(s,
serverDisplay));
}
for (Message line : remoteServerLines)
--
Gitblit v1.10.0