[camel] branch master updated (871e5ed -> 9481876)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 871e5ed  Camel-Disruptor: Fixed link for SEDA
     add 9481876  CAMEL-14182: Make Hystrix EIP general as Circuit Breaker EIP and allow to plugin other implementations (#3342)

No new revisions were added by this update.

Summary of changes:
 .../hystrix/processor/HystrixProcessorFactory.java |   8 +-
 .../hystrix/processor/HystrixReifier.java          |  10 +-
 ...{HystrixDefinition => CircuitBreakerDefinition} |   0
 .../processor/HystrixBadRequestExceptionTest.java  |   2 +-
 .../hystrix/processor/HystrixCircuitOpenTest.java  |  38 +++----
 .../processor/HystrixHierarchicalConfigTest.java   |  20 ++--
 .../processor/HystrixInheritErrorHandlerTest.java  |   2 +-
 .../hystrix/processor/HystrixManagementTest.java   |   6 +-
 .../HystrixRouteConfigMaximumSizeTest.java         |  18 ++--
 .../hystrix/processor/HystrixRouteConfigTest.java  |  15 ++-
 .../processor/HystrixRouteFallbackTest.java        |   2 +-
 .../HystrixRouteFallbackViaNetworkTest.java        |   2 +-
 .../hystrix/processor/HystrixRouteOkTest.java      |   2 +-
 .../hystrix/processor/HystrixTimeoutTest.java      |   2 +-
 .../processor/HystrixTimeoutWithFallbackTest.java  |   2 +-
 .../SpringHystrixRouteHierarchicalConfigTest.java  |  14 +--
 .../BlueprintHystrixRouteFallbackTest.xml          |   4 +-
 .../processor/BlueprintHystrixRouteOkTest.xml      |   4 +-
 .../SpringHystrixRouteConfigMaximumSizeTest.xml    |   4 +-
 .../processor/SpringHystrixRouteConfigRefTest.xml  |   4 +-
 .../processor/SpringHystrixRouteConfigTest.xml     |   4 +-
 .../processor/SpringHystrixRouteFallbackTest.xml   |   4 +-
 .../SpringHystrixRouteHierarchicalConfigTest.xml   |   4 +-
 .../hystrix/processor/SpringHystrixRouteOkTest.xml |   4 +-
 .../camel/impl/engine/DefaultProcessorFactory.java |  13 ++-
 .../src/main/docs/eips/hystrix-eip.adoc            | 115 ++++++++++++++-------
 .../src/main/docs/eips/onFallback-eip.adoc         |  17 +--
 ...finition.java => CircuitBreakerDefinition.java} |  84 ++++++---------
 .../model/HystrixConfigurationDefinition.java      |   6 +-
 .../apache/camel/model/ProcessorDefinition.java    |  20 ++--
 ...trixReifier.java => CircuitBreakerReifier.java} |  10 +-
 .../org/apache/camel/reifier/ProcessorReifier.java |  16 ++-
 .../camel/main/MainConfigurationProperties.java    |   2 +-
 .../ROOT/pages/camel-3-migration-guide.adoc        |   8 ++
 .../modules/ROOT/pages/hystrix-eip.adoc            | 115 ++++++++++++++-------
 .../modules/ROOT/pages/onFallback-eip.adoc         |  17 +--
 .../src/main/java/sample/camel/ClientRoute.java    |   2 +-
 .../HystrixHierarchicalConfiguration.java          |   5 +-
 .../HystrixHierarchicalConfigurationTest.java      |  12 +--
 .../processor/HystrixMultiConfiguration.java       |   9 +-
 .../processor/HystrixMultiConfigurationTest.java   |   1 -
 .../org/apache/camel/itest/CamelHystrixTest.xml    |   4 +-
 42 files changed, 352 insertions(+), 279 deletions(-)
 rename components/camel-hystrix/src/main/resources/META-INF/services/org/apache/camel/model/{HystrixDefinition => CircuitBreakerDefinition} (100%)
 rename core/camel-core-engine/src/main/java/org/apache/camel/model/{HystrixDefinition.java => CircuitBreakerDefinition.java} (69%)
 rename core/camel-core-engine/src/main/java/org/apache/camel/reifier/{HystrixReifier.java => CircuitBreakerReifier.java} (77%)