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:01:22 UTC
[1/2] git commit: Polished
Updated Branches:
refs/heads/master 52555435f -> bc73f1d9a
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7af4a267
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7af4a267
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7af4a267
Branch: refs/heads/master
Commit: 7af4a2671e4ce7259ffe8faa4725646642e436c4
Parents: 5255543
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Feb 12 15:54:24 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Feb 12 15:54:24 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/management/mbean/ManagedCamelContext.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7af4a267/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 75a4610..809dcf3 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
@@ -423,7 +423,6 @@ public class ManagedCamelContext extends ManagedPerformanceCounter implements Ti
if (includeRoutes) {
MBeanServer server = getContext().getManagementStrategy().getManagementAgent().getMBeanServer();
if (server != null) {
- // get all the routes mbeans and sort them accordingly to their index
String prefix = getContext().getManagementStrategy().getManagementAgent().getIncludeHostName() ? "*/" : "";
ObjectName query = ObjectName.getInstance("org.apache.camel:context=" + prefix + getContext().getManagementName() + ",type=routes,*");
Set<ObjectName> names = server.queryNames(query, null);
[2/2] 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/bc73f1d9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc73f1d9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc73f1d9
Branch: refs/heads/master
Commit: bc73f1d9a7819fd393ef2155f95504add79ba8c3
Parents: 7af4a26
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:02:43 2014 +0100
----------------------------------------------------------------------
.../camel/component/twitter/UriConfigurationTest.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bc73f1d9/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);
+ }
+
}