From 9d1e0a2b58c07ff470a8678f458ed29d69d9223d Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 05 May 2014 13:32:02 +0000
Subject: [PATCH] OPENDJ-1303 "opendj-cli" - Fixed log warnings / info.
---
opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java
index 73694a1..504b11d 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java
@@ -39,8 +39,6 @@
import java.security.cert.X509Certificate;
import java.util.HashMap;
import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
@@ -48,6 +46,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.util.Reject;
/**
@@ -100,7 +99,7 @@
}
}
- private static final Logger LOG = Logger.getLogger(PromptingTrustManager.class.getName());
+ private static final LocalizedLogger LOG = LocalizedLogger.getLoggerForThisClass();
private static final String DEFAULT_PATH = System.getProperty("user.home") + File.separator
+ ".opendj" + File.separator + "keystore";
@@ -273,9 +272,9 @@
*/
private void acceptCertificate(final X509Certificate[] chain, final boolean permanent) {
if (permanent) {
- LOG.log(Level.INFO, "Permanently accepting certificate chain to " + "truststore");
+ LOG.debug(LocalizableMessage.raw("Permanently accepting certificate chain to " + "truststore"));
} else {
- LOG.log(Level.INFO, "Accepting certificate chain for this session");
+ LOG.debug(LocalizableMessage.raw("Accepting certificate chain for this session"));
}
for (final X509Certificate aChain : chain) {
@@ -286,8 +285,8 @@
onDiskTrustStore.setCertificateEntry(alias, aChain);
}
} catch (final Exception e) {
- LOG.log(Level.WARNING, "Error setting certificate to store: " + e + "\nCert: "
- + aChain.toString());
+ LOG.warn(LocalizableMessage.raw("Error setting certificate to store: " + e + "\nCert: "
+ + aChain.toString()));
}
}
@@ -301,7 +300,7 @@
onDiskTrustStore.store(fos, DEFAULT_PASSWORD);
fos.close();
} catch (final Exception e) {
- LOG.log(Level.WARNING, "Error saving store to disk: " + e);
+ LOG.warn(LocalizableMessage.raw("Error saving store to disk: " + e));
}
}
}
--
Gitblit v1.10.0