From c953926620477c1fa65b8e37ecb33e15eb97e229 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 10 Mar 2014 10:33:34 +0000
Subject: [PATCH] Checkpoint for OPENDJ-1303 "opendj-cli" / Checkpoint OPENDJ-1343 Migrate dsconfig - Moved ApplicationKeyManager.java, ConnectionFactoryProvider.java / PromptingTrustManager.java from opendj-ldap-tools to opendj-cli. - Created AbstractAuthenticatedConnectionFactory.class - Overriding makeAuthenticatedConnectionFactory(...) in some tools. - Replaced argument declarations by CommonArguments. - CommonArguments : added property value to getControl() && modified getReportAuthzId(). - Minor code cleanup.
---
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java
similarity index 96%
rename from opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java
rename to opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java
index cd7a839..d4ec6a2 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PromptingTrustManager.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java
@@ -22,11 +22,11 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions copyright 2014 ForgeRock AS
*/
+package com.forgerock.opendj.cli;
-package com.forgerock.opendj.ldap.tools;
-
-import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
+import static com.forgerock.opendj.cli.CliMessages.*;
import java.io.File;
import java.io.FileInputStream;
@@ -50,9 +50,6 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.util.Reject;
-import com.forgerock.opendj.cli.ClientException;
-import com.forgerock.opendj.cli.ConsoleApplication;
-
/**
* A trust manager which prompts the user for the length of time that they would
* like to trust a server certificate.
@@ -103,12 +100,12 @@
}
}
- static private final Logger LOG = Logger.getLogger(PromptingTrustManager.class.getName());
+ private static final Logger LOG = Logger.getLogger(PromptingTrustManager.class.getName());
- static private final String DEFAULT_PATH = System.getProperty("user.home") + File.separator
+ private static final String DEFAULT_PATH = System.getProperty("user.home") + File.separator
+ ".opendj" + File.separator + "keystore";
- static private final char[] DEFAULT_PASSWORD = "OpenDJ".toCharArray();
+ private static final char[] DEFAULT_PASSWORD = "OpenDJ".toCharArray();
private final KeyStore inMemoryTrustStore;
--
Gitblit v1.10.0