You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/04/15 11:14:14 UTC

[camel] branch main updated: camel-core - Better loc:line for other DSLs

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 7c49aa77dba camel-core - Better loc:line for other DSLs
7c49aa77dba is described below

commit 7c49aa77dbae70044a20343fa3747e83f458be79
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Apr 15 13:13:49 2022 +0200

    camel-core - Better loc:line for other DSLs
---
 .../java/org/apache/camel/model/ProcessorDefinitionHelper.java    | 4 ++--
 .../camel-jbang-core/src/main/resources/templates/jsh.tmpl        | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
index 41289f41874..8197cffeb9f 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinitionHelper.java
@@ -383,8 +383,8 @@ public final class ProcessorDefinitionHelper {
             node.setLocation(resource.getLocation());
 
             String ext = FileUtil.onlyExt(resource.getLocation(), true);
-            if ("groovy".equals(ext) || "js".equals(ext)) {
-                // we cannot get line number for groovy/javascript scripts
+            if ("groovy".equals(ext) || "js".equals(ext) || "jsh".equals(ext)) {
+                // we cannot get line number for groovy/java-script/java-shell
                 return;
             }
         }
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/jsh.tmpl b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/jsh.tmpl
new file mode 100644
index 00000000000..1ddebe78fbe
--- /dev/null
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/jsh.tmpl
@@ -0,0 +1,8 @@
+// camel-k: language=jsh
+
+// Write your routes here, for example:
+builder.from("timer:tick?period=1000")
+    .routeId('jsh')
+    .setBody()
+      .simple('Hello Camel from ${routeId}')
+    .log('${body}');