This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 65a0acb CAMEL-13546 - handle not only java utils with generics but
also other generics because < and > is invalid in windows
new 73e830e Add a Route#getCamelContext for easy access
new 2b7c4d7 [CAMEL-13371] Remove some usage of the RouteDefinition model
new 9e6ddcb [CAMEL-13371] Rename ErrorHandlerBuilder to
ErrorHandlerFactory in some places
new 64abe19 [CAMEL-13371] small refactorings on RouteContext and reifiers
new b51384d [CAMEL-13371] Move DefaultRouteContext and some other classes
to camel-base
new a29bf5c [CAMEL-13371] Move languages to camel-base
new ddbeca9 Fix blueprint test
new a291535 Merge branch 'CAMEL-13371'
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../blueprint/handler/CamelNamespaceHandler.java | 2 +-
.../camel/cdi/CdiCamelBeanPostProcessor.java | 4 +-
.../cdi/transaction/JtaTransactionPolicy.java | 9 +-
.../component/dns/policy/DnsActivationPolicy.java | 4 +-
.../hystrix/processor/HystrixReifier.java | 3 +-
.../metrics/routepolicy/MetricsRoutePolicy.java | 6 +-
.../MicrometerMessageHistoryNamingStrategy.java | 2 +-
.../routepolicy/MicrometerRoutePolicy.java | 6 +-
.../MicrometerRoutePolicyNamingStrategy.java | 2 +-
.../quartz2/CronScheduledRoutePolicy.java | 2 +-
.../routepolicy/quartz2/ScheduledRoutePolicy.java | 4 +-
.../quartz2/SimpleScheduledRoutePolicy.java | 2 +-
.../camel/spring/CamelBeanPostProcessor.java | 4 +-
.../camel/spring/spi/SpringTransactionPolicy.java | 8 +-
.../apache/camel/spring/EndpointReferenceTest.java | 7 +-
.../config/CustomExecutorServiceManager.java | 4 +-
.../test/blueprint/BlueprintPropertiesTest.java | 2 +-
.../apache/camel/test/junit4/CamelTestSupport.java | 2 +-
.../zookeeper/policy/CuratorLeaderRoutePolicy.java | 2 +-
.../CuratorMultiMasterLeaderRoutePolicy.java | 5 +-
.../zookeeper/policy/ZooKeeperRoutePolicy.java | 2 +-
.../src/main/java/org/apache/camel/Route.java | 11 +-
.../camel/spi}/CamelInternalProcessorAdvice.java | 52 +-
.../java/org/apache/camel/spi/RouteContext.java | 35 +-
.../java/org/apache/camel/spi/RoutePolicy.java | 2 +-
.../impl/engine/BaseExecutorServiceManager.java} | 29 +-
.../impl/engine}/CamelPostProcessorHelper.java | 6 +-
.../engine}/DefaultCamelBeanPostProcessor.java | 4 +-
.../org/apache/camel/impl/engine/DefaultRoute.java | 6 +
.../camel/impl/engine}/DefaultRouteContext.java | 156 +++---
.../apache/camel/impl/health/RouteHealthCheck.java | 2 +-
.../camel/language/constant/ConstantLanguage.java | 0
.../apache/camel/language/constant/package.html | 0
.../camel/language/header/HeaderLanguage.java | 0
.../org/apache/camel/language/header/package.html | 0
.../java/org/apache/camel/language/package.html | 0
.../property/ExchangePropertyLanguage.java | 0
.../apache/camel/language/property/package.html | 0
.../org/apache/camel/language/ref/RefLanguage.java | 0
.../org/apache/camel/language/ref/package.html | 0
.../camel/language/simple/BaseSimpleParser.java | 0
.../apache/camel/language/simple/FileLanguage.java | 0
.../org/apache/camel/language/simple/Simple.java | 0
.../language/simple/SimpleExpressionBuilder.java | 25 +-
.../language/simple/SimpleExpressionParser.java | 0
.../camel/language/simple/SimpleLanguage.java | 2 +-
.../language/simple/SimplePredicateParser.java | 0
.../camel/language/simple/SimpleTokenizer.java | 0
.../camel/language/simple/ast/BaseSimpleNode.java | 0
.../language/simple/ast/BinaryExpression.java | 2 +-
.../apache/camel/language/simple/ast/Block.java | 0
.../apache/camel/language/simple/ast/BlockEnd.java | 0
.../camel/language/simple/ast/BlockStart.java | 0
.../camel/language/simple/ast/CompositeNodes.java | 2 +-
.../camel/language/simple/ast/DoubleQuoteEnd.java | 0
.../language/simple/ast/DoubleQuoteStart.java | 2 +-
.../language/simple/ast/LiteralExpression.java | 2 +-
.../camel/language/simple/ast/LiteralNode.java | 0
.../language/simple/ast/LogicalExpression.java | 2 +-
.../camel/language/simple/ast/NullExpression.java | 0
.../language/simple/ast/SimpleFunctionEnd.java | 0
.../simple/ast/SimpleFunctionExpression.java | 0
.../language/simple/ast/SimpleFunctionStart.java | 0
.../camel/language/simple/ast/SimpleNode.java | 0
.../camel/language/simple/ast/SingleQuoteEnd.java | 0
.../language/simple/ast/SingleQuoteStart.java | 2 +-
.../camel/language/simple/ast/UnaryExpression.java | 0
.../apache/camel/language/simple/ast/package.html | 0
.../org/apache/camel/language/simple/package.html | 0
.../language/simple/types/BinaryOperatorType.java | 0
.../language/simple/types/LogicalOperatorType.java | 0
.../simple/types/SimpleIllegalSyntaxException.java | 0
.../simple/types/SimpleParserException.java | 0
.../camel/language/simple/types/SimpleToken.java | 0
.../language/simple/types/SimpleTokenType.java | 0
.../camel/language/simple/types/TokenType.java | 0
.../language/simple/types/UnaryOperatorType.java | 0
.../camel/language/simple/types/package.html | 0
.../camel/processor/CamelInternalProcessor.java | 53 ++-
.../org/apache/camel/processor/ContractAdvice.java | 1 +
.../apache/camel/processor/RestBindingAdvice.java | 1 +
.../processor/SharedCamelInternalProcessor.java | 1 +
.../camel/builder/ErrorHandlerBuilderRef.java | 28 +-
.../camel/builder/ErrorHandlerBuilderSupport.java | 6 +-
.../apache/camel/builder/ExpressionBuilder.java | 12 -
.../org/apache/camel/builder/ValueBuilder.java | 274 +----------
.../org/apache/camel/impl/DefaultCamelContext.java | 2 +-
.../camel/impl/DefaultExecutorServiceManager.java | 521 +--------------------
.../java/org/apache/camel/impl/DefaultModel.java | 14 +-
.../java/org/apache/camel/impl/RouteService.java | 5 +-
.../camel/impl/cluster/ClusteredRoutePolicy.java | 5 -
.../apache/camel/model/OnCompletionDefinition.java | 19 -
.../apache/camel/model/OnExceptionDefinition.java | 18 -
.../camel/model/ProcessorDefinitionHelper.java | 6 +-
.../org/apache/camel/model/RouteDefinition.java | 24 +-
.../apache/camel/model/RouteDefinitionHelper.java | 17 +-
.../org/apache/camel/model/RoutesDefinition.java | 2 +-
.../camel/processor/channel/DefaultChannel.java | 4 +-
.../errorhandler/ErrorHandlerSupport.java | 2 +-
.../errorhandler/RedeliveryErrorHandler.java | 6 +-
.../DefaultExceptionPolicyStrategy.java | 8 +-
.../org/apache/camel/reifier/AggregateReifier.java | 2 +-
.../java/org/apache/camel/reifier/LogReifier.java | 2 +-
.../apache/camel/reifier/OnCompletionReifier.java | 4 +-
.../apache/camel/reifier/OnExceptionReifier.java | 5 +-
.../org/apache/camel/reifier/ProcessorReifier.java | 11 +-
.../org/apache/camel/reifier/RouteReifier.java | 116 +++--
.../java/org/apache/camel/reifier/SortReifier.java | 2 +-
.../java/org/apache/camel/reifier/StepReifier.java | 3 +-
.../camel/reifier/ThrowExceptionReifier.java | 2 +-
...melPostProcessorHelperConsumePredicateTest.java | 2 +-
...amelPostProcessorHelperConsumePropertyTest.java | 2 +-
...ostProcessorHelperSedaConsumePredicateTest.java | 2 +-
.../{ => engine}/CamelPostProcessorHelperTest.java | 4 +-
.../{ => engine}/CustomThreadPoolFactoryTest.java | 4 +-
.../DefaultManagementObjectNameStrategy.java | 4 +-
.../apache/camel/support/RoutePolicySupport.java | 23 +-
.../camel/support/builder/ExpressionBuilder.java | 24 +
.../camel/support}/builder/ValueBuilder.java | 22 +-
.../commands/AbstractLocalCamelController.java | 2 +-
120 files changed, 446 insertions(+), 1243 deletions(-)
rename core/{camel-base/src/main/java/org/apache/camel/processor =>
camel-api/src/main/java/org/apache/camel/spi}/CamelInternalProcessorAdvice.java
(52%)
copy
core/{camel-core/src/main/java/org/apache/camel/impl/DefaultExecutorServiceManager.java
=>
camel-base/src/main/java/org/apache/camel/impl/engine/BaseExecutorServiceManager.java}
(95%)
rename core/{camel-core/src/main/java/org/apache/camel/impl =>
camel-base/src/main/java/org/apache/camel/impl/engine}/CamelPostProcessorHelper.java
(98%)
rename core/{camel-core/src/main/java/org/apache/camel/impl =>
camel-base/src/main/java/org/apache/camel/impl/engine}/DefaultCamelBeanPostProcessor.java
(99%)
rename core/{camel-core/src/main/java/org/apache/camel/impl =>
camel-base/src/main/java/org/apache/camel/impl/engine}/DefaultRouteContext.java
(73%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/constant/package.html (100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/header/package.html (100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/package.html (100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/property/package.html (100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/ref/RefLanguage.java (100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/ref/package.html (100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/FileLanguage.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/Simple.java (100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
(96%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
(99%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
(99%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/Block.java (100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
(97%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
(97%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
(97%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
(98%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
(97%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/ast/package.html
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/package.html (100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/types/TokenType.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
(100%)
rename core/{camel-core =>
camel-base}/src/main/java/org/apache/camel/language/simple/types/package.html
(100%)
rename core/camel-core/src/test/java/org/apache/camel/impl/{ =>
engine}/CamelPostProcessorHelperConsumePredicateTest.java (98%)
rename core/camel-core/src/test/java/org/apache/camel/impl/{ =>
engine}/CamelPostProcessorHelperConsumePropertyTest.java (99%)
rename core/camel-core/src/test/java/org/apache/camel/impl/{ =>
engine}/CamelPostProcessorHelperSedaConsumePredicateTest.java (98%)
rename core/camel-core/src/test/java/org/apache/camel/impl/{ =>
engine}/CamelPostProcessorHelperTest.java (99%)
rename core/camel-core/src/test/java/org/apache/camel/impl/{ =>
engine}/CustomThreadPoolFactoryTest.java (95%)
copy core/{camel-core/src/main/java/org/apache/camel =>
camel-support/src/main/java/org/apache/camel/support}/builder/ValueBuilder.java
(91%)
