From f298aaee8802d3eaad4ff712ed088546586388d8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 24 Oct 2014 09:47:16 +0000
Subject: [PATCH] More code cleanup of ReplicationCliMain Removed utility methods that are just forwarding to other utility methods. Removed methods that have been ported to com.forgerock.opendj.cli.Utils.
---
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 89 +++++++++++++++++---------------------------
1 files changed, 35 insertions(+), 54 deletions(-)
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index b9109e0..cc1a343 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -121,6 +121,9 @@
import static com.forgerock.opendj.cli.Utils.*;
import static org.forgerock.util.Utils.*;
+import static org.opends.admin.ads.ServerDescriptor.*;
+import static org.opends.admin.ads.ServerDescriptor.ServerProperty.*;
+import static org.opends.admin.ads.util.ConnectionUtils.*;
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.quicksetup.Step.*;
import static org.opends.quicksetup.util.Utils.*;
@@ -1517,9 +1520,6 @@
// Try to connect
DataReplicationOptions repl = getUserData().getReplicationOptions();
AuthenticationData auth = repl.getAuthenticationData();
- String ldapUrl = getLdapUrl(auth);
- String dn = auth.getDn();
- String pwd = auth.getPwd();
if (isVerbose())
{
notifyListeners(getFormattedWithPoints(
@@ -1527,18 +1527,7 @@
}
try
{
- if (auth.useSecureConnection())
- {
- ApplicationTrustManager trustManager = getTrustManager();
- trustManager.setHost(auth.getHostName());
- ctx = createLdapsContext(ldapUrl, dn, pwd,
- getConnectTimeout(), null, trustManager);
- }
- else
- {
- ctx = createLdapContext(ldapUrl, dn, pwd,
- getConnectTimeout(), null);
- }
+ ctx = createInitialLdapContext(auth);
ADSContext adsContext = new ADSContext(ctx);
if (createdRemoteAds)
@@ -1774,8 +1763,7 @@
}
for (ServerDescriptor server : lastLoadedCache.getServers())
{
- Object v = server.getServerProperties().get
- (ServerDescriptor.ServerProperty.REPLICATION_SERVER_ID);
+ Object v = server.getServerProperties().get(REPLICATION_SERVER_ID);
if (v != null)
{
knownReplicationServerIds.add((Integer)v);
@@ -1791,8 +1779,7 @@
for (ReplicaDescriptor replica : suffix.getReplicas())
{
knownServerIds.add(replica.getReplicationId());
- Object v = replica.getServer().getServerProperties().get
- (ServerDescriptor.ServerProperty.REPLICATION_SERVER_ID);
+ Object v = replica.getServer().getServerProperties().get(REPLICATION_SERVER_ID);
if (v != null)
{
knownReplicationServerIds.add((Integer)v);
@@ -1903,10 +1890,8 @@
for (ServerDescriptor server : hm.keySet())
{
notifyListeners(getFormattedWithPoints(
- INFO_PROGRESS_CONFIGURING_REPLICATION_REMOTE.get(
- getHostPort(server))));
- Integer v = (Integer)server.getServerProperties().get(
- ServerDescriptor.ServerProperty.REPLICATION_SERVER_PORT);
+ INFO_PROGRESS_CONFIGURING_REPLICATION_REMOTE.get(getHostPort(server))));
+ Integer v = (Integer)server.getServerProperties().get(REPLICATION_SERVER_PORT);
int replicationPort;
boolean enableSecureReplication;
if (v != null)
@@ -2348,7 +2333,7 @@
filter.setSearchMonitoringInformation(false);
filter.addBaseDNToSearch(ADSContext.getAdministrationSuffixDN());
filter.addBaseDNToSearch(Constants.SCHEMA_DN);
- ServerDescriptor s = ServerDescriptor.createStandalone(rCtx, filter);
+ ServerDescriptor s = createStandalone(rCtx, filter);
for (ReplicaDescriptor replica : s.getReplicas())
{
String dn = replica.getSuffix().getDN();
@@ -2432,7 +2417,7 @@
TopologyCacheFilter filter = new TopologyCacheFilter();
filter.setSearchMonitoringInformation(false);
filter.addBaseDNToSearch(dn);
- ServerDescriptor s = ServerDescriptor.createStandalone(rCtx, filter);
+ ServerDescriptor s = createStandalone(rCtx, filter);
for (ReplicaDescriptor r : s.getReplicas())
{
if (areDnsEqual(r.getSuffix().getDN(), dn))
@@ -2538,22 +2523,7 @@
{
if (isRemoteServer)
{
- /* In case the user specified an existing topology... */
- String ldapUrl = getLdapUrl(auth);
- String dn = auth.getDn();
- String pwd = auth.getPwd();
- if (auth.useSecureConnection())
- {
- ApplicationTrustManager trustManager = getTrustManager();
- trustManager.setHost(auth.getHostName());
- remoteCtx = createLdapsContext(ldapUrl, dn, pwd,
- getConnectTimeout(), null, trustManager);
- }
- else
- {
- remoteCtx = createLdapContext(ldapUrl, dn, pwd,
- getConnectTimeout(), null);
- }
+ remoteCtx = createInitialLdapContext(auth);
adsContext = new ADSContext(remoteCtx); // adsContext owns remoteCtx
/* Check the remote server for ADS. If it does not exist, create the
@@ -2570,8 +2540,7 @@
TopologyCacheFilter filter = new TopologyCacheFilter();
filter.setSearchMonitoringInformation(false);
filter.setSearchBaseDNInformation(false);
- ServerDescriptor server
- = ServerDescriptor.createStandalone(remoteCtx, filter);
+ ServerDescriptor server = createStandalone(remoteCtx, filter);
server.updateAdsPropertiesWithServerProperties();
adsContext.registerServer(server.getAdsProperties());
createdRemoteAds = true;
@@ -2606,8 +2575,7 @@
TopologyCacheFilter filter = new TopologyCacheFilter();
filter.setSearchMonitoringInformation(false);
filter.setSearchBaseDNInformation(false);
- ServerDescriptor server = ServerDescriptor.createStandalone(localCtx,
- filter);
+ ServerDescriptor server = createStandalone(localCtx, filter);
server.updateAdsPropertiesWithServerProperties();
if (0 == adsContext.registerOrUpdateServer(server.getAdsProperties())) {
if (isRemoteServer)
@@ -2620,8 +2588,7 @@
}
if (isRemoteServer)
{
- ServerDescriptor.seedAdsTrustStore(localCtx,
- adsContext.getTrustedCertificates());
+ seedAdsTrustStore(localCtx, adsContext.getTrustedCertificates());
}
if (isVerbose())
{
@@ -2695,6 +2662,22 @@
}
}
+ private InitialLdapContext createInitialLdapContext(AuthenticationData auth) throws NamingException
+ {
+ String ldapUrl = getLdapUrl(auth);
+ String dn = auth.getDn();
+ String pwd = auth.getPwd();
+
+ if (auth.useSecureConnection())
+ {
+ ApplicationTrustManager trustManager = getTrustManager();
+ trustManager.setHost(auth.getHostName());
+ return createLdapsContext(ldapUrl, dn, pwd,
+ getConnectTimeout(), null, trustManager, null);
+ }
+ return createLdapContext(ldapUrl, dn, pwd, getConnectTimeout(), null);
+ }
+
/**
* Tells whether we must create a suffix that we are not going to replicate
* with other servers or not.
@@ -3479,7 +3462,7 @@
try
{
ctx = createLdapsContext(ldapUrl, dn, pwd,
- getConnectTimeout(), null, trustManager);
+ getConnectTimeout(), null, trustManager, null);
}
catch (Throwable t)
{
@@ -3489,7 +3472,7 @@
dn = ADSContext.getAdministratorDN(dn);
effectiveDn[0] = dn;
ctx = createLdapsContext(ldapUrl, dn, pwd,
- getConnectTimeout(), null, trustManager);
+ getConnectTimeout(), null, trustManager, null);
}
else
{
@@ -4116,8 +4099,7 @@
type = SuffixesToReplicateOptions.Type.NEW_SUFFIX_IN_TOPOLOGY;
}
- ServerDescriptor s = ServerDescriptor.createStandalone(ctx,
- new TopologyCacheFilter());
+ ServerDescriptor s = createStandalone(ctx, new TopologyCacheFilter());
Set<ReplicaDescriptor> replicas = s.getReplicas();
for (ReplicaDescriptor replica : replicas)
{
@@ -4225,8 +4207,7 @@
for (ReplicaDescriptor replica : suffix.getReplicas())
{
ServerDescriptor server = replica.getServer();
- Object v = server.getServerProperties().get(
- ServerDescriptor.ServerProperty.IS_REPLICATION_SERVER);
+ Object v = server.getServerProperties().get(IS_REPLICATION_SERVER);
if (!Boolean.TRUE.equals(v))
{
AuthenticationData authData = new AuthenticationData();
@@ -4247,7 +4228,7 @@
String dn = getUserData().getDirectoryManagerDn();
String pwd = getUserData().getDirectoryManagerPwd();
return createLdapsContext(ldapUrl, dn, pwd,
- getConnectTimeout(), null, null);
+ getConnectTimeout(), null, null, null);
}
/**
--
Gitblit v1.10.0