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 2015/02/09 08:49:33 UTC
[1/4] camel git commit: CAMEL-8023: Model and component javadoc
documentation
Repository: camel
Updated Branches:
refs/heads/master 35cc8902b -> 77f829471
CAMEL-8023: Model and component javadoc documentation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e7f0126a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e7f0126a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e7f0126a
Branch: refs/heads/master
Commit: e7f0126ae90870bbc14804baf3391c70ec5ebc0d
Parents: 35cc890
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 9 08:08:47 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 9 08:08:47 2015 +0100
----------------------------------------------------------------------
.../camel/component/seda/SedaComponent.java | 19 ++++++---
.../camel/component/seda/SedaEndpoint.java | 43 ++++++++++++++++++++
2 files changed, 57 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e7f0126a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
index a0f4269..9163c74 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
@@ -36,7 +36,7 @@ public class SedaComponent extends UriEndpointComponent {
protected final Logger log = LoggerFactory.getLogger(getClass());
protected final int maxConcurrentConsumers = 500;
protected int queueSize;
- protected int defaultConcurrentConsumers = 1;
+ protected int concurrentConsumers = 1;
private final Map<String, QueueReference> queues = new HashMap<String, QueueReference>();
private BlockingQueueFactory<Exchange> defaultQueueFactory = new LinkedBlockingQueueFactory<Exchange>();
@@ -48,6 +48,9 @@ public class SedaComponent extends UriEndpointComponent {
super(endpointClass);
}
+ /**
+ * Sets the default maximum capacity of the SEDA queue (i.e., the number of messages it can hold).
+ */
public void setQueueSize(int size) {
queueSize = size;
}
@@ -55,19 +58,25 @@ public class SedaComponent extends UriEndpointComponent {
public int getQueueSize() {
return queueSize;
}
-
+
+ /**
+ * Sets the default number of concurrent threads processing exchanges.
+ */
public void setConcurrentConsumers(int size) {
- defaultConcurrentConsumers = size;
+ concurrentConsumers = size;
}
public int getConcurrentConsumers() {
- return defaultConcurrentConsumers;
+ return concurrentConsumers;
}
public BlockingQueueFactory<Exchange> getDefaultQueueFactory() {
return defaultQueueFactory;
}
+ /**
+ * Sets the default queue factory.
+ */
public void setDefaultQueueFactory(BlockingQueueFactory<Exchange> defaultQueueFactory) {
this.defaultQueueFactory = defaultQueueFactory;
}
@@ -155,7 +164,7 @@ public class SedaComponent extends UriEndpointComponent {
@Override
@SuppressWarnings("unchecked")
protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
- int consumers = getAndRemoveParameter(parameters, "concurrentConsumers", Integer.class, defaultConcurrentConsumers);
+ int consumers = getAndRemoveParameter(parameters, "concurrentConsumers", Integer.class, concurrentConsumers);
boolean limitConcurrentConsumers = getAndRemoveParameter(parameters, "limitConcurrentConsumers", Boolean.class, true);
if (limitConcurrentConsumers && consumers > maxConcurrentConsumers) {
throw new IllegalArgumentException("The limitConcurrentConsumers flag in set to true. ConcurrentConsumers cannot be set at a value greater than "
http://git-wip-us.apache.org/repos/asf/camel/blob/e7f0126a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index 74dbfa1..6262bff 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -236,6 +236,11 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
}
}
+ /**
+ * Define the queue instance which will be used by seda endpoint.
+ * <p/>
+ * This option is only for rare use-cases where you want to use a custom queue instance.
+ */
public void setQueue(BlockingQueue<Exchange> queue) {
this.queue = queue;
this.size = queue.remainingCapacity();
@@ -246,6 +251,9 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
return size;
}
+ /**
+ * The maximum capacity of the SEDA queue (i.e., the number of messages it can hold).
+ */
public void setSize(int size) {
this.size = size;
}
@@ -255,6 +263,11 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
return queue.size();
}
+ /**
+ * Whether a thread that sends messages to a full SEDA queue will block until the queue's capacity is no longer exhausted.
+ * By default, an exception will be thrown stating that the queue is full.
+ * By enabling this option, the calling thread will instead block and wait until the message can be accepted.
+ */
public void setBlockWhenFull(boolean blockWhenFull) {
this.blockWhenFull = blockWhenFull;
}
@@ -264,6 +277,9 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
return blockWhenFull;
}
+ /**
+ * Number of concurrent threads processing exchanges.
+ */
public void setConcurrentConsumers(int concurrentConsumers) {
this.concurrentConsumers = concurrentConsumers;
}
@@ -277,6 +293,13 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
return waitForTaskToComplete;
}
+ /**
+ * Option to specify whether the caller should wait for the async task to complete or not before continuing.
+ * The following three options are supported: Always, Never or IfReplyExpected.
+ * The first two values are self-explanatory.
+ * The last value, IfReplyExpected, will only wait if the message is Request Reply based.
+ * The default option is IfReplyExpected.
+ */
public void setWaitForTaskToComplete(WaitForTaskToComplete waitForTaskToComplete) {
this.waitForTaskToComplete = waitForTaskToComplete;
}
@@ -286,6 +309,10 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
return timeout;
}
+ /**
+ * Timeout (in milliseconds) before a SEDA producer will stop waiting for an asynchronous task to complete.
+ * You can disable timeout by using 0 or a negative value.
+ */
public void setTimeout(long timeout) {
this.timeout = timeout;
}
@@ -295,6 +322,9 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
return failIfNoConsumers;
}
+ /**
+ * Whether the producer should fail by throwing an exception, when sending to a SEDA queue with no active consumers.
+ */
public void setFailIfNoConsumers(boolean failIfNoConsumers) {
this.failIfNoConsumers = failIfNoConsumers;
}
@@ -304,6 +334,11 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
return multipleConsumers;
}
+ /**
+ * Specifies whether multiple consumers are allowed. If enabled, you can use SEDA for Publish-Subscribe messaging.
+ * That is, you can send a message to the SEDA queue and have each consumer receive a copy of the message.
+ * When enabled, this option should be specified on every consumer endpoint.
+ */
public void setMultipleConsumers(boolean multipleConsumers) {
this.multipleConsumers = multipleConsumers;
}
@@ -313,6 +348,10 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
return pollTimeout;
}
+ /**
+ * The timeout used when polling. When a timeout occurs, the consumer can check whether it is allowed to continue running.
+ * Setting a lower value allows the consumer to react more quickly upon shutdown.
+ */
public void setPollTimeout(int pollTimeout) {
this.pollTimeout = pollTimeout;
}
@@ -322,6 +361,10 @@ public class SedaEndpoint extends DefaultEndpoint implements BrowsableEndpoint,
return purgeWhenStopping;
}
+ /**
+ * Whether to purge the task queue when stopping the consumer/route.
+ * This allows to stop faster, as any pending messages on the queue is discarded.
+ */
public void setPurgeWhenStopping(boolean purgeWhenStopping) {
this.purgeWhenStopping = purgeWhenStopping;
}
[2/4] camel git commit: CAMEL-8324: Camel JMX - Allow to configure
default management name pattern using JVM system property
Posted by da...@apache.org.
CAMEL-8324: Camel JMX - Allow to configure default management name pattern using JVM system property
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5170ccdf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5170ccdf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5170ccdf
Branch: refs/heads/master
Commit: 5170ccdf17bfe3f29ab04976e2ba3db30b11d0b8
Parents: e7f0126
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 9 08:28:29 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 9 08:28:29 2015 +0100
----------------------------------------------------------------------
.../impl/DefaultManagementNameStrategy.java | 3 +-
.../camel/management/JmxSystemPropertyKeys.java | 5 +-
...ManagedNamePatternJvmSystemPropertyTest.java | 64 ++++++++++++++++++++
3 files changed, 70 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5170ccdf/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementNameStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementNameStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementNameStrategy.java
index efc0be0..85df49c 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementNameStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultManagementNameStrategy.java
@@ -21,6 +21,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.camel.CamelContext;
+import org.apache.camel.management.JmxSystemPropertyKeys;
import org.apache.camel.spi.ManagementNameStrategy;
import org.apache.camel.util.ObjectHelper;
@@ -42,7 +43,7 @@ public class DefaultManagementNameStrategy implements ManagementNameStrategy {
private String namePattern;
public DefaultManagementNameStrategy(CamelContext camelContext) {
- this(camelContext, "#name#", "#name#-#counter#");
+ this(camelContext, System.getProperty(JmxSystemPropertyKeys.MANAGEMENT_NAME_PATTERN, "#name#"), "#name#-#counter#");
}
public DefaultManagementNameStrategy(CamelContext camelContext, String defaultPattern, String nextPattern) {
http://git-wip-us.apache.org/repos/asf/camel/blob/5170ccdf/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java b/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
index 3db8bfc..14e64ec 100644
--- a/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
+++ b/camel-core/src/main/java/org/apache/camel/management/JmxSystemPropertyKeys.java
@@ -59,9 +59,12 @@ public final class JmxSystemPropertyKeys {
// Whether to remove detected sensitive information (such as passwords) from MBean names and attributes.
public static final String MASK = "org.apache.camel.jmx.mask";
- // Whether to include host name in MBean naes
+ // Whether to include host name in MBean names
public static final String INCLUDE_HOST_NAME = "org.apache.camel.jmx.includeHostName";
+ // To configure the default management name pattern using a JVM system property
+ public static final String MANAGEMENT_NAME_PATTERN = "org.apache.camel.jmx.managementNamePattern";
+
private JmxSystemPropertyKeys() {
// not instantiated
}
http://git-wip-us.apache.org/repos/asf/camel/blob/5170ccdf/camel-core/src/test/java/org/apache/camel/management/ManagedNamePatternJvmSystemPropertyTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedNamePatternJvmSystemPropertyTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedNamePatternJvmSystemPropertyTest.java
new file mode 100644
index 0000000..2bd07bc
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedNamePatternJvmSystemPropertyTest.java
@@ -0,0 +1,64 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.management;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version
+ */
+public class ManagedNamePatternJvmSystemPropertyTest extends ManagementTestSupport {
+
+ @Override
+ protected void setUp() throws Exception {
+ System.setProperty(JmxSystemPropertyKeys.MANAGEMENT_NAME_PATTERN, "cool-#name#");
+ super.setUp();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ System.clearProperty(JmxSystemPropertyKeys.MANAGEMENT_NAME_PATTERN);
+ super.tearDown();
+ }
+
+ public void testManagedNamePattern() throws Exception {
+ // JMX tests dont work well on AIX CI servers (hangs them)
+ if (isPlatform("aix")) {
+ return;
+ }
+
+ MBeanServer mbeanServer = getMBeanServer();
+
+ assertEquals("cool-camel-1", context.getManagementName());
+
+ ObjectName on = ObjectName.getInstance("org.apache.camel:context=cool-camel-1,type=context,name=\"camel-1\"");
+ assertTrue("Should be registered", mbeanServer.isRegistered(on));
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").to("mock:result");
+ }
+ };
+ }
+}
[3/4] camel git commit: Fixed CS
Posted by da...@apache.org.
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a6c87f31
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a6c87f31
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a6c87f31
Branch: refs/heads/master
Commit: a6c87f315c9481bd819f6c55f0889be318fe4b60
Parents: 5170ccd
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 9 08:29:54 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 9 08:29:54 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/component/browse/BrowseComponent.java | 3 ++-
.../org/apache/camel/component/file/GenericFileOnCompletion.java | 2 +-
.../main/java/org/apache/camel/component/seda/SedaConsumer.java | 2 +-
.../src/main/java/org/apache/camel/processor/BatchProcessor.java | 2 +-
.../main/java/org/apache/camel/processor/StreamResequencer.java | 2 +-
.../org/apache/camel/processor/aggregate/AggregateProcessor.java | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a6c87f31/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
index 7e4c0aa..e3a6716 100644
--- a/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/browse/BrowseComponent.java
@@ -22,7 +22,8 @@ import org.apache.camel.Endpoint;
import org.apache.camel.impl.UriEndpointComponent;
/**
- * The <a href="http://camel.apache.org/browse.html">Browse Component</a> provides a simple <a href="http://camel.apache.org/browsableendpoint.html">BrowsableEndpoint</a> for testing visualization or debugging.
+ * The <a href="http://camel.apache.org/browse.html">Browse Component</a> provides a simple
+ * <a href="http://camel.apache.org/browsableendpoint.html">BrowsableEndpoint</a> for testing visualization or debugging.
*
* @version
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/a6c87f31/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
index 1916493..015250d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOnCompletion.java
@@ -17,9 +17,9 @@
package org.apache.camel.component.file;
import org.apache.camel.Exchange;
-import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.Synchronization;
+import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/camel/blob/a6c87f31/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
index 77a1698..5ddd0b5 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaConsumer.java
@@ -31,11 +31,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.ShutdownRunningTask;
import org.apache.camel.SuspendableService;
-import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.processor.MulticastProcessor;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.ShutdownAware;
import org.apache.camel.spi.Synchronization;
+import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.AsyncProcessorConverterHelper;
import org.apache.camel.util.ExchangeHelper;
http://git-wip-us.apache.org/repos/asf/camel/blob/a6c87f31/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
index 2dde110..c62b614 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/BatchProcessor.java
@@ -37,8 +37,8 @@ import org.apache.camel.Expression;
import org.apache.camel.Navigate;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
-import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.spi.ExceptionHandler;
+import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.ObjectHelper;
http://git-wip-us.apache.org/repos/asf/camel/blob/a6c87f31/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java b/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
index b5103f2..c51a446 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/StreamResequencer.java
@@ -31,11 +31,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Navigate;
import org.apache.camel.Processor;
import org.apache.camel.Traceable;
-import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.processor.resequencer.ResequencerEngine;
import org.apache.camel.processor.resequencer.SequenceElementComparator;
import org.apache.camel.processor.resequencer.SequenceSender;
import org.apache.camel.spi.ExceptionHandler;
+import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.ObjectHelper;
http://git-wip-us.apache.org/repos/asf/camel/blob/a6c87f31/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index 2118919..ebc6b84 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
@@ -45,7 +45,6 @@ import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.TimeoutMap;
import org.apache.camel.Traceable;
-import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.spi.AggregationRepository;
import org.apache.camel.spi.ExceptionHandler;
import org.apache.camel.spi.OptimisticLockingAggregationRepository;
@@ -53,6 +52,7 @@ import org.apache.camel.spi.RecoverableAggregationRepository;
import org.apache.camel.spi.ShutdownPrepared;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.support.DefaultTimeoutMap;
+import org.apache.camel.support.LoggingExceptionHandler;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.AsyncProcessorHelper;
import org.apache.camel.util.ExchangeHelper;
[4/4] camel git commit: Fixed tests
Posted by da...@apache.org.
Fixed tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/77f82947
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/77f82947
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/77f82947
Branch: refs/heads/master
Commit: 77f8294710be21538dacbb003c061aa40a9253c4
Parents: a6c87f3
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Feb 9 08:41:53 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Feb 9 08:41:53 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/management/ManagedCamelContextTest.java | 8 ++++----
.../apache/camel/management/ManagedEndpointExplainTest.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/77f82947/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
index 7bbe295..bcf1535 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
@@ -275,8 +275,8 @@ public class ManagedCamelContextTest extends ManagementTestSupport {
new String[]{"java.lang.String", "boolean"});
assertNotNull(json);
- assertEquals(15, StringHelper.countChar(json, '{'));
- assertEquals(15, StringHelper.countChar(json, '}'));
+ assertEquals(14, StringHelper.countChar(json, '{'));
+ assertEquals(14, StringHelper.countChar(json, '}'));
assertTrue(json.contains("\"scheme\": \"log\""));
assertTrue(json.contains("\"description\": \"The Log Component is for logging message exchanges via the underlying logging mechanism.\""));
@@ -367,8 +367,8 @@ public class ManagedCamelContextTest extends ManagementTestSupport {
assertTrue(json.contains("\"description\": \"The SEDA Component is for asynchronous SEDA exchanges on a BlockingQueue within a CamelContext\""));
assertTrue(json.contains("\"label\": \"core,endpoint\""));
- assertTrue(json.contains("\"concurrentConsumers\": { \"value\": \"1\" }"));
- assertTrue(json.contains("\"queueSize\": { \"kind\": \"property\", \"type\": \"integer\", \"javaType\": \"int\", \"deprecated\": \"false\", \"value\": \"0\" }"));
+ assertTrue(json.contains("\"defaultQueueFactory\": { \"kind\": \"property\", \"type\": \"object\", \"javaType\": \"org.apache.camel.component.seda.BlockingQueueFactory<org.apache.camel.Exchange>\","));
+ assertTrue(json.contains("\"queueSize\": { \"kind\": \"property\", \"type\": \"integer\", \"javaType\": \"int\", \"deprecated\": \"false\", \"value\": \"0\""));
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/77f82947/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java
index 4650a4c..195cbc4 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedEndpointExplainTest.java
@@ -48,9 +48,9 @@ public class ManagedEndpointExplainTest extends ManagementTestSupport {
TabularData data = (TabularData) mbeanServer.invoke(on, "explain", new Object[]{false}, new String[]{"boolean"});
assertEquals(4, data.size());
- // there should be 10 in total
+ // there should be 9 in total
data = (TabularData) mbeanServer.invoke(on, "explain", new Object[]{true}, new String[]{"boolean"});
- assertEquals(10, data.size());
+ assertEquals(9, data.size());
}
@Override