From 2df0995642fe74c30c26d72720f1a913b316644b Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 13 Jun 2013 07:37:00 +0000
Subject: [PATCH] CR-1837 - OPENDJ-760- mis-leading message displays when attempting to initialize replication and hostSource is typed incorrectly - removed 'the host/remote server' && fix typo in _ERR_CANNOT_CONNECT_TO_REMOTE_COMMUNICATION
---
opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 75 +++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 33 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index f5fe9e4..6e01c91 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -4631,39 +4631,20 @@
ReplicationCliReturnCode returnValue = SUCCESSFUL_NOP;
InitialLdapContext ctxSource = null;
InitialLdapContext ctxDestination = null;
- try
- {
- ctxSource = createAdministrativeContext(uData.getHostNameSource(),
- uData.getPortSource(), useSSL,
- useStartTLS,
- ADSContext.getAdministratorDN(uData.getAdminUid()),
- uData.getAdminPwd(), getConnectTimeout(), getTrustManager());
- }
- catch (NamingException ne)
- {
- String hostPort = getServerRepresentation(uData.getHostNameSource(),
- uData.getPortSource());
- println();
- println(getMessageForException(ne, hostPort));
- LOG.log(Level.SEVERE, "Complete error stack:", ne);
- }
- try
- {
- ctxDestination = createAdministrativeContext(
- uData.getHostNameDestination(),
- uData.getPortDestination(), useSSL,
- useStartTLS,
- ADSContext.getAdministratorDN(uData.getAdminUid()),
- uData.getAdminPwd(), getConnectTimeout(), getTrustManager());
- }
- catch (NamingException ne)
- {
- String hostPort = getServerRepresentation(uData.getHostNameDestination(),
- uData.getPortDestination());
- println();
- println(getMessageForException(ne, hostPort));
- LOG.log(Level.SEVERE, "Complete error stack:", ne);
- }
+
+ ctxSource = getAdministrativeContext(uData.getHostNameSource(),
+ uData.getPortSource(), useSSL,
+ useStartTLS,
+ ADSContext.getAdministratorDN(uData.getAdminUid()),
+ uData.getAdminPwd(), getConnectTimeout(), getTrustManager());
+
+ ctxDestination = getAdministrativeContext(
+ uData.getHostNameDestination(),
+ uData.getPortDestination(), useSSL,
+ useStartTLS,
+ ADSContext.getAdministratorDN(uData.getAdminUid()),
+ uData.getAdminPwd(), getConnectTimeout(), getTrustManager());
+
if ((ctxSource != null) && (ctxDestination != null))
{
LinkedList<String> baseDNs = uData.getBaseDNs();
@@ -4744,6 +4725,34 @@
return returnValue;
}
+ private InitialLdapContext getAdministrativeContext(final String host,
+ final int port, final boolean useSSL, final boolean useStartTLS,
+ final String bindDn, final String pwd, final int connectTimeout,
+ final ApplicationTrustManager trustManager)
+ {
+ InitialLdapContext context = null;
+ try
+ {
+ context = createAdministrativeContext(
+ host,
+ port,
+ useSSL,
+ useStartTLS,
+ bindDn,
+ pwd,
+ connectTimeout,
+ trustManager);
+ }
+ catch (NamingException ne)
+ {
+ final String hostPort = getServerRepresentation(host, port);
+ println();
+ println(Utils.getMessageForException(ne, hostPort));
+ LOG.log(Level.SEVERE, "Complete error stack:", ne);
+ }
+ return context;
+ }
+
/**
* Initializes the contents of a whole topology with the contents of the other
* using the parameters in the provided InitializeAllReplicationUserData.
--
Gitblit v1.10.0