You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/02/13 11:35:08 UTC
[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 <da...@apache.org>
Authored: Thu Feb 13 11:35:20 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
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<String, Properties> findComponents() throws Exception {
Map<String, Properties> answer = context.findComponents();
for (Map.Entry<String, Properties> 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<String, Properties> 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<URL> iter = resolver.loadAllResourcesAsURL(COMPONENT_DESCRIPTOR);
return findComponents(camelContext, iter);
}
@@ -376,7 +376,7 @@ public final class CamelContextHelper {
SortedMap<String, Properties> map = new TreeMap<String, Properties>();
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());
[2/2] git commit: CAMEL-7188: Fixed findComponents to work in OSGi,
so we can discover all the Camel components in the container.
Posted by da...@apache.org.
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/0147b7a5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0147b7a5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0147b7a5
Branch: refs/heads/camel-2.12.x
Commit: 0147b7a5a8771a145906f7951e60722bf2f80ba4
Parents: 6fc9727
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Feb 13 11:35:20 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Feb 13 11:36:21 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/0147b7a5/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 d20f8d3..a4d54d2 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
@@ -373,10 +373,10 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
public Map<String, Properties> findComponents() throws Exception {
Map<String, Properties> answer = context.findComponents();
for (Map.Entry<String, Properties> 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/0147b7a5/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<String, Properties> 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<URL> iter = resolver.loadAllResourcesAsURL(COMPONENT_DESCRIPTOR);
return findComponents(camelContext, iter);
}
@@ -376,7 +376,7 @@ public final class CamelContextHelper {
SortedMap<String, Properties> map = new TreeMap<String, Properties>();
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());