This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new b660b52 Regen
b660b52 is described below
commit b660b5237384dccdb260c4eed18207c208a4c2b4
Author: Zoran Regvart <[email protected]>
AuthorDate: Thu Aug 22 19:26:37 2019 +0200
Regen
---
components/readme.adoc | 2 +-
core/camel-core/readme-eip.adoc | 12 ++++++------
.../processor/interceptor/AdviceWithMockEndpointsTest.java | 1 -
.../AdviceWithMockMultipleEndpointsWithSkipTest.java | 3 ++-
.../test/java/org/apache/camel/processor/TransformTest.java | 1 +
.../java/org/apache/camel/processor/TransformViaDSLTest.java | 1 +
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +-
7 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/components/readme.adoc b/components/readme.adoc
index e63f45b..73d593d 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1015,7 +1015,7 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
| link:camel-bean/src/main/docs/bean-language.adoc[Bean method] (camel-bean) |
1.3 | To use a Java bean (aka method call) in Camel expressions or predicates.
-| link:camel-base/src/main/docs/constant-language.adoc[Constant] (camel-base)
| 1.5 | To use a constant value in Camel expressions or predicates.
+| link:camel-base/src/main/docs/constant-language.adoc[Constant] (camel-base)
| 1.5 | To use a constant value in Camel expressions or predicates. Important:
this is a fixed constant value that is only set once during starting up the
route, do not use this if you want dynamic values during routing.
|
link:camel-base/src/main/docs/exchangeProperty-language.adoc[ExchangeProperty]
(camel-base) | 2.0 | To use a Camel Exchange property in expressions or
predicates.
diff --git a/core/camel-core/readme-eip.adoc b/core/camel-core/readme-eip.adoc
index 107db78..67542d2 100644
--- a/core/camel-core/readme-eip.adoc
+++ b/core/camel-core/readme-eip.adoc
@@ -40,7 +40,7 @@ Number of EIPs: 62 (0 deprecated)
`<enrich>` | Enriches a message with data from a secondary resource
| link:src/main/docs/eips/failover-eip.adoc[Failover] +
-`<failover>` | Failover load balancer
+`<failover>` | Failover load balancer The failover load balancer is capable of
trying the next processor in case an Exchange failed with an exception during
processing. You can constrain the failover to activate only when one exception
of a list you specify occurs. If you do not specify a list any exception will
cause fail over to occur. This balancer uses the same strategy for matching
exceptions as the Exception Clause does for the onException.
| link:src/main/docs/eips/filter-eip.adoc[Filter] +
`<filter>` | Filter out messages based using a predicate
@@ -94,7 +94,7 @@ Number of EIPs: 62 (0 deprecated)
`<process>` | Calls a Camel processor
| link:src/main/docs/eips/random-eip.adoc[Random] +
-`<random>` | Random load balancer
+`<random>` | Random load balancer The random load balancer selects a random
endpoint for each exchange.
| link:src/main/docs/eips/recipientList-eip.adoc[Recipient List] +
`<recipientList>` | Routes messages to a number of dynamically specified
recipients (dynamic to)
@@ -118,7 +118,7 @@ Number of EIPs: 62 (0 deprecated)
`<rollback>` | Forces a rollback by stopping routing the message
| link:src/main/docs/eips/roundRobin-eip.adoc[Round Robin] +
-`<roundRobin>` | Round robin load balancer
+`<roundRobin>` | Round robin load balancer The round robin load balancer will
use the next endpoint for each message. This load balancer is not meant to work
with failover, for that you should use the dedicated failover load balancer.
| link:src/main/docs/eips/routingSlip-eip.adoc[Routing Slip] +
`<routingSlip>` | Routes a message through a series of steps that are
pre-determined (the slip)
@@ -154,7 +154,7 @@ Number of EIPs: 62 (0 deprecated)
`<step>` | Routes the message to a sequence of processors which is grouped
together as one logical name
| link:src/main/docs/eips/sticky-eip.adoc[Sticky] +
-`<sticky>` | Sticky load balancer
+`<sticky>` | Sticky load balancer Sticky load balancing using an Expression to
calculate a correlation key to perform the sticky load balancing; rather like
jsessionid in the web or JMSXGroupID in JMS.
| link:src/main/docs/eips/stop-eip.adoc[Stop] +
`<stop>` | Stops the processing of the current message
@@ -175,7 +175,7 @@ Number of EIPs: 62 (0 deprecated)
`<toD>` | Sends the message to a dynamic endpoint
| link:src/main/docs/eips/topic-eip.adoc[Topic] +
-`<topic>` | Topic load balancer
+`<topic>` | Topic load balancer The topic load balancer sends to all
destinations (rather like JMS Topics)
| link:src/main/docs/eips/transform-eip.adoc[Transform] +
`<transform>` | Transforms the message body based on an expression
@@ -187,7 +187,7 @@ Number of EIPs: 62 (0 deprecated)
`<validate>` | Validates a message based on an expression
| link:src/main/docs/eips/weighted-eip.adoc[Weighted] +
-`<weighted>` | Weighted load balancer
+`<weighted>` | Weighted load balancer The weighted load balancing policy
allows you to specify a processing load distribution ratio for each server with
respect to others. In addition to the weight, endpoint selection is then
further refined using random distribution based on weight.
| link:src/main/docs/eips/when-eip.adoc[When] +
`<when>` | Triggers a route when an expression evaluates to true
diff --git
a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java
b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java
index b7763ed..ca8adbe 100644
---
a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java
+++
b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java
@@ -105,7 +105,6 @@ public class AdviceWithMockEndpointsTest extends
ContextTestSupport {
// end::e2[]
// END SNIPPET: e2
-
// START SNIPPET: route
// tag::route[]
@Override
diff --git
a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java
b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java
index 0bf0f92..49d0934 100644
---
a/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java
+++
b/docs/components/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java
@@ -47,7 +47,8 @@ public class AdviceWithMockMultipleEndpointsWithSkipTest
extends ContextTestSupp
assertMockEndpointsSatisfied();
- // the message was not send to the direct:foo route and thus not sent
to the seda endpoint
+ // the message was not send to the direct:foo route and thus not sent
to
+ // the seda endpoint
SedaEndpoint seda = context.getEndpoint("seda:foo",
SedaEndpoint.class);
assertEquals(0, seda.getCurrentQueueSize());
}
diff --git
a/docs/user-manual/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java
b/docs/user-manual/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java
index 5e99b1e..9658893 100644
---
a/docs/user-manual/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java
+++
b/docs/user-manual/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.camel.processor;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
diff --git
a/docs/user-manual/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java
b/docs/user-manual/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java
index e87c967..2b79ff2 100644
---
a/docs/user-manual/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java
+++
b/docs/user-manual/modules/ROOT/examples/core/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
package org.apache.camel.processor;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 7d6a961..bffb769 100644
---
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -174,7 +174,7 @@
<dependency>
<groupId>io.methvin</groupId>
<artifactId>directory-watcher</artifactId>
- <version>0.9.5</version>
+ <version>0.9.6</version>
</dependency>
<dependency>
<groupId>io.nessus</groupId>
