This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit cd744faab76e6f0369255460d1e17f44a9a907e4 Author: Luca Burgazzoli <lburgazz...@gmail.com> AuthorDate: Thu Sep 24 19:47:12 2020 +0200 chore: move components to the components folder --- {camel-kamelet => components/camel-kamelet}/pom.xml | 2 +- .../camel/component/kamelet/KameletComponentConfigurer.java | 0 .../camel/component/kamelet/KameletEndpointConfigurer.java | 0 .../META-INF/services/org/apache/camel/component/kamelet | 0 .../services/org/apache/camel/configurer/kamelet-component | 0 .../services/org/apache/camel/configurer/kamelet-endpoint | 0 .../resources/org/apache/camel/component/kamelet/kamelet.json | 0 .../main/java/org/apache/camel/component/kamelet/Kamelet.java | 0 .../org/apache/camel/component/kamelet/KameletComponent.java | 0 .../java/org/apache/camel/component/kamelet/KameletEndpoint.java | 0 .../org/apache/camel/component/kamelet/KameletBasicTest.java | 0 .../apache/camel/component/kamelet/KameletPropertiesTest.java | 0 .../org/apache/camel/component/kamelet/KameletRouteTest.java | 0 .../apache/camel/component/kamelet/KameletValidationTest.java | 0 .../camel-kamelet}/src/test/resources/log4j2-test.xml | 0 .../camel-knative}/camel-knative-api/pom.xml | 0 .../component/knative/spi/CloudEventTypeConverterLoader.java | 0 .../META-INF/services/org/apache/camel/TypeConverterLoader | 0 .../java/org/apache/camel/component/knative/spi/CloudEvent.java | 0 .../camel/component/knative/spi/CloudEventTypeConverter.java | 0 .../java/org/apache/camel/component/knative/spi/CloudEvents.java | 0 .../java/org/apache/camel/component/knative/spi/Knative.java | 0 .../apache/camel/component/knative/spi/KnativeEnvironment.java | 0 .../org/apache/camel/component/knative/spi/KnativeSupport.java | 0 .../org/apache/camel/component/knative/spi/KnativeTransport.java | 0 .../component/knative/spi/KnativeTransportConfiguration.java | 0 .../camel/component/knative/spi/KnativeEnvironmentTest.java | 0 .../camel-knative-api}/src/test/resources/log4j2-test.xml | 0 .../camel-knative}/camel-knative-http/pom.xml | 0 .../apache/camel/component/knative/http/KnativeHttpConsumer.java | 0 .../component/knative/http/KnativeHttpHeaderFilterStrategy.java | 0 .../apache/camel/component/knative/http/KnativeHttpProducer.java | 0 .../apache/camel/component/knative/http/KnativeHttpSupport.java | 0 .../camel/component/knative/http/KnativeHttpTransport.java | 0 .../META-INF/services/org/apache/camel/knative/transport/http | 0 .../apache/camel/component/knative/http/KnativeHttpServer.java | 0 .../org/apache/camel/component/knative/http/KnativeHttpTest.java | 0 .../camel/component/knative/http/KnativeHttpTestSupport.java | 0 .../knative/http/assertions/HttpServerRequestAssert.java | 0 .../camel-knative-http}/src/test/resources/log4j2-test.xml | 0 .../camel-knative}/camel-knative-test/pom.xml | 0 .../camel/component/knative/test/KnativeEnvironmentSupport.java | 0 .../camel-knative}/camel-knative/pom.xml | 0 .../camel/component/knative/KnativeComponentConfigurer.java | 0 .../camel/component/knative/KnativeEndpointConfigurer.java | 0 .../META-INF/services/org/apache/camel/component/knative | 0 .../services/org/apache/camel/configurer/knative-component | 0 .../services/org/apache/camel/configurer/knative-endpoint | 0 .../resources/org/apache/camel/component/knative/knative.json | 0 .../camel-knative/src/main/docs/knative-component.adoc | 0 .../org/apache/camel/component/knative/KnativeComponent.java | 0 .../org/apache/camel/component/knative/KnativeConfiguration.java | 0 .../org/apache/camel/component/knative/KnativeConstants.java | 0 .../java/org/apache/camel/component/knative/KnativeEndpoint.java | 0 .../java/org/apache/camel/component/knative/KnativeProducer.java | 0 .../camel/component/knative/ce/AbstractCloudEventProcessor.java | 0 .../apache/camel/component/knative/ce/CloudEventProcessor.java | 0 .../apache/camel/component/knative/ce/CloudEventProcessors.java | 0 .../org/apache/camel/component/knative/KnativeComponentTest.java | 0 .../org/apache/camel/component/knative/KnativeTransportNoop.java | 0 .../camel-knative/src/test/resources/environment.json | 0 .../camel-knative/src/test/resources/log4j2-test.xml | 0 {camel-knative => components/camel-knative}/pom.xml | 2 +- {camel-wrap => components/camel-wrap}/pom.xml | 2 +- .../org/apache/camel/component/wrap/WrapComponentConfigurer.java | 0 .../org/apache/camel/component/wrap/WrapEndpointConfigurer.java | 0 .../resources/META-INF/services/org/apache/camel/component/wrap | 0 .../META-INF/services/org/apache/camel/configurer/wrap-component | 0 .../META-INF/services/org/apache/camel/configurer/wrap-endpoint | 0 .../resources/org/apache/camel/component/wrap/wrap.json | 0 .../src/main/java/org/apache/camel/component/wrap/Wrap.java | 0 .../main/java/org/apache/camel/component/wrap/WrapComponent.java | 0 .../main/java/org/apache/camel/component/wrap/WrapEndpoint.java | 0 .../test/java/org/apache/camel/component/wrap/WrapBasicTest.java | 0 .../camel-wrap}/src/test/resources/log4j2-test.xml | 0 {camel-knative => components}/pom.xml | 9 +++------ pom.xml | 5 +---- 77 files changed, 7 insertions(+), 13 deletions(-) diff --git a/camel-kamelet/pom.xml b/components/camel-kamelet/pom.xml similarity index 98% rename from camel-kamelet/pom.xml rename to components/camel-kamelet/pom.xml index 0184884..21232ac 100644 --- a/camel-kamelet/pom.xml +++ b/components/camel-kamelet/pom.xml @@ -20,7 +20,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-runtime-parent</artifactId> + <artifactId>camel-k-components</artifactId> <version>1.5.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletComponentConfigurer.java b/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletComponentConfigurer.java similarity index 100% rename from camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletComponentConfigurer.java rename to components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletComponentConfigurer.java diff --git a/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletEndpointConfigurer.java b/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletEndpointConfigurer.java similarity index 100% rename from camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletEndpointConfigurer.java rename to components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletEndpointConfigurer.java diff --git a/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/component/kamelet b/components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/component/kamelet similarity index 100% rename from camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/component/kamelet rename to components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/component/kamelet diff --git a/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/configurer/kamelet-component b/components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/configurer/kamelet-component similarity index 100% rename from camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/configurer/kamelet-component rename to components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/configurer/kamelet-component diff --git a/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/configurer/kamelet-endpoint b/components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/configurer/kamelet-endpoint similarity index 100% rename from camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/configurer/kamelet-endpoint rename to components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/configurer/kamelet-endpoint diff --git a/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json b/components/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json similarity index 100% rename from camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json rename to components/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json diff --git a/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/Kamelet.java b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/Kamelet.java similarity index 100% rename from camel-kamelet/src/main/java/org/apache/camel/component/kamelet/Kamelet.java rename to components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/Kamelet.java diff --git a/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java similarity index 100% rename from camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java rename to components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java diff --git a/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletEndpoint.java b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletEndpoint.java similarity index 100% rename from camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletEndpoint.java rename to components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletEndpoint.java diff --git a/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletBasicTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletBasicTest.java similarity index 100% rename from camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletBasicTest.java rename to components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletBasicTest.java diff --git a/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletPropertiesTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletPropertiesTest.java similarity index 100% rename from camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletPropertiesTest.java rename to components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletPropertiesTest.java diff --git a/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteTest.java similarity index 100% rename from camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteTest.java rename to components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletRouteTest.java diff --git a/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletValidationTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletValidationTest.java similarity index 100% rename from camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletValidationTest.java rename to components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletValidationTest.java diff --git a/camel-kamelet/src/test/resources/log4j2-test.xml b/components/camel-kamelet/src/test/resources/log4j2-test.xml similarity index 100% rename from camel-kamelet/src/test/resources/log4j2-test.xml rename to components/camel-kamelet/src/test/resources/log4j2-test.xml diff --git a/camel-knative/camel-knative-api/pom.xml b/components/camel-knative/camel-knative-api/pom.xml similarity index 100% rename from camel-knative/camel-knative-api/pom.xml rename to components/camel-knative/camel-knative-api/pom.xml diff --git a/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/CloudEventTypeConverterLoader.java b/components/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/CloudEventTypeConverterLoader.java similarity index 100% rename from camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/CloudEventTypeConverterLoader.java rename to components/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/CloudEventTypeConverterLoader.java diff --git a/camel-knative/camel-knative-api/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader b/components/camel-knative/camel-knative-api/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader similarity index 100% rename from camel-knative/camel-knative-api/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader rename to components/camel-knative/camel-knative-api/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader diff --git a/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/CloudEvent.java b/components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/CloudEvent.java similarity index 100% rename from camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/CloudEvent.java rename to components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/CloudEvent.java diff --git a/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/CloudEventTypeConverter.java b/components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/CloudEventTypeConverter.java similarity index 100% rename from camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/CloudEventTypeConverter.java rename to components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/CloudEventTypeConverter.java diff --git a/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/CloudEvents.java b/components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/CloudEvents.java similarity index 100% rename from camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/CloudEvents.java rename to components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/CloudEvents.java diff --git a/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/Knative.java b/components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/Knative.java similarity index 100% rename from camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/Knative.java rename to components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/Knative.java diff --git a/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeEnvironment.java b/components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeEnvironment.java similarity index 100% rename from camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeEnvironment.java rename to components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeEnvironment.java diff --git a/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeSupport.java b/components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeSupport.java similarity index 100% rename from camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeSupport.java rename to components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeSupport.java diff --git a/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeTransport.java b/components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeTransport.java similarity index 100% rename from camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeTransport.java rename to components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeTransport.java diff --git a/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeTransportConfiguration.java b/components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeTransportConfiguration.java similarity index 100% rename from camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeTransportConfiguration.java rename to components/camel-knative/camel-knative-api/src/main/java/org/apache/camel/component/knative/spi/KnativeTransportConfiguration.java diff --git a/camel-knative/camel-knative-api/src/test/java/org/apache/camel/component/knative/spi/KnativeEnvironmentTest.java b/components/camel-knative/camel-knative-api/src/test/java/org/apache/camel/component/knative/spi/KnativeEnvironmentTest.java similarity index 100% rename from camel-knative/camel-knative-api/src/test/java/org/apache/camel/component/knative/spi/KnativeEnvironmentTest.java rename to components/camel-knative/camel-knative-api/src/test/java/org/apache/camel/component/knative/spi/KnativeEnvironmentTest.java diff --git a/camel-knative/camel-knative-http/src/test/resources/log4j2-test.xml b/components/camel-knative/camel-knative-api/src/test/resources/log4j2-test.xml similarity index 100% rename from camel-knative/camel-knative-http/src/test/resources/log4j2-test.xml rename to components/camel-knative/camel-knative-api/src/test/resources/log4j2-test.xml diff --git a/camel-knative/camel-knative-http/pom.xml b/components/camel-knative/camel-knative-http/pom.xml similarity index 100% rename from camel-knative/camel-knative-http/pom.xml rename to components/camel-knative/camel-knative-http/pom.xml diff --git a/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpConsumer.java b/components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpConsumer.java similarity index 100% rename from camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpConsumer.java rename to components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpConsumer.java diff --git a/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpHeaderFilterStrategy.java b/components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpHeaderFilterStrategy.java similarity index 100% rename from camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpHeaderFilterStrategy.java rename to components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpHeaderFilterStrategy.java diff --git a/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpProducer.java b/components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpProducer.java similarity index 100% rename from camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpProducer.java rename to components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpProducer.java diff --git a/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpSupport.java b/components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpSupport.java similarity index 100% rename from camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpSupport.java rename to components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpSupport.java diff --git a/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpTransport.java b/components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpTransport.java similarity index 100% rename from camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpTransport.java rename to components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpTransport.java diff --git a/camel-knative/camel-knative-http/src/main/resources/META-INF/services/org/apache/camel/knative/transport/http b/components/camel-knative/camel-knative-http/src/main/resources/META-INF/services/org/apache/camel/knative/transport/http similarity index 100% rename from camel-knative/camel-knative-http/src/main/resources/META-INF/services/org/apache/camel/knative/transport/http rename to components/camel-knative/camel-knative-http/src/main/resources/META-INF/services/org/apache/camel/knative/transport/http diff --git a/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpServer.java b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpServer.java similarity index 100% rename from camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpServer.java rename to components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpServer.java diff --git a/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java similarity index 100% rename from camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java rename to components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java diff --git a/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTestSupport.java b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTestSupport.java similarity index 100% rename from camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTestSupport.java rename to components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTestSupport.java diff --git a/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/assertions/HttpServerRequestAssert.java b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/assertions/HttpServerRequestAssert.java similarity index 100% rename from camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/assertions/HttpServerRequestAssert.java rename to components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/assertions/HttpServerRequestAssert.java diff --git a/camel-knative/camel-knative-api/src/test/resources/log4j2-test.xml b/components/camel-knative/camel-knative-http/src/test/resources/log4j2-test.xml similarity index 100% rename from camel-knative/camel-knative-api/src/test/resources/log4j2-test.xml rename to components/camel-knative/camel-knative-http/src/test/resources/log4j2-test.xml diff --git a/camel-knative/camel-knative-test/pom.xml b/components/camel-knative/camel-knative-test/pom.xml similarity index 100% rename from camel-knative/camel-knative-test/pom.xml rename to components/camel-knative/camel-knative-test/pom.xml diff --git a/camel-knative/camel-knative-test/src/main/java/org/apache/camel/component/knative/test/KnativeEnvironmentSupport.java b/components/camel-knative/camel-knative-test/src/main/java/org/apache/camel/component/knative/test/KnativeEnvironmentSupport.java similarity index 100% rename from camel-knative/camel-knative-test/src/main/java/org/apache/camel/component/knative/test/KnativeEnvironmentSupport.java rename to components/camel-knative/camel-knative-test/src/main/java/org/apache/camel/component/knative/test/KnativeEnvironmentSupport.java diff --git a/camel-knative/camel-knative/pom.xml b/components/camel-knative/camel-knative/pom.xml similarity index 100% rename from camel-knative/camel-knative/pom.xml rename to components/camel-knative/camel-knative/pom.xml diff --git a/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeComponentConfigurer.java b/components/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeComponentConfigurer.java similarity index 100% rename from camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeComponentConfigurer.java rename to components/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeComponentConfigurer.java diff --git a/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeEndpointConfigurer.java b/components/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeEndpointConfigurer.java similarity index 100% rename from camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeEndpointConfigurer.java rename to components/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeEndpointConfigurer.java diff --git a/camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/component/knative b/components/camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/component/knative similarity index 100% rename from camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/component/knative rename to components/camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/component/knative diff --git a/camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/configurer/knative-component b/components/camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/configurer/knative-component similarity index 100% rename from camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/configurer/knative-component rename to components/camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/configurer/knative-component diff --git a/camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/configurer/knative-endpoint b/components/camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/configurer/knative-endpoint similarity index 100% rename from camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/configurer/knative-endpoint rename to components/camel-knative/camel-knative/src/generated/resources/META-INF/services/org/apache/camel/configurer/knative-endpoint diff --git a/camel-knative/camel-knative/src/generated/resources/org/apache/camel/component/knative/knative.json b/components/camel-knative/camel-knative/src/generated/resources/org/apache/camel/component/knative/knative.json similarity index 100% rename from camel-knative/camel-knative/src/generated/resources/org/apache/camel/component/knative/knative.json rename to components/camel-knative/camel-knative/src/generated/resources/org/apache/camel/component/knative/knative.json diff --git a/camel-knative/camel-knative/src/main/docs/knative-component.adoc b/components/camel-knative/camel-knative/src/main/docs/knative-component.adoc similarity index 100% rename from camel-knative/camel-knative/src/main/docs/knative-component.adoc rename to components/camel-knative/camel-knative/src/main/docs/knative-component.adoc diff --git a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java b/components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java similarity index 100% rename from camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java rename to components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java diff --git a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConfiguration.java b/components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConfiguration.java similarity index 100% rename from camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConfiguration.java rename to components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConfiguration.java diff --git a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConstants.java b/components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConstants.java similarity index 100% rename from camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConstants.java rename to components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeConstants.java diff --git a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java b/components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java similarity index 100% rename from camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java rename to components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeEndpoint.java diff --git a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeProducer.java b/components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeProducer.java similarity index 100% rename from camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeProducer.java rename to components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeProducer.java diff --git a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/ce/AbstractCloudEventProcessor.java b/components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/ce/AbstractCloudEventProcessor.java similarity index 100% rename from camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/ce/AbstractCloudEventProcessor.java rename to components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/ce/AbstractCloudEventProcessor.java diff --git a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessor.java b/components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessor.java similarity index 100% rename from camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessor.java rename to components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessor.java diff --git a/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessors.java b/components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessors.java similarity index 100% rename from camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessors.java rename to components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/ce/CloudEventProcessors.java diff --git a/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java b/components/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java similarity index 100% rename from camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java rename to components/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeComponentTest.java diff --git a/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeTransportNoop.java b/components/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeTransportNoop.java similarity index 100% rename from camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeTransportNoop.java rename to components/camel-knative/camel-knative/src/test/java/org/apache/camel/component/knative/KnativeTransportNoop.java diff --git a/camel-knative/camel-knative/src/test/resources/environment.json b/components/camel-knative/camel-knative/src/test/resources/environment.json similarity index 100% rename from camel-knative/camel-knative/src/test/resources/environment.json rename to components/camel-knative/camel-knative/src/test/resources/environment.json diff --git a/camel-knative/camel-knative/src/test/resources/log4j2-test.xml b/components/camel-knative/camel-knative/src/test/resources/log4j2-test.xml similarity index 100% rename from camel-knative/camel-knative/src/test/resources/log4j2-test.xml rename to components/camel-knative/camel-knative/src/test/resources/log4j2-test.xml diff --git a/camel-knative/pom.xml b/components/camel-knative/pom.xml similarity index 96% copy from camel-knative/pom.xml copy to components/camel-knative/pom.xml index e5b405c..7017615 100644 --- a/camel-knative/pom.xml +++ b/components/camel-knative/pom.xml @@ -20,7 +20,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-runtime-parent</artifactId> + <artifactId>camel-k-components</artifactId> <version>1.5.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/camel-wrap/pom.xml b/components/camel-wrap/pom.xml similarity index 98% rename from camel-wrap/pom.xml rename to components/camel-wrap/pom.xml index af467d2..3e96ca9 100644 --- a/camel-wrap/pom.xml +++ b/components/camel-wrap/pom.xml @@ -20,7 +20,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.apache.camel.k</groupId> - <artifactId>camel-k-runtime-parent</artifactId> + <artifactId>camel-k-components</artifactId> <version>1.5.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/camel-wrap/src/generated/java/org/apache/camel/component/wrap/WrapComponentConfigurer.java b/components/camel-wrap/src/generated/java/org/apache/camel/component/wrap/WrapComponentConfigurer.java similarity index 100% rename from camel-wrap/src/generated/java/org/apache/camel/component/wrap/WrapComponentConfigurer.java rename to components/camel-wrap/src/generated/java/org/apache/camel/component/wrap/WrapComponentConfigurer.java diff --git a/camel-wrap/src/generated/java/org/apache/camel/component/wrap/WrapEndpointConfigurer.java b/components/camel-wrap/src/generated/java/org/apache/camel/component/wrap/WrapEndpointConfigurer.java similarity index 100% rename from camel-wrap/src/generated/java/org/apache/camel/component/wrap/WrapEndpointConfigurer.java rename to components/camel-wrap/src/generated/java/org/apache/camel/component/wrap/WrapEndpointConfigurer.java diff --git a/camel-wrap/src/generated/resources/META-INF/services/org/apache/camel/component/wrap b/components/camel-wrap/src/generated/resources/META-INF/services/org/apache/camel/component/wrap similarity index 100% rename from camel-wrap/src/generated/resources/META-INF/services/org/apache/camel/component/wrap rename to components/camel-wrap/src/generated/resources/META-INF/services/org/apache/camel/component/wrap diff --git a/camel-wrap/src/generated/resources/META-INF/services/org/apache/camel/configurer/wrap-component b/components/camel-wrap/src/generated/resources/META-INF/services/org/apache/camel/configurer/wrap-component similarity index 100% rename from camel-wrap/src/generated/resources/META-INF/services/org/apache/camel/configurer/wrap-component rename to components/camel-wrap/src/generated/resources/META-INF/services/org/apache/camel/configurer/wrap-component diff --git a/camel-wrap/src/generated/resources/META-INF/services/org/apache/camel/configurer/wrap-endpoint b/components/camel-wrap/src/generated/resources/META-INF/services/org/apache/camel/configurer/wrap-endpoint similarity index 100% rename from camel-wrap/src/generated/resources/META-INF/services/org/apache/camel/configurer/wrap-endpoint rename to components/camel-wrap/src/generated/resources/META-INF/services/org/apache/camel/configurer/wrap-endpoint diff --git a/camel-wrap/src/generated/resources/org/apache/camel/component/wrap/wrap.json b/components/camel-wrap/src/generated/resources/org/apache/camel/component/wrap/wrap.json similarity index 100% rename from camel-wrap/src/generated/resources/org/apache/camel/component/wrap/wrap.json rename to components/camel-wrap/src/generated/resources/org/apache/camel/component/wrap/wrap.json diff --git a/camel-wrap/src/main/java/org/apache/camel/component/wrap/Wrap.java b/components/camel-wrap/src/main/java/org/apache/camel/component/wrap/Wrap.java similarity index 100% rename from camel-wrap/src/main/java/org/apache/camel/component/wrap/Wrap.java rename to components/camel-wrap/src/main/java/org/apache/camel/component/wrap/Wrap.java diff --git a/camel-wrap/src/main/java/org/apache/camel/component/wrap/WrapComponent.java b/components/camel-wrap/src/main/java/org/apache/camel/component/wrap/WrapComponent.java similarity index 100% rename from camel-wrap/src/main/java/org/apache/camel/component/wrap/WrapComponent.java rename to components/camel-wrap/src/main/java/org/apache/camel/component/wrap/WrapComponent.java diff --git a/camel-wrap/src/main/java/org/apache/camel/component/wrap/WrapEndpoint.java b/components/camel-wrap/src/main/java/org/apache/camel/component/wrap/WrapEndpoint.java similarity index 100% rename from camel-wrap/src/main/java/org/apache/camel/component/wrap/WrapEndpoint.java rename to components/camel-wrap/src/main/java/org/apache/camel/component/wrap/WrapEndpoint.java diff --git a/camel-wrap/src/test/java/org/apache/camel/component/wrap/WrapBasicTest.java b/components/camel-wrap/src/test/java/org/apache/camel/component/wrap/WrapBasicTest.java similarity index 100% rename from camel-wrap/src/test/java/org/apache/camel/component/wrap/WrapBasicTest.java rename to components/camel-wrap/src/test/java/org/apache/camel/component/wrap/WrapBasicTest.java diff --git a/camel-wrap/src/test/resources/log4j2-test.xml b/components/camel-wrap/src/test/resources/log4j2-test.xml similarity index 100% rename from camel-wrap/src/test/resources/log4j2-test.xml rename to components/camel-wrap/src/test/resources/log4j2-test.xml diff --git a/camel-knative/pom.xml b/components/pom.xml similarity index 88% rename from camel-knative/pom.xml rename to components/pom.xml index e5b405c..b34dfc6 100644 --- a/camel-knative/pom.xml +++ b/components/pom.xml @@ -26,14 +26,11 @@ <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <artifactId>camel-knative-parent</artifactId> - + <artifactId>camel-k-components</artifactId> <modules> - <module>camel-knative-api</module> - <module>camel-knative-test</module> <module>camel-knative</module> - <module>camel-knative-http</module> + <module>camel-kamelet</module> + <module>camel-wrap</module> </modules> - </project> diff --git a/pom.xml b/pom.xml index 2500057..e29a3a0 100644 --- a/pom.xml +++ b/pom.xml @@ -309,10 +309,7 @@ <modules> <module>tooling</module> - - <module>camel-knative</module> - <module>camel-kamelet</module> - <module>camel-wrap</module> + <module>components</module> <module>camel-k-runtime-core</module> <module>camel-k-main</module>