CAMEL-8025: Added karaf commands to show component list.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b264924f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b264924f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b264924f Branch: refs/heads/master Commit: b264924f0056e07d104c8f70079924699687a67f Parents: 7374b1d Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Nov 10 14:25:29 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Nov 10 14:51:12 2014 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/camel/impl/DefaultCamelContext.java | 2 ++ .../org/apache/camel/tools/apt/EndpointAnnotationProcessor.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b264924f/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 ff70147..8fcd291 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 @@ -1138,6 +1138,8 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon return "netty/http"; } else if ("netty4-http".equals(componentName)) { return "netty4/http"; + } else if ("spring-event".equals(componentName)) { + return "event"; } return componentName.replaceAll("-", ""); } http://git-wip-us.apache.org/repos/asf/camel/blob/b264924f/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java ---------------------------------------------------------------------- diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java index 0c2ffe8..c871eea 100644 --- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java +++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java @@ -278,7 +278,10 @@ public class EndpointAnnotationProcessor extends AbstractProcessor { // do not include the dot, so do not use idx + 1 doc = doc.substring(0, idx); } - model.setDescription(doc); + // the javadoc may actually be empty, so only change the doc if we got something + if (!Strings.isNullOrEmpty(doc)) { + model.setDescription(doc); + } } } }
