This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch CAMEL-22599 in repository https://gitbox.apache.org/repos/asf/camel.git
commit d94f4ce84d6f5173faa7ae61560db6422a214b20 Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Oct 27 14:21:16 2025 +0100 Camel-IBM Components: Create a middle folder like others Signed-off-by: Andrea Cosentino <[email protected]> --- components/{ => camel-ibm}/camel-ibm-cos/pom.xml | 2 +- .../ibm/cos/IBMCOSComponentConfigurer.java | 0 .../ibm/cos/IBMCOSEndpointConfigurer.java | 0 .../ibm/cos/IBMCOSEndpointUriFactory.java | 0 .../apache/camel/component/ibm/cos/ibm-cos.json | 0 .../services/org/apache/camel/component.properties | 0 .../services/org/apache/camel/component/ibm-cos | 0 .../org/apache/camel/configurer/ibm-cos-component | 0 .../org/apache/camel/configurer/ibm-cos-endpoint | 0 .../org/apache/camel/urifactory/ibm-cos-endpoint | 0 .../src/main/docs/ibm-cos-component.adoc | 0 .../camel/component/ibm/cos/IBMCOSComponent.java | 0 .../component/ibm/cos/IBMCOSConfiguration.java | 0 .../camel/component/ibm/cos/IBMCOSConstants.java | 0 .../camel/component/ibm/cos/IBMCOSConsumer.java | 0 .../camel/component/ibm/cos/IBMCOSEndpoint.java | 0 .../camel/component/ibm/cos/IBMCOSOperations.java | 0 .../camel/component/ibm/cos/IBMCOSProducer.java | 0 .../services/org/apache/camel/component/ibm-cos | 0 .../component/ibm/cos/IBMCOSComponentTest.java | 0 .../ibm/cos/integration/IBMCOSConsumerIT.java | 0 .../integration/IBMCOSConsumerMoveAfterReadIT.java | 0 .../IBMCOSProducerAdditionalOperationsIT.java | 0 .../integration/IBMCOSProducerCopyObjectIT.java | 0 .../IBMCOSProducerListOperationsIT.java | 0 .../integration/IBMCOSProducerPutGetDeleteIT.java | 0 .../ibm/cos/integration/IBMCOSTestSupport.java | 0 .../src/test/resources/integration-tests-README.md | 0 .../src/test/resources/log4j2.properties | 0 .../camel-ibm-secrets-manager/pom.xml | 2 +- .../IBMSecretsManagerComponentConfigurer.java | 0 .../IBMSecretsManagerEndpointConfigurer.java | 0 .../IBMSecretsManagerEndpointUriFactory.java | 0 .../ibm/secrets/manager/ibm-secrets-manager.json | 0 .../services/org/apache/camel/component.properties | 0 .../org/apache/camel/component/ibm-secrets-manager | 0 .../camel/configurer/ibm-secrets-manager-component | 0 .../camel/configurer/ibm-secrets-manager-endpoint | 0 .../apache/camel/periodic-task/ibm-secret-refresh | 0 .../org/apache/camel/properties-function/ibm | 0 .../camel/urifactory/ibm-secrets-manager-endpoint | 0 .../main/docs/ibm-secrets-manager-component.adoc | 0 .../manager/IBMSecretsManagerComponent.java | 0 .../manager/IBMSecretsManagerConfiguration.java | 0 .../manager/IBMSecretsManagerConstants.java | 0 .../secrets/manager/IBMSecretsManagerEndpoint.java | 0 .../manager/IBMSecretsManagerOperation.java | 0 .../secrets/manager/IBMSecretsManagerProducer.java | 0 .../IBMSecretsManagerPropertiesFunction.java | 0 .../vault/IBMEventStreamReloadTriggerTask.java | 0 .../IBMSecretsManagerCreateKVSecretIT.java | 0 .../IBMSecretsManagerCreateSecretIT.java | 0 .../operations/IBMSecretsManagerListSecretsIT.java | 0 ...MSecretsManagerNoEnvPropertiesSourceTestIT.java | 0 .../src/test/resources/log4j2.properties | 0 .../camel-ibm-watson-language/pom.xml | 2 +- .../WatsonLanguageComponentConfigurer.java | 0 .../language/WatsonLanguageEndpointConfigurer.java | 0 .../language/WatsonLanguageEndpointUriFactory.java | 0 .../ibm/watson/language/ibm-watson-language.json | 0 .../services/org/apache/camel/component.properties | 0 .../org/apache/camel/component/ibm-watson-language | 0 .../camel/configurer/ibm-watson-language-component | 0 .../camel/configurer/ibm-watson-language-endpoint | 0 .../camel/urifactory/ibm-watson-language-endpoint | 0 .../main/docs/ibm-watson-language-component.adoc | 0 .../watson/language/WatsonLanguageComponent.java | 0 .../language/WatsonLanguageConfiguration.java | 0 .../watson/language/WatsonLanguageConstants.java | 0 .../watson/language/WatsonLanguageEndpoint.java | 0 .../watson/language/WatsonLanguageOperations.java | 0 .../watson/language/WatsonLanguageProducer.java | 0 .../org/apache/camel/component/ibm-watson-language | 0 .../language/WatsonLanguageComponentTest.java | 0 .../integration/WatsonLanguageTestSupport.java | 0 .../watson/language/integration/WatsonNluIT.java | 0 .../src/test/resources/log4j2.properties | 0 components/camel-ibm/pom.xml | 41 ++++++++++++++++++++++ .../camel-ibm/src/main/docs/ibm-summary.adoc | 12 +++++++ components/pom.xml | 3 +- .../modules/ROOT/examples/json/ibm-cos.json | 2 +- .../ROOT/examples/json/ibm-secrets-manager.json | 2 +- .../ROOT/examples/json/ibm-watson-language.json | 2 +- docs/components/modules/ROOT/nav.adoc | 1 + .../modules/ROOT/pages/ibm-cos-component.adoc | 2 +- .../ROOT/pages/ibm-secrets-manager-component.adoc | 2 +- .../components/modules/ROOT/pages/ibm-summary.adoc | 1 + .../ROOT/pages/ibm-watson-language-component.adoc | 2 +- .../apache/camel/maven/packaging/MojoHelper.java | 4 +++ .../camel/maven/packaging/PrepareCatalogMojo.java | 1 + 90 files changed, 70 insertions(+), 11 deletions(-) diff --git a/components/camel-ibm-cos/pom.xml b/components/camel-ibm/camel-ibm-cos/pom.xml similarity index 98% rename from components/camel-ibm-cos/pom.xml rename to components/camel-ibm/camel-ibm-cos/pom.xml index 13b9ecea108c..bfe033449789 100644 --- a/components/camel-ibm-cos/pom.xml +++ b/components/camel-ibm/camel-ibm-cos/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.camel</groupId> - <artifactId>components</artifactId> + <artifactId>camel-ibm-parent</artifactId> <version>4.16.0-SNAPSHOT</version> </parent> diff --git a/components/camel-ibm-cos/src/generated/java/org/apache/camel/component/ibm/cos/IBMCOSComponentConfigurer.java b/components/camel-ibm/camel-ibm-cos/src/generated/java/org/apache/camel/component/ibm/cos/IBMCOSComponentConfigurer.java similarity index 100% rename from components/camel-ibm-cos/src/generated/java/org/apache/camel/component/ibm/cos/IBMCOSComponentConfigurer.java rename to components/camel-ibm/camel-ibm-cos/src/generated/java/org/apache/camel/component/ibm/cos/IBMCOSComponentConfigurer.java diff --git a/components/camel-ibm-cos/src/generated/java/org/apache/camel/component/ibm/cos/IBMCOSEndpointConfigurer.java b/components/camel-ibm/camel-ibm-cos/src/generated/java/org/apache/camel/component/ibm/cos/IBMCOSEndpointConfigurer.java similarity index 100% rename from components/camel-ibm-cos/src/generated/java/org/apache/camel/component/ibm/cos/IBMCOSEndpointConfigurer.java rename to components/camel-ibm/camel-ibm-cos/src/generated/java/org/apache/camel/component/ibm/cos/IBMCOSEndpointConfigurer.java diff --git a/components/camel-ibm-cos/src/generated/java/org/apache/camel/component/ibm/cos/IBMCOSEndpointUriFactory.java b/components/camel-ibm/camel-ibm-cos/src/generated/java/org/apache/camel/component/ibm/cos/IBMCOSEndpointUriFactory.java similarity index 100% rename from components/camel-ibm-cos/src/generated/java/org/apache/camel/component/ibm/cos/IBMCOSEndpointUriFactory.java rename to components/camel-ibm/camel-ibm-cos/src/generated/java/org/apache/camel/component/ibm/cos/IBMCOSEndpointUriFactory.java diff --git a/components/camel-ibm-cos/src/generated/resources/META-INF/org/apache/camel/component/ibm/cos/ibm-cos.json b/components/camel-ibm/camel-ibm-cos/src/generated/resources/META-INF/org/apache/camel/component/ibm/cos/ibm-cos.json similarity index 100% rename from components/camel-ibm-cos/src/generated/resources/META-INF/org/apache/camel/component/ibm/cos/ibm-cos.json rename to components/camel-ibm/camel-ibm-cos/src/generated/resources/META-INF/org/apache/camel/component/ibm/cos/ibm-cos.json diff --git a/components/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-ibm/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/component.properties similarity index 100% rename from components/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/component.properties rename to components/camel-ibm/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/component.properties diff --git a/components/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/component/ibm-cos b/components/camel-ibm/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/component/ibm-cos similarity index 100% rename from components/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/component/ibm-cos rename to components/camel-ibm/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/component/ibm-cos diff --git a/components/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-cos-component b/components/camel-ibm/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-cos-component similarity index 100% rename from components/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-cos-component rename to components/camel-ibm/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-cos-component diff --git a/components/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-cos-endpoint b/components/camel-ibm/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-cos-endpoint similarity index 100% rename from components/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-cos-endpoint rename to components/camel-ibm/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-cos-endpoint diff --git a/components/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ibm-cos-endpoint b/components/camel-ibm/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ibm-cos-endpoint similarity index 100% rename from components/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ibm-cos-endpoint rename to components/camel-ibm/camel-ibm-cos/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ibm-cos-endpoint diff --git a/components/camel-ibm-cos/src/main/docs/ibm-cos-component.adoc b/components/camel-ibm/camel-ibm-cos/src/main/docs/ibm-cos-component.adoc similarity index 100% rename from components/camel-ibm-cos/src/main/docs/ibm-cos-component.adoc rename to components/camel-ibm/camel-ibm-cos/src/main/docs/ibm-cos-component.adoc diff --git a/components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSComponent.java b/components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSComponent.java similarity index 100% rename from components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSComponent.java rename to components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSComponent.java diff --git a/components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConfiguration.java b/components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConfiguration.java similarity index 100% rename from components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConfiguration.java rename to components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConfiguration.java diff --git a/components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConstants.java b/components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConstants.java similarity index 100% rename from components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConstants.java rename to components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConstants.java diff --git a/components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConsumer.java b/components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConsumer.java similarity index 100% rename from components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConsumer.java rename to components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSConsumer.java diff --git a/components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSEndpoint.java b/components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSEndpoint.java similarity index 100% rename from components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSEndpoint.java rename to components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSEndpoint.java diff --git a/components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSOperations.java b/components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSOperations.java similarity index 100% rename from components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSOperations.java rename to components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSOperations.java diff --git a/components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSProducer.java b/components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSProducer.java similarity index 100% rename from components/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSProducer.java rename to components/camel-ibm/camel-ibm-cos/src/main/java/org/apache/camel/component/ibm/cos/IBMCOSProducer.java diff --git a/components/camel-ibm-cos/src/main/resources/META-INF/services/org/apache/camel/component/ibm-cos b/components/camel-ibm/camel-ibm-cos/src/main/resources/META-INF/services/org/apache/camel/component/ibm-cos similarity index 100% rename from components/camel-ibm-cos/src/main/resources/META-INF/services/org/apache/camel/component/ibm-cos rename to components/camel-ibm/camel-ibm-cos/src/main/resources/META-INF/services/org/apache/camel/component/ibm-cos diff --git a/components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/IBMCOSComponentTest.java b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/IBMCOSComponentTest.java similarity index 100% rename from components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/IBMCOSComponentTest.java rename to components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/IBMCOSComponentTest.java diff --git a/components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerIT.java b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerIT.java similarity index 100% rename from components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerIT.java rename to components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerIT.java diff --git a/components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerMoveAfterReadIT.java b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerMoveAfterReadIT.java similarity index 100% rename from components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerMoveAfterReadIT.java rename to components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSConsumerMoveAfterReadIT.java diff --git a/components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerAdditionalOperationsIT.java b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerAdditionalOperationsIT.java similarity index 100% rename from components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerAdditionalOperationsIT.java rename to components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerAdditionalOperationsIT.java diff --git a/components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerCopyObjectIT.java b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerCopyObjectIT.java similarity index 100% rename from components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerCopyObjectIT.java rename to components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerCopyObjectIT.java diff --git a/components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerListOperationsIT.java b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerListOperationsIT.java similarity index 100% rename from components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerListOperationsIT.java rename to components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerListOperationsIT.java diff --git a/components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerPutGetDeleteIT.java b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerPutGetDeleteIT.java similarity index 100% rename from components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerPutGetDeleteIT.java rename to components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSProducerPutGetDeleteIT.java diff --git a/components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSTestSupport.java b/components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSTestSupport.java similarity index 100% rename from components/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSTestSupport.java rename to components/camel-ibm/camel-ibm-cos/src/test/java/org/apache/camel/component/ibm/cos/integration/IBMCOSTestSupport.java diff --git a/components/camel-ibm-cos/src/test/resources/integration-tests-README.md b/components/camel-ibm/camel-ibm-cos/src/test/resources/integration-tests-README.md similarity index 100% rename from components/camel-ibm-cos/src/test/resources/integration-tests-README.md rename to components/camel-ibm/camel-ibm-cos/src/test/resources/integration-tests-README.md diff --git a/components/camel-ibm-cos/src/test/resources/log4j2.properties b/components/camel-ibm/camel-ibm-cos/src/test/resources/log4j2.properties similarity index 100% rename from components/camel-ibm-cos/src/test/resources/log4j2.properties rename to components/camel-ibm/camel-ibm-cos/src/test/resources/log4j2.properties diff --git a/components/camel-ibm-secrets-manager/pom.xml b/components/camel-ibm/camel-ibm-secrets-manager/pom.xml similarity index 98% rename from components/camel-ibm-secrets-manager/pom.xml rename to components/camel-ibm/camel-ibm-secrets-manager/pom.xml index 3b98776669b9..2de92b75b283 100644 --- a/components/camel-ibm-secrets-manager/pom.xml +++ b/components/camel-ibm/camel-ibm-secrets-manager/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.camel</groupId> - <artifactId>components</artifactId> + <artifactId>camel-ibm-parent</artifactId> <version>4.16.0-SNAPSHOT</version> </parent> diff --git a/components/camel-ibm-secrets-manager/src/generated/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerComponentConfigurer.java b/components/camel-ibm/camel-ibm-secrets-manager/src/generated/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerComponentConfigurer.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/generated/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerComponentConfigurer.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/generated/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerComponentConfigurer.java diff --git a/components/camel-ibm-secrets-manager/src/generated/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerEndpointConfigurer.java b/components/camel-ibm/camel-ibm-secrets-manager/src/generated/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerEndpointConfigurer.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/generated/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerEndpointConfigurer.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/generated/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerEndpointConfigurer.java diff --git a/components/camel-ibm-secrets-manager/src/generated/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerEndpointUriFactory.java b/components/camel-ibm/camel-ibm-secrets-manager/src/generated/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerEndpointUriFactory.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/generated/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerEndpointUriFactory.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/generated/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerEndpointUriFactory.java diff --git a/components/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json b/components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json similarity index 100% rename from components/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json rename to components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json diff --git a/components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/component.properties similarity index 100% rename from components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/component.properties rename to components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/component.properties diff --git a/components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/component/ibm-secrets-manager b/components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/component/ibm-secrets-manager similarity index 100% rename from components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/component/ibm-secrets-manager rename to components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/component/ibm-secrets-manager diff --git a/components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-secrets-manager-component b/components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-secrets-manager-component similarity index 100% rename from components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-secrets-manager-component rename to components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-secrets-manager-component diff --git a/components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-secrets-manager-endpoint b/components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-secrets-manager-endpoint similarity index 100% rename from components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-secrets-manager-endpoint rename to components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-secrets-manager-endpoint diff --git a/components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/periodic-task/ibm-secret-refresh b/components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/periodic-task/ibm-secret-refresh similarity index 100% rename from components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/periodic-task/ibm-secret-refresh rename to components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/periodic-task/ibm-secret-refresh diff --git a/components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/properties-function/ibm b/components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/properties-function/ibm similarity index 100% rename from components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/properties-function/ibm rename to components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/properties-function/ibm diff --git a/components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ibm-secrets-manager-endpoint b/components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ibm-secrets-manager-endpoint similarity index 100% rename from components/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ibm-secrets-manager-endpoint rename to components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ibm-secrets-manager-endpoint diff --git a/components/camel-ibm-secrets-manager/src/main/docs/ibm-secrets-manager-component.adoc b/components/camel-ibm/camel-ibm-secrets-manager/src/main/docs/ibm-secrets-manager-component.adoc similarity index 100% rename from components/camel-ibm-secrets-manager/src/main/docs/ibm-secrets-manager-component.adoc rename to components/camel-ibm/camel-ibm-secrets-manager/src/main/docs/ibm-secrets-manager-component.adoc diff --git a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerComponent.java b/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerComponent.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerComponent.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerComponent.java diff --git a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerConfiguration.java b/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerConfiguration.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerConfiguration.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerConfiguration.java diff --git a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerConstants.java b/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerConstants.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerConstants.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerConstants.java diff --git a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerEndpoint.java b/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerEndpoint.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerEndpoint.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerEndpoint.java diff --git a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerOperation.java b/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerOperation.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerOperation.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerOperation.java diff --git a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerProducer.java b/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerProducer.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerProducer.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerProducer.java diff --git a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerPropertiesFunction.java b/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerPropertiesFunction.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerPropertiesFunction.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/IBMSecretsManagerPropertiesFunction.java diff --git a/components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/vault/IBMEventStreamReloadTriggerTask.java b/components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/vault/IBMEventStreamReloadTriggerTask.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/vault/IBMEventStreamReloadTriggerTask.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/main/java/org/apache/camel/component/ibm/secrets/manager/vault/IBMEventStreamReloadTriggerTask.java diff --git a/components/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateKVSecretIT.java b/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateKVSecretIT.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateKVSecretIT.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateKVSecretIT.java diff --git a/components/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateSecretIT.java b/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateSecretIT.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateSecretIT.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerCreateSecretIT.java diff --git a/components/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerListSecretsIT.java b/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerListSecretsIT.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerListSecretsIT.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerListSecretsIT.java diff --git a/components/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerNoEnvPropertiesSourceTestIT.java b/components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerNoEnvPropertiesSourceTestIT.java similarity index 100% rename from components/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerNoEnvPropertiesSourceTestIT.java rename to components/camel-ibm/camel-ibm-secrets-manager/src/test/java/org/apache/camel/component/ibm/secrets/manager/integration/operations/IBMSecretsManagerNoEnvPropertiesSourceTestIT.java diff --git a/components/camel-ibm-secrets-manager/src/test/resources/log4j2.properties b/components/camel-ibm/camel-ibm-secrets-manager/src/test/resources/log4j2.properties similarity index 100% rename from components/camel-ibm-secrets-manager/src/test/resources/log4j2.properties rename to components/camel-ibm/camel-ibm-secrets-manager/src/test/resources/log4j2.properties diff --git a/components/camel-ibm-watson-language/pom.xml b/components/camel-ibm/camel-ibm-watson-language/pom.xml similarity index 98% rename from components/camel-ibm-watson-language/pom.xml rename to components/camel-ibm/camel-ibm-watson-language/pom.xml index 853a44240a88..4c08e67c632c 100644 --- a/components/camel-ibm-watson-language/pom.xml +++ b/components/camel-ibm/camel-ibm-watson-language/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.camel</groupId> - <artifactId>components</artifactId> + <artifactId>camel-ibm-parent</artifactId> <version>4.16.0-SNAPSHOT</version> </parent> diff --git a/components/camel-ibm-watson-language/src/generated/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponentConfigurer.java b/components/camel-ibm/camel-ibm-watson-language/src/generated/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponentConfigurer.java similarity index 100% rename from components/camel-ibm-watson-language/src/generated/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponentConfigurer.java rename to components/camel-ibm/camel-ibm-watson-language/src/generated/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponentConfigurer.java diff --git a/components/camel-ibm-watson-language/src/generated/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageEndpointConfigurer.java b/components/camel-ibm/camel-ibm-watson-language/src/generated/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageEndpointConfigurer.java similarity index 100% rename from components/camel-ibm-watson-language/src/generated/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageEndpointConfigurer.java rename to components/camel-ibm/camel-ibm-watson-language/src/generated/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageEndpointConfigurer.java diff --git a/components/camel-ibm-watson-language/src/generated/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageEndpointUriFactory.java b/components/camel-ibm/camel-ibm-watson-language/src/generated/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageEndpointUriFactory.java similarity index 100% rename from components/camel-ibm-watson-language/src/generated/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageEndpointUriFactory.java rename to components/camel-ibm/camel-ibm-watson-language/src/generated/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageEndpointUriFactory.java diff --git a/components/camel-ibm-watson-language/src/generated/resources/META-INF/org/apache/camel/component/ibm/watson/language/ibm-watson-language.json b/components/camel-ibm/camel-ibm-watson-language/src/generated/resources/META-INF/org/apache/camel/component/ibm/watson/language/ibm-watson-language.json similarity index 100% rename from components/camel-ibm-watson-language/src/generated/resources/META-INF/org/apache/camel/component/ibm/watson/language/ibm-watson-language.json rename to components/camel-ibm/camel-ibm-watson-language/src/generated/resources/META-INF/org/apache/camel/component/ibm/watson/language/ibm-watson-language.json diff --git a/components/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-ibm/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/component.properties similarity index 100% rename from components/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/component.properties rename to components/camel-ibm/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/component.properties diff --git a/components/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/component/ibm-watson-language b/components/camel-ibm/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/component/ibm-watson-language similarity index 100% rename from components/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/component/ibm-watson-language rename to components/camel-ibm/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/component/ibm-watson-language diff --git a/components/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-watson-language-component b/components/camel-ibm/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-watson-language-component similarity index 100% rename from components/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-watson-language-component rename to components/camel-ibm/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-watson-language-component diff --git a/components/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-watson-language-endpoint b/components/camel-ibm/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-watson-language-endpoint similarity index 100% rename from components/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-watson-language-endpoint rename to components/camel-ibm/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/configurer/ibm-watson-language-endpoint diff --git a/components/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ibm-watson-language-endpoint b/components/camel-ibm/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ibm-watson-language-endpoint similarity index 100% rename from components/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ibm-watson-language-endpoint rename to components/camel-ibm/camel-ibm-watson-language/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ibm-watson-language-endpoint diff --git a/components/camel-ibm-watson-language/src/main/docs/ibm-watson-language-component.adoc b/components/camel-ibm/camel-ibm-watson-language/src/main/docs/ibm-watson-language-component.adoc similarity index 100% rename from components/camel-ibm-watson-language/src/main/docs/ibm-watson-language-component.adoc rename to components/camel-ibm/camel-ibm-watson-language/src/main/docs/ibm-watson-language-component.adoc diff --git a/components/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponent.java b/components/camel-ibm/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponent.java similarity index 100% rename from components/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponent.java rename to components/camel-ibm/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponent.java diff --git a/components/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageConfiguration.java b/components/camel-ibm/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageConfiguration.java similarity index 100% rename from components/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageConfiguration.java rename to components/camel-ibm/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageConfiguration.java diff --git a/components/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageConstants.java b/components/camel-ibm/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageConstants.java similarity index 100% rename from components/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageConstants.java rename to components/camel-ibm/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageConstants.java diff --git a/components/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageEndpoint.java b/components/camel-ibm/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageEndpoint.java similarity index 100% rename from components/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageEndpoint.java rename to components/camel-ibm/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageEndpoint.java diff --git a/components/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageOperations.java b/components/camel-ibm/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageOperations.java similarity index 100% rename from components/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageOperations.java rename to components/camel-ibm/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageOperations.java diff --git a/components/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageProducer.java b/components/camel-ibm/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageProducer.java similarity index 100% rename from components/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageProducer.java rename to components/camel-ibm/camel-ibm-watson-language/src/main/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageProducer.java diff --git a/components/camel-ibm-watson-language/src/main/resources/META-INF/services/org/apache/camel/component/ibm-watson-language b/components/camel-ibm/camel-ibm-watson-language/src/main/resources/META-INF/services/org/apache/camel/component/ibm-watson-language similarity index 100% rename from components/camel-ibm-watson-language/src/main/resources/META-INF/services/org/apache/camel/component/ibm-watson-language rename to components/camel-ibm/camel-ibm-watson-language/src/main/resources/META-INF/services/org/apache/camel/component/ibm-watson-language diff --git a/components/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponentTest.java b/components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponentTest.java similarity index 100% rename from components/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponentTest.java rename to components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/WatsonLanguageComponentTest.java diff --git a/components/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/integration/WatsonLanguageTestSupport.java b/components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/integration/WatsonLanguageTestSupport.java similarity index 100% rename from components/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/integration/WatsonLanguageTestSupport.java rename to components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/integration/WatsonLanguageTestSupport.java diff --git a/components/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/integration/WatsonNluIT.java b/components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/integration/WatsonNluIT.java similarity index 100% rename from components/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/integration/WatsonNluIT.java rename to components/camel-ibm/camel-ibm-watson-language/src/test/java/org/apache/camel/component/ibm/watson/language/integration/WatsonNluIT.java diff --git a/components/camel-ibm-watson-language/src/test/resources/log4j2.properties b/components/camel-ibm/camel-ibm-watson-language/src/test/resources/log4j2.properties similarity index 100% rename from components/camel-ibm-watson-language/src/test/resources/log4j2.properties rename to components/camel-ibm/camel-ibm-watson-language/src/test/resources/log4j2.properties diff --git a/components/camel-ibm/pom.xml b/components/camel-ibm/pom.xml new file mode 100644 index 000000000000..cac281d89d62 --- /dev/null +++ b/components/camel-ibm/pom.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<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/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>components</artifactId> + <version>4.16.0-SNAPSHOT</version> + </parent> + + <artifactId>camel-ibm-parent</artifactId> + <packaging>pom</packaging> + <name>Camel :: IBM :: Parent</name> + <description>Camel IBM parent</description> + + <modules> + <module>camel-ibm-cos</module> + <module>camel-ibm-secrets-manager</module> + <module>camel-ibm-watson-language</module> + </modules> + +</project> diff --git a/components/camel-ibm/src/main/docs/ibm-summary.adoc b/components/camel-ibm/src/main/docs/ibm-summary.adoc new file mode 100644 index 000000000000..f5d9ae92f8f2 --- /dev/null +++ b/components/camel-ibm/src/main/docs/ibm-summary.adoc @@ -0,0 +1,12 @@ += IBM Component +:doctitle: IBM + +The *ibm-* component allows you to work with the +https://cloud.ibm.com/[IBM]. +IBM offers a great palette of different components like Cloud Object Storage, Watson, Event Stream etc. + +== {doctitle} components + +See the following for usage of each component: + +indexDescriptionList::[attributes='group={doctitle}',descriptionformat=description] diff --git a/components/pom.xml b/components/pom.xml index 001d560da3ea..c8e5f6e5af97 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -158,8 +158,7 @@ <module>camel-headersmap</module> <module>camel-hl7</module> <module>camel-huawei</module> - <module>camel-ibm-cos</module> - <module>camel-ibm-secrets-manager</module> + <module>camel-ibm</module> <module>camel-ical</module> <module>camel-iec60870</module> <module>camel-ignite</module> diff --git a/docs/components/modules/ROOT/examples/json/ibm-cos.json b/docs/components/modules/ROOT/examples/json/ibm-cos.json index 1f7218b04c6b..d9e951995c58 120000 --- a/docs/components/modules/ROOT/examples/json/ibm-cos.json +++ b/docs/components/modules/ROOT/examples/json/ibm-cos.json @@ -1 +1 @@ -../../../../../../components/camel-ibm-cos/src/generated/resources/META-INF/org/apache/camel/component/ibm/cos/ibm-cos.json \ No newline at end of file +../../../../../../components/camel-ibm/camel-ibm-cos/src/generated/resources/META-INF/org/apache/camel/component/ibm/cos/ibm-cos.json \ No newline at end of file diff --git a/docs/components/modules/ROOT/examples/json/ibm-secrets-manager.json b/docs/components/modules/ROOT/examples/json/ibm-secrets-manager.json index 481ac356836d..571d1c639637 120000 --- a/docs/components/modules/ROOT/examples/json/ibm-secrets-manager.json +++ b/docs/components/modules/ROOT/examples/json/ibm-secrets-manager.json @@ -1 +1 @@ -../../../../../../components/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json \ No newline at end of file +../../../../../../components/camel-ibm/camel-ibm-secrets-manager/src/generated/resources/META-INF/org/apache/camel/component/ibm/secrets/manager/ibm-secrets-manager.json \ No newline at end of file diff --git a/docs/components/modules/ROOT/examples/json/ibm-watson-language.json b/docs/components/modules/ROOT/examples/json/ibm-watson-language.json index bbb821e5e9d7..817ea7151c92 120000 --- a/docs/components/modules/ROOT/examples/json/ibm-watson-language.json +++ b/docs/components/modules/ROOT/examples/json/ibm-watson-language.json @@ -1 +1 @@ -../../../../../../components/camel-ibm-watson-language/src/generated/resources/META-INF/org/apache/camel/component/ibm/watson/language/ibm-watson-language.json \ No newline at end of file +../../../../../../components/camel-ibm/camel-ibm-watson-language/src/generated/resources/META-INF/org/apache/camel/component/ibm/watson/language/ibm-watson-language.json \ No newline at end of file diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc index 3584a685bd03..fcb3799569ca 100644 --- a/docs/components/modules/ROOT/nav.adoc +++ b/docs/components/modules/ROOT/nav.adoc @@ -176,6 +176,7 @@ *** xref:hwcloud-iam-component.adoc[Huawei Identity and Access Management (IAM)] *** xref:hwcloud-obs-component.adoc[Huawei Object Storage Service (OBS)] *** xref:hwcloud-smn-component.adoc[Huawei Simple Message Notification (SMN)] +** xref:ibm-summary.adoc[IBM] *** xref:ibm-cos-component.adoc[IBM Cloud Object Storage] *** xref:ibm-watson-language-component.adoc[IBM Watson Language] ** xref:ibm-secrets-manager-component.adoc[IBM Secrets Manager] diff --git a/docs/components/modules/ROOT/pages/ibm-cos-component.adoc b/docs/components/modules/ROOT/pages/ibm-cos-component.adoc index 449dca91e5c1..9e161c51c09e 120000 --- a/docs/components/modules/ROOT/pages/ibm-cos-component.adoc +++ b/docs/components/modules/ROOT/pages/ibm-cos-component.adoc @@ -1 +1 @@ -../../../../../components/camel-ibm-cos/src/main/docs/ibm-cos-component.adoc \ No newline at end of file +../../../../../components/camel-ibm/camel-ibm-cos/src/main/docs/ibm-cos-component.adoc \ No newline at end of file diff --git a/docs/components/modules/ROOT/pages/ibm-secrets-manager-component.adoc b/docs/components/modules/ROOT/pages/ibm-secrets-manager-component.adoc index 2002418d9a1a..f885d8a9160b 120000 --- a/docs/components/modules/ROOT/pages/ibm-secrets-manager-component.adoc +++ b/docs/components/modules/ROOT/pages/ibm-secrets-manager-component.adoc @@ -1 +1 @@ -../../../../../components/camel-ibm-secrets-manager/src/main/docs/ibm-secrets-manager-component.adoc \ No newline at end of file +../../../../../components/camel-ibm/camel-ibm-secrets-manager/src/main/docs/ibm-secrets-manager-component.adoc \ No newline at end of file diff --git a/docs/components/modules/ROOT/pages/ibm-summary.adoc b/docs/components/modules/ROOT/pages/ibm-summary.adoc new file mode 120000 index 000000000000..27ce534c6283 --- /dev/null +++ b/docs/components/modules/ROOT/pages/ibm-summary.adoc @@ -0,0 +1 @@ +../../../../../components/camel-ibm/src/main/docs/ibm-summary.adoc \ No newline at end of file diff --git a/docs/components/modules/ROOT/pages/ibm-watson-language-component.adoc b/docs/components/modules/ROOT/pages/ibm-watson-language-component.adoc index bec93e3ad524..d632d2d1ec63 120000 --- a/docs/components/modules/ROOT/pages/ibm-watson-language-component.adoc +++ b/docs/components/modules/ROOT/pages/ibm-watson-language-component.adoc @@ -1 +1 @@ -../../../../../components/camel-ibm-watson-language/src/main/docs/ibm-watson-language-component.adoc \ No newline at end of file +../../../../../components/camel-ibm/camel-ibm-watson-language/src/main/docs/ibm-watson-language-component.adoc \ No newline at end of file diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java index 80ce5641d906..a0e9331bedab 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/MojoHelper.java @@ -130,6 +130,10 @@ public final class MojoHelper { dir.resolve("camel-huaweicloud-imagerecognition"), dir.resolve("camel-huaweicloud-obs"), dir.resolve("camel-huaweicloud-smn")); + case "camel-ibm": + return Arrays.asList(dir.resolve("camel-ibm-cos"), + dir.resolve("camel-ibm-secrets-manager"), + dir.resolve("camel-ibm-watson-language")); case "camel-knative": return Collections.singletonList(dir.resolve("camel-knative-component")); case "camel-yaml-dsl": diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java index 7676e7afb528..e67e5606f816 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java @@ -934,6 +934,7 @@ public class PrepareCatalogMojo extends AbstractMojo { case "camel-http-base": case "camel-http-common": case "camel-huawei": + case "camel-ibm": case "camel-infinispan": case "camel-jetty-common": case "camel-knative":
