[camel-karaf] branch master updated: Fixed camel-karaf after recent resource loader changes

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new e22a625  Fixed camel-karaf after recent resource loader changes
e22a625 is described below

commit e22a6251cbee1f2873d92fd8f0dbe1461cc77abe
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Mar 5 18:04:35 2021 +0100

    Fixed camel-karaf after recent resource loader changes
---
 .../src/main/java/org/apache/camel/blueprint/CamelBlueprintHelper.java | 3 +--
 .../blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-blueprint-main/src/main/java/org/apache/camel/blueprint/CamelBlueprintHelper.java
 
b/components/camel-blueprint-main/src/main/java/org/apache/camel/blueprint/CamelBlueprintHelper.java
index bd85347..e0169ac 100644
--- 
a/components/camel-blueprint-main/src/main/java/org/apache/camel/blueprint/CamelBlueprintHelper.java
+++ 
b/components/camel-blueprint-main/src/main/java/org/apache/camel/blueprint/CamelBlueprintHelper.java
@@ -48,7 +48,6 @@ import java.util.jar.JarInputStream;
 import org.apache.camel.impl.engine.DefaultClassResolver;
 import org.apache.camel.spi.ClassResolver;
 import org.apache.camel.support.ObjectHelper;
-import org.apache.camel.support.ResourceHelper;
 import org.apache.camel.util.FileUtil;
 import org.apache.camel.util.IOHelper;
 import org.apache.felix.connect.PojoServiceRegistryFactoryImpl;
@@ -549,7 +548,7 @@ public final class CamelBlueprintHelper {
                     }
                 } else {
                     LOG.debug("Resolving resource: {}", s);
-                    URL url = 
ResourceHelper.resolveMandatoryResourceAsUrl(RESOLVER, s);
+                    URL url = RESOLVER.loadResourceAsURL(s);
                     if (url == null) {
                         throw new FileNotFoundException("Resource " + s + " 
not found");
                     }
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
index 8dbe971..ccbf178 100644
--- 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/ConfigAdminNoDefaultValuesBlueprintCreationTest.java
@@ -33,7 +33,7 @@ public class ConfigAdminNoDefaultValuesBlueprintCreationTest 
extends CamelBluepr
             super.setUp();
             fail("Should fail, because Blueprint XML uses property 
placeholders, but we didn't define any property sources");
         } catch (Exception e) {
-            assertThat(e.getCause().getCause().getMessage(), equalTo("Property 
with key [destination] not found in properties from text: {{destination}}"));
+            assertThat(e.getCause().getCause().getCause().getMessage(), 
equalTo("Property with key [destination] not found in properties from text: 
{{destination}}"));
         }
     }