diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2015-12-08 10:18:26 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2015-12-08 10:18:26 +1300 |
| commit | 782a1441c1bc33045b341c77e1a2394052bd16e8 (patch) | |
| tree | a8e8ebf73ffdf01de2a99cff8e8004af60598e2e /src/org/traccar/web | |
| parent | 8ce214876cb4c55c242e46fb004adeca16d3b23b (diff) | |
| download | traccar-server-782a1441c1bc33045b341c77e1a2394052bd16e8.tar.gz traccar-server-782a1441c1bc33045b341c77e1a2394052bd16e8.tar.bz2 traccar-server-782a1441c1bc33045b341c77e1a2394052bd16e8.zip | |
Add basic websocket servlet to the server
Diffstat (limited to 'src/org/traccar/web')
| -rw-r--r-- | src/org/traccar/web/WebServer.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java index e7c0057e4..cd01d04b4 100644 --- a/src/org/traccar/web/WebServer.java +++ b/src/org/traccar/web/WebServer.java @@ -33,6 +33,7 @@ import org.eclipse.jetty.webapp.WebAppContext; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; import org.traccar.Config; +import org.traccar.api.AsyncSocketServlet; import org.traccar.api.CorsResponseFilter; import org.traccar.api.ResourceErrorHandler; import org.traccar.api.SecurityRequestFilter; @@ -133,6 +134,7 @@ public class WebServer { PermissionResource.class, DeviceResource.class, UserResource.class, PositionResource.class); servletHandler.addServlet(new ServletHolder(new ServletContainer(resourceConfig)), "/rest/*"); } + servletHandler.addServlet(new ServletHolder(new AsyncSocketServlet()), "/socket"); servletHandler.addServlet(new ServletHolder(new AsyncServlet()), "/async/*"); servletHandler.addServlet(new ServletHolder(new ServerServlet()), "/server/*"); servletHandler.addServlet(new ServletHolder(new UserServlet()), "/user/*"); |