svn commit: r1306439 - in /camel/trunk: components/camel-websocket/src/main/java/org/apache/camel/component/websocket/ examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/

[da...@apache.org]

Author: davsclaus
Date: Wed Mar 28 15:44:48 2012
New Revision: 1306439

URL: http://svn.apache.org/viewvc?rev=1306439&view=rev
Log:
Allow to load static resources from classpath with camel-websocket. Polished the twitter example.

Added:
    camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java
Modified:
    camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
    camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
    camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/TwitterWebSocketRoute.java

Added: camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java?rev=1306439&view=auto
==============================================================================
--- camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java (added)
+++ camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/JettyClassPathResource.java Wed Mar 28 15:44:48 2012
@@ -0,0 +1,129 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.websocket;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.camel.spi.ClassResolver;
+import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ObjectHelper;
+import org.eclipse.jetty.util.resource.Resource;
+
+/**
+ * A Jetty {@link Resource} to load from the classpath using Camels {@link ClassResolver}
+ * which ensures loading resources works in OSGi and other containers.
+ */
+public class JettyClassPathResource extends Resource {
+    
+    private final ClassResolver resolver;
+    private final String path;
+
+    public JettyClassPathResource(ClassResolver resolver, String path) {
+        ObjectHelper.notNull(resolver, "ClassResolver");
+        ObjectHelper.notNull(path, "path");
+        this.resolver = resolver;
+        this.path = path;
+    }
+
+    @Override
+    public boolean isContainedIn(Resource r) throws MalformedURLException {
+        return false;
+    }
+
+    @Override
+    public void release() {
+        // noop
+    }
+
+    @Override
+    public boolean exists() {
+        InputStream is = resolver.loadResourceAsStream(path);
+        if (is != null) {
+            IOHelper.close(is);
+        }
+        return is != null;
+    }
+
+    @Override
+    public boolean isDirectory() {
+        return exists() && path.endsWith("/");
+    }
+
+    @Override
+    public long lastModified() {
+        return 0;
+    }
+
+    @Override
+    public long length() {
+        return 0;
+    }
+
+    @Override
+    public URL getURL() {
+        return resolver.loadResourceAsURL(path);
+    }
+
+    @Override
+    public File getFile() throws IOException {
+        URL url = getURL();
+        if (url != null) {
+            return new File(url.getFile());
+        }
+        return null;
+    }
+
+    @Override
+    public String getName() {
+        return path;
+    }
+
+    @Override
+    public InputStream getInputStream() throws IOException {
+        return resolver.loadResourceAsStream(path);
+    }
+
+    @Override
+    public OutputStream getOutputStream() throws IOException, SecurityException {
+        return null;
+    }
+
+    @Override
+    public boolean delete() throws SecurityException {
+        return false;
+    }
+
+    @Override
+    public boolean renameTo(Resource dest) throws SecurityException {
+        return false;
+    }
+
+    @Override
+    public String[] list() {
+        return new String[0];
+    }
+
+    @Override
+    public Resource addPath(String path) throws IOException, MalformedURLException {
+        return new JettyClassPathResource(resolver, this.path + "/" + path);
+    }
+}

Modified: camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java?rev=1306439&r1=1306438&r2=1306439&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java (original)
+++ camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java Wed Mar 28 15:44:48 2012
@@ -22,6 +22,7 @@ import java.util.Map;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.util.ObjectHelper;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.SessionManager;
 import org.eclipse.jetty.server.session.HashSessionManager;
@@ -71,6 +72,19 @@ public class WebsocketComponent extends 
         return staticResources;
     }
 
+    /**
+     * Set a resource path for static resources (such as .html files etc).
+     * <p/>
+     * The resources can be loaded from classpath, if you prefix with <tt>classpath:</tt>,
+     * otherwise the resources is loaded from file system or from JAR files.
+     * <p/>
+     * For example to load from root classpath use <tt>classpath:.</tt>, or
+     * <tt>classpath:WEB-INF/static</tt>
+     * <p/>
+     * If not configured (eg <tt>null</tt>) then no static resource is in use.
+     *
+     * @param staticResources the base path
+     */
     public void setStaticResources(String staticResources) {
         this.staticResources = staticResources;
     }
@@ -102,7 +116,14 @@ public class WebsocketComponent extends 
         context.setSessionHandler(sh);
 
         if (home != null) {
-            context.setResourceBase(home);
+            if (home.startsWith("classpath:")) {
+                home = ObjectHelper.after(home, "classpath:");
+                LOG.debug("Using base resource from classpath: {}", home);
+                context.setBaseResource(new JettyClassPathResource(getCamelContext().getClassResolver(), home));
+            } else {
+                LOG.debug("Using base resource: {}", home);
+                context.setResourceBase(home);
+            }
             DefaultServlet defaultServlet = new DefaultServlet();
             ServletHolder holder = new ServletHolder(defaultServlet);
 

Modified: camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java?rev=1306439&r1=1306438&r2=1306439&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java (original)
+++ camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketProducer.java Wed Mar 28 15:44:48 2012
@@ -32,7 +32,6 @@ public class WebsocketProducer extends D
         super(endpoint);
         this.store = store;
         this.sendToAll = endpoint.getSendToAll();
-        System.out.println("Configured with " + sendToAll);
     }
 
     @Override

Modified: camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/TwitterWebSocketRoute.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/TwitterWebSocketRoute.java?rev=1306439&r1=1306438&r2=1306439&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/TwitterWebSocketRoute.java (original)
+++ camel/trunk/examples/camel-example-twitter-websocket/src/main/java/org/apache/camel/example/websocket/TwitterWebSocketRoute.java Wed Mar 28 15:44:48 2012
@@ -92,10 +92,11 @@ public class TwitterWebSocketRoute exten
 
     @Override
     public void configure() throws Exception {
-        // setup Camel web-socket component on port 9090
+        // setup Camel web-socket component on the port we have defined
         WebsocketComponent wc = getContext().getComponent("websocket", WebsocketComponent.class);
         wc.setPort(port);
-        wc.setStaticResources("src/main/resources");
+        // we can serve static resources from the classpath: or file: system
+        wc.setStaticResources("classpath:.");
 
         // setup Twitter component
         TwitterComponent tc = getContext().getComponent("twitter", TwitterComponent.class);