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/ApplicationKeyManager.java | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ApplicationKeyManager.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java
similarity index 96%
rename from opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ApplicationKeyManager.java
rename to opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java
index b87e3ec..1672349 100755
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ApplicationKeyManager.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java
@@ -23,9 +23,9 @@
*
* Copyright 2008-2010 Sun Microsystems, Inc.
* Portions Copyright 2009 Parametric Technology Corporation (PTC)
+ * Portions copyright 2014 ForgeRock AS
*/
-
-package com.forgerock.opendj.ldap.tools;
+package com.forgerock.opendj.cli;
import java.net.Socket;
import java.security.KeyStore;
@@ -164,9 +164,8 @@
final Socket socket) {
if (keyManager != null) {
return keyManager.chooseClientAlias(keyType, issuers, socket);
- } else {
- return null;
}
+ return null;
}
/**
@@ -187,13 +186,11 @@
* @return the alias name for the desired key, or null if there are no
* matches.
*/
- public String chooseServerAlias(final String keyType, final Principal[] issuers,
- final Socket socket) {
+ public String chooseServerAlias(final String keyType, final Principal[] issuers, final Socket socket) {
if (keyManager != null) {
return keyManager.chooseServerAlias(keyType, issuers, socket);
- } else {
- return null;
}
+ return null;
}
/**
@@ -208,9 +205,8 @@
public X509Certificate[] getCertificateChain(final String alias) {
if (keyManager != null) {
return keyManager.getCertificateChain(alias);
- } else {
- return null;
}
+ return null;
}
/**
@@ -229,9 +225,8 @@
public String[] getClientAliases(final String keyType, final Principal[] issuers) {
if (keyManager != null) {
return keyManager.getClientAliases(keyType, issuers);
- } else {
- return null;
}
+ return null;
}
/**
@@ -244,9 +239,8 @@
public PrivateKey getPrivateKey(final String alias) {
if (keyManager != null) {
return keyManager.getPrivateKey(alias);
- } else {
- return null;
}
+ return null;
}
/**
@@ -265,8 +259,7 @@
public String[] getServerAliases(final String keyType, final Principal[] issuers) {
if (keyManager != null) {
return keyManager.getServerAliases(keyType, issuers);
- } else {
- return null;
}
+ return null;
}
}
--
Gitblit v1.10.0