You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2021/12/21 15:11:08 UTC
[camel] 08/09: Merge branch 'main' of github.com:apache/camel into main
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5ff880e76f3dbca8a99a2b79c3dc08ebdfcf20f3
Merge: be53252 b097352
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Mon Dec 20 15:37:20 2021 -0500
Merge branch 'main' of github.com:apache/camel into main
bom/camel-bom/pom.xml | 5 ++
.../org/apache/camel/catalog/components/log.json | 1 +
.../org/apache/camel/catalog/others.properties | 1 +
.../org/apache/camel/catalog/others/debug.json | 15 ++++++
components/camel-debug/pom.xml | 59 ++++++++++++++++++++++
.../services/org/apache/camel/debugger-factory | 2 +
.../services/org/apache/camel/other.properties | 7 +++
.../camel-debug/src/generated/resources/debug.json | 15 ++++++
components/camel-debug/src/main/docs/debug.adoc | 22 ++++++++
.../camel/impl/debugger/CamelDebuggerFactory.java | 53 +++++++++++++++++++
.../camel/component/log/LogEndpointConfigurer.java | 3 ++
.../camel/component/log/LogEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/log/log.json | 1 +
.../apache/camel/component/log/LogEndpoint.java | 13 ++++-
components/pom.xml | 1 +
core/camel-allcomponents/pom.xml | 4 ++
.../generated/java/org/apache/camel/Category.java | 6 ---
.../main/java/org/apache/camel/spi/Debugger.java | 2 +
.../java/org/apache/camel/spi/DebuggerFactory.java | 34 +++++++++++++
.../camel/impl/engine/AbstractCamelContext.java | 12 +++++
.../camel/component/log/LogEndpointTest.java | 10 ++++
.../endpoint/dsl/LogEndpointBuilderFactory.java | 31 ++++++++++++
.../camel/main/DefaultConfigurationConfigurer.java | 6 ++-
.../DefaultExchangeFormatterConfigurer.java | 6 +++
.../processor/DefaultExchangeFormatter.java | 18 +++++++
.../modules/others/examples/json/debug.json | 1 +
docs/components/modules/others/nav.adoc | 1 +
docs/components/modules/others/pages/debug.adoc | 1 +
parent/pom.xml | 5 ++
.../src/main/java/org/apache/camel/Category.java | 6 ---
30 files changed, 329 insertions(+), 15 deletions(-)