Author: davsclaus
Date: Sun May 27 13:13:05 2012
New Revision: 1343041
URL: http://svn.apache.org/viewvc?rev=1343041&view=rev
Log:
CAMEL-5310: More details being logged from created SSLContext.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextParameters.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextServerParameters.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SecureRandomParameters.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java?rev=1343041&r1=1343040&r2=1343041&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/BaseSSLContextParameters.java
Sun May 27 13:13:05 2012
@@ -49,6 +49,8 @@ import org.apache.camel.util.jsse.Filter
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static
org.apache.camel.util.CollectionHelper.collectionAsCommaDelimitedString;
+
/**
* Represents configuration options that can be applied in the client-side
* or server-side context depending on what they are applied to.
@@ -728,6 +730,16 @@ public abstract class BaseSSLContextPara
public SSLContextDecorator(SSLContextSpiDecorator decorator) {
super(decorator, decorator.getDelegate().getProvider(),
decorator.getDelegate().getProtocol());
}
+
+ @Override
+ public String toString() {
+ return String.format("SSLContext[provider=%s, protocol=%s,
needClientAuth=%s,
wantClientAuth=%s\n\tdefaultProtocols=%s\n\tdefaultChiperSuites=%s\n\tsupportedProtocols=%s\n\tsupportedChiperSuites=%s\n]",
+ getProvider(), getProtocol(),
getDefaultSSLParameters().getNeedClientAuth(),
getDefaultSSLParameters().getWantClientAuth(),
+
collectionAsCommaDelimitedString(getDefaultSSLParameters().getProtocols()),
+
collectionAsCommaDelimitedString(getDefaultSSLParameters().getCipherSuites()),
+
collectionAsCommaDelimitedString(getSupportedSSLParameters().getProtocols()),
+
collectionAsCommaDelimitedString(getSupportedSSLParameters().getCipherSuites()));
+ }
}
/**
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextParameters.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextParameters.java?rev=1343041&r1=1343040&r2=1343041&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextParameters.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextParameters.java
Sun May 27 13:13:05 2012
@@ -229,7 +229,7 @@ public class SSLContextParameters extend
*/
public SSLContext createSSLContext() throws GeneralSecurityException,
IOException {
- LOG.debug("Creating SSLContext from SSLContextParameters: {}", this);
+ LOG.trace("Creating SSLContext from SSLContextParameters: {}", this);
KeyManager[] keyManagers = this.keyManagers == null ? null :
this.keyManagers.createKeyManagers();
TrustManager[] trustManagers = this.trustManagers == null ? null :
this.trustManagers.createTrustManagers();
@@ -254,7 +254,7 @@ public class SSLContextParameters extend
this.getSSLEngineConfigurers(context),
this.getSSLSocketFactoryConfigurers(context),
this.getSSLServerSocketFactoryConfigurers(context)));
-
+ LOG.debug("Created {}", context);
return context;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextServerParameters.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextServerParameters.java?rev=1343041&r1=1343040&r2=1343041&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextServerParameters.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SSLContextServerParameters.java
Sun May 27 13:13:05 2012
@@ -68,7 +68,7 @@ public class SSLContextServerParameters
LOG.debug("Configuring server-side SSLContext session timeout: " +
this.getSessionTimeout());
this.configureSessionContext(context.getServerSessionContext(),
this.getSessionTimeout());
}
- LOG.debug("Configured server-side SSLContext parameters.");
+ LOG.debug("Configured server-side SSLContext parameters.");
}
/**
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SecureRandomParameters.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SecureRandomParameters.java?rev=1343041&r1=1343040&r2=1343041&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SecureRandomParameters.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/SecureRandomParameters.java
Sun May 27 13:13:05 2012
@@ -56,7 +56,7 @@ public class SecureRandomParameters exte
* not exist.
*/
public SecureRandom createSecureRandom() throws GeneralSecurityException {
- LOG.debug("Creating SecureRandom from SecureRandomParameters: {}",
this);
+ LOG.trace("Creating SecureRandom from SecureRandomParameters: {}",
this);
SecureRandom secureRandom;
if (this.getProvider() != null) {
