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 7498da4 CAMEL-13473: Move dataformats back from camel-base to
camel-core and put in better package name, as they are not part of the engine
impl.
new 5737a14 CAMEL-13474: Move dataformats out of camel-core. Remove
deprecated data formats first.
new e196d59 CAMEL-13474: Move dataformats out of camel-core. Remove
deprecated data formats first.
new af7a999 CAMEL-13474: Move dataformats out of camel-core.
new eb17970 CAMEL-13474: Move dataformats out of camel-core.
new 7245e89 CAMEL-13474: Move dataformats out of camel-core.
new 0872b3f CAMEL-13474: Move dataformats out of camel-core.
new 4b53af7 CAMEL-13474: Move dataformats out of camel-core.
The 36918 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:
MIGRATION.md | 5 +
apache-camel/pom.xml | 10 ++
apache-camel/src/main/descriptors/common-bin.xml | 2 +
bom/camel-bom/pom.xml | 10 ++
.../component/jetty/HttpGZipEncodingTest.java | 4 +-
.../pulsar/PulsarConcurrentConsumerInTest.java | 2 +-
.../component/pulsar/PulsarConsumerInTest.java | 2 +-
.../SpringDataFormatWithNonChildElementTest.java | 28 ----
.../StringDataFormatPropertyPlaceholderTest.java | 31 ----
.../camel/spring/issues/StringDataFormatTest.java | 63 -------
.../dataFormatWithNonChildElementTest.xml | 48 ------
.../stringDataFormatPropertyPlaceholderTest.xml | 52 ------
.../camel/spring/issues/stringDataFormatTest.xml | 49 ------
components/camel-zip-deflater/pom.xml | 45 +++++
.../src/main/docs/gzipdeflater-dataformat.adoc | 10 +-
.../src/main/docs/zipdeflater-dataformat.adoc | 7 +-
.../deflater/GzipDeflaterDataFormat.java | 8 +-
.../dataformat/deflater/ZipDeflaterDataFormat.java | 14 +-
components/readme.adoc | 10 +-
core/camel-core/pom.xml | 4 +
core/camel-core/readme.adoc | 13 --
.../src/main/docs/serialization-dataformat.adoc | 36 ----
.../src/main/docs/string-dataformat.adoc | 48 ------
.../org/apache/camel/builder/DataFormatClause.java | 37 +----
.../camel/dataformat/SerializationDataFormat.java | 80 ---------
.../apache/camel/dataformat/StringDataFormat.java | 93 -----------
.../org/apache/camel/model/MarshalDefinition.java | 8 +-
.../apache/camel/model/UnmarshalDefinition.java | 8 +-
.../model/dataformat/DataFormatsDefinition.java | 4 +-
.../camel/model/dataformat/GzipDataFormat.java | 6 +-
.../model/dataformat/SerializationDataFormat.java | 36 ----
.../camel/model/dataformat/StringDataFormat.java | 54 ------
...pDataFormat.java => ZipDeflaterDataFormat.java} | 10 +-
.../DataFormatTransformerDefinition.java | 8 +-
.../reifier/dataformat/DataFormatReifier.java | 8 +-
.../reifier/dataformat/GzipDataFormatReifier.java | 6 -
.../dataformat/SerializationDataFormatReifier.java | 34 ----
.../dataformat/StringDataFormatReifier.java | 35 ----
.../reifier/dataformat/ZipDataFormatReifier.java | 17 +-
.../camel/builder/TransformerBuilderTest.java | 23 ---
.../DataFormatEndpointSerializationTest.java | 57 -------
.../dataformat/DataFormatEndpointStringTest.java | 56 -------
.../component/mock/MockPredicateEqualityTest.java | 63 -------
.../camel/impl/GzipDataFormatFileDeleteTest.java | 2 +-
.../GzipDataFormatFileUnmarshalDeleteTest.java | 4 +-
.../org/apache/camel/impl/GzipDataFormatTest.java | 4 +-
.../camel/impl/SerializationDataFormatTest.java | 56 -------
.../apache/camel/impl/StringDataFormatTest.java | 181 ---------------------
...va => ZipDeflaterDataFormatFileDeleteTest.java} | 4 +-
...DeflaterDataFormatFileUnmarshalDeleteTest.java} | 6 +-
...matTest.java => ZipDeflaterDataFormatTest.java} | 20 +--
.../camel/issues/OnExceptionWithTwoBeansTest.java | 1 -
.../apache/camel/issues/SetHeaderIssueTest.java | 75 ---------
.../processor/CBRWhenUnmarshalEndChoiceTest.java | 57 -------
.../camel/processor/DataFormatFactoryTest.java | 55 -------
.../camel/processor/DataFormatStreamingTest.java | 31 ----
.../org/apache/camel/processor/DataFormatTest.java | 98 -----------
.../org/apache/camel/processor/SetHeaderTest.java | 57 -------
.../impl/RuntimeCamelCatalogTest.java | 13 --
.../camel/management/ManagedDataFormatTest.java | 3 +-
.../camel/management/ManagedMarshalTest.java | 11 +-
.../management/ManagedTransformerRegistryTest.java | 11 +-
.../camel/management/ManagedUnmarshalTest.java | 11 +-
docs/components/modules/ROOT/nav.adoc | 2 +
.../ROOT/pages/gzipdeflater-dataformat.adoc | 10 +-
.../modules/ROOT/pages/zipdeflater-dataformat.adoc | 7 +-
parent/pom.xml | 10 ++
.../camel/commands/TransformerListCommandTest.java | 116 -------------
.../karaf/features/src/main/resources/features.xml | 1 +
.../GzipDataFormatAutoConfiguration.java | 128 ---------------
.../SerializationDataFormatConfiguration.java | 56 -------
.../StringDataFormatAutoConfiguration.java | 128 ---------------
.../springboot/StringDataFormatConfiguration.java | 68 --------
.../additional-spring-configuration-metadata.json | 66 --------
.../src/main/resources/META-INF/spring.factories | 4 -
.../camel-zip-deflater-starter/pom.xml | 53 ++++++
.../GzipDeflaterDataFormatAutoConfiguration.java} | 35 ++--
.../GzipDeflaterDataFormatConfiguration.java} | 10 +-
.../ZipDeflaterDataFormatAutoConfiguration.java} | 34 ++--
.../ZipDeflaterDataFormatConfiguration.java} | 10 +-
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.factories | 23 +++
.../src/main/resources/META-INF/spring.provides | 17 ++
platforms/spring-boot/components-starter/pom.xml | 1 +
.../camel-spring-boot-dependencies/pom.xml | 10 ++
.../apache/camel/itest/async/HttpAsyncDslTest.java | 7 +-
87 files changed, 334 insertions(+), 2306 deletions(-)
delete mode 100644
components/camel-spring/src/test/java/org/apache/camel/spring/dataformat/SpringDataFormatWithNonChildElementTest.java
delete mode 100644
components/camel-spring/src/test/java/org/apache/camel/spring/issues/StringDataFormatPropertyPlaceholderTest.java
delete mode 100644
components/camel-spring/src/test/java/org/apache/camel/spring/issues/StringDataFormatTest.java
delete mode 100644
components/camel-spring/src/test/resources/org/apache/camel/spring/dataformat/dataFormatWithNonChildElementTest.xml
delete mode 100644
components/camel-spring/src/test/resources/org/apache/camel/spring/issues/stringDataFormatPropertyPlaceholderTest.xml
delete mode 100644
components/camel-spring/src/test/resources/org/apache/camel/spring/issues/stringDataFormatTest.xml
create mode 100644 components/camel-zip-deflater/pom.xml
copy core/camel-core/src/main/docs/gzip-dataformat.adoc =>
components/camel-zip-deflater/src/main/docs/gzipdeflater-dataformat.adoc (88%)
copy core/camel-core/src/main/docs/zip-dataformat.adoc =>
components/camel-zip-deflater/src/main/docs/zipdeflater-dataformat.adoc (95%)
rename
core/camel-core/src/main/java/org/apache/camel/dataformat/GzipDataFormat.java
=>
components/camel-zip-deflater/src/main/java/org/apache/camel/dataformat/deflater/GzipDeflaterDataFormat.java
(92%)
rename
core/camel-core/src/main/java/org/apache/camel/dataformat/ZipDataFormat.java =>
components/camel-zip-deflater/src/main/java/org/apache/camel/dataformat/deflater/ZipDeflaterDataFormat.java
(90%)
delete mode 100644 core/camel-core/src/main/docs/serialization-dataformat.adoc
delete mode 100644 core/camel-core/src/main/docs/string-dataformat.adoc
delete mode 100644
core/camel-core/src/main/java/org/apache/camel/dataformat/SerializationDataFormat.java
delete mode 100644
core/camel-core/src/main/java/org/apache/camel/dataformat/StringDataFormat.java
delete mode 100644
core/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
delete mode 100644
core/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
rename
core/camel-core/src/main/java/org/apache/camel/model/dataformat/{ZipDataFormat.java
=> ZipDeflaterDataFormat.java} (89%)
delete mode 100644
core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/SerializationDataFormatReifier.java
delete mode 100644
core/camel-core/src/main/java/org/apache/camel/reifier/dataformat/StringDataFormatReifier.java
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatEndpointSerializationTest.java
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/component/dataformat/DataFormatEndpointStringTest.java
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/component/mock/MockPredicateEqualityTest.java
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/impl/SerializationDataFormatTest.java
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/impl/StringDataFormatTest.java
rename
core/camel-core/src/test/java/org/apache/camel/impl/{ZipDataFormatFileDeleteTest.java
=> ZipDeflaterDataFormatFileDeleteTest.java} (94%)
rename
core/camel-core/src/test/java/org/apache/camel/impl/{ZipDataFormatFileUnmarshalDeleteTest.java
=> ZipDeflaterDataFormatFileUnmarshalDeleteTest.java} (93%)
rename
core/camel-core/src/test/java/org/apache/camel/impl/{ZipDataFormatTest.java =>
ZipDeflaterDataFormatTest.java} (91%)
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/issues/SetHeaderIssueTest.java
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/processor/CBRWhenUnmarshalEndChoiceTest.java
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/processor/DataFormatFactoryTest.java
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/processor/DataFormatStreamingTest.java
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/processor/DataFormatTest.java
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/processor/SetHeaderTest.java
rename core/camel-core/src/main/docs/gzip-dataformat.adoc =>
docs/components/modules/ROOT/pages/gzipdeflater-dataformat.adoc (88%)
rename core/camel-core/src/main/docs/zip-dataformat.adoc =>
docs/components/modules/ROOT/pages/zipdeflater-dataformat.adoc (95%)
delete mode 100644
platforms/commands/commands-core/src/test/java/org/apache/camel/commands/TransformerListCommandTest.java
delete mode 100644
platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/dataformat/springboot/GzipDataFormatAutoConfiguration.java
delete mode 100644
platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/dataformat/springboot/SerializationDataFormatConfiguration.java
delete mode 100644
platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/dataformat/springboot/StringDataFormatAutoConfiguration.java
delete mode 100644
platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/dataformat/springboot/StringDataFormatConfiguration.java
create mode 100644
platforms/spring-boot/components-starter/camel-zip-deflater-starter/pom.xml
rename
platforms/spring-boot/components-starter/{camel-core-starter/src/main/java/org/apache/camel/dataformat/springboot/ZipDataFormatAutoConfiguration.java
=>
camel-zip-deflater-starter/src/main/java/org/apache/camel/dataformat/deflater/springboot/GzipDeflaterDataFormatAutoConfiguration.java}
(80%)
rename
platforms/spring-boot/components-starter/{camel-core-starter/src/main/java/org/apache/camel/dataformat/springboot/GzipDataFormatConfiguration.java
=>
camel-zip-deflater-starter/src/main/java/org/apache/camel/dataformat/deflater/springboot/GzipDeflaterDataFormatConfiguration.java}
(87%)
rename
platforms/spring-boot/components-starter/{camel-core-starter/src/main/java/org/apache/camel/dataformat/springboot/SerializationDataFormatAutoConfiguration.java
=>
camel-zip-deflater-starter/src/main/java/org/apache/camel/dataformat/deflater/springboot/ZipDeflaterDataFormatAutoConfiguration.java}
(81%)
rename
platforms/spring-boot/components-starter/{camel-core-starter/src/main/java/org/apache/camel/dataformat/springboot/ZipDataFormatConfiguration.java
=>
camel-zip-deflater-starter/src/main/java/org/apache/camel/dataformat/deflater/springboot/ZipDeflaterDataFormatConfiguration.java}
(89%)
copy {tooling/maven/camel-package-maven-plugin =>
platforms/spring-boot/components-starter/camel-zip-deflater-starter}/src/main/resources/META-INF/LICENSE.txt
(100%)
copy {tooling/maven/camel-package-maven-plugin =>
platforms/spring-boot/components-starter/camel-zip-deflater-starter}/src/main/resources/META-INF/NOTICE.txt
(100%)
create mode 100644
platforms/spring-boot/components-starter/camel-zip-deflater-starter/src/main/resources/META-INF/spring.factories
create mode 100644
platforms/spring-boot/components-starter/camel-zip-deflater-starter/src/main/resources/META-INF/spring.provides
