From 1a3a07f47d0c6e9452e39dd0472a3356434782bf Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 29 Apr 2010 15:34:27 +0000
Subject: [PATCH] Batch of changes that : - Update BDB JE to version 4.0.95 - Remove BDB logging configuration and definitely fix issue 4367 - Resolve issue 4523 - ACI and sub-entry caches not updated on replicas - Update the build factory to warn about generated messages on precommit - Resolve some issues in the Control Panel - Fix an issue with java.properties being ignored by some CLI
---
opends/src/quicksetup/org/opends/quicksetup/SecurityOptions.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/SecurityOptions.java b/opends/src/quicksetup/org/opends/quicksetup/SecurityOptions.java
index 3bae717..6d90912 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/SecurityOptions.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/SecurityOptions.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup;
@@ -107,10 +107,28 @@
public static SecurityOptions createSelfSignedCertificateOptions(
boolean enableSSL, boolean enableStartTLS, int sslPort)
{
+
+ return createSelfSignedCertificateOptions(enableSSL, enableStartTLS,
+ sslPort, SELF_SIGNED_CERT_ALIAS);
+ }
+
+ /**
+ * Creates a new instance of a SecurityOptions using a self-signed
+ * certificate.
+ * @param enableSSL whether SSL is enabled or not.
+ * @param enableStartTLS whether Start TLS is enabled or not.
+ * @param sslPort the value of the LDAPS port.
+ * @param aliasToUse the alias of the certificate in the key store to be used.
+ * @return a new instance of a SecurityOptions using a self-signed
+ * certificate.
+ */
+ public static SecurityOptions createSelfSignedCertificateOptions(
+ boolean enableSSL, boolean enableStartTLS, int sslPort, String aliasToUse)
+ {
SecurityOptions ops = new SecurityOptions();
ops.setCertificateType(CertificateType.SELF_SIGNED_CERTIFICATE);
updateCertificateOptions(ops, enableSSL, enableStartTLS, sslPort,
- SELF_SIGNED_CERT_ALIAS);
+ aliasToUse);
return ops;
}
--
Gitblit v1.10.0