Updated Branches: refs/heads/master 630aff69c -> 1b3a28a6e
Expose classresolvers in JMX on CamelContextMBean for ppl to be able to see this. As well DEBUG logging on starting Camel. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4479267f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4479267f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4479267f Branch: refs/heads/master Commit: 4479267f0c20cb554334f845ed1d1ba89df11ac9 Parents: 630aff6 Author: Claus Ibsen <[email protected]> Authored: Tue Jul 23 15:13:37 2013 +0200 Committer: Claus Ibsen <[email protected]> Committed: Tue Jul 23 15:13:37 2013 +0200 ---------------------------------------------------------------------- .../management/mbean/ManagedCamelContextMBean.java | 9 +++++++++ .../org/apache/camel/impl/DefaultCamelContext.java | 10 +++++++++- .../camel/management/mbean/ManagedCamelContext.java | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4479267f/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java index 514fdbe..566f6e0 100644 --- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java +++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedCamelContextMBean.java @@ -45,6 +45,15 @@ public interface ManagedCamelContextMBean extends ManagedPerformanceCounterMBean @ManagedAttribute(description = "Camel Properties") Map<String, String> getProperties(); + @ManagedAttribute(description = "ClassResolver class name") + String getClassResolver(); + + @ManagedAttribute(description = "PackageScanClassResolver class name") + String getPackageScanClassResolver(); + + @ManagedAttribute(description = "ApplicationContext class name") + String getApplicationContextClassName(); + /** * Gets the value of a CamelContext property name * http://git-wip-us.apache.org/repos/asf/camel/blob/4479267f/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java index bb9b2d1..7e179d1 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java @@ -1547,7 +1547,15 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon } private void doStartCamel() throws Exception { - log.info("Using ClassResolver {}", getClassResolver()); + if (applicationContextClassLoader == null) { + // use the classloader that loaded this class + setApplicationContextClassLoader(this.getClass().getClassLoader()); + } + + if (log.isDebugEnabled()) { + log.debug("Using ClassResolver={}, PackageScanClassResolver={}, ApplicationContextClassLoader={}", + new Object[]{getClassResolver(), getPackageScanClassResolver(), getApplicationContextClassLoader()}); + } if (isStreamCaching()) { log.info("StreamCaching is enabled on CamelContext: {}", getName()); http://git-wip-us.apache.org/repos/asf/camel/blob/4479267f/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java index 76e8996..e643e8d 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java @@ -84,6 +84,22 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti return context.getUptime(); } + public String getClassResolver() { + return context.getClassResolver().getClass().getName(); + } + + public String getPackageScanClassResolver() { + return context.getPackageScanClassResolver().getClass().getName(); + } + + public String getApplicationContextClassName() { + if (context.getApplicationContextClassLoader() != null) { + return context.getApplicationContextClassLoader().toString(); + } else { + return null; + } + } + public Map<String, String> getProperties() { if (context.getProperties().isEmpty()) { return null;
