You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/01/17 07:50:07 UTC

[camel] branch main updated (1bb854a -> 0551369)

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

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


    from 1bb854a  Upgrade AWS SDK v2 to version 2.17.112
     add 0551369  Dataformat rename (#6760)

No new revisions were added by this update.

Summary of changes:
 .../apache/camel/catalog/dataformats.properties    |  22 +-
 .../{gzipdeflater.json => gzipDeflater.json}       |   6 +-
 .../{jacksonxml.json => jacksonXml.json}           |   6 +-
 .../camel/catalog/dataformats/mimeMultipart.json   |   4 +-
 .../dataformats/{soapjaxb.json => soap.json}       |  10 +-
 .../dataformats/{tarfile.json => tarFile.json}     |   4 +-
 .../camel/catalog/dataformats/univocityCsv.json    |   4 +-
 .../{univocity-fixed.json => univocityFixed.json}  |   8 +-
 .../camel/catalog/dataformats/univocityTsv.json    |   4 +-
 .../{secureXML.json => xmlSecurity.json}           |   6 +-
 .../{zipdeflater.json => zipDeflater.json}         |   8 +-
 .../apache/camel/catalog/dataformats/zipFile.json  |   4 +-
 .../org/apache/camel/catalog/models.properties     |  27 +-
 .../org/apache/camel/catalog/models/custom.json    |   2 +-
 .../apache/camel/catalog/models/dataFormats.json   |   2 +-
 .../apache/camel/catalog/models/gzipDeflater.json  |   4 +-
 .../apache/camel/catalog/models/jacksonXml.json    |   4 +-
 .../org/apache/camel/catalog/models/marshal.json   |   2 +-
 .../{mime-multipart.json => mimeMultipart.json}    |   2 +-
 .../catalog/models/{soapjaxb.json => soap.json}    |   6 +-
 .../catalog/models/{tarfile.json => tarFile.json}  |   2 +-
 .../apache/camel/catalog/models/univocityCsv.json  |   2 +-
 .../camel/catalog/models/univocityFixed.json       |   4 +-
 ...{univocity-header.json => univocityHeader.json} |   2 +-
 .../{univocity-tsv.json => univocityTsv.json}      |   2 +-
 .../org/apache/camel/catalog/models/unmarshal.json |   2 +-
 .../apache/camel/catalog/models/xmlSecurity.json   |   4 +-
 .../org/apache/camel/catalog/models/xmlrpc.json    |  19 --
 .../models/{zipdeflater.json => zipDeflater.json}  |   6 +-
 .../org/apache/camel/catalog/models/zipFile.json   |   2 +-
 .../apache/camel/catalog/schemas/camel-spring.xsd  | 376 ++++++++++-----------
 .../org/apache/camel/catalog/CamelCatalogTest.java |   2 +-
 ...jacksonxml-dataformat => jacksonXml-dataformat} |   0
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../camel/dataformat/{jacksonxml => jacksonXml}    |   0
 .../{jacksonxml.json => jacksonXml.json}           |   6 +-
 ...-dataformat.adoc => jacksonXml-dataformat.adoc} |  42 +--
 .../component/jacksonxml/JacksonXMLDataFormat.java |   4 +-
 .../jacksonxml/JacksonConcurrentTest.java          |   4 +-
 .../jacksonxml/JacksonJsonDataFormatTest.java      |  12 +-
 .../JacksonMarshalContentTypeHeaderTest.java       |   2 +-
 .../jacksonxml/JacksonMarshalViewTest.java         |   8 +-
 .../jacksonxml/SpringJacksonEnableFeatureTest.xml  |   2 +-
 .../SpringJacksonMarshalUnmarshalListTest.xml      |   2 +-
 .../jacksonxml/SpringJacksonXmlDataFormatTest.xml  |   8 +-
 .../camel-jaxb/src/main/docs/jaxb-dataformat.adoc  |   4 +-
 ...ltipart-dataformat => mimeMultipart-dataformat} |   0
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../dataformat/{mime-multipart => mimeMultipart}   |   0
 .../dataformat/mime/multipart/mimeMultipart.json   |   4 +-
 ...taformat.adoc => mimeMultipart-dataformat.adoc} |   6 +-
 .../mime/multipart/MimeMultipartDataFormat.java    |   4 +-
 .../multipart/MimeMultipartDataFormatTest.java     |   2 +-
 ...nfigurer.java => SoapDataFormatConfigurer.java} |   4 +-
 .../soap/SoapJaxbDataFormatConfigurer.java         |   5 +-
 .../org/apache/camel/configurer/soap-dataformat    |   2 +
 .../apache/camel/configurer/soapjaxb-dataformat    |   2 -
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/dataformat/{soapjaxb => soap} |   2 +-
 .../dataformat/soap/{soapjaxb.json => soap.json}   |  10 +-
 ...apjaxb-dataformat.adoc => soap-dataformat.adoc} |  16 +-
 .../dataformat/soap/Soap11DataFormatAdapter.java   |  10 +-
 .../dataformat/soap/Soap12DataFormatAdapter.java   |  10 +-
 ...SoapJaxbDataFormat.java => SoapDataFormat.java} |  14 +-
 .../dataformat/soap/SoapDataFormatAdapter.java     |   4 +-
 .../camel/dataformat/soap/SoapClientTest.java      |   2 +-
 .../camel/dataformat/soap/SoapCxfClientTest.java   |   2 +-
 .../camel/dataformat/soap/SoapCxfServerTest.java   |   2 +-
 .../dataformat/soap/SoapMarshalSetterTest.java     |   4 +-
 .../camel/dataformat/soap/SoapMarshalTest.java     |   6 +-
 .../camel/dataformat/soap/SoapRoundtripTest.java   |   4 +-
 .../camel/dataformat/soap/SoapServerTest.java      |   2 +-
 .../dataformat/soap/SoapToSoapDontIgnoreTest.java  |   8 +-
 .../dataformat/soap/SoapToSoapIgnoreTest.java      |   8 +-
 .../soap/SoapToSoapSingleDataFormatterTest.java    |   4 +-
 .../camel/dataformat/soap/SoapUnMarshalTest.java   |   2 +-
 .../camel/dataformat/soap12/Soap12MarshalTest.java |   8 +-
 .../dataformat/soap12/Soap12UnMarshalTest.java     |   2 +-
 .../soap/SoapSpringRoundtripTest-context.xml       |   2 +-
 .../soap12/Soap12SpringRoundtripTest-context.xml   |   2 +-
 .../{tarfile-dataformat => tarFile-dataformat}     |   0
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/dataformat/{tarfile => tarFile}   |   0
 .../tarfile/{tarfile.json => tarFile.json}         |   4 +-
 ...ile-dataformat.adoc => tarFile-dataformat.adoc} |   2 +-
 .../dataformat/tarfile/TarFileDataFormat.java      |   4 +-
 .../tarfile/SpringTarFileDataFormatTest.xml        |  14 +-
 ...ava => UniVocityFixedDataFormatConfigurer.java} |   4 +-
 .../camel/configurer/univocity-fixed-dataformat    |   2 -
 ...city-csv-dataformat => univocityCsv-dataformat} |   0
 .../camel/configurer/univocityFixed-dataformat     |   2 +
 ...city-tsv-dataformat => univocityTsv-dataformat} |   0
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../org/apache/camel/dataformat/univocity-fixed    |   2 -
 .../dataformat/{univocity-csv => univocityCsv}     |   0
 .../org/apache/camel/dataformat/univocityFixed     |   2 +
 .../dataformat/{univocity-tsv => univocityTsv}     |   0
 .../camel/dataformat/univocity/univocityCsv.json   |   4 +-
 .../{univocity-fixed.json => univocityFixed.json}  |   8 +-
 .../camel/dataformat/univocity/univocityTsv.json   |   4 +-
 ...ataformat.adoc => univocityCsv-dataformat.adoc} |   2 +-
 ...aformat.adoc => univocityFixed-dataformat.adoc} |   2 +-
 ...ataformat.adoc => univocityTsv-dataformat.adoc} |   2 +-
 .../univocity/UniVocityCsvDataFormat.java          |   4 +-
 ...taFormat.java => UniVocityFixedDataFormat.java} |  16 +-
 .../univocity/UniVocityTsvDataFormat.java          |   4 +-
 ...UniVocityFixedDataFormatMarshalSpringTest.java} |   5 +-
 ...va => UniVocityFixedDataFormatMarshalTest.java} |  10 +-
 ...Test.java => UniVocityFixedDataFormatTest.java} |  48 +--
 ...iVocityFixedDataFormatUnmarshalSpringTest.java} |   5 +-
 ... => UniVocityFixedDataFormatUnmarshalTest.java} |  14 +-
 .../UniVocityCsvDataFormatMarshalSpringTest.xml    |  12 +-
 .../UniVocityCsvDataFormatUnmarshalSpringTest.xml  |  18 +-
 ...VocityFixedWidthDataFormatMarshalSpringTest.xml |  26 +-
 ...cityFixedWidthDataFormatUnmarshalSpringTest.xml |  48 +--
 .../UniVocityTsvDataFormatMarshalSpringTest.xml    |  12 +-
 .../UniVocityTsvDataFormatUnmarshalSpringTest.xml  |  18 +-
 ...secureXML-dataformat => xmlSecurity-dataformat} |   0
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../camel/dataformat/{secureXML => xmlSecurity}    |   0
 .../{secureXML.json => xmlSecurity.json}           |   6 +-
 ...dataformat.adoc => xmlSecurity-dataformat.adoc} |  30 +-
 .../xmlsecurity/XMLSecurityDataFormat.java         |   4 +-
 .../xmlsecurity/XMLEncryption11Test.java           |  10 +-
 .../xmlsecurity/XMLSecurityConcurrencyTest.java    |   4 +-
 .../xmlsecurity/XMLSecurityDataFormatTest.java     |  64 ++--
 .../SpringXmlSecurityDataFormatTest-context.xml    |   4 +-
 ...curityDataFormatWithKeyPasswordTest-context.xml |   4 +-
 ...deflater-dataformat => gzipDeflater-dataformat} |   0
 ...pdeflater-dataformat => zipDeflater-dataformat} |   0
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../dataformat/{gzipdeflater => gzipDeflater}      |   0
 .../camel/dataformat/{zipdeflater => zipDeflater}  |   0
 .../{gzipdeflater.json => gzipDeflater.json}       |   6 +-
 .../{zipdeflater.json => zipDeflater.json}         |   8 +-
 ...ataformat.adoc => gzipDeflater-dataformat.adoc} |   2 +-
 ...dataformat.adoc => zipDeflater-dataformat.adoc} |   6 +-
 .../deflater/GzipDeflaterDataFormat.java           |   4 +-
 .../dataformat/deflater/ZipDeflaterDataFormat.java |   4 +-
 .../{zipfile-dataformat => zipFile-dataformat}     |   0
 .../org/apache/camel/dataformat.properties         |   2 +-
 .../apache/camel/dataformat/{zipfile => zipFile}   |   0
 .../apache/camel/dataformat/zipfile/zipFile.json   |   4 +-
 ...ile-dataformat.adoc => zipFile-dataformat.adoc} |   2 +-
 .../dataformat/zipfile/ZipFileDataFormat.java      |   4 +-
 .../services/org/apache/camel/model.properties     |  27 +-
 .../org/apache/camel/model/dataformat/custom.json  |   2 +-
 .../apache/camel/model/dataformat/dataFormats.json |   2 +-
 .../camel/model/dataformat/gzipDeflater.json       |   4 +-
 .../apache/camel/model/dataformat/jacksonXml.json  |   4 +-
 .../org/apache/camel/model/dataformat/jaxb.index   |   7 +-
 .../{mime-multipart.json => mimeMultipart.json}    |   2 +-
 .../model/dataformat/{soapjaxb.json => soap.json}  |   6 +-
 .../dataformat/{tarfile.json => tarFile.json}      |   2 +-
 .../camel/model/dataformat/univocityCsv.json       |   2 +-
 .../camel/model/dataformat/univocityFixed.json     |   4 +-
 ...{univocity-header.json => univocityHeader.json} |   2 +-
 .../{univocity-tsv.json => univocityTsv.json}      |   2 +-
 .../apache/camel/model/dataformat/xmlSecurity.json |   4 +-
 .../org/apache/camel/model/dataformat/xmlrpc.json  |  19 --
 .../{zipdeflater.json => zipDeflater.json}         |   6 +-
 .../org/apache/camel/model/dataformat/zipFile.json |   2 +-
 .../resources/org/apache/camel/model/marshal.json  |   2 +-
 .../org/apache/camel/model/unmarshal.json          |   2 +-
 .../org/apache/camel/builder/DataFormatClause.java | 106 +++---
 .../org/apache/camel/model/MarshalDefinition.java  |  28 +-
 .../apache/camel/model/UnmarshalDefinition.java    |  28 +-
 .../camel/model/dataformat/CustomDataFormat.java   |   2 +-
 .../model/dataformat/DataFormatsDefinition.java    |  21 +-
 ...DataFormat.java => GzipDeflaterDataFormat.java} |   8 +-
 .../model/dataformat/JacksonXMLDataFormat.java     |   6 +-
 .../model/dataformat/MimeMultipartDataFormat.java  |   4 +-
 ...SoapJaxbDataFormat.java => SoapDataFormat.java} |  16 +-
 .../camel/model/dataformat/TarFileDataFormat.java  |   4 +-
 .../model/dataformat/UniVocityCsvDataFormat.java   |   4 +-
 ...taFormat.java => UniVocityFixedDataFormat.java} |   8 +-
 .../camel/model/dataformat/UniVocityHeader.java    |   2 +-
 .../model/dataformat/UniVocityTsvDataFormat.java   |   4 +-
 .../model/dataformat/XMLSecurityDataFormat.java    |   6 +-
 .../camel/model/dataformat/XmlRpcDataFormat.java   |  55 ---
 .../model/dataformat/ZipDeflaterDataFormat.java    |   8 +-
 .../camel/model/dataformat/ZipFileDataFormat.java  |   4 +-
 .../DataFormatTransformerDefinition.java           |  28 +-
 .../reifier/dataformat/DataFormatReifier.java      |  17 +-
 .../reifier/dataformat/GzipDataFormatReifier.java  |   6 +-
 ...rmatReifier.java => SoapDataFormatReifier.java} |   8 +-
 .../UniVocityFixedWidthDataFormatReifier.java      |   4 +-
 .../dataformat/XmlRpcDataFormatReifier.java        |  36 --
 .../org/apache/camel/main/dataformats.properties   |  22 +-
 .../java/org/apache/camel/xml/in/ModelParser.java  |  48 ++-
 .../resources/routeWithXMLSecurityDataFormat.xml   |   2 +-
 .../test/resources/routeWithZipFileDataFormat.xml  |   2 +-
 .../dataformats/examples/json/gzipdeflater.json    |   2 +-
 .../dataformats/examples/json/jacksonxml.json      |   2 +-
 .../dataformats/examples/json/mime-multipart.json  |   1 -
 .../dataformats/examples/json/mimeMultipart.json   |   1 +
 .../dataformats/examples/json/secureXML.json       |   1 -
 .../modules/dataformats/examples/json/soap.json    |   1 +
 .../dataformats/examples/json/soapjaxb.json        |   1 -
 .../modules/dataformats/examples/json/tarfile.json |   2 +-
 .../dataformats/examples/json/univocity-csv.json   |   1 -
 .../dataformats/examples/json/univocity-fixed.json |   1 -
 .../dataformats/examples/json/univocity-tsv.json   |   1 -
 .../dataformats/examples/json/univocityCsv.json    |   1 +
 .../dataformats/examples/json/univocityFixed.json  |   1 +
 .../dataformats/examples/json/univocityTsv.json    |   1 +
 .../dataformats/examples/json/xmlSecurity.json     |   1 +
 .../dataformats/examples/json/zipdeflater.json     |   2 +-
 .../modules/dataformats/examples/json/zipfile.json |   2 +-
 docs/components/modules/dataformats/nav.adoc       |  22 +-
 .../dataformats/pages/gzipdeflater-dataformat.adoc |   2 +-
 .../dataformats/pages/jacksonxml-dataformat.adoc   |   2 +-
 .../pages/mime-multipart-dataformat.adoc           |   1 -
 .../pages/mimeMultipart-dataformat.adoc            |   1 +
 .../dataformats/pages/secureXML-dataformat.adoc    |   1 -
 .../modules/dataformats/pages/soap-dataformat.adoc |   1 +
 .../dataformats/pages/soapjaxb-dataformat.adoc     |   1 -
 .../dataformats/pages/tarfile-dataformat.adoc      |   2 +-
 .../pages/univocity-csv-dataformat.adoc            |   1 -
 .../pages/univocity-fixed-dataformat.adoc          |   1 -
 .../pages/univocity-tsv-dataformat.adoc            |   1 -
 .../dataformats/pages/univocityCsv-dataformat.adoc |   1 +
 .../pages/univocityFixed-dataformat.adoc           |   1 +
 .../dataformats/pages/univocityTsv-dataformat.adoc |   1 +
 .../dataformats/pages/xmlSecurity-dataformat.adoc  |   1 +
 .../dataformats/pages/zipdeflater-dataformat.adoc  |   2 +-
 .../dataformats/pages/zipfile-dataformat.adoc      |   2 +-
 .../ROOT/pages/camel-3x-upgrade-guide-3_15.adoc    |  28 +-
 docs/user-manual/modules/ROOT/pages/security.adoc  |   2 +-
 .../dsl/yaml/deserializers/ModelDeserializers.java | 336 ++++++++----------
 .../deserializers/ModelDeserializersResolver.java  |  39 ++-
 .../src/generated/resources/camel-yaml-dsl.json    | 117 +++----
 232 files changed, 1119 insertions(+), 1342 deletions(-)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/{gzipdeflater.json => gzipDeflater.json} (83%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/{jacksonxml.json => jacksonXml.json} (98%)
 rename components/camel-mail/src/generated/resources/org/apache/camel/dataformat/mime/multipart/mime-multipart.json => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/mimeMultipart.json (97%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/{soapjaxb.json => soap.json} (88%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/{tarfile.json => tarFile.json} (98%)
 rename components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-csv.json => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityCsv.json (99%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/{univocity-fixed.json => univocityFixed.json} (98%)
 rename components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocity-tsv.json => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocityTsv.json (98%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/{secureXML.json => xmlSecurity.json} (98%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/{zipdeflater.json => zipDeflater.json} (87%)
 rename components/camel-zipfile/src/generated/resources/org/apache/camel/dataformat/zipfile/zipfile.json => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/zipFile.json (98%)
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/customDataFormat.json => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/custom.json (96%)
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/gzipdeflater.json => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/gzipDeflater.json (84%)
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jacksonxml.json => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonXml.json (99%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/{mime-multipart.json => mimeMultipart.json} (98%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/{soapjaxb.json => soap.json} (90%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/{tarfile.json => tarFile.json} (99%)
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/univocity-csv.json => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/univocityCsv.json (99%)
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/univocity-fixed.json => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/univocityFixed.json (99%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/{univocity-header.json => univocityHeader.json} (96%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/{univocity-tsv.json => univocityTsv.json} (99%)
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/secureXML.json => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xmlSecurity.json (98%)
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xmlrpc.json
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/{zipdeflater.json => zipDeflater.json} (88%)
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/zipfile.json => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/zipFile.json (99%)
 rename components/camel-jacksonxml/src/generated/resources/META-INF/services/org/apache/camel/configurer/{jacksonxml-dataformat => jacksonXml-dataformat} (100%)
 rename components/camel-jacksonxml/src/generated/resources/META-INF/services/org/apache/camel/dataformat/{jacksonxml => jacksonXml} (100%)
 rename components/camel-jacksonxml/src/generated/resources/org/apache/camel/component/jacksonxml/{jacksonxml.json => jacksonXml.json} (98%)
 rename components/camel-jacksonxml/src/main/docs/{jacksonxml-dataformat.adoc => jacksonXml-dataformat.adoc} (92%)
 rename components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/configurer/{mime-multipart-dataformat => mimeMultipart-dataformat} (100%)
 rename components/camel-mail/src/generated/resources/META-INF/services/org/apache/camel/dataformat/{mime-multipart => mimeMultipart} (100%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/mime-multipart.json => components/camel-mail/src/generated/resources/org/apache/camel/dataformat/mime/multipart/mimeMultipart.json (97%)
 rename components/camel-mail/src/main/docs/{mime-multipart-dataformat.adoc => mimeMultipart-dataformat.adoc} (97%)
 copy components/camel-soap/src/generated/java/org/apache/camel/dataformat/soap/{SoapJaxbDataFormatConfigurer.java => SoapDataFormatConfigurer.java} (80%)
 create mode 100644 components/camel-soap/src/generated/resources/META-INF/services/org/apache/camel/configurer/soap-dataformat
 delete mode 100644 components/camel-soap/src/generated/resources/META-INF/services/org/apache/camel/configurer/soapjaxb-dataformat
 rename components/camel-soap/src/generated/resources/META-INF/services/org/apache/camel/dataformat/{soapjaxb => soap} (50%)
 rename components/camel-soap/src/generated/resources/org/apache/camel/dataformat/soap/{soapjaxb.json => soap.json} (88%)
 rename components/camel-soap/src/main/docs/{soapjaxb-dataformat.adoc => soap-dataformat.adoc} (91%)
 rename components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/{SoapJaxbDataFormat.java => SoapDataFormat.java} (96%)
 rename components/camel-tarfile/src/generated/resources/META-INF/services/org/apache/camel/configurer/{tarfile-dataformat => tarFile-dataformat} (100%)
 rename components/camel-tarfile/src/generated/resources/META-INF/services/org/apache/camel/dataformat/{tarfile => tarFile} (100%)
 rename components/camel-tarfile/src/generated/resources/org/apache/camel/dataformat/tarfile/{tarfile.json => tarFile.json} (98%)
 rename components/camel-tarfile/src/main/docs/{tarfile-dataformat.adoc => tarFile-dataformat.adoc} (99%)
 rename components/camel-univocity-parsers/src/generated/java/org/apache/camel/dataformat/univocity/{UniVocityFixedWidthDataFormatConfigurer.java => UniVocityFixedDataFormatConfigurer.java} (93%)
 delete mode 100644 components/camel-univocity-parsers/src/generated/resources/META-INF/services/org/apache/camel/configurer/univocity-fixed-dataformat
 rename components/camel-univocity-parsers/src/generated/resources/META-INF/services/org/apache/camel/configurer/{univocity-csv-dataformat => univocityCsv-dataformat} (100%)
 create mode 100644 components/camel-univocity-parsers/src/generated/resources/META-INF/services/org/apache/camel/configurer/univocityFixed-dataformat
 rename components/camel-univocity-parsers/src/generated/resources/META-INF/services/org/apache/camel/configurer/{univocity-tsv-dataformat => univocityTsv-dataformat} (100%)
 delete mode 100644 components/camel-univocity-parsers/src/generated/resources/META-INF/services/org/apache/camel/dataformat/univocity-fixed
 rename components/camel-univocity-parsers/src/generated/resources/META-INF/services/org/apache/camel/dataformat/{univocity-csv => univocityCsv} (100%)
 create mode 100644 components/camel-univocity-parsers/src/generated/resources/META-INF/services/org/apache/camel/dataformat/univocityFixed
 rename components/camel-univocity-parsers/src/generated/resources/META-INF/services/org/apache/camel/dataformat/{univocity-tsv => univocityTsv} (100%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocity-csv.json => components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocityCsv.json (99%)
 rename components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/{univocity-fixed.json => univocityFixed.json} (98%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/univocity-tsv.json => components/camel-univocity-parsers/src/generated/resources/org/apache/camel/dataformat/univocity/univocityTsv.json (98%)
 rename components/camel-univocity-parsers/src/main/docs/{univocity-csv-dataformat.adoc => univocityCsv-dataformat.adoc} (99%)
 rename components/camel-univocity-parsers/src/main/docs/{univocity-fixed-dataformat.adoc => univocityFixed-dataformat.adoc} (99%)
 rename components/camel-univocity-parsers/src/main/docs/{univocity-tsv-dataformat.adoc => univocityTsv-dataformat.adoc} (99%)
 rename components/camel-univocity-parsers/src/main/java/org/apache/camel/dataformat/univocity/{UniVocityFixedWidthDataFormat.java => UniVocityFixedDataFormat.java} (93%)
 rename components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/{UniVocityFixedWidthDataFormatMarshalSpringTest.java => UniVocityFixedDataFormatMarshalSpringTest.java} (95%)
 rename components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/{UniVocityFixedWidthDataFormatMarshalTest.java => UniVocityFixedDataFormatMarshalTest.java} (93%)
 rename components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/{UniVocityFixedWidthDataFormatTest.java => UniVocityFixedDataFormatTest.java} (81%)
 rename components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/{UniVocityFixedWidthDataFormatUnmarshalSpringTest.java => UniVocityFixedDataFormatUnmarshalSpringTest.java} (96%)
 rename components/camel-univocity-parsers/src/test/java/org/apache/camel/dataformat/univocity/{UniVocityFixedWidthDataFormatUnmarshalTest.java => UniVocityFixedDataFormatUnmarshalTest.java} (93%)
 rename components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/configurer/{secureXML-dataformat => xmlSecurity-dataformat} (100%)
 rename components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/dataformat/{secureXML => xmlSecurity} (100%)
 rename components/camel-xmlsecurity/src/generated/resources/org/apache/camel/dataformat/xmlsecurity/{secureXML.json => xmlSecurity.json} (98%)
 rename components/camel-xmlsecurity/src/main/docs/{secureXML-dataformat.adoc => xmlSecurity-dataformat.adoc} (90%)
 rename components/camel-zip-deflater/src/generated/resources/META-INF/services/org/apache/camel/configurer/{gzipdeflater-dataformat => gzipDeflater-dataformat} (100%)
 rename components/camel-zip-deflater/src/generated/resources/META-INF/services/org/apache/camel/configurer/{zipdeflater-dataformat => zipDeflater-dataformat} (100%)
 rename components/camel-zip-deflater/src/generated/resources/META-INF/services/org/apache/camel/dataformat/{gzipdeflater => gzipDeflater} (100%)
 rename components/camel-zip-deflater/src/generated/resources/META-INF/services/org/apache/camel/dataformat/{zipdeflater => zipDeflater} (100%)
 rename components/camel-zip-deflater/src/generated/resources/org/apache/camel/dataformat/deflater/{gzipdeflater.json => gzipDeflater.json} (83%)
 rename components/camel-zip-deflater/src/generated/resources/org/apache/camel/dataformat/deflater/{zipdeflater.json => zipDeflater.json} (87%)
 rename components/camel-zip-deflater/src/main/docs/{gzipdeflater-dataformat.adoc => gzipDeflater-dataformat.adoc} (98%)
 rename components/camel-zip-deflater/src/main/docs/{zipdeflater-dataformat.adoc => zipDeflater-dataformat.adoc} (95%)
 rename components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/configurer/{zipfile-dataformat => zipFile-dataformat} (100%)
 rename components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/dataformat/{zipfile => zipFile} (100%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/zipfile.json => components/camel-zipfile/src/generated/resources/org/apache/camel/dataformat/zipfile/zipFile.json (98%)
 rename components/camel-zipfile/src/main/docs/{zipfile-dataformat.adoc => zipFile-dataformat.adoc} (99%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/customDataFormat.json => core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/custom.json (96%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/gzipdeflater.json => core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/gzipDeflater.json (84%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jacksonxml.json => core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/jacksonXml.json (99%)
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/{mime-multipart.json => mimeMultipart.json} (98%)
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/{soapjaxb.json => soap.json} (90%)
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/{tarfile.json => tarFile.json} (99%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/univocity-csv.json => core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/univocityCsv.json (99%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/univocity-fixed.json => core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/univocityFixed.json (99%)
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/{univocity-header.json => univocityHeader.json} (96%)
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/{univocity-tsv.json => univocityTsv.json} (99%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/secureXML.json => core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/xmlSecurity.json (98%)
 delete mode 100644 core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/xmlrpc.json
 rename core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/{zipdeflater.json => zipDeflater.json} (88%)
 rename catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/zipfile.json => core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/zipFile.json (99%)
 rename core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/{GzipDataFormat.java => GzipDeflaterDataFormat.java} (87%)
 rename core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/{SoapJaxbDataFormat.java => SoapDataFormat.java} (94%)
 rename core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/{UniVocityFixedWidthDataFormat.java => UniVocityFixedDataFormat.java} (92%)
 delete mode 100644 core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XmlRpcDataFormat.java
 rename core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/{SoapJaxbDataFormatReifier.java => SoapDataFormatReifier.java} (83%)
 delete mode 100644 core/camel-core-reifier/src/main/java/org/apache/camel/reifier/dataformat/XmlRpcDataFormatReifier.java
 delete mode 120000 docs/components/modules/dataformats/examples/json/mime-multipart.json
 create mode 120000 docs/components/modules/dataformats/examples/json/mimeMultipart.json
 delete mode 120000 docs/components/modules/dataformats/examples/json/secureXML.json
 create mode 120000 docs/components/modules/dataformats/examples/json/soap.json
 delete mode 120000 docs/components/modules/dataformats/examples/json/soapjaxb.json
 delete mode 120000 docs/components/modules/dataformats/examples/json/univocity-csv.json
 delete mode 120000 docs/components/modules/dataformats/examples/json/univocity-fixed.json
 delete mode 120000 docs/components/modules/dataformats/examples/json/univocity-tsv.json
 create mode 120000 docs/components/modules/dataformats/examples/json/univocityCsv.json
 create mode 120000 docs/components/modules/dataformats/examples/json/univocityFixed.json
 create mode 120000 docs/components/modules/dataformats/examples/json/univocityTsv.json
 create mode 120000 docs/components/modules/dataformats/examples/json/xmlSecurity.json
 delete mode 120000 docs/components/modules/dataformats/pages/mime-multipart-dataformat.adoc
 create mode 120000 docs/components/modules/dataformats/pages/mimeMultipart-dataformat.adoc
 delete mode 120000 docs/components/modules/dataformats/pages/secureXML-dataformat.adoc
 create mode 120000 docs/components/modules/dataformats/pages/soap-dataformat.adoc
 delete mode 120000 docs/components/modules/dataformats/pages/soapjaxb-dataformat.adoc
 delete mode 120000 docs/components/modules/dataformats/pages/univocity-csv-dataformat.adoc
 delete mode 120000 docs/components/modules/dataformats/pages/univocity-fixed-dataformat.adoc
 delete mode 120000 docs/components/modules/dataformats/pages/univocity-tsv-dataformat.adoc
 create mode 120000 docs/components/modules/dataformats/pages/univocityCsv-dataformat.adoc
 create mode 120000 docs/components/modules/dataformats/pages/univocityFixed-dataformat.adoc
 create mode 120000 docs/components/modules/dataformats/pages/univocityTsv-dataformat.adoc
 create mode 120000 docs/components/modules/dataformats/pages/xmlSecurity-dataformat.adoc