Updated Branches: refs/heads/camel-2.11.x aa939a6eb -> 75a171143
CAMEL-6432: Use URL to load resources using camel getclassresolver Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/75a17114 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/75a17114 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/75a17114 Branch: refs/heads/camel-2.11.x Commit: 75a1711434cb515f154de6f2a741248a228d987c Parents: aa939a6 Author: Charles Mouliard <cmoulli...@apache.org> Authored: Fri Jun 7 15:10:00 2013 +0200 Committer: Charles Mouliard <cmoulli...@apache.org> Committed: Fri Jun 7 15:10:37 2013 +0200 ---------------------------------------------------------------------- .../component/websocket/WebsocketComponent.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/75a17114/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java index 04e9f06..31bc5c0 100644 --- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java +++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java @@ -18,6 +18,7 @@ package org.apache.camel.component.websocket; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.net.URL; import java.util.EnumSet; import java.util.HashMap; import java.util.List; @@ -349,7 +350,10 @@ public class WebsocketComponent extends DefaultComponent { } if (resources[0].equals("classpath")) { - context.setBaseResource(new JettyClassPathResource(getCamelContext().getClassResolver(), resources[1])); + // Does not work when deployed as a bundle + // context.setBaseResource(new JettyClassPathResource(getCamelContext().getClassResolver(), resources[1])); + URL url = this.getCamelContext().getClassResolver().loadResourceAsURL(resources[1]); + context.setBaseResource(Resource.newResource(url)); } else if (resources[0].equals("file")) { context.setBaseResource(Resource.newResource(resources[1])); }
