From c6289461b5a3fe333089023d4b9e9ed41d6e79af Mon Sep 17 00:00:00 2001 From: Claus Ibsen Date: Fri, 22 Mar 2024 10:29:20 +0100 Subject: [PATCH] move camel-chatscript into camel-ai folder (#13590) --- components/{ => camel-ai}/camel-chatscript/pom.xml | 3 +-- .../component/chatscript/ChatScriptComponentConfigurer.java | 0 .../component/chatscript/ChatScriptEndpointConfigurer.java | 0 .../component/chatscript/ChatScriptEndpointUriFactory.java | 0 .../org/apache/camel/component/chatscript/chatscript.json | 0 .../META-INF/services/org/apache/camel/component.properties | 0 .../META-INF/services/org/apache/camel/component/chatscript | 0 .../services/org/apache/camel/configurer/chatscript-component | 0 .../services/org/apache/camel/configurer/chatscript-endpoint | 0 .../services/org/apache/camel/urifactory/chatscript-endpoint | 0 .../camel-chatscript/src/main/docs/chatscript-component.adoc | 0 .../org/apache/camel/component/chatscript/ChatScriptBot.java | 0 .../camel/component/chatscript/ChatScriptComponent.java | 0 .../apache/camel/component/chatscript/ChatScriptEndpoint.java | 0 .../apache/camel/component/chatscript/ChatScriptMessage.java | 0 .../apache/camel/component/chatscript/ChatScriptProducer.java | 0 .../camel/component/chatscript/utils/ChatScriptConstants.java | 0 .../org/apache/camel/component/ChatScriptComponentIT.java | 0 .../camel-chatscript/src/test/resources/log4j2.properties | 0 components/camel-ai/pom.xml | 1 + components/pom.xml | 1 - docs/components/modules/ROOT/examples/json/chatscript.json | 2 +- docs/components/modules/ROOT/pages/chatscript-component.adoc | 2 +- .../java/org/apache/camel/maven/packaging/MojoHelper.java | 4 ++-- 24 files changed, 6 insertions(+), 7 deletions(-) rename components/{ => camel-ai}/camel-chatscript/pom.xml (98%) rename components/{ => camel-ai}/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptComponentConfigurer.java (100%) rename components/{ => camel-ai}/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointConfigurer.java (100%) rename components/{ => camel-ai}/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriFactory.java (100%) rename components/{ => camel-ai}/camel-chatscript/src/generated/resources/META-INF/org/apache/camel/component/chatscript/chatscript.json (100%) rename components/{ => camel-ai}/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/component.properties (100%) rename components/{ => camel-ai}/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/component/chatscript (100%) rename components/{ => camel-ai}/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/configurer/chatscript-component (100%) rename components/{ => camel-ai}/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/configurer/chatscript-endpoint (100%) rename components/{ => camel-ai}/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/urifactory/chatscript-endpoint (100%) rename components/{ => camel-ai}/camel-chatscript/src/main/docs/chatscript-component.adoc (100%) rename components/{ => camel-ai}/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptBot.java (100%) rename components/{ => camel-ai}/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptComponent.java (100%) rename components/{ => camel-ai}/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptEndpoint.java (100%) rename components/{ => camel-ai}/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptMessage.java (100%) rename components/{ => camel-ai}/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptProducer.java (100%) rename components/{ => camel-ai}/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/utils/ChatScriptConstants.java (100%) rename components/{ => camel-ai}/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java (100%) rename components/{ => camel-ai}/camel-chatscript/src/test/resources/log4j2.properties (100%) diff --git a/components/camel-chatscript/pom.xml b/components/camel-ai/camel-chatscript/pom.xml similarity index 98% rename from components/camel-chatscript/pom.xml rename to components/camel-ai/camel-chatscript/pom.xml index 084d4c82ab316..e2db7649b616f 100644 --- a/components/camel-chatscript/pom.xml +++ b/components/camel-ai/camel-chatscript/pom.xml @@ -21,14 +21,13 @@ 4.0.0 + camel-ai-parent org.apache.camel - components 4.5.0-SNAPSHOT camel-chatscript jar - Camel :: ChatScript Camel support for ChatScript diff --git a/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptComponentConfigurer.java b/components/camel-ai/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptComponentConfigurer.java similarity index 100% rename from components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptComponentConfigurer.java rename to components/camel-ai/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptComponentConfigurer.java diff --git a/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointConfigurer.java b/components/camel-ai/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointConfigurer.java similarity index 100% rename from components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointConfigurer.java rename to components/camel-ai/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointConfigurer.java diff --git a/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriFactory.java b/components/camel-ai/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriFactory.java similarity index 100% rename from components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriFactory.java rename to components/camel-ai/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriFactory.java diff --git a/components/camel-chatscript/src/generated/resources/META-INF/org/apache/camel/component/chatscript/chatscript.json b/components/camel-ai/camel-chatscript/src/generated/resources/META-INF/org/apache/camel/component/chatscript/chatscript.json similarity index 100% rename from components/camel-chatscript/src/generated/resources/META-INF/org/apache/camel/component/chatscript/chatscript.json rename to components/camel-ai/camel-chatscript/src/generated/resources/META-INF/org/apache/camel/component/chatscript/chatscript.json diff --git a/components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-ai/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/component.properties similarity index 100% rename from components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/component.properties rename to components/camel-ai/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/component.properties diff --git a/components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/component/chatscript b/components/camel-ai/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/component/chatscript similarity index 100% rename from components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/component/chatscript rename to components/camel-ai/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/component/chatscript diff --git a/components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/configurer/chatscript-component b/components/camel-ai/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/configurer/chatscript-component similarity index 100% rename from components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/configurer/chatscript-component rename to components/camel-ai/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/configurer/chatscript-component diff --git a/components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/configurer/chatscript-endpoint b/components/camel-ai/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/configurer/chatscript-endpoint similarity index 100% rename from components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/configurer/chatscript-endpoint rename to components/camel-ai/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/configurer/chatscript-endpoint diff --git a/components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/urifactory/chatscript-endpoint b/components/camel-ai/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/urifactory/chatscript-endpoint similarity index 100% rename from components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/urifactory/chatscript-endpoint rename to components/camel-ai/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/urifactory/chatscript-endpoint diff --git a/components/camel-chatscript/src/main/docs/chatscript-component.adoc b/components/camel-ai/camel-chatscript/src/main/docs/chatscript-component.adoc similarity index 100% rename from components/camel-chatscript/src/main/docs/chatscript-component.adoc rename to components/camel-ai/camel-chatscript/src/main/docs/chatscript-component.adoc diff --git a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptBot.java b/components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptBot.java similarity index 100% rename from components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptBot.java rename to components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptBot.java diff --git a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptComponent.java b/components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptComponent.java similarity index 100% rename from components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptComponent.java rename to components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptComponent.java diff --git a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptEndpoint.java b/components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptEndpoint.java similarity index 100% rename from components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptEndpoint.java rename to components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptEndpoint.java diff --git a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptMessage.java b/components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptMessage.java similarity index 100% rename from components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptMessage.java rename to components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptMessage.java diff --git a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptProducer.java b/components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptProducer.java similarity index 100% rename from components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptProducer.java rename to components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptProducer.java diff --git a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/utils/ChatScriptConstants.java b/components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/utils/ChatScriptConstants.java similarity index 100% rename from components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/utils/ChatScriptConstants.java rename to components/camel-ai/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/utils/ChatScriptConstants.java diff --git a/components/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java b/components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java similarity index 100% rename from components/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java rename to components/camel-ai/camel-chatscript/src/test/java/org/apache/camel/component/ChatScriptComponentIT.java diff --git a/components/camel-chatscript/src/test/resources/log4j2.properties b/components/camel-ai/camel-chatscript/src/test/resources/log4j2.properties similarity index 100% rename from components/camel-chatscript/src/test/resources/log4j2.properties rename to components/camel-ai/camel-chatscript/src/test/resources/log4j2.properties diff --git a/components/camel-ai/pom.xml b/components/camel-ai/pom.xml index 843f9c1ec9259..01aae2b25ebf3 100644 --- a/components/camel-ai/pom.xml +++ b/components/camel-ai/pom.xml @@ -34,6 +34,7 @@ Camel AI parent + camel-chatscript camel-djl camel-langchain-chat camel-langchain-embeddings diff --git a/components/pom.xml b/components/pom.xml index 98de9eb7c60fa..072abafe160bd 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -98,7 +98,6 @@ camel-caffeine camel-cassandraql camel-cbor - camel-chatscript camel-chunk camel-cloudevents camel-cm-sms diff --git a/docs/components/modules/ROOT/examples/json/chatscript.json b/docs/components/modules/ROOT/examples/json/chatscript.json index 7255bd3827580..630f33007c587 120000 --- a/docs/components/modules/ROOT/examples/json/chatscript.json +++ b/docs/components/modules/ROOT/examples/json/chatscript.json @@ -1 +1 @@ -../../../../../../components/camel-chatscript/src/generated/resources/META-INF/org/apache/camel/component/chatscript/chatscript.json \ No newline at end of file +../../../../../../components/camel-ai/camel-chatscript/src/generated/resources/META-INF/org/apache/camel/component/chatscript/chatscript.json \ No newline at end of file diff --git a/docs/components/modules/ROOT/pages/chatscript-component.adoc b/docs/components/modules/ROOT/pages/chatscript-component.adoc index 2340bce4b72aa..c8717cc0a081e 120000 --- a/docs/components/modules/ROOT/pages/chatscript-component.adoc +++ b/docs/components/modules/ROOT/pages/chatscript-component.adoc @@ -1 +1 @@ -../../../../../components/camel-chatscript/src/main/docs/chatscript-component.adoc \ No newline at end of file +../../../../../components/camel-ai/camel-chatscript/src/main/docs/chatscript-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 75a311af1ce3c..8aa0be809680e 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 @@ -37,8 +37,8 @@ private MojoHelper() { public static List getComponentPath(Path dir) { switch (dir.getFileName().toString()) { case "camel-ai": - return Arrays.asList(dir.resolve("camel-djl"), dir.resolve("camel-langchain-chat"), - dir.resolve("camel-langchain-embeddings")); + return Arrays.asList(dir.resolve("camel-chatscript"), dir.resolve("camel-djl"), + dir.resolve("camel-langchain-chat"), dir.resolve("camel-langchain-embeddings")); case "camel-as2": return Collections.singletonList(dir.resolve("camel-as2-component")); case "camel-avro-rpc":