|
@@ -26,6 +26,7 @@ import com.dmdirc.util.LogUtils;
|
26
|
26
|
|
27
|
27
|
import org.eclipse.jetty.server.Handler;
|
28
|
28
|
import org.eclipse.jetty.server.Server;
|
|
29
|
+import org.eclipse.jetty.server.handler.ContextHandler;
|
29
|
30
|
import org.eclipse.jetty.server.handler.DefaultHandler;
|
30
|
31
|
import org.eclipse.jetty.server.handler.HandlerList;
|
31
|
32
|
import org.eclipse.jetty.server.handler.ResourceHandler;
|
|
@@ -63,12 +64,22 @@ public class WebServer {
|
63
|
64
|
resourceHandler.setWelcomeFiles(new String[]{ "index.html" });
|
64
|
65
|
resourceHandler.setBaseResource(Resource.newClassPathResource("/www"));
|
65
|
66
|
|
|
67
|
+ final ResourceHandler clientResourceHandler = new ResourceHandler();
|
|
68
|
+ clientResourceHandler.setBaseResource(Resource.newClassPathResource("/com/dmdirc/res/"));
|
|
69
|
+ final ContextHandler clientResourceContext = new ContextHandler("/res");
|
|
70
|
+ clientResourceContext.setHandler(clientResourceHandler);
|
|
71
|
+
|
66
|
72
|
final ServletContextHandler wsHandler = new ServletContextHandler();
|
67
|
73
|
wsHandler.setContextPath("/");
|
68
|
74
|
wsHandler.addServlet(WebUiWebSocketServlet.class, "/ws");
|
69
|
75
|
|
70
|
76
|
HandlerList handlers = new HandlerList();
|
71
|
|
- handlers.setHandlers(new Handler[] { resourceHandler, wsHandler, new DefaultHandler() });
|
|
77
|
+ handlers.setHandlers(new Handler[] {
|
|
78
|
+ resourceHandler,
|
|
79
|
+ clientResourceContext,
|
|
80
|
+ wsHandler,
|
|
81
|
+ new DefaultHandler()
|
|
82
|
+ });
|
72
|
83
|
server.setHandler(handlers);
|
73
|
84
|
|
74
|
85
|
server.start();
|