You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dj...@apache.org on 2020/03/23 21:22:38 UTC

[camel] branch camel-2.x updated (3787783 -> b767175)

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

djencks pushed a change to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 3787783  Merge pull request #3661 from djencks/camel-2.x-issue-14747-aggregate-eip-task-14756
     new cc3b829  Rearrange source and fix automation of components doc to match latest. The automation of index page generation is not included in this commit.
     new ef75f71  Correct asciidoc syntax and include:: directives
     new b767175  Merge pull request #3667 from djencks/camel-2.x-issue-14765-rearrange-components

The 34823 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:
 .../src/main/docs}/antora.yml                      |    3 -
 .../{ => modules/ROOT/pages}/bean-component.adoc   |   18 +-
 .../ROOT/pages}/binding-component.adoc             |   14 +-
 .../{ => modules/ROOT/pages}/browse-component.adoc |   12 +-
 .../{ => modules/ROOT/pages}/class-component.adoc  |   14 +-
 .../ROOT/pages}/controlbus-component.adoc          |   18 +-
 .../ROOT/pages}/dataformat-component.adoc          |   10 +-
 .../ROOT/pages}/dataset-component.adoc             |   28 +-
 .../{ => modules/ROOT/pages}/direct-component.adoc |   12 +-
 .../ROOT/pages}/direct-vm-component.adoc           |   12 +-
 .../{ => modules/ROOT/pages}/file-component.adoc   |   82 +-
 .../ROOT/pages}/language-component.adoc            |   14 +-
 .../{ => modules/ROOT/pages}/log-component.adoc    |   32 +-
 .../{ => modules/ROOT/pages}/mock-component.adoc   |   46 +-
 .../ROOT/pages}/properties-component.adoc          |   70 +-
 .../{ => modules/ROOT/pages}/ref-component.adoc    |   12 +-
 .../ROOT/pages}/rest-api-component.adoc            |    8 +-
 .../{ => modules/ROOT/pages}/rest-component.adoc   |   24 +-
 .../{ => modules/ROOT/pages}/saga-component.adoc   |    8 +-
 .../ROOT/pages}/scheduler-component.adoc           |   20 +-
 .../{ => modules/ROOT/pages}/seda-component.adoc   |   24 +-
 .../{ => modules/ROOT/pages}/stub-component.adoc   |   10 +-
 .../{ => modules/ROOT/pages}/test-component.adoc   |   12 +-
 .../{ => modules/ROOT/pages}/timer-component.adoc  |   18 +-
 .../ROOT/pages}/validator-component.adoc           |   12 +-
 .../{ => modules/ROOT/pages}/vm-component.adoc     |   12 +-
 .../{ => modules/ROOT/pages}/xslt-component.adoc   |   42 +-
 .../dataformats/pages}/gzip-dataformat.adoc        |   12 +-
 .../pages}/serialization-dataformat.adoc           |    6 +-
 .../dataformats/pages}/string-dataformat.adoc      |   10 +-
 .../dataformats/pages}/zip-dataformat.adoc         |   10 +-
 .../languages/pages}/bean-language.adoc            |   14 +-
 .../languages/pages}/constant-language.adoc        |    8 +-
 .../pages}/exchangeProperty-language.adoc          |    8 +-
 .../languages/pages}/file-language.adoc            |   20 +-
 .../languages/pages}/header-language.adoc          |    8 +-
 .../languages/pages}/ref-language.adoc             |   12 +-
 .../languages/pages}/simple-language.adoc          |   44 +-
 .../languages/pages}/tokenize-language.adoc        |    4 +-
 .../languages/pages}/xpath-language.adoc           |   46 +-
 .../languages/pages}/xtokenize-language.adoc       |    4 +-
 ...ate => component-dataformats-nav.adoc.template} |    1 +
 ...plate => component-languages-nav.adoc.template} |    1 +
 docs/component-nav.adoc.template                   |    1 +
 docs/components/antora.yml                         |    4 +-
 .../interceptor/AdviceWithMockEndpointsTest.java   |    0
 ...dviceWithMockMultipleEndpointsWithSkipTest.java |    0
 .../InterceptSendToMockEndpointStrategyTest.xml    |    0
 .../org/apache/camel/spring/mock/camel-route.xml   |    0
 .../patterns/IsMockEndpointsAndSkipJUnit4Test.java |    0
 .../test/patterns/IsMockEndpointsJUnit4Test.java   |    0
 docs/components/modules/ROOT/nav.adoc              |  766 +++++++-------
 docs/components/modules/ROOT/pages/index.adoc      | 1081 ++++++++++++++------
 docs/components/modules/dataformats/nav.adoc       |   51 +
 .../pages/asn1-dataformat.adoc                     |    0
 .../pages/avro-dataformat.adoc                     |    0
 .../pages/barcode-dataformat.adoc                  |    0
 .../pages/base64-dataformat.adoc                   |    0
 .../pages/beanio-dataformat.adoc                   |    0
 .../pages/bindy-dataformat.adoc                    |    0
 .../pages/boon-dataformat.adoc                     |    0
 .../pages/castor-dataformat.adoc                   |    0
 .../pages/crypto-dataformat.adoc                   |    0
 .../pages/csv-dataformat.adoc                      |    0
 .../pages/fhirJson-dataformat.adoc                 |    0
 .../pages/fhirXml-dataformat.adoc                  |    0
 .../pages/flatpack-dataformat.adoc                 |    0
 .../pages/hessian-dataformat.adoc                  |    0
 .../pages/hl7-dataformat.adoc                      |    0
 .../pages/ical-dataformat.adoc                     |    0
 .../modules/dataformats/pages/index.adoc           |  113 ++
 .../pages/jacksonxml-dataformat.adoc               |    0
 .../pages/jaxb-dataformat.adoc                     |    0
 .../pages/jibx-dataformat.adoc                     |    0
 .../pages/json-fastjson-dataformat.adoc            |    0
 .../pages/json-gson-dataformat.adoc                |    0
 .../pages/json-jackson-dataformat.adoc             |    0
 .../pages/json-johnzon-dataformat.adoc             |    0
 .../pages/json-xstream-dataformat.adoc             |    0
 .../pages/lzf-dataformat.adoc                      |    0
 .../pages/mime-multipart-dataformat.adoc           |    0
 .../pages/pgp-dataformat.adoc                      |    0
 .../pages/protobuf-dataformat.adoc                 |    0
 .../pages/rss-dataformat.adoc                      |    0
 .../pages/secureXML-dataformat.adoc                |    0
 .../pages/soapjaxb-dataformat.adoc                 |    0
 .../pages/syslog-dataformat.adoc                   |    0
 .../pages/tarfile-dataformat.adoc                  |    0
 .../pages/thrift-dataformat.adoc                   |    0
 .../pages/tidyMarkup-dataformat.adoc               |    0
 .../pages/univocity-csv-dataformat.adoc            |    0
 .../pages/univocity-fixed-dataformat.adoc          |    0
 .../pages/univocity-tsv-dataformat.adoc            |    0
 .../pages/xmlBeans-dataformat.adoc                 |    0
 .../pages/xmlrpc-dataformat.adoc                   |    0
 .../pages/xstream-dataformat.adoc                  |    0
 .../pages/yaml-snakeyaml-dataformat.adoc           |    0
 .../pages/zipfile-dataformat.adoc                  |    0
 docs/components/modules/languages/nav.adoc         |   28 +
 .../{ROOT => languages}/pages/el-language.adoc     |    0
 .../{ROOT => languages}/pages/groovy-language.adoc |    0
 docs/components/modules/languages/pages/index.adoc |   62 ++
 .../pages/javaScript-language.adoc                 |    0
 .../pages/jsonpath-language.adoc                   |    0
 .../{ROOT => languages}/pages/jxpath-language.adoc |    0
 .../{ROOT => languages}/pages/mvel-language.adoc   |    0
 .../{ROOT => languages}/pages/ognl-language.adoc   |    0
 .../{ROOT => languages}/pages/php-language.adoc    |    0
 .../{ROOT => languages}/pages/python-language.adoc |    0
 .../{ROOT => languages}/pages/ruby-language.adoc   |    0
 .../{ROOT => languages}/pages/spel-language.adoc   |    0
 .../{ROOT => languages}/pages/sql-language.adoc    |    0
 .../{ROOT => languages}/pages/terser-language.adoc |    0
 .../{ROOT => languages}/pages/xquery-language.adoc |    0
 docs/gulpfile.js                                   |  158 ++-
 docs/package.json                                  |    1 +
 docs/yarn.lock                                     |   56 +
 117 files changed, 1963 insertions(+), 1153 deletions(-)
 copy {docs/components => camel-core/src/main/docs}/antora.yml (93%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/bean-component.adoc (96%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/binding-component.adoc (96%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/browse-component.adoc (95%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/class-component.adoc (96%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/controlbus-component.adoc (96%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/dataformat-component.adoc (93%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/dataset-component.adoc (96%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/direct-component.adoc (97%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/direct-vm-component.adoc (97%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/file-component.adoc (97%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/language-component.adoc (96%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/log-component.adoc (95%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/mock-component.adoc (92%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/properties-component.adoc (95%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/ref-component.adoc (95%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/rest-api-component.adoc (96%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/rest-component.adoc (95%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/saga-component.adoc (92%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/scheduler-component.adoc (97%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/seda-component.adoc (97%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/stub-component.adoc (98%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/test-component.adoc (98%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/timer-component.adoc (96%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/validator-component.adoc (97%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/vm-component.adoc (98%)
 rename camel-core/src/main/docs/{ => modules/ROOT/pages}/xslt-component.adoc (95%)
 rename camel-core/src/main/docs/{ => modules/dataformats/pages}/gzip-dataformat.adoc (94%)
 rename camel-core/src/main/docs/{ => modules/dataformats/pages}/serialization-dataformat.adoc (95%)
 rename camel-core/src/main/docs/{ => modules/dataformats/pages}/string-dataformat.adoc (94%)
 rename camel-core/src/main/docs/{ => modules/dataformats/pages}/zip-dataformat.adoc (96%)
 rename camel-core/src/main/docs/{ => modules/languages/pages}/bean-language.adoc (95%)
 rename camel-core/src/main/docs/{ => modules/languages/pages}/constant-language.adoc (92%)
 rename camel-core/src/main/docs/{ => modules/languages/pages}/exchangeProperty-language.adoc (91%)
 rename camel-core/src/main/docs/{ => modules/languages/pages}/file-language.adoc (97%)
 rename camel-core/src/main/docs/{ => modules/languages/pages}/header-language.adoc (90%)
 rename camel-core/src/main/docs/{ => modules/languages/pages}/ref-language.adoc (87%)
 rename camel-core/src/main/docs/{ => modules/languages/pages}/simple-language.adoc (97%)
 rename camel-core/src/main/docs/{ => modules/languages/pages}/tokenize-language.adoc (97%)
 rename camel-core/src/main/docs/{ => modules/languages/pages}/xpath-language.adoc (96%)
 rename camel-core/src/main/docs/{ => modules/languages/pages}/xtokenize-language.adoc (96%)
 copy docs/{component-nav.adoc.template => component-dataformats-nav.adoc.template} (65%)
 copy docs/{component-nav.adoc.template => component-languages-nav.adoc.template} (67%)
 copy {camel-core => docs/components/modules/ROOT/examples/camel-core}/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockEndpointsTest.java (100%)
 copy {camel-core => docs/components/modules/ROOT/examples/camel-core}/src/test/java/org/apache/camel/processor/interceptor/AdviceWithMockMultipleEndpointsWithSkipTest.java (100%)
 copy {components => docs/components/modules/ROOT/examples/components}/camel-spring/src/test/resources/org/apache/camel/spring/mock/InterceptSendToMockEndpointStrategyTest.xml (100%)
 copy {components => docs/components/modules/ROOT/examples/components}/camel-spring/src/test/resources/org/apache/camel/spring/mock/camel-route.xml (100%)
 copy {components => docs/components/modules/ROOT/examples/components}/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsAndSkipJUnit4Test.java (100%)
 copy {components => docs/components/modules/ROOT/examples/components}/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsJUnit4Test.java (100%)
 create mode 100644 docs/components/modules/dataformats/nav.adoc
 rename docs/components/modules/{ROOT => dataformats}/pages/asn1-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/avro-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/barcode-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/base64-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/beanio-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/bindy-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/boon-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/castor-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/crypto-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/csv-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/fhirJson-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/fhirXml-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/flatpack-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/hessian-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/hl7-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/ical-dataformat.adoc (100%)
 create mode 100644 docs/components/modules/dataformats/pages/index.adoc
 rename docs/components/modules/{ROOT => dataformats}/pages/jacksonxml-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/jaxb-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/jibx-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/json-fastjson-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/json-gson-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/json-jackson-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/json-johnzon-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/json-xstream-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/lzf-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/mime-multipart-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/pgp-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/protobuf-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/rss-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/secureXML-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/soapjaxb-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/syslog-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/tarfile-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/thrift-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/tidyMarkup-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/univocity-csv-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/univocity-fixed-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/univocity-tsv-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/xmlBeans-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/xmlrpc-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/xstream-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/yaml-snakeyaml-dataformat.adoc (100%)
 rename docs/components/modules/{ROOT => dataformats}/pages/zipfile-dataformat.adoc (100%)
 create mode 100644 docs/components/modules/languages/nav.adoc
 rename docs/components/modules/{ROOT => languages}/pages/el-language.adoc (100%)
 rename docs/components/modules/{ROOT => languages}/pages/groovy-language.adoc (100%)
 create mode 100644 docs/components/modules/languages/pages/index.adoc
 rename docs/components/modules/{ROOT => languages}/pages/javaScript-language.adoc (100%)
 rename docs/components/modules/{ROOT => languages}/pages/jsonpath-language.adoc (100%)
 rename docs/components/modules/{ROOT => languages}/pages/jxpath-language.adoc (100%)
 rename docs/components/modules/{ROOT => languages}/pages/mvel-language.adoc (100%)
 rename docs/components/modules/{ROOT => languages}/pages/ognl-language.adoc (100%)
 rename docs/components/modules/{ROOT => languages}/pages/php-language.adoc (100%)
 rename docs/components/modules/{ROOT => languages}/pages/python-language.adoc (100%)
 rename docs/components/modules/{ROOT => languages}/pages/ruby-language.adoc (100%)
 rename docs/components/modules/{ROOT => languages}/pages/spel-language.adoc (100%)
 rename docs/components/modules/{ROOT => languages}/pages/sql-language.adoc (100%)
 rename docs/components/modules/{ROOT => languages}/pages/terser-language.adoc (100%)
 rename docs/components/modules/{ROOT => languages}/pages/xquery-language.adoc (100%)