Author: davsclaus
Date: Mon May 28 10:30:58 2012
New Revision: 1343197
URL: http://svn.apache.org/viewvc?rev=1343197&view=rev
Log:
CAMEL-5310: Polished
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/JsseParameters.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/JsseParameters.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/JsseParameters.java?rev=1343197&r1=1343196&r2=1343197&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/JsseParameters.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/jsse/JsseParameters.java
Mon May 28 10:30:58 2012
@@ -123,6 +123,7 @@ public class JsseParameters implements C
try {
LOG.trace("Trying to open resource as a file.");
is = new FileInputStream(resource);
+ LOG.debug("Loaded resource as file {}", resource);
} catch (FileNotFoundException e) {
LOG.trace("Could not open resource as a file.", e);
}
@@ -134,6 +135,8 @@ public class JsseParameters implements C
if (is == null) {
LOG.trace("Could not open resource as a class path resource
using the TCCL {}.",
Thread.currentThread().getContextClassLoader());
+ } else {
+ LOG.debug("Loaded resource from TCCL ClassLoader {}",
resource);
}
}
@@ -144,6 +147,8 @@ public class JsseParameters implements C
if (is == null) {
LOG.trace("Could not open resource as a class path resource
using the classloader {}.",
this.getClass().getClassLoader());
+ } else {
+ LOG.debug("Loaded resource from JsseParameter ClassLoader {}",
resource);
}
}
@@ -151,15 +156,20 @@ public class JsseParameters implements C
try {
LOG.trace("Trying to open resource as a URL.");
is = new URL(resource).openStream();
+ LOG.debug("Loaded resource as URL {}", resource);
} catch (IOException e) {
- LOG.trace("Could not open resource as a URL.", e);
+ LOG.trace("Could not open resource as a URL", e);
}
}
if (is == null && this.context != null) {
LOG.trace("Trying to open resource using the CamelContext
ClassResolver {}", context.getClassResolver());
is = context.getClassResolver().loadResourceAsStream(resource);
- LOG.trace("Could not to open resource using the CamelContext
ClassResolver {}.", context.getClassResolver());
+ if (is == null) {
+ LOG.trace("Could not to open resource using the CamelContext
ClassResolver {}.", context.getClassResolver());
+ } else {
+ LOG.debug("Loaded resource using the CamelContext
ClassResolver {}", resource);
+ }
}
if (is == null) {
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=1343197&r1=1343196&r2=1343197&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
Mon May 28 10:30:58 2012
@@ -264,12 +264,12 @@ public class SSLContextParameters extend
super.configureSSLContext(context);
if (this.getClientParameters() != null) {
- LOG.debug("Overriding client-side SSLContext parameters with
configured client parameters.");
+ LOG.trace("Overriding client-side SSLContext parameters with
configured client parameters.");
this.getClientParameters().configureSSLContext(context);
}
if (this.getServerParameters() != null) {
- LOG.debug("Overriding server-side SSLContext parameters with
configured server parameters.");
+ LOG.trace("Overriding server-side SSLContext parameters with
configured server parameters.");
this.getServerParameters().configureSSLContext(context);
}
@@ -282,12 +282,12 @@ public class SSLContextParameters extend
List<Configurer<SSLEngine>> configurers =
super.getSSLEngineConfigurers(context);
if (this.getClientParameters() != null) {
- LOG.debug("Augmenting SSLEngine configurers with configurers from
client parameters.");
+ LOG.trace("Augmenting SSLEngine configurers with configurers from
client parameters.");
configurers.addAll(this.getClientParameters().getSSLEngineConfigurers(context));
}
if (this.getServerParameters() != null) {
- LOG.debug("Augmenting SSLEngine configurers with configurers from
server parameters.");
+ LOG.trace("Augmenting SSLEngine configurers with configurers from
server parameters.");
configurers.addAll(this.getServerParameters().getSSLEngineConfigurers(context));
}
@@ -302,7 +302,7 @@ public class SSLContextParameters extend
List<Configurer<SSLSocketFactory>> configurers =
super.getSSLSocketFactoryConfigurers(context);
if (this.getClientParameters() != null) {
- LOG.debug("Augmenting SSLSocketFactory configurers with
configurers from client parameters.");
+ LOG.trace("Augmenting SSLSocketFactory configurers with
configurers from client parameters.");
configurers.addAll(this.getClientParameters().getSSLSocketFactoryConfigurers(context));
}
@@ -317,7 +317,7 @@ public class SSLContextParameters extend
List<Configurer<SSLServerSocketFactory>> configurers =
super.getSSLServerSocketFactoryConfigurers(context);
if (this.getServerParameters() != null) {
- LOG.debug("Augmenting SSLServerSocketFactory configurers with
configurers from server parameters.");
+ LOG.trace("Augmenting SSLServerSocketFactory configurers with
configurers from server parameters.");
configurers.addAll(this.getServerParameters().getSSLServerSocketFactoryConfigurers(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=1343197&r1=1343196&r2=1343197&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
Mon May 28 10:30:58 2012
@@ -63,12 +63,12 @@ public class SSLContextServerParameters
@Override
protected void configureSSLContext(SSLContext context) throws
GeneralSecurityException {
- LOG.debug("Configuring server-side SSLContext parameters...");
+ LOG.trace("Configuring server-side SSLContext parameters...");
if (this.getSessionTimeout() != null) {
LOG.debug("Configuring server-side SSLContext session timeout: " +
this.getSessionTimeout());
this.configureSessionContext(context.getServerSessionContext(),
this.getSessionTimeout());
}
- LOG.debug("Configured server-side SSLContext parameters.");
+ LOG.trace("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=1343197&r1=1343196&r2=1343197&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
Mon May 28 10:30:58 2012
@@ -56,7 +56,7 @@ public class SecureRandomParameters exte
* not exist.
*/
public SecureRandom createSecureRandom() throws GeneralSecurityException {
- LOG.trace("Creating SecureRandom from SecureRandomParameters: {}",
this);
+ LOG.debug("Creating SecureRandom from SecureRandomParameters: {}",
this);
SecureRandom secureRandom;
if (this.getProvider() != null) {
