From 0e9445463dbd065a765589a30dde204f4504bbd2 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 20 Oct 2008 11:40:48 +0000
Subject: [PATCH] Fix for issue 3504 (setup --userJavaKeystore doesn't support JCEKS keystore).
---
opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java b/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
index ae388a0..5a0ed37 100644
--- a/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opends/src/server/org/opends/server/tools/InstallDSArgumentParser.java
@@ -90,6 +90,7 @@
StringArgument directoryManagerDNArg;
StringArgument directoryManagerPwdStringArg;
StringArgument useJavaKeyStoreArg;
+ StringArgument useJCEKSArg;
StringArgument usePkcs12Arg;
StringArgument keyStorePasswordArg;
StringArgument certNicknameArg;
@@ -347,6 +348,12 @@
INFO_INSTALLDS_DESCRIPTION_USE_JAVAKEYSTORE.get());
addArgument(useJavaKeyStoreArg);
+ useJCEKSArg = new StringArgument("useJCEKS".toLowerCase(),
+ null, "useJCEKS", false, false,
+ true, INFO_KEYSTOREPATH_PLACEHOLDER.get(), null, "useJCEKS",
+ INFO_INSTALLDS_DESCRIPTION_USE_JCEKS.get());
+ addArgument(useJCEKSArg);
+
usePkcs12Arg = new StringArgument("usePkcs12keyStore".toLowerCase(),
null, "usePkcs12keyStore", false, false,
true, INFO_KEYSTOREPATH_PLACEHOLDER.get(), null, "usePkcs12keyStore",
@@ -652,6 +659,10 @@
{
certificateType++;
}
+ if (useJCEKSArg.isPresent())
+ {
+ certificateType++;
+ }
if (usePkcs11Arg.isPresent())
{
certificateType++;
--
Gitblit v1.10.0