From 41c43fc954fef02214a224f83273abdf36cc22a0 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 21 Sep 2016 15:36:26 +0000
Subject: [PATCH] OPENDJ-2413 Add ldaps port and add toString() method to some parameter classes
---
opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/EmbeddedDirectoryServer.java | 4 ++--
opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ConnectionParameters.java | 33 ++++++++++++++-------------------
opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/SetupParameters.java | 7 -------
opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ReplicationParameters.java | 13 ++++++++++++-
4 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ConnectionParameters.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ConnectionParameters.java
index e30a82d..9b284da 100644
--- a/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ConnectionParameters.java
+++ b/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ConnectionParameters.java
@@ -26,7 +26,6 @@
private String hostName;
private Integer ldapPort;
private Integer ldapsPort;
- private boolean enableStartTLS;
private ConnectionParameters()
{
@@ -43,6 +42,20 @@
return new ConnectionParameters();
}
+ @Override
+ public String toString()
+ {
+ return "ConnectionParameters ["
+ + "host name=" + hostName
+ + ", ldap port=" + ldapPort
+ + ", ldaps port=" + ldapsPort
+ + ", admin port=" + adminPort
+ + ", bind DN=" + bindDn
+ + ", admin uid=" + adminUid
+ + "]";
+
+ }
+
String getAdminPassword()
{
return adminPassword;
@@ -83,11 +96,6 @@
return ldapsPort;
}
- boolean isStartTLSEnabled()
- {
- return enableStartTLS;
- }
-
/**
* Sets the password of the Global Administrator to use to bind to the server.
*
@@ -154,19 +162,6 @@
}
/**
- * Sets the start TLS indicator.
- *
- * @param startTLS
- * the indicator which should be {@code true} to enable StartTLS, {@code false} otherwise
- * @return this builder
- */
- public ConnectionParameters enableStartTLS(boolean startTLS)
- {
- enableStartTLS = startTLS;
- return this;
- }
-
- /**
* Sets the the fully-qualified directory server host name.
*
* @param hostName
diff --git a/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/EmbeddedDirectoryServer.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/EmbeddedDirectoryServer.java
index 56e737e..bfaa684 100644
--- a/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/EmbeddedDirectoryServer.java
+++ b/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/EmbeddedDirectoryServer.java
@@ -206,7 +206,7 @@
{
throw new EmbeddedDirectoryServerException(ERR_EMBEDDED_SERVER_CONFIGURE_REPLICATION.get(
configParams.getServerRootDirectory(), parameters.getReplicationPortSource(),
- parameters.getHostnameDestination(), parameters.getReplicationPortDestination(), returnCode));
+ parameters.getHostNameDestination(), parameters.getReplicationPortDestination(), returnCode));
}
}
@@ -325,7 +325,7 @@
if (returnCode != 0)
{
throw new EmbeddedDirectoryServerException(ERR_EMBEDDED_SERVER_INITIALIZE_REPLICATION.get(
- configParams.getServerRootDirectory(), connectionParams.getAdminPort(), parameters.getHostnameDestination(),
+ configParams.getServerRootDirectory(), connectionParams.getAdminPort(), parameters.getHostNameDestination(),
parameters.getAdminPortDestination(), returnCode));
}
}
diff --git a/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ReplicationParameters.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ReplicationParameters.java
index b1d2934..2e3a4fb 100644
--- a/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ReplicationParameters.java
+++ b/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/ReplicationParameters.java
@@ -107,6 +107,17 @@
"--noPropertiesFile" };
}
+ @Override
+ public String toString()
+ {
+ return "ReplicationParameters [baseDn=" + baseDn
+ + ", source replication port=" + replicationPortSource
+ + ", destination host name=" + getHostNameDestination()
+ + ", destination replication port=" + replicationPortDestination
+ + ", destination admin port=" + getAdminPortDestination()
+ + "]";
+ }
+
int getReplicationPortSource()
{
return replicationPortSource;
@@ -117,7 +128,7 @@
return replicationPortDestination;
}
- String getHostnameDestination()
+ String getHostNameDestination()
{
return connParamsForDestination.getHostName();
}
diff --git a/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/SetupParameters.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/SetupParameters.java
index 6cc1799..bfe7520 100644
--- a/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/SetupParameters.java
+++ b/opendj-server-legacy/src/main/java/org/forgerock/opendj/server/embedded/SetupParameters.java
@@ -68,13 +68,6 @@
{
args.add("--ldapsPort");
args.add(s(connParams.getLdapSecurePort()));
- }
- if (connParams.isStartTLSEnabled())
- {
- args.add("--enableStartTLS");
- }
- if (connParams.getLdapSecurePort() != null || connParams.isStartTLSEnabled())
- {
args.add("--generateSelfSignedCertificate");
}
return args.toArray(new String[args.size()]);
--
Gitblit v1.10.0