Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 00E1A10D60 for ; Thu, 13 Feb 2014 10:35:14 +0000 (UTC) Received: (qmail 28874 invoked by uid 500); 13 Feb 2014 10:35:13 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 28792 invoked by uid 500); 13 Feb 2014 10:35:11 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 28772 invoked by uid 99); 13 Feb 2014 10:35:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Feb 2014 10:35:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9997689E28D; Thu, 13 Feb 2014 10:35:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Thu, 13 Feb 2014 10:35:08 -0000 Message-Id: <7ef10a359670402289e52c297b8590e5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: CAMEL-7188: Fixed findComponents to work in OSGi, so we can discover all the Camel components in the container. Updated Branches: refs/heads/camel-2.12.x 6fc972721 -> 0147b7a5a refs/heads/master de96d4581 -> 7fe4af53a CAMEL-7188: Fixed findComponents to work in OSGi, so we can discover all the Camel components in the container. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7fe4af53 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7fe4af53 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7fe4af53 Branch: refs/heads/master Commit: 7fe4af53a9c206fb201115be870694283f877740 Parents: de96d45 Author: Claus Ibsen Authored: Thu Feb 13 11:35:20 2014 +0100 Committer: Claus Ibsen Committed: Thu Feb 13 11:35:20 2014 +0100 ---------------------------------------------------------------------- .../org/apache/camel/management/mbean/ManagedCamelContext.java | 4 ++-- .../src/main/java/org/apache/camel/util/CamelContextHelper.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7fe4af53/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 f18ec50..4414a76 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 @@ -374,10 +374,10 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti public Map findComponents() throws Exception { Map answer = context.findComponents(); for (Map.Entry entry : answer.entrySet()) { - // remove component and com as its not serializable over JMX if (entry.getValue() != null) { + // remove component as its not serializable over JMX entry.getValue().remove("component"); - // and components which just list all the components in the JAR/bundle and that is verbose and not needed + // .. and components which just list all the components in the JAR/bundle and that is verbose and not needed entry.getValue().remove("components"); } } http://git-wip-us.apache.org/repos/asf/camel/blob/7fe4af53/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java index c8d80e7..7708231 100644 --- a/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java +++ b/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java @@ -365,7 +365,7 @@ public final class CamelContextHelper { */ public static SortedMap findComponents(CamelContext camelContext) throws LoadPropertiesException { ClassResolver resolver = camelContext.getClassResolver(); - LOG.info("Finding all components using class resolver: {} -> {}", new Object[]{resolver}); + LOG.debug("Finding all components using class resolver: {} -> {}", new Object[]{resolver}); Enumeration iter = resolver.loadAllResourcesAsURL(COMPONENT_DESCRIPTOR); return findComponents(camelContext, iter); } @@ -376,7 +376,7 @@ public final class CamelContextHelper { SortedMap map = new TreeMap(); while (componentDescriptionIter != null && componentDescriptionIter.hasMoreElements()) { URL url = componentDescriptionIter.nextElement(); - LOG.info("Finding components in url: {}", url); + LOG.trace("Finding components in url: {}", url); try { Properties properties = new Properties(); properties.load(url.openStream());