You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/02/04 17:01:24 UTC
svn commit: r503429 -
/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/SSLManager.java
Author: sebb
Date: Sun Feb 4 08:01:23 2007
New Revision: 503429
URL: http://svn.apache.org/viewvc?view=rev&rev=503429
Log:
Improve logging messages
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/SSLManager.java
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/SSLManager.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/SSLManager.java?view=diff&rev=503429&r1=503428&r2=503429
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/SSLManager.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/SSLManager.java Sun Feb 4 08:01:23 2007
@@ -107,11 +107,11 @@
try {
if (fileName.endsWith(".p12") || fileName.endsWith(".P12")) { // $NON-NLS-1$ // $NON-NLS-2$
this.keyStore = JmeterKeyStore.getInstance(PKCS12);
- log.info("KeyStore Type: PKCS 12");
+ log.info("KeyStore created OK, Type: PKCS 12");
System.setProperty("javax.net.ssl.keyStoreType", PKCS12); // $NON-NLS-1$
} else {
this.keyStore = JmeterKeyStore.getInstance("JKS"); // $NON-NLS-1$
- log.info("KeyStore Type: JKS");
+ log.info("KeyStore created OK, Type: JKS");
}
} catch (Exception e) {
this.keyStore = null;
@@ -125,8 +125,9 @@
if (initStore.exists()) {
fileInputStream = new FileInputStream(initStore);
this.keyStore.load(fileInputStream, getPassword());
+ log.info("Keystore loaded OK from file");
} else {
- log.warn("Keystore not found, creating empty keystore");
+ log.warn("Keystore file not found, loading empty keystore");
this.defaultpw = ""; // Ensure not null
this.keyStore.load(null, "");
}
@@ -183,7 +184,7 @@
try {
this.trustStore = KeyStore.getInstance("JKS");
- log.info("TrustStore Type: JKS");
+ log.info("TrustStore created OK, Type: JKS");
} catch (Exception e) {
this.trustStore = null;
throw new RuntimeException("Problem creating truststore: "+e.getMessage());
@@ -196,8 +197,9 @@
if (initStore.exists()) {
fileInputStream = new FileInputStream(initStore);
this.trustStore.load(fileInputStream, null);
+ log.info("Truststore loaded OK from file");
} else {
- log.info("Truststore not found, creating empty truststore");
+ log.info("Truststore file not found, loading empty truststore");
this.trustStore.load(null, null);
}
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org