[camel] branch main updated: CAMEL-19689: camel-jbang - Load classpath resources that have src/main/resources as prefix.

[davsclaus]

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 1fb17b7b26c CAMEL-19689: camel-jbang - Load classpath resources that 
have src/main/resources as prefix.
1fb17b7b26c is described below

commit 1fb17b7b26c5e78dbd95f44f96fa97ad86856d22
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Aug 4 19:31:58 2023 +0200

    CAMEL-19689: camel-jbang - Load classpath resources that have 
src/main/resources as prefix.
---
 .../org/apache/camel/main/util/ExtraFilesClassLoader.java   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git 
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java
 
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java
index fc1a0a5993c..01017acc86b 100644
--- 
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java
+++ 
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/util/ExtraFilesClassLoader.java
@@ -40,10 +40,17 @@ public final class ExtraFilesClassLoader extends 
ClassLoader {
 
     @Override
     public URL getResource(String name) {
-        for (String n : files) {
-            if (name.equals(n)) {
+        for (String f : files) {
+            String source = f;
+            // deal with adding files to classpath that are in 
src/main/resources
+            if (source.startsWith("src/main/resources/")) {
+                source = source.substring(19);
+            } else if (source.startsWith("src\\main\\resources\\")) {
+                source = source.substring(19);
+            }
+            if (name.equals(source)) {
                 try {
-                    return new File(name).toURI().toURL();
+                    return new File(f).toURI().toURL();
                 } catch (MalformedURLException e) {
                     // ignore
                 }