Updated Branches: refs/heads/master 95ebf0e11 -> f57c78f10
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/f57c78f1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f57c78f1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f57c78f1 Branch: refs/heads/master Commit: f57c78f100482592b36bf6f06c9e5c703e5c751d Parents: 95ebf0e Author: Charles Mouliard <cmoulli...@apache.org> Authored: Fri Jun 7 15:15:41 2013 +0200 Committer: Charles Mouliard <cmoulli...@apache.org> Committed: Fri Jun 7 15:15:41 2013 +0200 ---------------------------------------------------------------------- .../component/websocket/WebsocketComponent.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f57c78f1/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])); }
