This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new fb21ad7a2ef CAMEL-20755: camel-kamelet - Default location should be
without leading slash for classpath
fb21ad7a2ef is described below
commit fb21ad7a2efdcd4173e7c35238b4aa09042c0de1
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri May 10 22:42:38 2024 +0200
CAMEL-20755: camel-kamelet - Default location should be without leading
slash for classpath
---
.../resources/org/apache/camel/catalog/components/kamelet.json | 2 +-
.../resources/META-INF/org/apache/camel/component/kamelet/kamelet.json | 2 +-
components/camel-kamelet/src/main/docs/kamelet-component.adoc | 2 +-
.../src/main/java/org/apache/camel/component/kamelet/Kamelet.java | 2 +-
dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc | 2 +-
.../src/main/java/org/apache/camel/main/KameletMain.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kamelet.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kamelet.json
index e4282bd40cd..5892168a498 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kamelet.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kamelet.json
@@ -23,7 +23,7 @@
"remote": true
},
"componentProperties": {
- "location": { "index": 0, "kind": "property", "displayName": "Location",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "classpath:\/kamelets", "description": "The
location(s) of the Kamelets on the file system. Multiple locations can be set
separated by comma." },
+ "location": { "index": 0, "kind": "property", "displayName": "Location",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "classpath:kamelets", "description": "The
location(s) of the Kamelets on the file system. Multiple locations can be set
separated by comma." },
"routeProperties": { "index": 1, "kind": "property", "displayName": "Route
Properties", "group": "common", "label": "", "required": false, "type":
"object", "javaType": "java.util.Map<java.lang.String, java.util.Properties>",
"deprecated": false, "autowired": false, "secret": false, "description": "Set
route local parameters." },
"templateProperties": { "index": 2, "kind": "property", "displayName":
"Template Properties", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "java.util.Map<java.lang.String,
java.util.Properties>", "deprecated": false, "autowired": false, "secret":
false, "description": "Set template local parameters." },
"bridgeErrorHandler": { "index": 3, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions (if possible) occurred while the Camel consumer is trying
to pickup incoming messages, or the like [...]
diff --git
a/components/camel-kamelet/src/generated/resources/META-INF/org/apache/camel/component/kamelet/kamelet.json
b/components/camel-kamelet/src/generated/resources/META-INF/org/apache/camel/component/kamelet/kamelet.json
index e4282bd40cd..5892168a498 100644
---
a/components/camel-kamelet/src/generated/resources/META-INF/org/apache/camel/component/kamelet/kamelet.json
+++
b/components/camel-kamelet/src/generated/resources/META-INF/org/apache/camel/component/kamelet/kamelet.json
@@ -23,7 +23,7 @@
"remote": true
},
"componentProperties": {
- "location": { "index": 0, "kind": "property", "displayName": "Location",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "classpath:\/kamelets", "description": "The
location(s) of the Kamelets on the file system. Multiple locations can be set
separated by comma." },
+ "location": { "index": 0, "kind": "property", "displayName": "Location",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "classpath:kamelets", "description": "The
location(s) of the Kamelets on the file system. Multiple locations can be set
separated by comma." },
"routeProperties": { "index": 1, "kind": "property", "displayName": "Route
Properties", "group": "common", "label": "", "required": false, "type":
"object", "javaType": "java.util.Map<java.lang.String, java.util.Properties>",
"deprecated": false, "autowired": false, "secret": false, "description": "Set
route local parameters." },
"templateProperties": { "index": 2, "kind": "property", "displayName":
"Template Properties", "group": "common", "label": "", "required": false,
"type": "object", "javaType": "java.util.Map<java.lang.String,
java.util.Properties>", "deprecated": false, "autowired": false, "secret":
false, "description": "Set template local parameters." },
"bridgeErrorHandler": { "index": 3, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions (if possible) occurred while the Camel consumer is trying
to pickup incoming messages, or the like [...]
diff --git a/components/camel-kamelet/src/main/docs/kamelet-component.adoc
b/components/camel-kamelet/src/main/docs/kamelet-component.adoc
index d3bd5261eb8..db0f4aec6e2 100644
--- a/components/camel-kamelet/src/main/docs/kamelet-component.adoc
+++ b/components/camel-kamelet/src/main/docs/kamelet-component.adoc
@@ -45,7 +45,7 @@ The *kamelet* endpoint is *lenient*, which means that the
endpoint accepts addit
== Discovery
-If a xref:manual::route-template.adoc[Route Template] is not found, the
*kamelet* endpoint tries to load the related *kamelet* definition from the file
system (by default `classpath:/kamelets`). The default resolution mechanism
expects _Kamelets_ files to have the extension `.kamelet.yaml`.
+If a xref:manual::route-template.adoc[Route Template] is not found, the
*kamelet* endpoint tries to load the related *kamelet* definition from the file
system (by default `classpath:kamelets`). The default resolution mechanism
expects _Kamelets_ files to have the extension `.kamelet.yaml`.
== Samples
diff --git
a/components/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
index 0432b9d1f16..94d94e229cc 100644
---
a/components/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
@@ -44,7 +44,7 @@ public final class Kamelet {
public static final String PARAM_TEMPLATE_ID = "templateId";
public static final String PARAM_LOCATION = "location";
public static final String PARAM_UUID = "uuid";
- public static final String DEFAULT_LOCATION = "classpath:/kamelets";
+ public static final String DEFAULT_LOCATION = "classpath:kamelets";
public static final String NO_ERROR_HANDLER = "noErrorHandler";
// use a running counter as uuid
diff --git a/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc
b/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc
index f10904609b9..3cac474929d 100644
--- a/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc
+++ b/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc
@@ -20,7 +20,7 @@ The `KameletMain` is pre-configured with the following
properties:
[source,properties]
----
-camel.component.kamelet.location =
classpath:/kamelets,github:apache:camel-kamelets/kamelets
+camel.component.kamelet.location =
classpath:kamelets,github:apache:camel-kamelets/kamelets
camel.component.rest.consumerComponentName = platform-http
camel.component.rest.producerComponentName = vertx-http
camel.main.jmxUpdateRouteEnabled = true
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
index d66bc292903..16fd0d42600 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
@@ -101,7 +101,7 @@ import org.apache.camel.tooling.maven.MavenGav;
*/
public class KameletMain extends MainCommandLineSupport {
- public static final String DEFAULT_KAMELETS_LOCATION =
"classpath:/kamelets,github:apache:camel-kamelets/kamelets";
+ public static final String DEFAULT_KAMELETS_LOCATION =
"classpath:kamelets,github:apache:camel-kamelets/kamelets";
protected final MainRegistry registry = new MainRegistry();
private String profile = "dev";
