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/12 17:35:10 UTC
[1/3] git commit: CAMEL-7200: get component doc to work in OSGi.
Updated Branches:
refs/heads/camel-2.12.x c09ae2fe5 -> a53021617
refs/heads/master bc73f1d9a -> 78a850ccc
CAMEL-7200: get component doc to work in OSGi.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/78a850cc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/78a850cc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/78a850cc
Branch: refs/heads/master
Commit: 78a850cccc9a17cb3811c489579957db111463ac
Parents: bc73f1d
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 12 17:34:49 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 12 17:34:49 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/impl/DefaultCamelContext.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/78a850cc/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 69bf5de..0f5e0c8 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
@@ -1029,7 +1029,9 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
public String getComponentDocumentation(String componentName) throws IOException {
String path = CamelContextHelper.COMPONENT_DOCUMENTATION_PREFIX + componentName + "/" + componentName + ".html";
- InputStream inputStream = getClassResolver().loadResourceAsStream(path);
+ ClassResolver resolver = getClassResolver();
+ InputStream inputStream = resolver.loadResourceAsStream(path);
+ log.debug("Loading component documentation for: {} using class resolver: {} -> {}", new Object[]{componentName, resolver, inputStream});
if (inputStream != null) {
try {
return IOHelper.loadText(inputStream);
[3/3] git commit: CAMEL-7200: get component doc to work in OSGi.
Posted by da...@apache.org.
CAMEL-7200: get component doc to work in OSGi.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a5302161
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a5302161
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a5302161
Branch: refs/heads/camel-2.12.x
Commit: a5302161701d74785c09a94cfed68e024eb4c955
Parents: b00f9d2
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 12 17:34:49 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 12 17:36:24 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/impl/DefaultCamelContext.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a5302161/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 64078ec..03f149d 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
@@ -1030,7 +1030,9 @@ public class DefaultCamelContext extends ServiceSupport implements ModelCamelCon
public String getComponentDocumentation(String componentName) throws IOException {
String path = CamelContextHelper.COMPONENT_DOCUMENTATION_PREFIX + componentName + "/" + componentName + ".html";
- InputStream inputStream = getClassResolver().loadResourceAsStream(path);
+ ClassResolver resolver = getClassResolver();
+ InputStream inputStream = resolver.loadResourceAsStream(path);
+ log.debug("Loading component documentation for: {} using class resolver: {} -> {}", new Object[]{componentName, resolver, inputStream});
if (inputStream != null) {
try {
return IOHelper.loadText(inputStream);
[2/3] git commit: Added test
Posted by da...@apache.org.
Added test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b00f9d29
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b00f9d29
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b00f9d29
Branch: refs/heads/camel-2.12.x
Commit: b00f9d29e16fc33f71c9b70348d047a96ac890e6
Parents: c09ae2f
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 12 17:02:43 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 12 17:36:14 2014 +0100
----------------------------------------------------------------------
.../camel/component/twitter/UriConfigurationTest.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b00f9d29/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
index 144a730..32edd06 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UriConfigurationTest.java
@@ -21,6 +21,7 @@ import org.apache.camel.ComponentConfiguration;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointConfiguration;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Assert;
import org.junit.Test;
@@ -88,4 +89,16 @@ public class UriConfigurationTest extends Assert {
assertTrue(json.contains("\"consumerKey\": { \"type\": \"java.lang.String\" }"));
}
+ @Test
+ public void testComponentDocumentation() throws Exception {
+ // cannot be tested on java 1.6
+ if (CamelTestSupport.isJava16()) {
+ return;
+ }
+
+ CamelContext context = new DefaultCamelContext();
+ String html = context.getComponentDocumentation("twitter");
+ assertNotNull("Should have found some auto-generated HTML if on Java 7", html);
+ }
+
}